Unifies "does not implement" SystemException texts

diff --git a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
index bebafaecf184900ff3639ecab6a3d06d075f9da5..87a17ff470251b11569dabfbc7c32559792c9c29 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
@@ -81,7 +81,7 @@ class WorkerProxyAction extends AbstractSecureAction {
                }
                
                if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\worker\IWorker')) {
-                       throw new SystemException("class '".$this->className."' should implement the interface 'wcf\system\worker\IWorker'");
+                       throw new SystemException("'".$this->className."' does not implement 'wcf\system\worker\IWorker'");
                }
        }
        

diff --git a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php
index 4ccde0c3baa35ad4f9312fa7cb284b7e47effdf5..8dfafb0c450ae664a23f3521e19627730e25c205 100644 (file)
--- a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php
+++ b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php
@@ -111,10 +111,10 @@ class AJAXInvokeAction extends AbstractSecureAction {
        protected function invoke() {
                // check for interface and inheritance of SingletonFactory
                if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\IAJAXInvokeAction')) {
-                       throw new SystemException("'".$this->className."' should implement 'wcf\system\IAJAXInvokeAction'");
+                       throw new SystemException("'".$this->className."' does not implement 'wcf\system\IAJAXInvokeAction'");
                }
                else if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
-                       throw new SystemException("'".$this->className."' should extend 'wcf\system\SingletonFactory'");
+                       throw new SystemException("'".$this->className."' does not extend 'wcf\system\SingletonFactory'");
                }
                
                $this->actionObject = call_user_func(array($this->className, 'getInstance'));

