Use `InvalidObjectArgument` in more places (#4207)

diff --git a/wcfsetup/install/files/lib/system/bulk/processing/user/AbstractUserGroupsUserBulkProcessingAction.class.php b/wcfsetup/install/files/lib/system/bulk/processing/user/AbstractUserGroupsUserBulkProcessingAction.class.php
index e9b14cc96a4b18d61690bd21648e7c9787e6e9b1..cf08f4f9f90b3e5563d0a051a4472eafb3fe2866 100644 (file)
--- a/wcfsetup/install/files/lib/system/bulk/processing/user/AbstractUserGroupsUserBulkProcessingAction.class.php
+++ b/wcfsetup/install/files/lib/system/bulk/processing/user/AbstractUserGroupsUserBulkProcessingAction.class.php
@@ -7,6 +7,7 @@ use wcf\data\DatabaseObjectList;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserEditor;
 use wcf\data\user\UserList;
+use wcf\system\exception\InvalidObjectArgument;
 use wcf\system\exception\UserInputException;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\WCF;
@@ -61,7 +62,7 @@ abstract class AbstractUserGroupsUserBulkProcessingAction extends AbstractUserBu
     public function executeAction(DatabaseObjectList $objectList)
     {
         if (!($objectList instanceof UserList)) {
-            throw new \InvalidArgumentException("Object list is no instance of '" . UserList::class . "', instance of '" . \get_class($objectList) . "' given.");
+            throw new InvalidObjectArgument($objectList, UserList::class, 'Object list');
         }
 
         $users = $this->getAccessibleUsers($objectList);

diff --git a/wcfsetup/install/files/lib/system/bulk/processing/user/DeleteUserBulkProcessingAction.class.php b/wcfsetup/install/files/lib/system/bulk/processing/user/DeleteUserBulkProcessingAction.class.php
index 14b3aa04917e12054a458fbc38d7f6d21c267a74..1d84e0f0c45dd83edd0fd9f9ecdab4dfa5e76606 100644 (file)
--- a/wcfsetup/install/files/lib/system/bulk/processing/user/DeleteUserBulkProcessingAction.class.php
+++ b/wcfsetup/install/files/lib/system/bulk/processing/user/DeleteUserBulkProcessingAction.class.php
@@ -5,6 +5,7 @@ namespace wcf\system\bulk\processing\user;
 use wcf\data\DatabaseObjectList;
 use wcf\data\user\UserAction;
 use wcf\data\user\UserList;
+use wcf\system\exception\InvalidObjectArgument;
 use wcf\system\WCF;
 
 /**
@@ -24,7 +25,7 @@ class DeleteUserBulkProcessingAction extends AbstractUserBulkProcessingAction
     public function executeAction(DatabaseObjectList $objectList)
     {
         if (!($objectList instanceof UserList)) {
-            throw new \InvalidArgumentException("Object list is no instance of '" . UserList::class . "', instance of '" . \get_class($objectList) . "' given.");
+            throw new InvalidObjectArgument($objectList, UserList::class, 'Object list');
         }
 
         $users = $this->getAccessibleUsers($objectList);

diff --git a/wcfsetup/install/files/lib/system/bulk/processing/user/ExportMailAddressUserBulkProcessingAction.class.php b/wcfsetup/install/files/lib/system/bulk/processing/user/ExportMailAddressUserBulkProcessingAction.class.php
index 5332c561c990987fb987af873672ce2d929f6d5d..f7484cbff75cfa3161f7a8cdb3afd2a91d802398 100644 (file)
--- a/wcfsetup/install/files/lib/system/bulk/processing/user/ExportMailAddressUserBulkProcessingAction.class.php
+++ b/wcfsetup/install/files/lib/system/bulk/processing/user/ExportMailAddressUserBulkProcessingAction.class.php
@@ -4,6 +4,7 @@ namespace wcf\system\bulk\processing\user;
 
 use wcf\data\DatabaseObjectList;
 use wcf\data\user\UserList;
+use wcf\system\exception\InvalidObjectArgument;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -48,7 +49,7 @@ class ExportMailAddressUserBulkProcessingAction extends AbstractUserBulkProcessi
     public function executeAction(DatabaseObjectList $objectList)
     {
         if (!($objectList instanceof UserList)) {
-            throw new \InvalidArgumentException("Object list is no instance of '" . UserList::class . "', instance of '" . \get_class($objectList) . "' given.");
+            throw new InvalidObjectArgument($objectList, UserList::class, 'Object list');
         }
 
         $this->executed = true;

diff --git a/wcfsetup/install/files/lib/system/bulk/processing/user/SendMailUserBulkProcessingAction.class.php b/wcfsetup/install/files/lib/system/bulk/processing/user/SendMailUserBulkProcessingAction.class.php
index 98cea41c005612bd0b94db77e6b421d003aa50b7..6d8197e1fd0f46ed9c28148c038685c58a3f66cb 100644 (file)
--- a/wcfsetup/install/files/lib/system/bulk/processing/user/SendMailUserBulkProcessingAction.class.php
+++ b/wcfsetup/install/files/lib/system/bulk/processing/user/SendMailUserBulkProcessingAction.class.php
@@ -5,6 +5,7 @@ namespace wcf\system\bulk\processing\user;
 use wcf\data\DatabaseObjectList;
 use wcf\data\user\UserList;
 use wcf\system\email\EmailGrammar;
+use wcf\system\exception\InvalidObjectArgument;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
@@ -62,7 +63,7 @@ class SendMailUserBulkProcessingAction extends AbstractUserBulkProcessingAction
     public function executeAction(DatabaseObjectList $objectList)
     {
         if (!($objectList instanceof UserList)) {
-            throw new \InvalidArgumentException("Object list is no instance of '" . UserList::class . "', instance of '" . \get_class($objectList) . "' given.");
+            throw new InvalidObjectArgument($objectList, UserList::class, 'Object list');
         }
 
         if (\count($objectList)) {