refactor: clean up code style using pint

aspirantzhang · aspirantzhang · commit 5808e00dfc40 · 2025-03-10T21:48:37.000+08:00
diff --git a/contexts/Authorization/Application/Coordinators/RoleCoordinator.php b/contexts/Authorization/Application/Coordinators/RoleCoordinator.php
@@ -19,8 +19,7 @@ class RoleCoordinator extends BaseCoordinator
 {
     public function __construct(
         private RoleRepository $repository
-    ) {
-    }
+    ) {}
 
     public function create(CreateRoleDTO $data): Role
     {
diff --git a/contexts/Authorization/Application/Coordinators/UserIdentityCoordinator.php b/contexts/Authorization/Application/Coordinators/UserIdentityCoordinator.php
@@ -9,22 +9,21 @@
 use Contexts\Authorization\Application\DTOs\User\CreateUserDTO;
 use Contexts\Authorization\Application\DTOs\User\GetUserListDTO;
 use Contexts\Authorization\Application\DTOs\User\UpdateUserDTO;
+use Contexts\Authorization\Domain\Role\Models\RoleId;
 use Contexts\Authorization\Domain\UserIdentity\Models\Email;
 use Contexts\Authorization\Domain\UserIdentity\Models\Password;
+use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserId;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserIdentity;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserStatus;
 use Contexts\Authorization\Infrastructure\Repositories\UserRepository;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
-use Contexts\Authorization\Domain\Role\Models\RoleId;
 
 class UserIdentityCoordinator extends BaseCoordinator
 {
     public function __construct(
         private UserRepository $repository
-    ) {
-    }
+    ) {}
 
     public function create(CreateUserDTO $data): UserIdentity
     {
diff --git a/contexts/Authorization/Application/DTOs/Role/CreateRoleDTO.php b/contexts/Authorization/Application/DTOs/Role/CreateRoleDTO.php
@@ -9,8 +9,7 @@ class CreateRoleDTO
     public function __construct(
         public readonly string $label,
         public readonly ?string $created_at
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Application/DTOs/Role/GetRoleListDTO.php b/contexts/Authorization/Application/DTOs/Role/GetRoleListDTO.php
@@ -13,8 +13,7 @@ public function __construct(
         public readonly ?array $createdAtRange,
         public readonly int $page,
         public readonly int $perPage,
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Application/DTOs/Role/UpdateRoleDTO.php b/contexts/Authorization/Application/DTOs/Role/UpdateRoleDTO.php
@@ -10,8 +10,7 @@ public function __construct(
         public readonly ?string $label,
         public readonly ?string $status,
         public readonly ?string $created_at
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Application/DTOs/User/CreateUserDTO.php b/contexts/Authorization/Application/DTOs/User/CreateUserDTO.php
@@ -11,8 +11,7 @@ public function __construct(
         public readonly string $password,
         public readonly string $display_name,
         public readonly ?string $created_at
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Application/DTOs/User/GetUserListDTO.php b/contexts/Authorization/Application/DTOs/User/GetUserListDTO.php
@@ -14,8 +14,7 @@ public function __construct(
         public readonly ?array $createdAtRange,
         public readonly int $page,
         public readonly int $perPage,
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Application/DTOs/User/UpdateUserDTO.php b/contexts/Authorization/Application/DTOs/User/UpdateUserDTO.php
@@ -11,8 +11,7 @@ public function __construct(
         public readonly ?string $display_name,
         public readonly ?string $status,
         public readonly ?string $created_at
-    ) {
-    }
+    ) {}
 
     public static function fromRequest(array $data): self
     {
diff --git a/contexts/Authorization/Domain/Role/Events/RoleCreatedEvent.php b/contexts/Authorization/Domain/Role/Events/RoleCreatedEvent.php
@@ -13,8 +13,7 @@ class RoleCreatedEvent
 
     public function __construct(
         private readonly RoleId $roleId,
-    ) {
-    }
+    ) {}
 
     public function getRoleId(): RoleId
     {
diff --git a/contexts/Authorization/Domain/Role/Models/Role.php b/contexts/Authorization/Domain/Role/Models/Role.php
@@ -4,7 +4,6 @@
 
 namespace Contexts\Authorization\Domain\Role\Models;
 
-use App\Exceptions\BizException;
 use App\Http\DomainModel\BaseDomainModel;
 use Carbon\CarbonImmutable;
 use Contexts\Authorization\Domain\Role\Events\RoleCreatedEvent;
diff --git a/contexts/Authorization/Domain/Role/Models/RoleId.php b/contexts/Authorization/Domain/Role/Models/RoleId.php
@@ -6,6 +6,4 @@
 
 use Contexts\Shared\ValueObjects\IntId;
 
-class RoleId extends IntId
-{
-}
+class RoleId extends IntId {}
diff --git a/contexts/Authorization/Domain/Role/Models/RoleStatus.php b/contexts/Authorization/Domain/Role/Models/RoleStatus.php
@@ -6,6 +6,4 @@
 
 use Contexts\Shared\ValueObjects\CommonStatus;
 
-class RoleStatus extends CommonStatus
-{
-}
+class RoleStatus extends CommonStatus {}
diff --git a/contexts/Authorization/Domain/UserIdentity/Events/PasswordChangedEvent.php b/contexts/Authorization/Domain/UserIdentity/Events/PasswordChangedEvent.php
@@ -13,8 +13,7 @@ class PasswordChangedEvent
 
     public function __construct(
         private readonly UserId $userId,
-    ) {
-    }
+    ) {}
 
     public function getUserId(): UserId
     {
diff --git a/contexts/Authorization/Domain/UserIdentity/Events/RoleAssignedEvent.php b/contexts/Authorization/Domain/UserIdentity/Events/RoleAssignedEvent.php
@@ -15,8 +15,7 @@ class RoleAssignedEvent
     public function __construct(
         private readonly UserId $userId,
         private readonly RoleId $roleId
-    ) {
-    }
+    ) {}
 
     public function getUserId(): UserId
     {
diff --git a/contexts/Authorization/Domain/UserIdentity/Events/RoleRemovedEvent.php b/contexts/Authorization/Domain/UserIdentity/Events/RoleRemovedEvent.php
@@ -15,8 +15,7 @@ class RoleRemovedEvent
     public function __construct(
         private readonly UserId $userId,
         private readonly RoleId $roleId
-    ) {
-    }
+    ) {}
 
     public function getUserId(): UserId
     {
diff --git a/contexts/Authorization/Domain/UserIdentity/Events/UserCreatedEvent.php b/contexts/Authorization/Domain/UserIdentity/Events/UserCreatedEvent.php
@@ -13,8 +13,7 @@ class UserCreatedEvent
 
     public function __construct(
         private readonly UserId $userId,
-    ) {
-    }
+    ) {}
 
     public function getUserId(): UserId
     {
diff --git a/contexts/Authorization/Domain/UserIdentity/Models/Password.php b/contexts/Authorization/Domain/UserIdentity/Models/Password.php
@@ -6,9 +6,7 @@
 
 class Password
 {
-    private function __construct(private string $hashedValue)
-    {
-    }
+    private function __construct(private string $hashedValue) {}
 
     public static function createFromPlainText(string $plainText): self
     {
diff --git a/contexts/Authorization/Domain/UserIdentity/Models/RoleIdCollection.php b/contexts/Authorization/Domain/UserIdentity/Models/RoleIdCollection.php
@@ -31,7 +31,7 @@ public function diff(RoleIdCollection $other): self
     {
         return new self(
             $this->items->filter(
-                fn (RoleId $id) => !$other->contains($id)
+                fn (RoleId $id) => ! $other->contains($id)
             )->all()
         );
     }
@@ -55,6 +55,7 @@ public function getIdsArray(): array
 
     /**
      * @template T
+     *
      * @param  callable(RoleId): T  $callback
      * @return Collection<int, T>
      */
diff --git a/contexts/Authorization/Domain/UserIdentity/Models/UserId.php b/contexts/Authorization/Domain/UserIdentity/Models/UserId.php
@@ -6,6 +6,4 @@
 
 use Contexts\Shared\ValueObjects\IntId;
 
-class UserId extends IntId
-{
-}
+class UserId extends IntId {}
diff --git a/contexts/Authorization/Domain/UserIdentity/Models/UserIdentity.php b/contexts/Authorization/Domain/UserIdentity/Models/UserIdentity.php
@@ -7,11 +7,11 @@
 use App\Exceptions\BizException;
 use App\Http\DomainModel\BaseDomainModel;
 use Carbon\CarbonImmutable;
+use Contexts\Authorization\Domain\Role\Models\RoleId;
 use Contexts\Authorization\Domain\UserIdentity\Events\PasswordChangedEvent;
 use Contexts\Authorization\Domain\UserIdentity\Events\RoleAssignedEvent;
 use Contexts\Authorization\Domain\UserIdentity\Events\RoleRemovedEvent;
 use Contexts\Authorization\Domain\UserIdentity\Events\UserCreatedEvent;
-use Contexts\Authorization\Domain\Role\Models\RoleId;
 
 class UserIdentity extends BaseDomainModel
 {
@@ -27,7 +27,7 @@ private function __construct(
         private ?CarbonImmutable $updated_at = null
     ) {
         $this->created_at = $created_at ?? CarbonImmutable::now();
-        $this->roleIdCollection = new RoleIdCollection();
+        $this->roleIdCollection = new RoleIdCollection;
     }
 
     public function syncRoles(RoleIdCollection $newRoles): void
@@ -98,11 +98,11 @@ public static function reconstitute(
         UserStatus $status,
         ?CarbonImmutable $created_at = null,
         ?CarbonImmutable $updated_at = null,
-        RoleIdCollection $roleIdCollection = null,
+        ?RoleIdCollection $roleIdCollection = null,
         array $events = []
     ): self {
         $user = new self($id, $email, $password, $display_name, $status, $created_at, $updated_at);
-        $user->roleIdCollection = $roleIdCollection ?? new RoleIdCollection();
+        $user->roleIdCollection = $roleIdCollection ?? new RoleIdCollection;
 
         foreach ($events as $event) {
             $user->recordEvent($event);
diff --git a/contexts/Authorization/Domain/UserIdentity/Models/UserStatus.php b/contexts/Authorization/Domain/UserIdentity/Models/UserStatus.php
@@ -6,6 +6,4 @@
 
 use Contexts\Shared\ValueObjects\CommonStatus;
 
-class UserStatus extends CommonStatus
-{
-}
+class UserStatus extends CommonStatus {}
diff --git a/contexts/Authorization/Infrastructure/Migrations/2025_03_10_022301_create_pivot_user_role_table.php b/contexts/Authorization/Infrastructure/Migrations/2025_03_10_022301_create_pivot_user_role_table.php
@@ -6,7 +6,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
diff --git a/contexts/Authorization/Infrastructure/Migrations/2025_03_10_022301_create_roles_table.php b/contexts/Authorization/Infrastructure/Migrations/2025_03_10_022301_create_roles_table.php
@@ -6,7 +6,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
diff --git a/contexts/Authorization/Infrastructure/Records/UserRecord.php b/contexts/Authorization/Infrastructure/Records/UserRecord.php
@@ -6,17 +6,17 @@
 
 use App\Exceptions\SysException;
 use App\Http\Models\BaseModel;
+use Contexts\Authorization\Domain\Role\Models\RoleId;
 use Contexts\Authorization\Domain\UserIdentity\Models\Email;
 use Contexts\Authorization\Domain\UserIdentity\Models\Password;
+use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserId;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserIdentity;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserStatus;
 use Contexts\Authorization\Infrastructure\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
-use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
-use Contexts\Authorization\Domain\Role\Models\RoleId;
 
 /**
  * @property int $id
diff --git a/contexts/Authorization/Infrastructure/Repositories/UserRepository.php b/contexts/Authorization/Infrastructure/Repositories/UserRepository.php
@@ -5,13 +5,13 @@
 namespace Contexts\Authorization\Infrastructure\Repositories;
 
 use Contexts\Authorization\Domain\UserIdentity\Exceptions\UserNotFoundException;
+use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserId;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserIdentity;
 use Contexts\Authorization\Domain\UserIdentity\Models\UserStatus;
 use Contexts\Authorization\Infrastructure\Records\UserRecord;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Contexts\Authorization\Domain\UserIdentity\Models\RoleIdCollection;
 
 class UserRepository
 {
diff --git a/contexts/Authorization/Infrastructure/Routes.php b/contexts/Authorization/Infrastructure/Routes.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
+use Contexts\Authorization\Presentation\Controllers\RoleController;
 use Contexts\Authorization\Presentation\Controllers\UserIdentityController;
 use Illuminate\Support\Facades\Route;
-use Contexts\Authorization\Presentation\Controllers\RoleController;
 
 Route::middleware([])->name('Authorization.')->group(function () {
     Route::controller(UserIdentityController::class)->prefix('users')->name('User.')->group(function () {
diff --git a/contexts/Authorization/Presentation/Controllers/RoleController.php b/contexts/Authorization/Presentation/Controllers/RoleController.php
@@ -11,8 +11,8 @@
 use Contexts\Authorization\Application\DTOs\Role\UpdateRoleDTO;
 use Contexts\Authorization\Presentation\Requests\Role\CreateRoleRequest;
 use Contexts\Authorization\Presentation\Requests\Role\GetRoleListRequest;
-use Contexts\Authorization\Presentation\Requests\Role\UpdateRoleRequest;
 use Contexts\Authorization\Presentation\Requests\Role\RoleIdRequest;
+use Contexts\Authorization\Presentation\Requests\Role\UpdateRoleRequest;
 use Contexts\Authorization\Presentation\Resources\RoleResource;
 
 class RoleController extends BaseController
diff --git a/contexts/Authorization/Presentation/Controllers/UserIdentityController.php b/contexts/Authorization/Presentation/Controllers/UserIdentityController.php
@@ -12,10 +12,10 @@
 use Contexts\Authorization\Presentation\Requests\User\ChangePasswordRequest;
 use Contexts\Authorization\Presentation\Requests\User\CreateUserRequest;
 use Contexts\Authorization\Presentation\Requests\User\GetUserListRequest;
+use Contexts\Authorization\Presentation\Requests\User\UpdateRolesRequest;
 use Contexts\Authorization\Presentation\Requests\User\UpdateUserRequest;
 use Contexts\Authorization\Presentation\Requests\User\UserIdRequest;
 use Contexts\Authorization\Presentation\Resources\UserResource;
-use Contexts\Authorization\Presentation\Requests\User\UpdateRolesRequest;
 
 class UserIdentityController extends BaseController
 {
diff --git a/contexts/Authorization/Tests/Feature/Infrastructure/Repositories/CategoryRepositoryTest.php b/contexts/Authorization/Tests/Feature/Infrastructure/Repositories/CategoryRepositoryTest.php
diff --git a/contexts/Authorization/Tests/Feature/Infrastructure/Repositories/UserRepositoryTest.php b/contexts/Authorization/Tests/Feature/Infrastructure/Repositories/UserRepositoryTest.php
diff --git a/contexts/Authorization/Tests/Feature/UserTest.php b/contexts/Authorization/Tests/Feature/UserTest.php
diff --git a/contexts/Authorization/Tests/Unit/Domain/Role/Models/RoleTest.php b/contexts/Authorization/Tests/Unit/Domain/Role/Models/RoleTest.php

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ class RoleCoordinator extends BaseCoordinator`
`19`	`19`	`{`
`20`	`20`	`public function __construct(`
`21`	`21`	`private RoleRepository $repository`
`22`		`- ) {`
`23`		`- }`
	`22`	`+ ) {}`
`24`	`23`
`25`	`24`	`public function create(CreateRoleDTO $data): Role`
`26`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ class CreateRoleDTO`
`9`	`9`	`public function __construct(`
`10`	`10`	`public readonly string $label,`
`11`	`11`	`public readonly ?string $created_at`
`12`		`- ) {`
`13`		`- }`
	`12`	`+ ) {}`
`14`	`13`
`15`	`14`	`public static function fromRequest(array $data): self`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ public function __construct(`
`13`	`13`	`public readonly ?array $createdAtRange,`
`14`	`14`	`public readonly int $page,`
`15`	`15`	`public readonly int $perPage,`
`16`		`- ) {`
`17`		`- }`
	`16`	`+ ) {}`
`18`	`17`
`19`	`18`	`public static function fromRequest(array $data): self`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@ public function __construct(`
`10`	`10`	`public readonly ?string $label,`
`11`	`11`	`public readonly ?string $status,`
`12`	`12`	`public readonly ?string $created_at`
`13`		`- ) {`
`14`		`- }`
	`13`	`+ ) {}`
`15`	`14`
`16`	`15`	`public static function fromRequest(array $data): self`
`17`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ public function __construct(`
`11`	`11`	`public readonly string $password,`
`12`	`12`	`public readonly string $display_name,`
`13`	`13`	`public readonly ?string $created_at`
`14`		`- ) {`
`15`		`- }`
	`14`	`+ ) {}`
`16`	`15`
`17`	`16`	`public static function fromRequest(array $data): self`
`18`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ public function __construct(`
`14`	`14`	`public readonly ?array $createdAtRange,`
`15`	`15`	`public readonly int $page,`
`16`	`16`	`public readonly int $perPage,`
`17`		`- ) {`
`18`		`- }`
	`17`	`+ ) {}`
`19`	`18`
`20`	`19`	`public static function fromRequest(array $data): self`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ class RoleCreatedEvent`
`13`	`13`
`14`	`14`	`public function __construct(`
`15`	`15`	`private readonly RoleId $roleId,`
`16`		`- ) {`
`17`		`- }`
	`16`	`+ ) {}`
`18`	`17`
`19`	`18`	`public function getRoleId(): RoleId`
`20`	`19`	`{`