diff --git a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
index de68bcf53677ab4f2dfae1dbc583db0178767f47..6f58f5e4ee49f520afe1a1b59c59d2555e358782 100644 (file)
--- a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
+++ b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
@@ -57,12 +57,12 @@ class AJAXProxyAction extends AJAXInvokeAction {
         */
        protected function invoke() {
                if (!ClassUtil::isInstanceOf($this->className, 'wcf\data\IDatabaseObjectAction')) {
-                       throw new SystemException("'".$this->className."' should implement 'wcf\data\IDatabaseObjectAction'");
+                       throw new SystemException("'".$this->className."' does not implement 'wcf\data\IDatabaseObjectAction'");
                }
                
                if (!empty($this->interfaceName)) {
                        if (!ClassUtil::isInstanceOf($this->className, $this->interfaceName)) {
-                               throw new SystemException("'".$this->className."' should implement '".$this->interfaceName."'");
+                               throw new SystemException("'".$this->className."' does not implement '".$this->interfaceName."'");
                        }
                }
                

diff --git a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
index af60731ae3c47b0185bb6c0f28247c6ccabe67b6..3a0efa80d1b0f5823aed635d298c2e7766b4c95c 100644 (file)
--- a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
+++ b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
@@ -38,7 +38,7 @@ class ProcessibleDatabaseObject extends DatabaseObject {
                                        throw new SystemException("Unable to find class '".$this->className."'");
                                }
                                if (!ClassUtil::isInstanceOf($this->className, static::$processorInterface)) {
-                                       throw new SystemException("'".$this->className."' should implement ".static::$processorInterface);
+                                       throw new SystemException("'".$this->className."' does not implement '".static::$processorInterface."'");
                                }
                                
                                if (ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
@@ -46,7 +46,7 @@ class ProcessibleDatabaseObject extends DatabaseObject {
                                }
                                else {
                                        if (!ClassUtil::isInstanceOf($this->className, 'wcf\data\IDatabaseObjectProcessor')) {
-                                               throw new SystemException("'".$this->className."' should implement wcf\data\IDatabaseObjectProcessor");
+                                               throw new SystemException("'".$this->className."' does not implement 'wcf\data\IDatabaseObjectProcessor'");
                                        }
                                        
                                        $this->processor = new $this->className($this);

diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
index dc2383a7447057ec6637c595c64253012e636206..3727de9a17a43e8e3776ae01923b17c47c5f50d6 100644 (file)
--- a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
@@ -69,11 +69,11 @@ class ObjectType extends ProcessibleDatabaseObject {
                                        objects itself - instead it provides methods to receive the required objects.
                                
                                if (!ClassUtil::isInstanceOf($this->className, 'wcf\data\IDatabaseObjectProcessor')) {
-                                       throw new SystemException("'".$this->className."' should implement wcf\data\IDatabaseObjectProcessor");
+                                       throw new SystemException("'".$this->className."' does not implement 'wcf\data\IDatabaseObjectProcessor'");
                                }
                                */
                                if (($definitionInterface = ObjectTypeCache::getInstance()->getDefinition($this->definitionID)->interfaceName) && !ClassUtil::isInstanceOf($this->className, $definitionInterface)) {
-                                       throw new SystemException("'".$this->className."' should implement ".$definitionInterface);
+                                       throw new SystemException("'".$this->className."' does not implement '".$definitionInterface."'");
                                }
                                
                                if (ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {

diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
index 958d542ffdb086e893cb87103b0ad096b4dfc937..1ded4ff1fc34de766c1c3c5f9bf2501d46953478 100644 (file)
--- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
+++ b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
@@ -44,7 +44,7 @@ class Sitemap extends DatabaseObject {
                        }
                        
                        if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\sitemap\ISitemapProvider')) {
-                               throw new SystemException("Class '".$this->className."' does not implement the interface 'wcf\system\sitemap\ISitemapProvider'");
+                               throw new SystemException("'".$this->className."' does not implement 'wcf\system\sitemap\ISitemapProvider'");
                        }
                        
                        $this->sitemapObj = new $this->className();

diff --git a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
index 7165eee3fa3586cdb4cd45ef915b8358057a6fd2..a71cff6f25d7c6d074c8062b20154b023271e787 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
@@ -82,7 +82,7 @@ class ViewableUserOption extends DatabaseObjectDecorator {
                        
                        // validate interface
                        if (!ClassUtil::isInstanceOf($this->outputClass, 'wcf\system\option\user\IUserOptionOutput')) {
-                               throw new SystemException("'".$this->outputClass."' should implement wcf\system\option\user\IUserOptionOutput");
+                               throw new SystemException("'".$this->outputClass."' does not implement 'wcf\system\option\user\IUserOptionOutput'");
                        }
                        
                        self::$outputObjects[$this->outputClass] = new $this->outputClass();

diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
index 7a4d7d102beb5ca8261aa2451ca282b6c354282b..e15402e5b00af9bc0a2725bb12f178d1bc370d03 100644 (file)
--- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
+++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
@@ -132,7 +132,7 @@ abstract class MultipleLinkPage extends AbstractPage {
                }
                
                if (!ClassUtil::isInstanceOf($this->objectListClassName, 'wcf\data\DatabaseObjectList')) {
-                       throw new SystemException("Class '".$this->objectListClassName."' does not extend 'wcf\data\DatabaseObjectList'");
+                       throw new SystemException("'".$this->objectListClassName."' does not extend 'wcf\data\DatabaseObjectList'");
                }
                
                $this->objectList = new $this->objectListClassName();

diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
index f4c2e03be09221d5d9b80669cf56cdc7edd381cd..55291229a4e9f95cbf233f2e010de283173dd30c 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
@@ -121,7 +121,7 @@ class UserGroupPermissionCacheBuilder implements ICacheBuilder {
                                throw new SystemException("unable to find class '".$className."'");
                        }
                        if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
-                               throw new SystemException("'".$className."' should implement wcf\system\option\user\group\IUserGroupOptionType");
+                               throw new SystemException("'".$className."' does not implement 'wcf\system\option\user\group\IUserGroupOptionType'");
                        }
                        
                        // create instance

diff --git a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
index 27f140a4277e969446b7a1ff3b79c477f6219161..1e5a88a6c63e2ff4530b55ed93c7799f331589fe 100644 (file)
--- a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
+++ b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
@@ -113,7 +113,7 @@ class CleanupHandler {
                        
                        // validate interface
                        if (!(ClassUtil::isInstanceOf($adapterData['className'], 'wcf\system\cleanup\ICleanupAdapter'))) {
-                               throw new SystemException("class '".$adapterData['className']."' does not implement the interface 'wcf\system\cleanup\ICleanupAdapter'");
+                               throw new SystemException("'".$adapterData['className']."' does not implement 'wcf\system\cleanup\ICleanupAdapter'");
                        }
                        
                        $adapter = new $adapterData['className']();

diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
index e338d333e016c23d3f75f8528d390611f9fb451f..3f80a221b5483c995507257ce94bd1d27d4a9457 100644 (file)
--- a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
@@ -247,7 +247,7 @@ class ClipboardHandler extends SingletonFactory {
                        if (!isset($actions[$actionClassName])) {
                                // validate class
                                if (!ClassUtil::isInstanceOf($actionClassName, 'wcf\system\clipboard\action\IClipboardAction')) {
-                                       throw new SystemException("class '".$actionClassName."' does not implement the interface 'wcf\system\clipboard\action\IClipboardAction'.");
+                                       throw new SystemException("'".$actionClassName."' does not implement 'wcf\system\clipboard\action\IClipboardAction'");
                                }
                                
                                $actions[$actionClassName] = array(

diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
index ac57c5b459b4c0abb1b57316787a6fe579736eb6..b3f4d401582cb53c8618d22237258539a6cc56c1 100644 (file)
--- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
@@ -164,7 +164,7 @@ class CronjobScheduler extends SingletonFactory {
                
                // verify class signature
                if (!(ClassUtil::isInstanceOf($className, 'wcf\system\cronjob\ICronjob'))) {
-                       throw new SystemException("class '".$className."' does not implement the interface 'wcf\system\cronjob\ICronjob'");
+                       throw new SystemException("'".$className."' does not implement 'wcf\system\cronjob\ICronjob'");
                }
                
                // execute cronjob

diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
index 7c58634b03d498a04c869a420ff5a3b47cd90e4f..ba5732a701b1be1edae851162dce5391d7d9619d 100644 (file)
--- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php
+++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
@@ -114,7 +114,7 @@ class EventHandler extends SingletonFactory {
                                                                        throw new SystemException("Unable to find class '".$action['listenerClassName']."'");
                                                                }
                                                                if (!ClassUtil::isInstanceOf($action['listenerClassName'], 'wcf\system\event\IEventListener')) {
-                                                                       throw new SystemException("'".$action['listenerClassName']."' should implement interface wcf\system\event\IEventListener");
+                                                                       throw new SystemException("'".$action['listenerClassName']."' does not implement 'wcf\system\event\IEventListener'");
                                                                }
                                                                
                                                                $object = new $action['listenerClassName'];
@@ -179,7 +179,7 @@ class EventHandler extends SingletonFactory {
                                                throw new SystemException("Unable to find class '".$action['listenerClassName']."'");
                                        }
                                        if (!ClassUtil::isInstanceOf($action['listenerClassName'], 'wcf\system\event\IEventListener')) {
-                                               throw new SystemException("'".$action['listenerClassName']."' should implement interface wcf\system\event\IEventListener");
+                                               throw new SystemException("'".$action['listenerClassName']."' does not implement 'wcf\system\event\IEventListener'");
                                        }
                                        
                                        $object = new $action['listenerClassName'];

diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
index 0adc91e52e7312422f86e67c0f5064645322914e..0ad504ee57104accf280dd4d3e1613cd7d484fed 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
@@ -357,7 +357,7 @@ class OptionHandler implements IOptionHandler {
                        return null;
                }
                if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\IOptionType')) {
-                       throw new SystemException("'".$className."' should implement wcf\system\option\IOptionType");
+                       throw new SystemException("'".$className."' does not implement 'wcf\system\option\IOptionType'");
                }
                
                return $className;

diff --git a/wcfsetup/install/files/lib/system/option/user/group/UserGroupOptionHandler.class.php b/wcfsetup/install/files/lib/system/option/user/group/UserGroupOptionHandler.class.php
index 79744f588c8a02610ad3788048dc9eda19eb11de..4c176020eb80b1d52e33d42bc0ad201b4d989bab 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/user/group/UserGroupOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/group/UserGroupOptionHandler.class.php
@@ -42,7 +42,7 @@ class UserGroupOptionHandler extends OptionHandler {
                        return null;
                }
                if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
-                       throw new SystemException("'".$className."' should implement 'wcf\system\option\user\group\IUserGroupOptionType'");
+                       throw new SystemException("'".$className."' does not implement 'wcf\system\option\user\group\IUserGroupOptionType'");
                }
                
                return $className;

diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index dc49a2a67ce9bfb6fb168f1552cfadefb5f1ad65..f79c9eb024a2a427f83c471d113390cb22a77a8a 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -484,7 +484,7 @@ class PackageInstallationDispatcher {
                $plugin = new $className($this, $nodeData);
                
                if (!($plugin instanceof \wcf\system\package\plugin\IPackageInstallationPlugin)) {
-                       throw new SystemException("class '".$className."' does not implement the interface 'wcf\system\package\plugin\IPackageInstallationPlugin'");
+                       throw new SystemException("'".$className."' does not implement 'wcf\system\package\plugin\IPackageInstallationPlugin'");
                }
                
                // execute PIP

diff --git a/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php b/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php
index 81df9e34156eef2de47bd0046f2f9e0d9b0c432c..dea4438f2d31d3149952ff543ee8f91d553eb837 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php
@@ -60,7 +60,7 @@ class ACPSearchHandler extends SingletonFactory {
                foreach ($this->cache as $acpSearchProvider) {
                        $className = $acpSearchProvider->className;
                        if (!ClassUtil::isInstanceOf($className, 'wcf\system\search\acp\IACPSearchResultProvider')) {
-                               throw new SystemException("Class '".$className."' does not implement the interface 'wcf\system\search\acp\IACPSearchResultProvider'");
+                               throw new SystemException("'".$className."' does not implement 'wcf\system\search\acp\IACPSearchResultProvider'");
                        }
                        
                        $provider = new $className();