namespaces refactoring

src/Domain/Sharing/Controllers/BrowseShareController.php

@@ -1,27 +1,25 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\HelperService;
 use Illuminate\Support\Collection;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\FileResource;
 use Illuminate\Support\Facades\Hash;
-use App\Http\Resources\ShareResource;
 use Illuminate\Support\Facades\Storage;
-use App\Http\Requests\Share\AuthenticateShareRequest;
+use Domain\Admin\Resources\FileResource;
+use Domain\Admin\Resources\ShareResource;
+use Domain\SetupWizard\Services\HelperService;
+use Domain\Sharing\Requests\AuthenticateShareRequest;
 
 class BrowseShareController extends Controller
 {
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = resolve(HelperService::class);
+    public function __construct(
+        private HelperService $helper,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/FileSharedAccessController.php

@@ -1,20 +1,18 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
 use Domain\Settings\Models\Zip;
 use Domain\Settings\Models\Share;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\Settings\Models\File as UserFile;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
+use Domain\Settings\Models\File as UserFile;
+use Domain\SetupWizard\Services\HelperService;
 
 class FileSharedAccessController extends Controller
 {
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = resolve(HelperService::class);
+    public function __construct(
+        private HelperService $helper,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -1,32 +1,29 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Domain\SetupWizard\Services\FileManagerService;
 use Illuminate\Database\Eloquent\Model;
+use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Requests\MoveItemRequest;
+use Domain\Files\Requests\DeleteItemRequest;
+use Domain\Files\Requests\RenameItemRequest;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\Files\Requests\CreateFolderRequest;
+use Domain\SetupWizard\Services\HelperService;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\FileFunctions\UploadRequest;
-use App\Http\Requests\FileFunctions\MoveItemRequest;
-use App\Http\Requests\FileFunctions\DeleteItemRequest;
-use App\Http\Requests\FileFunctions\RenameItemRequest;
-use App\Http\Requests\FileFunctions\CreateFolderRequest;
+use Domain\SetupWizard\Services\FileManagerService;
 
 class ManipulateShareItemsController extends Controller
 {
-    private $filemanager;
-    private $helper;
-
-    public function __construct()
-    {
-        $this->filemanager = resolve(FileManagerService::class);
-        $this->helper = resolve(HelperService::class);
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private FileManagerService $filemanager,
+        private HelperService $helper,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/ShareController.php

@@ -1,18 +1,18 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Sharing\Controllers;
 
 use Validator;
+use Illuminate\Http\Request;
 use Domain\Settings\Models\Zip;
 use Domain\Settings\Models\Share;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Resources\ShareResource;
-use App\Notifications\SharedSendViaEmail;
+use Domain\Admin\Resources\ShareResource;
 use Illuminate\Support\Facades\Notification;
-use App\Http\Requests\Share\CreateShareRequest;
-use App\Http\Requests\Share\UpdateShareRequest;
+use Domain\Sharing\Requests\CreateShareRequest;
+use Domain\Sharing\Requests\UpdateShareRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Sharing\Notifications\SharedSendViaEmail;
 
 class ShareController extends Controller
 {