Move user commands to wcf\command\user

Cyperghost · Cyperghost · commit 0b44359b570b · 2025-08-15T10:19:20.000+02:00
diff --git a/wcfsetup/install/files/lib/action/UserBanAction.class.php b/wcfsetup/install/files/lib/action/UserBanAction.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\action;
 
+use wcf\command\user\BanUser;
 use wcf\data\user\UserProfile;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -10,7 +11,6 @@
 use wcf\system\form\builder\field\dependency\EmptyFormFieldDependency;
 use wcf\system\form\builder\field\MultilineTextFormField;
 use wcf\system\form\builder\Psr15DialogForm;
-use wcf\system\user\command\BanUser;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/action/UserDisableAvatarAction.class.php b/wcfsetup/install/files/lib/action/UserDisableAvatarAction.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\action;
 
+use wcf\command\user\DisableAvatar;
 use wcf\data\user\UserProfile;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -10,7 +11,6 @@
 use wcf\system\form\builder\field\dependency\EmptyFormFieldDependency;
 use wcf\system\form\builder\field\MultilineTextFormField;
 use wcf\system\form\builder\Psr15DialogForm;
-use wcf\system\user\command\DisableAvatar;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/action/UserDisableCoverPhotoAction.class.php b/wcfsetup/install/files/lib/action/UserDisableCoverPhotoAction.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\action;
 
+use wcf\command\user\DisableCoverPhoto;
 use wcf\data\user\UserProfile;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -10,7 +11,6 @@
 use wcf\system\form\builder\field\dependency\EmptyFormFieldDependency;
 use wcf\system\form\builder\field\MultilineTextFormField;
 use wcf\system\form\builder\Psr15DialogForm;
-use wcf\system\user\command\DisableCoverPhoto;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/action/UserDisableSignatureAction.class.php b/wcfsetup/install/files/lib/action/UserDisableSignatureAction.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\action;
 
+use wcf\command\user\DisableSignature;
 use wcf\data\user\UserProfile;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -10,7 +11,6 @@
 use wcf\system\form\builder\field\dependency\EmptyFormFieldDependency;
 use wcf\system\form\builder\field\MultilineTextFormField;
 use wcf\system\form\builder\Psr15DialogForm;
