Laravel 9 upgrade

src/App/Http/Kernel.php

@@ -53,7 +53,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             EnsureFrontendRequestsAreStateful::class,
-            //'throttle:api',
+            'throttle:api',
             SubstituteBindings::class,
         ],
     ];

src/App/Providers/RouteServiceProvider.php

@@ -1,6 +1,9 @@
 <?php
 namespace App\Providers;
 
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
@@ -27,97 +30,60 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function map()
+    public function boot()
     {
-        $this->mapApiRoutes();
-        $this->mapShareRoutes();
-        $this->mapUploadRequestRoutes();
-        $this->mapAdminApiRoutes();
-        $this->mapSetupWizardApiRoutes();
-        $this->mapUserApiRoutes();
-        $this->mapMaintenanceRoutes();
-        $this->mapFileRoutes();
-        $this->mapTeamsRoutes();
-        $this->mapWebRoutes();
+        $this->configureRateLimiting();
+
+        $this->routes(function () {
+            Route::prefix('api')
+                ->middleware('api')
+                ->group(base_path('routes/api.php'));
+
+            Route::prefix('api')
+                ->middleware('api')
+                ->group(base_path('routes/share.php'));
+
+            Route::prefix('api/upload-request')
+                ->middleware('api')
+                ->group(base_path('routes/upload-request.php'));
+
+            Route::prefix('api/admin')
+                ->middleware(['api', 'auth:sanctum'])
+                ->group(base_path('routes/admin.php'));
+
+            Route::middleware(['setup-wizard'])
+                ->group(base_path('routes/setup.php'));
+
+            Route::prefix('api/user')
+                ->middleware('api')
+                ->group(base_path('routes/user.php'));
+
+            Route::middleware('web')
+                ->group(base_path('routes/maintenance.php'));
+
+            Route::middleware('web')
+                ->group(base_path('routes/file.php'));
+
+            Route::prefix('api/teams')
+                ->middleware(['api'])
+                ->group(base_path('routes/teams.php'));
+
+            Route::middleware('web')
+                ->group(base_path('routes/web.php'));
+        });
     }
 
     /**
-     * Define the "web" routes for the application.
-     *
-     * These routes all receive session state, CSRF protection, etc.
+     * Configure the rate limiters for the application.
      *
      * @return void
      */
-    protected function mapWebRoutes()
+    protected function configureRateLimiting()
     {
-        Route::middleware('web')
-            ->group(base_path('routes/web.php'));
-    }
-
-    protected function mapMaintenanceRoutes()
-    {
-        Route::middleware('web')
-            ->group(base_path('routes/maintenance.php'));
-    }
-
-    protected function mapFileRoutes()
-    {
-        Route::middleware('web')
-            ->group(base_path('routes/file.php'));
-    }
-
-    /**
-     * Define the "api" routes for the application.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::prefix('api')
-            ->middleware('api')
-            ->group(base_path('routes/api.php'));
-    }
-
-    protected function mapShareRoutes()
-    {
-        Route::prefix('api')
-            ->middleware('api')
-            ->group(base_path('routes/share.php'));
-    }
-
-    protected function mapUploadRequestRoutes()
-    {
-        Route::prefix('api/upload-request')
-            ->middleware('api')
-            ->group(base_path('routes/upload-request.php'));
-    }
-
-    protected function mapAdminApiRoutes()
-    {
-        Route::prefix('api/admin')
-            ->middleware(['api', 'auth:sanctum'])
-            ->group(base_path('routes/admin.php'));
-    }
-
-    protected function mapUserApiRoutes()
-    {
-        Route::prefix('api/user')
-            ->middleware('api')
-            ->group(base_path('routes/user.php'));
-    }
-
-    protected function mapTeamsRoutes()
-    {
-        Route::prefix('api/teams')
-            ->middleware(['api'])
-            ->group(base_path('routes/teams.php'));
-    }
-
-    protected function mapSetupWizardApiRoutes()
-    {
-        Route::middleware(['setup-wizard'])
-            ->group(base_path('routes/setup.php'));
+        RateLimiter::for('api', function (Request $request) {
+            return $request->user()
+                ? Limit::perMinute(1000)->by($request->user()->id)
+                : Limit::perMinute(100)->by($request->ip());
+        });
     }
 }

src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php

@@ -17,10 +17,10 @@ class StoreEnvironmentSettingsController extends Controller
         if (! app()->runningUnitTests()) {
             $drivers = [
                 'local' => [
-                    'FILESYSTEM_DRIVER' => 'local',
+                    'FILESYSTEM_DISK' => 'local',
                 ],
                 's3'    => [
-                    'FILESYSTEM_DRIVER'    => 's3',
+                    'FILESYSTEM_DISK'    => 's3',
                     'S3_ACCESS_KEY_ID'     => $request->input('storage.key') ?? null,
                     'S3_SECRET_ACCESS_KEY' => $request->input('storage.secret') ?? null,
                     'S3_DEFAULT_REGION'    => $request->input('storage.region') ?? null,

src/Support/Middleware/TrustProxies.php

@@ -1,15 +1,15 @@
 <?php
 namespace Support\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -18,5 +18,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

src/Support/helpers.php

@@ -245,7 +245,7 @@ if (! function_exists('get_storage')) {
      */
     function get_storage()
     {
-        return env('FILESYSTEM_DRIVER');
+        return env('FILESYSTEM_DISK');
     }
 }