Update to laravel/framwork 6.18

VSLCatena · Aug 10, 2020 · afe6faf · afe6faf
1 parent ea1bbe0
commit afe6faf
Show file tree

Hide file tree

Showing 3 changed files with 2,781 additions and 1,248 deletions.
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
+    protected $headers = Request :: HEADER_X_FORWARDED_ALL ;
 }
diff --git a/composer.json b/composer.json
@@ -6,20 +6,21 @@
     "type": "project",
     "require": {
         "php": ">=7.0.0",
-        "adldap2/adldap2-laravel": "^3.0",
+        "adldap2/adldap2-laravel": "^6.0.8",
         "barryvdh/laravel-ide-helper": "^2.4",
         "doctrine/dbal": "^2.6",
-        "fideloper/proxy": "~3.3",
-        "laravel/framework": "5.5.*",
-        "laravel/tinker": "~1.0",
-        "nesbot/carbon": "^1.22"
+        "fideloper/proxy": "^4.0",
+        "laravel/framework": "^6.18",
+        "laravel/helpers": "^1.2",
+        "laravel/tinker": "^2.0",
+        "nesbot/carbon": "^2.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.1",
         "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~6.0"
+        "fzaninotto/faker": "^1.4",
+        "mockery/mockery": "^1.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "classmap": [