Throw PHP's \InvalidArgumentException

diff --git a/wcfsetup/install/files/lib/system/condition/AbstractObjectTextPropertyCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractObjectTextPropertyCondition.class.php
index f0c165b01e11211c2227040d05322b27e8afe4bb..0a0ceb29068c6c03c47dffeed53ec530ef0c1426 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/AbstractObjectTextPropertyCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractObjectTextPropertyCondition.class.php
@@ -2,7 +2,6 @@
 namespace wcf\system\condition;
 use wcf\data\DatabaseObject;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 
 /**
  * Abstract condition implementation for check a text-typed property of a database
@@ -42,7 +41,7 @@ abstract class AbstractObjectTextPropertyCondition extends AbstractTextCondition
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                $className = $this->getListClassName();
                if (!($objectList instanceof $className)) {
-                       throw new InvalidArgumentException("Object list is no instance of '{$className}', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '{$className}', instance of '".get_class($objectList)."' given.");
                }
                
                if ($this->supportsMultipleValues) {

diff --git a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
index 4fe0c4895f3687db85ebd412bdcb31e88725f590..8501e325626a2f003696c7fb5fb80fd247c0dd41 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
@@ -3,7 +3,6 @@ namespace wcf\system\condition;
 use wcf\data\condition\Condition;
 use wcf\data\DatabaseObject;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 
@@ -50,7 +49,7 @@ abstract class AbstractTimestampCondition extends AbstractSingleFieldCondition i
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                $className = $this->getListClassName();
                if (!($objectList instanceof $className)) {
-                       throw new InvalidArgumentException("Object list is no instance of '{$className}', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '{$className}', instance of '".get_class($objectList)."' given.");
                }
                
                $objectList->getConditionBuilder()->add($objectList->getDatabaseTableAlias().'.'.$this->getPropertyName().' <> ?', [0]);

diff --git a/wcfsetup/install/files/lib/system/condition/IObjectListCondition.class.php b/wcfsetup/install/files/lib/system/condition/IObjectListCondition.class.php
index cd3029b9e91e6afd062809aa1d3a8b3c0d6e1379..13323346e4261dda5e48680d4ec27e4351d99891 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/IObjectListCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/IObjectListCondition.class.php
@@ -21,6 +21,7 @@ interface IObjectListCondition extends ICondition {
         * 
         * @param       DatabaseObjectList      $objectList
         * @param       array                   $conditionData
+        * @throws      \InvalidArgumentException       if the given object list object is no object of the expected database object list class 
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData);
 }

diff --git a/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
index 023095dc1869418048b922ed6d9c54f1b614dcdc..c6ef357d84560f2884d294bd8554309627aaf5d9 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\WCF;
 
 /**
@@ -53,7 +52,7 @@ class UserAvatarCondition extends AbstractSelectCondition implements IContentCon
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                switch ($conditionData['userAvatar']) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserEmailCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserEmailCondition.class.php
index 5f2307b17f8876444cb73b2b3f2ad2ca61f30f61..e46f563dcf4c25930a9cd1934ef9ec0003de0d2a 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserEmailCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserEmailCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\WCF;
 
 /**
@@ -35,7 +34,7 @@ class UserEmailCondition extends AbstractTextCondition implements IContentCondit
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                $objectList->getConditionBuilder()->add('user_table.email LIKE ?', ['%'.addcslashes($conditionData['email'], '_%').'%']);

diff --git a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
index 9913a65f141f2a217870ab24c085a31d00d7fb52..b8ffbe4e5d151ff6f024824379972b37505e3448 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
@@ -5,7 +5,6 @@ use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
@@ -63,7 +62,7 @@ class UserGroupCondition extends AbstractMultipleFieldsCondition implements ICon
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                if (isset($conditionData['groupIDs'])) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserIntegerPropertyCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserIntegerPropertyCondition.class.php
index 005dfb43f7407e568b0a35f64ebe11147e471a0b..6d985fddbc564dad3f7fee2e5c1e37ee472f3427 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserIntegerPropertyCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserIntegerPropertyCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\WCF;
 
 /**
@@ -25,7 +24,7 @@ class UserIntegerPropertyCondition extends AbstractIntegerCondition implements I
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                if (isset($conditionData['greaterThan'])) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
index 111685df269bb0d8e5b37b0ad410b136db220204..cb7083a45ec0874265889f22d39b14c94c6cae08 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
@@ -39,7 +38,7 @@ class UserLanguageCondition extends AbstractSingleFieldCondition implements ICon
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                $objectList->getConditionBuilder()->add('user_table.languageID IN (?)', [$conditionData['languageIDs']]);

diff --git a/wcfsetup/install/files/lib/system/condition/UserOptionsCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserOptionsCondition.class.php
index 2584444bc4bed7adc1d68fe7cd59df7c6708a690..baee7c8134f559870fb789373c9fce0551185090 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserOptionsCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserOptionsCondition.class.php
@@ -5,7 +5,6 @@ use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObject;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\option\user\UserOptionHandler;
 use wcf\system\WCF;
 
@@ -44,7 +43,7 @@ class UserOptionsCondition extends AbstractMultipleFieldsCondition implements IC
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                $optionValues = $conditionData['optionValues'];

diff --git a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
index 13bbccb14b255ca09bb0e39d46ec11e98ce4d7bc..a930235e9c7d5ece604928ab359ba6d832960976 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 
@@ -43,7 +42,7 @@ class UserRegistrationDateCondition extends AbstractSingleFieldCondition impleme
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                if (isset($conditionData['registrationDateEnd'])) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateIntervalCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateIntervalCondition.class.php
index 99d6a17bef2205233f5878ec7dea8750d05e0282..4fb83286bf411d2329d661cf9d4030bf523e5e86 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateIntervalCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateIntervalCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\WCF;
 
 /**
@@ -36,7 +35,7 @@ class UserRegistrationDateIntervalCondition extends AbstractIntegerCondition imp
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                if ($conditionData['greaterThan'] !== null) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
index fa59fd5222624b411490d8af600e4f4148a18f2a..6276adc65a6b08613605c3b6d9f3f922f9009454 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 
@@ -55,7 +54,7 @@ class UserStateCondition extends AbstractSingleFieldCondition implements IConten
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                if (isset($conditionData['userIsBanned'])) {

diff --git a/wcfsetup/install/files/lib/system/condition/UserUsernameCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserUsernameCondition.class.php
index d17db653c00637d745312251b4880d5ebed456e7..4a05be502d22bcc898c53a4c7f73a63056d06b65 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserUsernameCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserUsernameCondition.class.php
@@ -4,7 +4,6 @@ use wcf\data\condition\Condition;
 use wcf\data\user\User;
 use wcf\data\user\UserList;
 use wcf\data\DatabaseObjectList;
-use wcf\system\exception\InvalidArgumentException;
 use wcf\system\WCF;
 
 /**
@@ -35,7 +34,7 @@ class UserUsernameCondition extends AbstractTextCondition implements IContentCon
         */
        public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
                if (!($objectList instanceof UserList)) {
-                       throw new InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
+                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
                }
                
                $objectList->getConditionBuilder()->add('user_table.username LIKE ?', ['%'.addcslashes($conditionData['username'], '_%').'%']);