From d4a33215b44fcf756377cc4da75dedd4ba83b9d8 Mon Sep 17 00:00:00 2001 From: Julian Prieber Date: Tue, 30 Jan 2024 18:09:30 +0100 Subject: [PATCH] Updated to Laravel 10 --- app/Http/Middleware/TrustProxies.php | 9 +++++++-- composer.json | 23 +++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index a3b6aef..a786503 100755 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -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 @@ -19,5 +19,10 @@ class TrustProxies extends Middleware * * @var int */ - 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; + 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; } diff --git a/composer.json b/composer.json index 4dc6e04..26082da 100644 --- a/composer.json +++ b/composer.json @@ -5,33 +5,32 @@ "keywords": ["link"], "license": "GPL-3.0-or-later", "require": { - "php": ">=8.0", + "php": ">=8.1", "awssat/laravel-visits": "^6.0", - "codedge/laravel-selfupdater": "^3.6", + "codedge/laravel-selfupdater": "^3.8.1", "cohensive/oembed": "^0.17", - "doctrine/dbal": "^3.0", - "fideloper/proxy": "^4.4", - "geo-sot/laravel-env-editor": "^2.0", + "doctrine/dbal": "^3.8.0", + "geo-sot/laravel-env-editor": "^2.1.1", "guzzlehttp/guzzle": "^7.4", "jeroendesloovere/vcard": "^1.7", - "laravel/framework": "^9.52.4", + "laravel/framework": "^10.42.0", "laravel/socialite": "^5.5", "laravel/tinker": "^2.5", "livewire/livewire": "^2.12", "rappasoft/laravel-livewire-tables": "^2.15", "simplesoftwareio/simple-qrcode": "~4", - "spatie/laravel-backup": "^8.17" + "spatie/laravel-backup": "^8.5.1" }, "require-dev": { "barryvdh/laravel-ide-helper": "^2.12", "fakerphp/faker": "^1.9.1", - "laravel-lang/common": "^2.0", + "laravel-lang/common": "^6.1.0", "laravel/breeze": "^1.1", - "laravel/sail": "^1.0.1", + "laravel/sail": "^1.27.2", "mockery/mockery": "^1.4.2", - "nunomaduro/collision": "^6.1", - "phpunit/phpunit": "^9.3.3", - "spatie/laravel-ignition": "^1.0" + "nunomaduro/collision": "^7.10.0", + "phpunit/phpunit": "^10.5.9", + "spatie/laravel-ignition": "^2.4.1" }, "autoload": { "files": [