From 66f3a1db1df459665db5ffa7a506dd912aeb4920 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 7 Mar 2024 15:13:44 +0100 Subject: [PATCH 1/7] Prep Laravel v12 --- CHANGELOG.md | 6 +++--- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b1f93ea088..3e14cade2c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v11.0.0...11.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v12.0.0...master) -## [v11.0.0 (2023-02-17)](https://github.com/laravel/laravel/compare/v10.3.2...v11.0.0) +## [v12.0.0 (2025-??-??)](https://github.com/laravel/laravel/compare/v11.0.0...v12.0.0) -Laravel 11 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. +Laravel 12 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. diff --git a/composer.json b/composer.json index 3cdf16e37aa..f082590464f 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "^8.2", - "laravel/framework": "^11.0", + "laravel/framework": "^12.0", "laravel/tinker": "^2.9" }, "require-dev": { @@ -49,7 +49,7 @@ }, "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" }, "laravel": { "dont-discover": [] From cee3d510cf54a4fa93e3850a7577094eee53f925 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 11:13:44 +0100 Subject: [PATCH 2/7] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f082590464f..c064ed5c98b 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "^8.2", - "laravel/framework": "^12.0", + "laravel/framework": "dev-l12", "laravel/tinker": "^2.9" }, "require-dev": { From 8f7b98265a7fa2513650c002da380bc222775fc9 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 11:27:58 +0100 Subject: [PATCH 3/7] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c064ed5c98b..43f2a6e37dc 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "^8.2", - "laravel/framework": "dev-l12", + "laravel/framework": "dev-prep-l12", "laravel/tinker": "^2.9" }, "require-dev": { From e1e03c7f5993148d19fe25a3939722cdce4452b3 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 11:29:56 +0100 Subject: [PATCH 4/7] wip --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 43f2a6e37dc..20c199fd46e 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,7 @@ "laravel/sail": "^1.26", "mockery/mockery": "^1.6", "nunomaduro/collision": "^8.0", - "phpunit/phpunit": "^10.5", - "spatie/laravel-ignition": "^2.4" + "phpunit/phpunit": "^10.5" }, "autoload": { "psr-4": { From 117dfe26a4238b1e59a696f3c2b12fdf720f36ee Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 12:24:27 +0100 Subject: [PATCH 5/7] wip --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 20c199fd46e..58933587bf2 100644 --- a/composer.json +++ b/composer.json @@ -7,12 +7,12 @@ "require": { "php": "^8.2", "laravel/framework": "dev-prep-l12", - "laravel/tinker": "^2.9" + "laravel/tinker": "dev-develop" }, "require-dev": { "fakerphp/faker": "^1.23", "laravel/pint": "^1.13", - "laravel/sail": "^1.26", + "laravel/sail": "dev-develop", "mockery/mockery": "^1.6", "nunomaduro/collision": "^8.0", "phpunit/phpunit": "^10.5" From 64dbb141ae593a1995d18da0275bf325a67d2a9e Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 12:26:27 +0100 Subject: [PATCH 6/7] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 58933587bf2..a574a6c3796 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "^8.2", - "laravel/framework": "dev-prep-l12", + "laravel/framework": "^12.0", "laravel/tinker": "dev-develop" }, "require-dev": { From 53631c427b039a6b57124d6cb7ae81ab4177f874 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 13:23:37 +0100 Subject: [PATCH 7/7] wip --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index a574a6c3796..0ccdd82bf3d 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,6 @@ "laravel/pint": "^1.13", "laravel/sail": "dev-develop", "mockery/mockery": "^1.6", - "nunomaduro/collision": "^8.0", "phpunit/phpunit": "^10.5" }, "autoload": {