deprecate wcf\util\ClassUtil:: isInstanceOf

diff --git a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
index d19dcbc86bc68174dec426cba8ced84dc6a78ecf..401a65400f00477ca48fb8527e1a89e2286b1768 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
@@ -4,7 +4,6 @@ use wcf\action\AbstractSecureAction;
 use wcf\action\AJAXInvokeAction;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 use wcf\util\JSON;
 
 /**
@@ -64,7 +63,7 @@ class WorkerProxyAction extends AJAXInvokeAction {
                        throw new SystemException("class name cannot be empty.");
                }
                
-               if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\worker\IWorker')) {
+               if (!is_subclass_of($this->className, '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 d3f8ad79313b716e501b2e0afe500128406e4637..c1a1f848e758e9942ecb8d1dc78018eb677f2aa4 100644 (file)
--- a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php
+++ b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php
@@ -10,7 +10,6 @@ use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 use wcf\util\JSON;
 use wcf\util\StringUtil;
 
@@ -111,10 +110,10 @@ class AJAXInvokeAction extends AbstractSecureAction {
         */
        protected function invoke() {
                // check for interface and inheritance of SingletonFactory
-               if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\IAJAXInvokeAction')) {
+               if (!is_subclass_of($this->className, 'wcf\system\IAJAXInvokeAction')) {
                        throw new SystemException("'".$this->className."' does not implement 'wcf\system\IAJAXInvokeAction'");
                }
-               else if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
+               else if (!is_subclass_of($this->className, 'wcf\system\SingletonFactory')) {
                        throw new SystemException("'".$this->className."' does not extend 'wcf\system\SingletonFactory'");
                }
                

diff --git a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
index b55791c0088715e7715585313ab9e484a98035b3..cc5f4493435d1e6306ca96d884e9f82274ed88b1 100644 (file)
--- a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
+++ b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
@@ -4,7 +4,6 @@ use wcf\data\IStorableObject;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
 /**
@@ -57,12 +56,12 @@ class AJAXProxyAction extends AJAXInvokeAction {
         * @see \wcf\action\IAction::execute()
         */
        protected function invoke() {
-               if (!ClassUtil::isInstanceOf($this->className, 'wcf\data\IDatabaseObjectAction')) {
+               if (!is_subclass_of($this->className, '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)) {
+                       if (!is_subclass_of($this->className, $this->interfaceName)) {
                                throw new SystemException("'".$this->className."' does not implement '".$this->interfaceName."'");
                        }
                }

diff --git a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
index 26c5ac1f2967246a8d42e586e082322369b69bdc..d474dd49c9d6e14eb76dc918b46f7f3d2e5199e8 100644 (file)
--- a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
+++ b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
@@ -7,7 +7,6 @@ use wcf\system\exception\UserInputException;
 use wcf\system\request\RequestHandler;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\util\ClassUtil;
 use wcf\util\JSON;
 use wcf\util\StringUtil;
 
@@ -214,7 +213,7 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction, ID
         * Resets cache of database object.
         */
        protected function resetCache() {
-               if (ClassUtil::isInstanceOf($this->className, 'wcf\data\IEditableCachedObject')) {
+               if (is_subclass_of($this->className, 'wcf\data\IEditableCachedObject')) {
                        call_user_func(array($this->className, 'resetCache'));
                }
        }

diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
index eb463a0d22e56e1b7cfdd2bcd6b3c56bd218702e..7f6df86dd6674255127e54eafcb497b65dfe6624 100644 (file)
--- a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
+++ b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
@@ -4,7 +4,6 @@ use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Abstract class for a list of database objects.
@@ -122,13 +121,13 @@ abstract class DatabaseObjectList implements \Countable, ITraversableObject {
                
                if (!empty($this->decoratorClassName)) {
                        // validate decorator class name
-                       if (!ClassUtil::isInstanceOf($this->decoratorClassName, 'wcf\data\DatabaseObjectDecorator')) {
+                       if (!is_subclass_of($this->decoratorClassName, 'wcf\data\DatabaseObjectDecorator')) {
                                throw new SystemException("'".$this->decoratorClassName."' should extend 'wcf\data\DatabaseObjectDecorator'");
                        }
                        
                        $objectClassName = $this->objectClassName ?: $this->className;
                        $baseClassName = call_user_func(array($this->decoratorClassName, 'getBaseClass'));
-                       if ($objectClassName != $baseClassName && !ClassUtil::isInstanceOf($baseClassName, $objectClassName)) {
+                       if ($objectClassName != $baseClassName && !is_subclass_of($baseClassName, $objectClassName)) {
                                throw new SystemException("'".$this->decoratorClassName."' can't decorate objects of class '".$objectClassName."'");
                        }
                }

diff --git a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
index 31c0a6e81a0dd6512592528619dde2cf829bc523..d006a0baa329bd12eb46f8a4766e0d043855b342 100644 (file)
--- a/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
+++ b/wcfsetup/install/files/lib/data/ProcessibleDatabaseObject.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace wcf\data;
 use wcf\system\exception\SystemException;
-use wcf\util\ClassUtil;
 
 /**
  * Abstract class for all processible data holder classes.
@@ -37,15 +36,15 @@ class ProcessibleDatabaseObject extends DatabaseObject {
                                if (!class_exists($this->className)) {
                                        throw new SystemException("Unable to find class '".$this->className."'");
                                }
-                               if (!ClassUtil::isInstanceOf($this->className, static::$processorInterface)) {
+                               if (!is_subclass_of($this->className, static::$processorInterface)) {
                                        throw new SystemException("'".$this->className."' does not implement '".static::$processorInterface."'");
                                }
                                
-                               if (ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
+                               if (is_subclass_of($this->className, 'wcf\system\SingletonFactory')) {
                                        $this->processor = call_user_func(array($this->className, 'getInstance'));
                                }
                                else {
-                                       if (!ClassUtil::isInstanceOf($this->className, 'wcf\data\IDatabaseObjectProcessor')) {
+                                       if (!is_subclass_of($this->className, 'wcf\data\IDatabaseObjectProcessor')) {
                                                throw new SystemException("'".$this->className."' does not implement 'wcf\data\IDatabaseObjectProcessor'");
                                        }
                                        

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 782cde862bdf15bf2cdbc4589d538127331dd6d1..c75afb724e860fc87c6467896ef0fa456d95bd37 100644 (file)
--- a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
@@ -4,7 +4,6 @@ use wcf\data\ProcessibleDatabaseObject;
 use wcf\data\TDatabaseObjectOptions;
 use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
-use wcf\util\ClassUtil;
 
 /**
  * Represents an object type.
@@ -78,11 +77,11 @@ class ObjectType extends ProcessibleDatabaseObject {
                                if (!class_exists($this->className)) {
                                        throw new SystemException("Unable to find class '".$this->className."'");
                                }
-                               if (($definitionInterface = ObjectTypeCache::getInstance()->getDefinition($this->definitionID)->interfaceName) && !ClassUtil::isInstanceOf($this->className, $definitionInterface)) {
+                               if (($definitionInterface = ObjectTypeCache::getInstance()->getDefinition($this->definitionID)->interfaceName) && !is_subclass_of($this->className, $definitionInterface)) {
                                        throw new SystemException("'".$this->className."' does not implement '".$definitionInterface."'");
                                }
                                
-                               if (ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
+                               if (is_subclass_of($this->className, 'wcf\system\SingletonFactory')) {
                                        $this->processor = call_user_func(array($this->className, 'getInstance'));
                                }
                                else {

diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
index 651a0257bfe432e1f1012736c00824088d1a0c31..960949a1cfcd68b0a1197cc7843e3acb0a9fbb90 100644 (file)
--- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
+++ b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php
@@ -5,7 +5,6 @@ use wcf\data\TDatabaseObjectOptions;
 use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Represents a sitemap entry.
@@ -49,7 +48,7 @@ class Sitemap extends DatabaseObject {
                                throw new SystemException("Unable to find class '".$this->className."' for sitemap '".$this->sitemapName."'");
                        }
                        
-                       if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\sitemap\ISitemapProvider')) {
+                       if (!is_subclass_of($this->className, 'wcf\system\sitemap\ISitemapProvider')) {
                                throw new SystemException("'".$this->className."' does not implement 'wcf\system\sitemap\ISitemapProvider'");
                        }
                        

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 efb3038635643703e57c4d12448045ba5dba0847..6de8fe56c9eaa0456a7d396544dfb84d09457610 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
@@ -4,7 +4,6 @@ use wcf\data\user\User;
 use wcf\data\DatabaseObjectDecorator;
 use wcf\system\cache\builder\UserOptionCacheBuilder;
 use wcf\system\exception\SystemException;
-use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
 /**
@@ -73,7 +72,7 @@ class ViewableUserOption extends DatabaseObjectDecorator {
                        }
                        
                        // validate interface
-                       if (!ClassUtil::isInstanceOf($this->outputClass, 'wcf\system\option\user\IUserOptionOutput')) {
+                       if (!is_subclass_of($this->outputClass, 'wcf\system\option\user\IUserOptionOutput')) {
                                throw new SystemException("'".$this->outputClass."' does not implement 'wcf\system\option\user\IUserOptionOutput'");
                        }
                        

diff --git a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
index aca02ed7dc1e6da044620d7e8c194af2cd14ae43..ab0c1a4563604779fdb7024364ae3b758502a8fd 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
@@ -4,7 +4,6 @@ use wcf\data\DatabaseObject;
 use wcf\data\TDatabaseObjectOptions;
 use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
-use wcf\util\ClassUtil;
 
 /**
  * Represents an user profile menu item.
@@ -56,11 +55,11 @@ class UserProfileMenuItem extends DatabaseObject {
                                throw new SystemException("Unable to find class '".$this->className."'");
                        }
                        
-                       if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\SingletonFactory')) {
+                       if (!is_subclass_of($this->className, 'wcf\system\SingletonFactory')) {
                                throw new SystemException("'".$this->className."' does not extend 'wcf\system\SingletonFactory'");
                        }
                        
-                       if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\menu\user\profile\content\IUserProfileMenuContent')) {
+                       if (!is_subclass_of($this->className, 'wcf\system\menu\user\profile\content\IUserProfileMenuContent')) {
                                throw new SystemException("'".$this->className."' does not implement 'wcf\system\menu\user\profile\content\IUserProfileMenuContent'");
                        }
                        

diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
index 36459c242ceb645fe1eed42260e3e5e2f547b872..432281ef98509d6270d62ea19aea3287abe0142c 100644 (file)
--- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
+++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
@@ -3,7 +3,6 @@ namespace wcf\page;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Provides default implementations for a multiple link page.
@@ -131,7 +130,7 @@ abstract class MultipleLinkPage extends AbstractPage {
                        throw new SystemException('DatabaseObjectList class name not specified.');
                }
                
-               if (!ClassUtil::isInstanceOf($this->objectListClassName, 'wcf\data\DatabaseObjectList')) {
+               if (!is_subclass_of($this->objectListClassName, 'wcf\data\DatabaseObjectList')) {
                        throw new SystemException("'".$this->objectListClassName."' does not extend 'wcf\data\DatabaseObjectList'");
                }
                

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index d5867af46f6a666c0bb97817b3404a390585aa67..0d5951cc584b4d97c1e029ced44baf735d73562f 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -23,7 +23,6 @@ use wcf\system\session\SessionHandler;
 use wcf\system\style\StyleHandler;
 use wcf\system\template\TemplateEngine;
 use wcf\system\user\storage\UserStorageHandler;
-use wcf\util\ClassUtil;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 use wcf\util\UserUtil;
@@ -476,7 +475,7 @@ class WCF {
                self::$autoloadDirectories[$abbreviation] = $packageDir . 'lib/';
                
                $className = $abbreviation.'\system\\'.strtoupper($abbreviation).'Core';
-               if (class_exists($className) && ClassUtil::isInstanceOf($className, 'wcf\system\application\IApplication')) {
+               if (class_exists($className) && is_subclass_of($className, 'wcf\system\application\IApplication')) {
                        // include config file
                        $configPath = $packageDir . PackageInstallationDispatcher::CONFIG_FILE;
                        if (file_exists($configPath)) {
@@ -649,7 +648,7 @@ class WCF {
                }
                
                if (class_exists($objectName)) {
-                       if (!(ClassUtil::isInstanceOf($objectName, 'wcf\system\SingletonFactory'))) {
+                       if (!(is_subclass_of($objectName, 'wcf\system\SingletonFactory'))) {
                                throw new SystemException("class '".$objectName."' does not implement the interface 'SingletonFactory'");
                        }
                        

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 15d69df24daf717fea919fe1d992e57b6b4ebd53..775d319020d4b05d29beec79de4d9f3ed1687a23 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
@@ -3,7 +3,6 @@ namespace wcf\system\cache\builder;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
 /**
@@ -96,7 +95,7 @@ class UserGroupPermissionCacheBuilder extends AbstractCacheBuilder {
                        if (!class_exists($className)) {
                                throw new SystemException("unable to find class '".$className."'");
                        }
-                       if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
+                       if (!is_subclass_of($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
                                throw new SystemException("'".$className."' does not implement 'wcf\system\option\user\group\IUserGroupOptionType'");
                        }
                        

diff --git a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
index 7e437e3d4d4848310c6e8374ad7be0389c44f43a..2e897b4193aacbe03715a6d273238215fc8756ac 100644 (file)
--- a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
@@ -3,7 +3,6 @@ namespace wcf\system\cli\command;
 use phpline\internal\Log;
 use wcf\system\CLIWCF;
 use wcf\system\Regex;
-use wcf\util\ClassUtil;
 use wcf\util\CLIUtil;
 use wcf\util\DirectoryUtil;
 use wcf\util\StringUtil;
@@ -78,7 +77,7 @@ class WorkerCLICommand implements IArgumentedCLICommand {
                        if (!$reflection->isInstantiable()) {
                                $invalid = true;
                        }
-                       else if (!ClassUtil::isInstanceOf($class, 'wcf\system\worker\IWorker')) {
+                       else if (!is_subclass_of($class, 'wcf\system\worker\IWorker')) {
                                $invalid = true;
                        }
                }
@@ -155,7 +154,7 @@ class WorkerCLICommand implements IArgumentedCLICommand {
                        $reflection = new \ReflectionClass($class);
                        if (!$reflection->isInstantiable()) continue;
                        
-                       if (!ClassUtil::isInstanceOf($class, 'wcf\system\worker\IWorker')) {
+                       if (!is_subclass_of($class, 'wcf\system\worker\IWorker')) {
                                Log::info('Invalid worker file: ', $worker);
                                continue;
                        }

diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
index 6d3882f1b60d7123664902b428bd86a3db481269..50cb81706165e234f890a80b79e15a8bda461888 100644 (file)
--- a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
@@ -7,7 +7,6 @@ use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Handles clipboard-related actions.
@@ -320,7 +319,7 @@ class ClipboardHandler extends SingletonFactory {
                        $actionClassName = $actionObject->actionClassName;
                        if (!isset($actions[$actionClassName])) {
                                // validate class
-                               if (!ClassUtil::isInstanceOf($actionClassName, 'wcf\system\clipboard\action\IClipboardAction')) {
+                               if (!is_subclass_of($actionClassName, 'wcf\system\clipboard\action\IClipboardAction')) {
                                        throw new SystemException("'".$actionClassName."' does not implement 'wcf\system\clipboard\action\IClipboardAction'");
                                }
                                

diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
index 0bd1430e3f66dc85261d93f1b96ccc777aa03092..8ed5bc57d316fcffec55e1c92a025c6080491d1a 100644 (file)
--- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
@@ -7,7 +7,6 @@ use wcf\system\cache\builder\CronjobCacheBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Provides functions to execute cronjobs.
@@ -173,7 +172,7 @@ class CronjobScheduler extends SingletonFactory {
                }
                
                // verify class signature
-               if (!(ClassUtil::isInstanceOf($className, 'wcf\system\cronjob\ICronjob'))) {
+               if (!(is_subclass_of($className, 'wcf\system\cronjob\ICronjob'))) {
                        throw new SystemException("'".$className."' does not implement 'wcf\system\cronjob\ICronjob'");
                }
                

diff --git a/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php b/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
index b73c317699c153647d38a5a06f8c4ca2120ebd05..5cd036b6f7f453f04b25559ebab92541f5ff3eaf 100644 (file)
--- a/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
@@ -8,7 +8,6 @@ use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Handles dashboard boxes.
@@ -67,7 +66,7 @@ class DashboardHandler extends SingletonFactory {
                );
                foreach ($boxIDs as $boxID) {
                        $className = $this->boxCache[$boxID]->className;
-                       if (!ClassUtil::isInstanceOf($className, 'wcf\system\dashboard\box\IDashboardBox')) {
+                       if (!is_subclass_of($className, 'wcf\system\dashboard\box\IDashboardBox')) {
                                throw new SystemException("'".$className."' does not implement 'wcf\system\dashboard\box\IDashboardBox'");
                        }
                        

diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
index c66fcbd53f8396dd4474c1d015d0a086f3d4d0c1..f04a97b8c9e9b90fe839faacdf3f60a59124a08f 100644 (file)
--- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php
+++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
@@ -5,7 +5,6 @@ use wcf\system\event\listener\IParameterizedEventListener;
 use wcf\system\event\IEventListener as ILegacyEventListener;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
-use wcf\util\ClassUtil;
 
 /**
  * EventHandler executes all registered actions for a specific event.
@@ -111,9 +110,9 @@ class EventHandler extends SingletonFactory {
                                                                        if (!class_exists($eventListener->listenerClassName)) {
                                                                                throw new SystemException("Unable to find class '".$eventListener->listenerClassName."'");
                                                                        }
-                                                                       if (!ClassUtil::isInstanceOf($eventListener->listenerClassName, 'wcf\system\event\listener\IParameterizedEventListener')) {
+                                                                       if (!is_subclass_of($eventListener->listenerClassName, 'wcf\system\event\listener\IParameterizedEventListener')) {
                                                                                // legacy event listeners
-                                                                               if (!ClassUtil::isInstanceOf($eventListener->listenerClassName, 'wcf\system\event\IEventListener')) {
+                                                                               if (!is_subclass_of($eventListener->listenerClassName, 'wcf\system\event\IEventListener')) {
                                                                                        throw new SystemException("'".$eventListener->listenerClassName."' does not implement 'wcf\system\event\listener\IParameterizedEventListener'");
                                                                                }
                                                                        }
@@ -196,9 +195,9 @@ class EventHandler extends SingletonFactory {
                                                if (!class_exists($eventListener->listenerClassName)) {
                                                        throw new SystemException("Unable to find class '".$eventListener->listenerClassName."'");
                                                }
-                                               if (!ClassUtil::isInstanceOf($eventListener->listenerClassName, 'wcf\system\event\listener\IParameterizedEventListener')) {
+                                               if (!is_subclass_of($eventListener->listenerClassName, 'wcf\system\event\listener\IParameterizedEventListener')) {
                                                        // legacy event listeners
-                                                       if (!ClassUtil::isInstanceOf($eventListener->listenerClassName, 'wcf\system\event\IEventListener')) {
+                                                       if (!is_subclass_of($eventListener->listenerClassName, 'wcf\system\event\IEventListener')) {
                                                                throw new SystemException("'".$eventListener->listenerClassName."' does not implement 'wcf\system\event\listener\IParameterizedEventListener'");
                                                        }
                                                }

diff --git a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
index fce8fe86de1a4ab4088ed52d9850c59f6e3a6969..b8111f510ba2b436c2e013ecdc67a700322b4e97 100644 (file)
--- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
+++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
@@ -11,7 +11,6 @@ use wcf\system\exception\UserInputException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\util\ClassUtil;
 use wcf\util\MessageUtil;
 use wcf\util\StringUtil;
 
@@ -134,7 +133,7 @@ class QuickReplyManager extends SingletonFactory {
                
                $this->container = new $containerClassName($parameters['objectID']);
                if (!empty($containerDecoratorClassName)) {
-                       if (!ClassUtil::isInstanceOf($containerDecoratorClassName, 'wcf\data\DatabaseObjectDecorator')) {
+                       if (!is_subclass_of($containerDecoratorClassName, 'wcf\data\DatabaseObjectDecorator')) {
                                throw new SystemException("'".$containerDecoratorClassName."' does not extend 'wcf\data\DatabaseObjectDecorator'");
                        }
                        
@@ -233,7 +232,7 @@ class QuickReplyManager extends SingletonFactory {
                        }
                        
                        // update visit time (messages shouldn't occur as new upon next visit)
-                       if (ClassUtil::isInstanceOf($containerActionClassName, 'wcf\data\IVisitableObjectAction')) {
+                       if (is_subclass_of($containerActionClassName, 'wcf\data\IVisitableObjectAction')) {
                                $containerAction = new $containerActionClassName(array(($this->container instanceof DatabaseObjectDecorator ? $this->container->getDecoratedObject() : $this->container)), 'markAsRead');
                                $containerAction->executeAction();
                        }

diff --git a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
index 06b2948ef367fa09e456d7d0df5d7e992f65127b..74696623681b095436eeec382f820a3efe15a398 100644 (file)
--- a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
@@ -7,7 +7,6 @@ use wcf\data\user\UserProfile;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Default implementation for moderation queue handlers.
@@ -48,7 +47,7 @@ abstract class AbstractModerationQueueHandler implements IModerationQueueHandler
         * @see \wcf\system\moderation\queue\IModerationQueueHandler::identifyOrphans()
         */
        public function identifyOrphans(array $queues) {
-               if (empty($this->className) || !class_exists($this->className) || !ClassUtil::isInstanceOf($this->className, 'wcf\data\DatabaseObject')) {
+               if (empty($this->className) || !class_exists($this->className) || !is_subclass_of($this->className, 'wcf\data\DatabaseObject')) {
                        throw new SystemException("DatabaseObject class name '" . $this->className . "' is missing or invalid");
                }
                

diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
index 102a0e52be6f739ead2f3d3619e9f41a49595b10..63b32e8a3d4d783068928b4595f6f802f224fb53 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
@@ -7,7 +7,6 @@ use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
-use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
 /**
@@ -376,7 +375,7 @@ class OptionHandler implements IOptionHandler {
                        return null;
                }
                
-               if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\IOptionType')) {
+               if (!is_subclass_of($className, 'wcf\system\option\IOptionType')) {
                        throw new SystemException("'".$className."' does not implement 'wcf\system\option\IOptionType'");
                }
                

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 5115a8f535f7b6c5a9bf01cb0ae011b6324e553a..f696bad27a6971a4ccfef406aea5bd436bae7948 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
@@ -5,7 +5,6 @@ use wcf\data\user\group\UserGroup;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\option\OptionHandler;
-use wcf\util\ClassUtil;
 use wcf\system\WCF;
 
 /**
@@ -84,7 +83,7 @@ class UserGroupOptionHandler extends OptionHandler {
                if (!class_exists($className)) {
                        return null;
                }
-               if (!ClassUtil::isInstanceOf($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
+               if (!is_subclass_of($className, 'wcf\system\option\user\group\IUserGroupOptionType')) {
                        throw new SystemException("'".$className."' does not implement 'wcf\system\option\user\group\IUserGroupOptionType'");
                }
                

diff --git a/wcfsetup/install/files/lib/system/poll/PollManager.class.php b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
index 285db1a878f39fb43d3feb7ae64946ba2288a581..374208c342f800ac97d76092e83b3b13b8660aca 100644 (file)
--- a/wcfsetup/install/files/lib/system/poll/PollManager.class.php
+++ b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
@@ -10,7 +10,6 @@ use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
 /**
@@ -418,10 +417,10 @@ class PollManager extends SingletonFactory {
                
                // validates against object type's class
                $className = $this->cache[$objectType]->className;
-               if (!ClassUtil::isInstanceOf($className, 'wcf\system\poll\IPollHandler')) {
+               if (!is_subclass_of($className, 'wcf\system\poll\IPollHandler')) {
                        throw new SystemException("'".$className."' does not implement 'wcf\system\poll\IPollHandler'");
                }
-               else if (!ClassUtil::isInstanceOf($className, 'wcf\system\SingletonFactory')) {
+               else if (!is_subclass_of($className, 'wcf\system\SingletonFactory')) {
                        throw new SystemException("'".$className."' does not extend 'wcf\system\SingletonFactory'");
                }
                

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 6dd22bc797912f96e8a09ab12f3e80ea13062f47..0a9c30861cd120c53d1a83d83251f5e3a5c04a09 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/ACPSearchHandler.class.php
@@ -4,7 +4,6 @@ use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\builder\ACPSearchProviderCacheBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
-use wcf\util\ClassUtil;
 
 /**
  * Handles ACP Search.
@@ -50,7 +49,7 @@ class ACPSearchHandler extends SingletonFactory {
                
                foreach ($this->cache as $acpSearchProvider) {
                        $className = $acpSearchProvider->className;
-                       if (!ClassUtil::isInstanceOf($className, 'wcf\system\search\acp\IACPSearchResultProvider')) {
+                       if (!is_subclass_of($className, 'wcf\system\search\acp\IACPSearchResultProvider')) {
                                throw new SystemException("'".$className."' does not implement 'wcf\system\search\acp\IACPSearchResultProvider'");
                        }
                        

diff --git a/wcfsetup/install/files/lib/system/search/acp/AbstractCategorizedACPSearchResultProvider.class.php b/wcfsetup/install/files/lib/system/search/acp/AbstractCategorizedACPSearchResultProvider.class.php
index e22734d528773a8de450b5b9e090ecae3d7f9352..e37341b15c91a862dbc982650e031da9e885ba6a 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/acp/AbstractCategorizedACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/AbstractCategorizedACPSearchResultProvider.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace wcf\system\search\acp;
 use wcf\system\exception\SystemException;
-use wcf\util\ClassUtil;
 
 /**
  * Abstract implementation of a ACP search result provider with nested categories.
@@ -88,7 +87,7 @@ abstract class AbstractCategorizedACPSearchResultProvider extends AbstractACPSea
         */
        protected function loadCategories() {
                // validate list class name
-               if (empty($this->listClassName) || !ClassUtil::isInstanceOf($this->listClassName, 'wcf\data\DatabaseObjectList')) {
+               if (empty($this->listClassName) || !is_subclass_of($this->listClassName, 'wcf\data\DatabaseObjectList')) {
                        throw new SystemException("Given class '".$this->listClassName."' is empty or invalid");
                }
                

diff --git a/wcfsetup/install/files/lib/system/user/authentication/UserAuthenticationFactory.class.php b/wcfsetup/install/files/lib/system/user/authentication/UserAuthenticationFactory.class.php
index 20d876ea1b901de17b531f5d75f3a7cc025f9709..193ccfa084be6eeee8f108c904be8f087120f9e1 100644 (file)
--- a/wcfsetup/install/files/lib/system/user/authentication/UserAuthenticationFactory.class.php
+++ b/wcfsetup/install/files/lib/system/user/authentication/UserAuthenticationFactory.class.php
@@ -3,7 +3,6 @@ namespace wcf\system\user\authentication;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
-use wcf\util\ClassUtil;
 
 /**
  * Gets the user authentication instance.
@@ -35,7 +34,7 @@ class UserAuthenticationFactory extends SingletonFactory {
                // call loadInstance event
                EventHandler::getInstance()->fireAction($this, 'init');
                
-               if (!ClassUtil::isInstanceOf($this->className, 'wcf\system\user\authentication\IUserAuthentication')) {
+               if (!is_subclass_of($this->className, 'wcf\system\user\authentication\IUserAuthentication')) {
                        throw new SystemException("'" . $this->className . "' does not implement 'wcf\system\user\authentication\IUserAuthentication'");
                }
                

diff --git a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
index 660661b89a73109f6c1f6ecaab1f17af82de248b..3c88eb226833a4a627ca23a86ca3a7ba61fb2fa8 100644 (file)
--- a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
@@ -5,7 +5,6 @@ use wcf\system\exception\SystemException;
 use wcf\system\request\LinkHandler;
 use wcf\system\search\SearchIndexManager;
 use wcf\system\WCF;
-use wcf\util\ClassUtil;
 
 /**
  * Abstract implementation of rebuild data worker.
@@ -92,7 +91,7 @@ abstract class AbstractRebuildDataWorker extends AbstractWorker implements IRebu
                        throw new SystemException('DatabaseObjectList class name not specified.');
                }
                
-               if (!ClassUtil::isInstanceOf($this->objectListClassName, 'wcf\data\DatabaseObjectList')) {
+               if (!is_subclass_of($this->objectListClassName, 'wcf\data\DatabaseObjectList')) {
                        throw new SystemException("'".$this->objectListClassName."' does not extend 'wcf\data\DatabaseObjectList'");
                }
                

diff --git a/wcfsetup/install/files/lib/util/ClassUtil.class.php b/wcfsetup/install/files/lib/util/ClassUtil.class.php
index dd682286ec4dc4eefffc27d809d2f930f0c20590..66992bb50c81532af8129ceea2722a6e044637a3 100644 (file)
--- a/wcfsetup/install/files/lib/util/ClassUtil.class.php
+++ b/wcfsetup/install/files/lib/util/ClassUtil.class.php
@@ -34,6 +34,8 @@ final class ClassUtil {
         * @param       string          $className
         * @param       string          $targetClass
         * @return      boolean
+        * 
+        * @deprecated  use is_subclass_of() instead
         */
        public static function isInstanceOf($className, $targetClass) {
                // validate parameters