-use wcf\system\user\command\DisableSignature;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/command/user/BanUser.class.php b/wcfsetup/install/files/lib/command/user/BanUser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
diff --git a/wcfsetup/install/files/lib/command/user/DisableAvatar.class.php b/wcfsetup/install/files/lib/command/user/DisableAvatar.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -21,8 +21,7 @@ public function __construct(
         private readonly User $user,
         private readonly string $reason,
         private readonly int $expires = 0,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/DisableCoverPhoto.class.php b/wcfsetup/install/files/lib/command/user/DisableCoverPhoto.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -21,8 +21,7 @@ public function __construct(
         private readonly User $user,
         private readonly string $reason,
         private readonly int $expires = 0,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/DisableSignature.class.php b/wcfsetup/install/files/lib/command/user/DisableSignature.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -21,8 +21,7 @@ public function __construct(
         private readonly User $user,
         private readonly string $reason,
         private readonly int $expires = 0,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/DisableUser.class.php b/wcfsetup/install/files/lib/command/user/DisableUser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use ParagonIE\ConstantTime\Hex;
 use wcf\data\user\group\UserGroup;
@@ -23,8 +23,7 @@ final class DisableUser
 {
     public function __construct(
         private readonly User $user,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/EnableAvatar.class.php b/wcfsetup/install/files/lib/command/user/EnableAvatar.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -19,8 +19,7 @@ final class EnableAvatar
 {
     public function __construct(
         private readonly User $user,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/EnableCoverPhoto.class.php b/wcfsetup/install/files/lib/command/user/EnableCoverPhoto.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -19,8 +19,7 @@ final class EnableCoverPhoto
 {
     public function __construct(
         private readonly User $user,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/EnableSignature.class.php b/wcfsetup/install/files/lib/command/user/EnableSignature.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -17,9 +17,7 @@
  */
 final class EnableSignature
 {
-    public function __construct(private readonly User $user)
-    {
-    }
+    public function __construct(private readonly User $user) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/EnableUser.class.php b/wcfsetup/install/files/lib/command/user/EnableUser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
@@ -27,8 +27,7 @@ final class EnableUser
     public function __construct(
         private readonly User $user,
         public readonly bool $skipNotification = false,
-    ) {
-    }
+    ) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/command/user/UnbanUser.class.php b/wcfsetup/install/files/lib/command/user/UnbanUser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -17,9 +17,7 @@
  */
 final class UnbanUser
 {
-    public function __construct(private readonly User $user)
-    {
-    }
+    public function __construct(private readonly User $user) {}
 
     public function __invoke(): void
     {
diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -3,6 +3,15 @@
 namespace wcf\data\user;
 
 use ParagonIE\ConstantTime\Hex;
+use wcf\command\user\BanUser;
+use wcf\command\user\DisableAvatar;
+use wcf\command\user\DisableSignature;
+use wcf\command\user\DisableUser;
+use wcf\command\user\EnableAvatar;
+use wcf\command\user\EnableCoverPhoto;
+use wcf\command\user\EnableSignature;
+use wcf\command\user\EnableUser;
+use wcf\command\user\UnbanUser;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\file\FileAction;
 use wcf\data\IClipboardAction;
@@ -25,15 +34,6 @@
 use wcf\system\request\RequestHandler;
 use wcf\system\session\SessionHandler;
 use wcf\system\style\FontAwesomeIcon;
-use wcf\system\user\command\BanUser;
-use wcf\system\user\command\DisableAvatar;
-use wcf\system\user\command\DisableSignature;
-use wcf\system\user\command\DisableUser;
-use wcf\system\user\command\EnableAvatar;
-use wcf\system\user\command\EnableCoverPhoto;
-use wcf\system\user\command\EnableSignature;
-use wcf\system\user\command\EnableUser;
-use wcf\system\user\command\UnbanUser;
 use wcf\system\user\group\assignment\UserGroupAssignmentHandler;
 use wcf\system\WCF;
 
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/DisableUser.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/DisableUser.class.php
@@ -33,7 +33,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         $this->assertUserCanBeDisabled($user);
 
         if (!$user->pendingActivation()) {
-            (new \wcf\system\user\command\DisableUser($user))();
+            (new \wcf\command\user\DisableUser($user))();
         }
 
         return new JsonResponse([]);
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUser.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUser.class.php
@@ -33,7 +33,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         $this->assertUserCanBeEnabled($user);
 
         if ($user->pendingActivation()) {
-            (new \wcf\system\user\command\EnableUser($user))();
+            (new \wcf\command\user\EnableUser($user))();
         }
 
         return new JsonResponse([]);
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserAvatar.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserAvatar.class.php
@@ -5,14 +5,14 @@
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\user\EnableAvatar;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\http\Helper;
 use wcf\system\endpoint\IController;
 use wcf\system\endpoint\PostRequest;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
-use wcf\system\user\command\EnableAvatar;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserCoverPhoto.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserCoverPhoto.class.php
@@ -5,14 +5,14 @@
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\user\EnableCoverPhoto;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\http\Helper;
 use wcf\system\endpoint\IController;
 use wcf\system\endpoint\PostRequest;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
-use wcf\system\user\command\EnableCoverPhoto;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserSignature.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/EnableUserSignature.class.php
@@ -5,14 +5,14 @@
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\user\EnableSignature;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\http\Helper;
 use wcf\system\endpoint\IController;
 use wcf\system\endpoint\PostRequest;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
-use wcf\system\user\command\EnableSignature;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/UnbanUser.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/UnbanUser.class.php
@@ -33,7 +33,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         $this->assertUserCanUnbanned($user);
 
         if ($user->banned) {
-            (new \wcf\system\user\command\UnbanUser($user))();
+            (new \wcf\command\user\UnbanUser($user))();
         }
 
         return new JsonResponse([]);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace wcf\system\user\command;`
	`3`	`+namespace wcf\command\user;`
`4`	`4`
`5`	`5`	`use ParagonIE\ConstantTime\Hex;`
`6`	`6`	`use wcf\data\user\group\UserGroup;`
`@@ -23,8 +23,7 @@ final class DisableUser`
`23`	`23`	`{`
`24`	`24`	`public function __construct(`
`25`	`25`	`private readonly User $user,`
`26`		`- ) {`
`27`		`- }`
	`26`	`+ ) {}`
`28`	`27`
`29`	`28`	`public function __invoke(): void`
`30`	`29`	`{`