Skip to content

Commit 008a0fc

Browse files
committed
upgrade to 5.7
1 parent aaf453c commit 008a0fc

File tree

4 files changed

+1576
-1381
lines changed

4 files changed

+1576
-1381
lines changed

app/Http/Middleware/TrustProxies.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
1919
*
2020
* @var array
2121
*/
22-
protected $headers = [
23-
Request::HEADER_FORWARDED => 'FORWARDED',
24-
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
25-
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
26-
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
27-
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
28-
];
22+
protected $headers = Request::HEADER_X_FORWARDED_ALL;
2923
}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"type": "project",
77
"require": {
88
"php": ">=7.0.0",
9-
"fideloper/proxy": "~3.3",
9+
"fideloper/proxy": "~4.0",
1010
"guzzlehttp/guzzle": "~6.3",
1111
"hieu-le/active": "~3.5",
1212
"intervention/image": "^2.4",
13-
"laravel/framework": "5.5.*",
13+
"laravel/framework": "5.7.*",
1414
"laravel/horizon": "~1.0",
1515
"laravel/tinker": "~1.0",
1616
"mews/captcha": "~2.0",
@@ -27,7 +27,7 @@
2727
"filp/whoops": "~2.0",
2828
"fzaninotto/faker": "~1.4",
2929
"mockery/mockery": "0.9.*",
30-
"phpunit/phpunit": "~6.0",
30+
"phpunit/phpunit": "~7.0",
3131
"summerblue/generator": "~0.5"
3232
},
3333
"autoload": {

0 commit comments

Comments
 (0)