Upgrade to Laravel 5.6 & Vuetify 1.0

elcobvg · Mar 26, 2018 · baf0b5b · baf0b5b
1 parent 333328b
commit baf0b5b
Show file tree

Hide file tree

Showing 7 changed files with 2,177 additions and 1,367 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,3 +3,7 @@
 ## 0.1.0 - 2017-10-17
 
 - Initial release
+
+## 1.0.0 - 2018-03-27
+
+- Laravel 5.6 + Vuetify 1.0
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
@@ -5,19 +5,19 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.0.0",
-        "fideloper/proxy": "~3.3",
-        "laravel/framework": "5.5.*",
+        "php": ">=7.1.3",
+        "fideloper/proxy": "~4.0",
+        "laravel/framework": "5.6.*",
         "laravel/tinker": "~1.0",
         "tymon/jwt-auth": "dev-develop"
     },
     "require-dev": {
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
-        "laravel/dusk": "^2.0",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~6.0",
-        "squizlabs/php_codesniffer": "^3.1"
+        "laravel/dusk": "~3.0",
+        "mockery/mockery": "~1.0",
+        "phpunit/phpunit": "~7.0",
+        "squizlabs/php_codesniffer": "^3.2"
     },
     "autoload": {
         "classmap": [