Skip to content

Commit 28c6774

Browse files
committed
Revert "Merge pull request #784 from LinkStackOrg/laravel-10"
This reverts commit 2e193ea, reversing changes made to bcca99b.
1 parent 58dab38 commit 28c6774

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

app/Http/Middleware/TrustProxies.php

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

33
namespace App\Http\Middleware;
44

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

88
class TrustProxies extends Middleware
@@ -19,10 +19,5 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
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;
22+
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;
2823
}

composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,33 @@
55
"keywords": ["link"],
66
"license": "GPL-3.0-or-later",
77
"require": {
8-
"php": ">=8.1",
8+
"php": ">=8.0",
99
"awssat/laravel-visits": "^6.0",
10-
"codedge/laravel-selfupdater": "^3.8.1",
10+
"codedge/laravel-selfupdater": "^3.6",
1111
"cohensive/oembed": "^0.17",
12-
"doctrine/dbal": "^3.8.0",
13-
"geo-sot/laravel-env-editor": "^2.1.1",
12+
"doctrine/dbal": "^3.0",
13+
"fideloper/proxy": "^4.4",
14+
"geo-sot/laravel-env-editor": "^2.0",
1415
"guzzlehttp/guzzle": "^7.4",
1516
"jeroendesloovere/vcard": "^1.7",
16-
"laravel/framework": "^10.42.0",
17+
"laravel/framework": "^9.52.4",
1718
"laravel/socialite": "^5.5",
1819
"laravel/tinker": "^2.5",
1920
"livewire/livewire": "^2.12",
2021
"rappasoft/laravel-livewire-tables": "^2.15",
2122
"simplesoftwareio/simple-qrcode": "~4",
22-
"spatie/laravel-backup": "^8.5.1"
23+
"spatie/laravel-backup": "^8.17"
2324
},
2425
"require-dev": {
2526
"barryvdh/laravel-ide-helper": "^2.12",
2627
"fakerphp/faker": "^1.9.1",
27-
"laravel-lang/common": "^6.1.0",
28+
"laravel-lang/common": "^2.0",
2829
"laravel/breeze": "^1.1",
29-
"laravel/sail": "^1.27.2",
30+
"laravel/sail": "^1.0.1",
3031
"mockery/mockery": "^1.4.2",
31-
"nunomaduro/collision": "^7.10.0",
32-
"phpunit/phpunit": "^10.5.9",
33-
"spatie/laravel-ignition": "^2.4.1"
32+
"nunomaduro/collision": "^6.1",
33+
"phpunit/phpunit": "^9.3.3",
34+
"spatie/laravel-ignition": "^1.0"
3435
},
3536
"autoload": {
3637
"files": [

0 commit comments

Comments
 (0)