Update to laravel 9

superman1408 · Feb 23, 2022 · 7e2370a · 7e2370a
1 parent 6d7eb49
commit 7e2370a
Show file tree

Hide file tree

Showing 16 changed files with 974 additions and 1,832 deletions.
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
-use Illuminate\Http\Request;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
+use Symfony\Component\HttpFoundation\Request;
 
 class TrustProxies extends Middleware
 {
@@ -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,37 +8,33 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.4|^8.0|^8.1",
+        "php": "^8.0.2|^8.1",
         "ext-json": "*",
-        "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "jenssegers/agent": "^2.6",
-        "laravel/framework": "^8.42",
+        "laravel/framework": "^9.0",
         "laravel/tinker": "^2.5",
         "laravel/ui": "^3.1",
         "pusher/pusher-php-server": "^7.0",
-        "rtippin/janus-client": "^1.0",
-        "rtippin/messenger": "^1.19",
-        "rtippin/messenger-bots": "^1.12",
+        "rtippin/janus-client": "^1.1",
+        "rtippin/messenger": "^1.20",
+        "rtippin/messenger-bots": "^1.13",
         "rtippin/messenger-ui": "^2.6"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.8",
         "beyondcode/laravel-dump-server": "^1.6",
-        "facade/ignition": "^2.5",
+        "spatie/laravel-ignition": "^1.0",
         "fakerphp/faker": "^1.9.1",
         "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
+        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.3.3",
-        "rtippin/messenger-faker": "^1.6"
+        "rtippin/messenger-faker": "^1.7"
     },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "platform": {
-            "php": "7.4"
-        },
         "sort-packages": true
     },
     "extra": {