Skip to content
This repository was archived by the owner on Feb 18, 2023. It is now read-only.

Commit 27f68ab

Browse files
committed
update to Laravel 9
1 parent 956d63c commit 27f68ab

File tree

5 files changed

+1077
-1649
lines changed

5 files changed

+1077
-1649
lines changed

app/Http/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
1616
protected $middleware = [
1717
// \App\Http\Middleware\TrustHosts::class,
1818
\App\Http\Middleware\TrustProxies::class,
19-
\Fruitcake\Cors\HandleCors::class,
19+
\Illuminate\Http\Middleware\HandleCors::class,
2020
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
2121
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
2222
\App\Http\Middleware\TrimStrings::class,

app/Http/Middleware/TrustProxies.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace App\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
class TrustProxies extends Middleware
99
{
1010
/**
1111
* The trusted proxies for this application.
1212
*
13-
* @var array|string|null
13+
* @var array<int, string>|string|null
1414
*/
1515
protected $proxies;
1616

@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
protected $headers = Request::HEADER_X_FORWARDED_ALL;
23-
}
22+
protected $headers =
23+
Request::HEADER_X_FORWARDED_FOR |
24+
Request::HEADER_X_FORWARDED_HOST |
25+
Request::HEADER_X_FORWARDED_PORT |
26+
Request::HEADER_X_FORWARDED_PROTO |
27+
Request::HEADER_X_FORWARDED_AWS_ELB;
28+
}

composer.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,26 @@
1919
}
2020
],
2121
"require": {
22-
"php": ">=7.4",
23-
"fideloper/proxy": "^4.2",
24-
"fruitcake/laravel-cors": "^2.0",
25-
"guzzlehttp/guzzle": "^7.0.1",
26-
"intervention/image": "^2.5",
22+
"php": "^8.0.2",
23+
"guzzlehttp/guzzle": "^7.2",
24+
"laravel/framework": "^9.19",
25+
"intervention/image": "^2.7",
2726
"intervention/imagecache": "^2.4",
28-
"laravel/framework": "^8.0",
29-
"laravel/passport": "^10.0",
30-
"laravel/socialite": "^5.1",
31-
"laravel/tinker": "^2.0",
32-
"spatie/laravel-fractal": "^5.8",
33-
"spatie/laravel-permission": "^3.17"
27+
"laravel/passport": "^10.4",
28+
"laravel/socialite": "^5.5",
29+
"laravel/tinker": "^2.7",
30+
"spatie/laravel-fractal": "^6.0",
31+
"spatie/laravel-permission": "^5.5"
3432
},
3533
"require-dev": {
3634
"brianium/paratest": "^6.2",
37-
"eduarguz/shift-php-cs": "dev-master",
38-
"facade/ignition": "^2.5",
3935
"fakerphp/faker": "^1.9.1",
40-
"mockery/mockery": "^1.4.2",
41-
"nunomaduro/collision": "^5.0",
42-
"phpunit/phpunit": "^9.3.3"
36+
"laravel/pint": "^1.0",
37+
"laravel/sail": "^1.0.1",
38+
"mockery/mockery": "^1.4.4",
39+
"nunomaduro/collision": "^6.1",
40+
"phpunit/phpunit": "^9.5.10",
41+
"spatie/laravel-ignition": "^1.0"
4342
},
4443
"config": {
4544
"optimize-autoloader": true,

0 commit comments

Comments
 (0)