Refactoring

src/Domain/Items/Controllers/DeleteFileOrFolderController.php

@@ -9,21 +9,22 @@ use Domain\Items\Actions\DeleteFileOrFolderAction;
 
 class DeleteFileOrFolderController extends Controller
 {
+    public function __construct(
+        public DeleteFileOrFolderAction $deleteFileOrFolder,
+    ){}
+
     /**
      * Delete item for authenticated master|editor user
      */
     public function __invoke(
         DeleteItemRequest $request,
-        DeleteFileOrFolderAction $deleteFileOrFolder,
     ): Response {
         abort_if(
-            is_demo_account(Auth::user()?->email),
-            204,
-            'Done.'
+            is_demo_account(Auth::user()?->email), 204, 'Done.'
         );
 
         foreach ($request->input('items') as $item) {
-            ($deleteFileOrFolder)($item, $item['id']);
+            ($this->deleteFileOrFolder)($item, $item['id']);
         }
 
         return response('Done', 204);

src/Domain/Items/Controllers/MoveFileOrFolderController.php

@@ -9,12 +9,15 @@ use Domain\Items\Actions\MoveFileOrFolderAction;
 
 class MoveFileOrFolderController extends Controller
 {
+    public function __construct(
+        public MoveFileOrFolderAction $moveFileOrFolder,
+    ) {}
+
     /**
      * Move item for authenticated master|editor user
      */
     public function __invoke(
         MoveItemRequest $request,
-        MoveFileOrFolderAction $moveFileOrFolder,
     ): Response {
         abort_if(
             is_demo_account(Auth::user()?->email),
@@ -22,10 +25,8 @@ class MoveFileOrFolderController extends Controller
             'Done.'
         );
 
-        ($moveFileOrFolder)(
-            $request,
-            $request->input('to_id')
-        );
+        // Move item
+        ($this->moveFileOrFolder)($request, $request->input('to_id'));
 
         return response('Done!', 204);
     }

src/Domain/Items/Controllers/RenameFileOrFolderController.php

@@ -11,26 +11,29 @@ use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 
 class RenameFileOrFolderController extends Controller
 {
+    public function __construct(
+        public RenameFileOrFolderAction $renameFileOrFolder,
+        public UpdateFolderPropertyAction $updateFolderProperty,
+        public FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
+    ) {}
+
     /**
      * Rename item for authenticated master|editor user
      */
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-        RenameFileOrFolderAction $renameFileOrFolder,
-        UpdateFolderPropertyAction $updateFolderProperty,
-        FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
     ): Model | array {
         if (is_demo_account(Auth::user()->email)) {
-            return ($fakeRenameFileOrFolder)($request, $id);
+            return ($this->fakeRenameFileOrFolder)($request, $id);
         }
 
         // If request contain icon or color, then change it
         if ($request->filled('emoji') || $request->filled('color')) {
-            ($updateFolderProperty)($request, $id);
+            ($this->updateFolderProperty)($request, $id);
         }
 
         // Rename Item
-        return ($renameFileOrFolder)($request, $id);
+        return ($this->renameFileOrFolder)($request, $id);
     }
 }