upgrade laravel 8 -> laravel 9

SlovakNationalGallery · Feb 7, 2024 · 45f65b4 · 45f65b4
1 parent e899a8f
commit 45f65b4
Show file tree

Hide file tree

Showing 3 changed files with 2,059 additions and 1,861 deletions.
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -19,5 +19,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;
+}
diff --git a/composer.json b/composer.json
@@ -8,42 +8,43 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.0.2",
         "babenkoivan/elastic-migrations": "^1.3",
         "babenkoivan/elastic-scout-driver": "^1.2",
         "babenkoivan/elastic-scout-driver-plus": "^2.3",
         "backpack/crud": "^5.0.0",
-        "backpack/filemanager": "^1.1",
+        "backpack/filemanager": "^2.0",
         "backpack/logmanager": "^4.0",
         "backpack/pro": "1.2.8",
         "doctrine/dbal": "^2.5",
-        "fakerphp/faker": "^1.13",
-        "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.12",
-        "laravel/scout": "^8.5",
+        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^9.0",
+        "laravel/sanctum": "^3.0",
+        "laravel/scout": "^9.0",
         "laravel/telescope": "^4.3",
-        "laravel/tinker": "^2.5",
-        "laravel/ui": "^3.1",
-        "league/flysystem-sftp": "~1.0",
-        "lorisleiva/laravel-deployer": "^0.3.5",
+        "laravel/tinker": "^2.7",
+        "league/flysystem-sftp": "^3.0",
         "mcamara/laravel-localization": "^1.6",
         "sentry/sentry-laravel": "^3.3",
         "spatie/laravel-medialibrary": "^9.4",
         "spatie/laravel-missing-page-redirector": "^2.7",
-        "spatie/laravel-sluggable": "^2.6",
-        "spatie/laravel-tags": "^3.0",
-        "spatie/laravel-translatable": "^4.6",
+        "spatie/laravel-sluggable": "^3.5",
+        "spatie/laravel-tags": "^4.5",
+        "spatie/laravel-translatable": "^6.5",
         "spatie/pdf-to-image": "^2.1",
         "staudenmeir/eloquent-has-many-deep": "^1.13"
     },
     "require-dev": {
         "backpack/generators": "^3.1",
-        "facade/ignition": "^2.5",
-        "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3.3"
+        "deployer/deployer": "^7.3",
+        "fakerphp/faker": "^1.9.1",
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.0.1",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
     },
     "config": {
         "optimize-autoloader": true,