From 49c1198e4e23c53f40ea63838e190312c989e7fd Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 9 Feb 2022 09:24:11 +0100 Subject: [PATCH 1/5] Prep Laravel 10 --- app/Http/Kernel.php | 2 +- composer.json | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d3722c2d5c4..753471ae0b7 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -16,7 +16,7 @@ class Kernel extends HttpKernel protected $middleware = [ // \App\Http\Middleware\TrustHosts::class, \App\Http\Middleware\TrustProxies::class, - \Fruitcake\Cors\HandleCors::class, + // \Fruitcake\Cors\HandleCors::class, \App\Http\Middleware\PreventRequestsDuringMaintenance::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, diff --git a/composer.json b/composer.json index 69137367823..70682772377 100644 --- a/composer.json +++ b/composer.json @@ -6,19 +6,14 @@ "license": "MIT", "require": { "php": "^8.0", - "fruitcake/laravel-cors": "^2.0.5", "guzzlehttp/guzzle": "^7.2", - "laravel/framework": "^9.0", - "laravel/sanctum": "^2.14", - "laravel/tinker": "^2.7" + "laravel/framework": "^9.0" }, "require-dev": { "fakerphp/faker": "^1.9.1", - "laravel/sail": "^1.0.1", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.1", - "phpunit/phpunit": "^9.5.10", - "spatie/laravel-ignition": "^1.0" + "phpunit/phpunit": "^9.5.10" }, "autoload": { "psr-4": { From 575b483f5e82911c420417bc20be1fbb0fe405b1 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 11 Feb 2022 12:57:57 +0100 Subject: [PATCH 2/5] Update composer.json --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 70682772377..a113d6e2532 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,14 @@ "require": { "php": "^8.0", "guzzlehttp/guzzle": "^7.2", - "laravel/framework": "^9.0" + "fruitcake/laravel-cors": "dev-develop", + "laravel/framework": "^10.0", + "laravel/sanctum": "dev-develop", + "laravel/tinker": "dev-develop" }, "require-dev": { "fakerphp/faker": "^1.9.1", + "laravel/sail": "dev-develop", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.1", "phpunit/phpunit": "^9.5.10" From 6fcd7615b791614bfc29f6ea9ecbf8351d737a52 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 11 Feb 2022 12:58:52 +0100 Subject: [PATCH 3/5] Update Kernel.php --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 753471ae0b7..d3722c2d5c4 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -16,7 +16,7 @@ class Kernel extends HttpKernel protected $middleware = [ // \App\Http\Middleware\TrustHosts::class, \App\Http\Middleware\TrustProxies::class, - // \Fruitcake\Cors\HandleCors::class, + \Fruitcake\Cors\HandleCors::class, \App\Http\Middleware\PreventRequestsDuringMaintenance::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, From a421bb4ecc5271fa4a5c714b5e2b6312c8961d04 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 11 Feb 2022 15:07:03 +0100 Subject: [PATCH 4/5] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index a113d6e2532..bec2bec5b81 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.1", "phpunit/phpunit": "^9.5.10" + "spatie/laravel-ignition": "dev-l10" }, "autoload": { "psr-4": { From 4e4aff852eadafc886aec5a53f0a5d1f21167d5d Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 11 Feb 2022 15:17:52 +0100 Subject: [PATCH 5/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bec2bec5b81..04268e2293f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "laravel/sail": "dev-develop", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.1", - "phpunit/phpunit": "^9.5.10" + "phpunit/phpunit": "^9.5.10", "spatie/laravel-ignition": "dev-l10" }, "autoload": {