From 50e611a1a9934ceae665ceb27a2765b48125b4f4 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 21 Sep 2013 18:44:05 +0200 Subject: [PATCH] Shouldn't define static classes as abstract. New Exception class added (MethodNotImplementedException) --- classes/Managed_DataObject.php | 5 ++- lib/iomanager.php | 4 ++- lib/methodnotimplementedexception.php | 50 +++++++++++++++++++++++++++ lib/siteprofile.php | 5 ++- 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 lib/methodnotimplementedexception.php diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php index 80210dc8a3..ae37dd02ea 100644 --- a/classes/Managed_DataObject.php +++ b/classes/Managed_DataObject.php @@ -28,7 +28,10 @@ abstract class Managed_DataObject extends Memcached_DataObject /** * The One True Thingy that must be defined and declared. */ - public static abstract function schemaDef(); + public static function schemaDef() + { + throw new MethodNotImplementedException(__METHOD__); + } /** * Get an instance by key diff --git a/lib/iomanager.php b/lib/iomanager.php index 217599a6d2..cb2b35daee 100644 --- a/lib/iomanager.php +++ b/lib/iomanager.php @@ -38,7 +38,9 @@ abstract class IoManager /** * Factory function to get an appropriate subclass. */ - public abstract static function get(); + public static function get() { + throw new MethodNotImplementedException(__METHOD__); + } /** * Tell the i/o queue master if and how we can handle multi-site diff --git a/lib/methodnotimplementedexception.php b/lib/methodnotimplementedexception.php new file mode 100644 index 0000000000..8ae81ba5fa --- /dev/null +++ b/lib/methodnotimplementedexception.php @@ -0,0 +1,50 @@ +. + * + * @category Exception + * @package StatusNet + * @author Mikael Nordfeldth + * @copyright 2013 Free Software Foundation, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('GNUSOCIAL')) { + exit(1); +} + +/** + * Class for an exception when a local user is not found by certain criteria + * + * @category Exception + * @package StatusNet + * @author Mikael Nordfeldth + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +class MethodNotImplementedException extends ServerException +{ + public function __construct($method) + { + parent::__construct(sprintf(_('Method %s not implemented'), $method)); + } +} diff --git a/lib/siteprofile.php b/lib/siteprofile.php index f5e601c24c..16237f1bc3 100644 --- a/lib/siteprofile.php +++ b/lib/siteprofile.php @@ -73,7 +73,10 @@ class SiteProfile */ abstract class SiteProfileSettings { - abstract static function getSettings(); + static function getSettings() + { + throw new MethodNotImplementedException(__METHOD__); + } static function defaultPlugins() { return array(