upgraded laravel version to 5.7

emir · Oct 4, 2018 · 08a841d · 08a841d
1 parent ab52a4d
commit 08a841d
Show file tree

Hide file tree

Showing 3 changed files with 1,035 additions and 832 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
@@ -8,10 +8,10 @@
         "php": ">=7.0.0",
         "avengers/bootforms": "^1.0",
         "cviebrock/eloquent-sluggable": "^4.3",
-        "fideloper/proxy": "~3.3",
+        "fideloper/proxy": "~4.0",
         "guzzlehttp/guzzle": "^6.3",
         "laracasts/flash": "^3.0",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.7.*",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "roave/security-advisories": "dev-master",
@@ -24,7 +24,7 @@
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "~1.0",
         "phpunit/phpunit": "~6.0",
-        "satooshi/php-coveralls": "^1.0"
+        "php-coveralls/php-coveralls": "^1.0"
     },
     "autoload": {
         "classmap": [