fix: upgrade to laravel 9

daveroverts · Feb 12, 2022 · f582f33 · f582f33
1 parent e3acd26
commit f582f33
Show file tree

Hide file tree

Showing 9 changed files with 2,745 additions and 3,061 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,8 +114,8 @@ jobs:
       - name: Copy/Paste Detector
         run: phpcpd app/ --min-lines=50
 
-      - name: Enlightn Security Checker
-        run: php vendor/enlightn/security-checker/security-checker security:check composer.lock
+      # - name: Enlightn Security Checker
+      #   run: php vendor/enlightn/security-checker/security-checker security:check composer.lock
   test-php-postgresql:
     name: Test PHP with PostgreSQL
     runs-on: ubuntu-latest

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 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
@@ -10,15 +10,13 @@
     "require": {
         "php": "^8.0",
         "aws/aws-sdk-php": "^3.209",
-        "bensampo/laravel-enum": "^4.2",
+        "bensampo/laravel-enum": "^5.0",
         "blade-ui-kit/blade-ui-kit": "^0.3.3",
         "bugsnag/bugsnag-laravel": "^2.22",
-        "cviebrock/eloquent-sluggable": "^8.0",
+        "cviebrock/eloquent-sluggable": "^9.0",
         "doctrine/dbal": "^3.3",
-        "facade/ignition": "^2.17",
-        "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
-        "laravel/framework": "^8.82",
+        "laravel/framework": "^9.0",
         "laravel/horizon": "^5.8",
         "laravel/telescope": "^4.7",
         "laravel/tinker": "^2.7",
@@ -28,18 +26,18 @@
         "predis/predis": "^1.1",
         "protonemedia/laravel-form-components": "^3.5",
         "spatie/laravel-activitylog": "^4.4",
-        "tabuna/breadcrumbs": "^2.4"
+        "spatie/laravel-ignition": "^1.0",
+        "tabuna/breadcrumbs": "^3.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.6",
         "barryvdh/laravel-ide-helper": "^2.12",
-        "beyondcode/laravel-query-detector": "^1.5",
+        "beyondcode/laravel-query-detector": "^1.6",
         "brianium/paratest": "^6.4",
-        "enlightn/security-checker": "^1.9",
         "fakerphp/faker": "^1.18",
         "laravel/sail": "^1.13",
         "mockery/mockery": "^1.5",
-        "nunomaduro/collision": "^5.10",
+        "nunomaduro/collision": "^6.1",
         "nunomaduro/larastan": "^1.0",
         "phpunit/phpunit": "^9.5"
     },