Skip to content

Commit

Permalink
update to laravel 10
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Feb 16, 2023
1 parent b450c23 commit cae5913
Show file tree
Hide file tree
Showing 3 changed files with 1,795 additions and 1,495 deletions.
9 changes: 7 additions & 2 deletions app/Http/Middleware/TrustProxies.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Http\Middleware;

use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;

class TrustProxies extends Middleware
Expand All @@ -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;
}
28 changes: 13 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,27 @@
],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fideloper/proxy": "^4.2",
"laravel/framework": "^8.0",
"laravel/tinker": "^2.2",
"spatie/laravel-sitemap": "^5.9",
"symfony/browser-kit": "^5.0",
"php": "^8.1",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^10.0",
"laravel/tinker": "^2.8",
"laravel/sanctum": "^3.2",
"spatie/laravel-sitemap": "^6.0",
"symfony/browser-kit": "^6.0",
"torchlight/torchlight-commonmark": "^0.5.2",
"torchlight/torchlight-laravel": "^0.5.7"
},
"require-dev": {
"facade/ignition": "^2.3.6",
"fakerphp/faker": "^1.19",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0"
"spatie/laravel-ignition": "^2.0",
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "7.4"
}
"sort-packages": true
},
"extra": {
"laravel": {
Expand Down
Loading

0 comments on commit cae5913

Please sign in to comment.