namespaces refactoring part 3

src/App/Http/Kernel.php

@@ -1,7 +1,19 @@
 <?php
 namespace App\Http;
 
+use Fruitcake\Cors\HandleCors;
+use Support\Middleware\TrimStrings;
+use Support\Middleware\TrustProxies;
+use Support\Middleware\EncryptCookies;
+use Support\Middleware\VerifyCsrfToken;
+use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Support\Middleware\PreventRequestsDuringMaintenance;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
 
 class Kernel extends HttpKernel
@@ -14,13 +26,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        // \App\Http\Middleware\TrustHosts::class,
-        \Support\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
-        \Support\Middleware\PreventRequestsDuringMaintenance::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \Support\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        TrustProxies::class,
+        HandleCors::class,
+        PreventRequestsDuringMaintenance::class,
+        ValidatePostSize::class,
+        TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -30,20 +41,18 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \Support\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \Support\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            EncryptCookies::class,
+            AddQueuedCookiesToResponse::class,
+            StartSession::class,
+            ShareErrorsFromSession::class,
+            VerifyCsrfToken::class,
+            SubstituteBindings::class,
         ],
 
         'api' => [
             EnsureFrontendRequestsAreStateful::class,
             //'throttle:api',
-            //\App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            SubstituteBindings::class,
         ],
     ];
 

src/App/Providers/AppServiceProvider.php

@@ -1,7 +1,6 @@
 <?php
 namespace App\Providers;
 
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider

src/App/Users/Models/User.php

@@ -2,13 +2,13 @@
 namespace App\Users\Models;
 
 use ByteUnits\Metric;
-use Database\Factories\UserFactory;
-use Domain\Files\Models\File;
-use Domain\Folders\Models\Folder;
-use Domain\Traffic\Models\Traffic;
 use Illuminate\Support\Str;
+use Domain\Files\Models\File;
 use Laravel\Cashier\Billable;
+use Domain\Folders\Models\Folder;
 use Laravel\Sanctum\HasApiTokens;
+use Domain\Traffic\Models\Traffic;
+use Database\Factories\UserFactory;
 use Kyslik\ColumnSortable\Sortable;
 use Support\Services\HelperService;
 use Illuminate\Support\Facades\Storage;

src/Domain/Files/Models/File.php

@@ -2,11 +2,11 @@
 namespace Domain\Files\Models;
 
 use ByteUnits\Metric;
-use Database\Factories\FileFactory;
-use Domain\Folders\Models\Folder;
-use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Database\Factories\FileFactory;
 use Kyslik\ColumnSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;

src/Domain/Files/Requests/UploadRequest.php

@@ -26,7 +26,7 @@ class UploadRequest extends FormRequest
         return [
             'filename'  => 'required|string',
             'folder_id' => 'nullable|uuid',
-            'is_last'   => 'sometimes|boolean',
+            'is_last'   => 'sometimes|string',
             'file'      => ['required', 'file', new DisabledMimetypes],
         ];
     }

src/Domain/Folders/Models/Folder.php

@@ -1,12 +1,12 @@
 <?php
 namespace Domain\Folders\Models;
 
-use Database\Factories\FolderFactory;
-use Domain\Files\Models\File;
-use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
+use Domain\Files\Models\File;
 use Laravel\Scout\Searchable;
+use Domain\Sharing\Models\Share;
 use Kyslik\ColumnSortable\Sortable;
+use Database\Factories\FolderFactory;
 use Illuminate\Database\Eloquent\Model;
 use TeamTNT\TNTSearch\Indexer\TNTIndexer;
 use \Illuminate\Database\Eloquent\SoftDeletes;

src/Domain/Homepage/Controllers/AppFunctionsController.php

@@ -74,11 +74,15 @@ class AppFunctionsController extends Controller
      */
     public function og_site(Share $shared)
     {
+        $namespace = match ($shared->type) {
+            'folder' => 'Domain\\Folders\\Models\\Folder',
+            'file'   => 'Domain\\Files\\Models\\File',
+        };
+
         // Get file/folder record
-        $item = ('App\\Models\\' . ucfirst($shared->type))
-            ::where('user_id', $shared->user->id)
-                ->where('id', $shared->item_id)
-                ->first();
+        $item = ($namespace)::where('user_id', $shared->user->id)
+            ->where('id', $shared->item_id)
+            ->first();
 
         if ($item->thumbnail) {
             $item->setPublicUrl($shared->token);

src/Domain/Sharing/Models/Share.php

@@ -1,8 +1,9 @@
 <?php
 namespace Domain\Sharing\Models;
 
-use Database\Factories\ShareFactory;
+use App\Users\Models\User;
 use Illuminate\Support\Str;
+use Database\Factories\ShareFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

src/Domain/Zipping/Models/Zip.php

@@ -2,8 +2,8 @@
 namespace Domain\Zipping\Models;
 
 use App\Users\Models\User;
-use Database\Factories\ZipFactory;
 use Illuminate\Support\Str;
+use Database\Factories\ZipFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

src/Support/helpers.php

@@ -258,9 +258,12 @@ if (! function_exists('get_item')) {
      */
     function get_item($type, $id)
     {
-        $model = strtolower($type) === 'folder' ? 'Folder' : 'File';
+        $namespace = match ($type) {
+            'folder' => 'Domain\\Folders\\Models\\Folder',
+            'file'   => 'Domain\\Files\\Models\\File',
+        };
 
-        return ("App\\Models\\$model")::find($id);
+        return ($namespace)::find($id);
     }
 }