Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.x] Prep Laravel v12 #50406

Merged
merged 6 commits into from
Mar 12, 2024
Merged

[12.x] Prep Laravel v12 #50406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02cfde6
Prep Laravel v12
driesvints Mar 7, 2024
0958731
wip
driesvints Mar 7, 2024
f27897d
Temp constraint on prompts
driesvints Mar 8, 2024
e7eb3e3
Merge branch 'master' into prep-l12
driesvints Mar 12, 2024
6c23a79
wip
driesvints Mar 12, 2024
89ef909
Merge branch 'master' into prep-l12
driesvints Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Release Notes for 11.x
# Release Notes for 12.x

## [Unreleased](https://github.com/laravel/framework/compare/v11.0.0..master)
## [Unreleased](https://github.com/laravel/framework/compare/v12.0.0..master)

## [v11.0.0 (2024-??-??)](https://github.com/laravel/framework/compare/v11.0.0...master)
## [v12.0.0 (2025-??-??)](https://github.com/laravel/framework/compare/v12.0.0...master)

Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/11.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/11.x/releases).
Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/12.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/12.x/releases).
2 changes: 1 addition & 1 deletion bin/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ then
exit 1
fi

RELEASE_BRANCH="11.x"
RELEASE_BRANCH="12.x"
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
VERSION=$1

Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"fruitcake/php-cors": "^1.3",
"guzzlehttp/guzzle": "^7.8",
"guzzlehttp/uri-template": "^1.0",
"laravel/prompts": "^0.1.15",
"laravel/prompts": "dev-l12",
"laravel/serializable-closure": "^1.3",
"league/commonmark": "^2.2.1",
"league/flysystem": "^3.8.0",
Expand Down Expand Up @@ -106,7 +106,7 @@
"league/flysystem-sftp-v3": "^3.0",
"mockery/mockery": "^1.6",
"nyholm/psr7": "^1.2",
"orchestra/testbench-core": "^9.0",
"orchestra/testbench-core": "^10.0",
"pda/pheanstalk": "^5.0",
"phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^10.5|^11.0",
Expand Down Expand Up @@ -151,7 +151,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
Expand Down Expand Up @@ -196,6 +196,6 @@
"composer/package-versions-deprecated": true
}
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true
}
20 changes: 10 additions & 10 deletions src/Illuminate/Auth/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"require": {
"php": "^8.2",
"ext-hash": "*",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/http": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/queue": "^11.0",
"illuminate/support": "^11.0"
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/http": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/queue": "^12.0",
"illuminate/support": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -30,13 +30,13 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
"illuminate/console": "Required to use the auth:clear-resets command (^11.0).",
"illuminate/queue": "Required to fire login / logout events (^11.0).",
"illuminate/session": "Required to use the session based guard (^11.0)."
"illuminate/console": "Required to use the auth:clear-resets command (^12.0).",
"illuminate/queue": "Required to fire login / logout events (^12.0).",
"illuminate/session": "Required to use the session based guard (^12.0)."
},
"config": {
"sort-packages": true
Expand Down
14 changes: 7 additions & 7 deletions src/Illuminate/Broadcasting/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"require": {
"php": "^8.2",
"psr/log": "^1.0|^2.0|^3.0",
"illuminate/bus": "^11.0",
"illuminate/collections": "^11.0",
"illuminate/container": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/queue": "^11.0",
"illuminate/support": "^11.0"
"illuminate/bus": "^12.0",
"illuminate/collections": "^12.0",
"illuminate/container": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/queue": "^12.0",
"illuminate/support": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
Expand Down
10 changes: 5 additions & 5 deletions src/Illuminate/Bus/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"require": {
"php": "^8.2",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/pipeline": "^11.0",
"illuminate/support": "^11.0"
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/pipeline": "^12.0",
"illuminate/support": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
Expand Down
16 changes: 8 additions & 8 deletions src/Illuminate/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"require": {
"php": "^8.2",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/support": "^11.0"
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0"
},
"provide": {
"psr/simple-cache-implementation": "1.0|2.0|3.0"
Expand All @@ -30,16 +30,16 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
"ext-apcu": "Required to use the APC cache driver.",
"ext-filter": "Required to use the DynamoDb cache driver.",
"ext-memcached": "Required to use the memcache cache driver.",
"illuminate/database": "Required to use the database cache driver (^11.0).",
"illuminate/filesystem": "Required to use the file cache driver (^11.0).",
"illuminate/redis": "Required to use the redis cache driver (^11.0).",
"illuminate/database": "Required to use the database cache driver (^12.0).",
"illuminate/filesystem": "Required to use the file cache driver (^12.0).",
"illuminate/redis": "Required to use the redis cache driver (^12.0).",
"symfony/cache": "Required to use PSR-6 cache bridge (^7.0)."
},
"config": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Collections/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": "^8.2",
"illuminate/conditionable": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0"
"illuminate/conditionable": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Conditionable/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Config/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
],
"require": {
"php": "^8.2",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0"
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
22 changes: 11 additions & 11 deletions src/Illuminate/Console/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"require": {
"php": "^8.2",
"ext-mbstring": "*",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/support": "^11.0",
"illuminate/view": "^11.0",
"laravel/prompts": "^0.1.12",
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0",
"illuminate/view": "^12.0",
"laravel/prompts": "dev-l12",
"nunomaduro/termwind": "^2.0",
"symfony/console": "^7.0",
"symfony/polyfill-php83": "^1.28",
Expand All @@ -34,17 +34,17 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
"ext-pcntl": "Required to use signal trapping.",
"dragonmantank/cron-expression": "Required to use scheduler (^3.3.2).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.8).",
"illuminate/bus": "Required to use the scheduled job dispatcher (^11.0).",
"illuminate/container": "Required to use the scheduler (^11.0).",
"illuminate/filesystem": "Required to use the generator command (^11.0).",
"illuminate/queue": "Required to use closures for scheduled jobs (^11.0)."
"illuminate/bus": "Required to use the scheduled job dispatcher (^12.0).",
"illuminate/container": "Required to use the scheduler (^12.0).",
"illuminate/filesystem": "Required to use the generator command (^12.0).",
"illuminate/queue": "Required to use closures for scheduled jobs (^12.0)."
},
"config": {
"sort-packages": true
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Container/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": "^11.0",
"illuminate/contracts": "^12.0",
"psr/container": "^1.1.1|^2.0.1"
},
"provide": {
Expand All @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Contracts/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
10 changes: 5 additions & 5 deletions src/Illuminate/Cookie/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"require": {
"php": "^8.2",
"ext-hash": "*",
"illuminate/collections": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/support": "^11.0",
"illuminate/collections": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0",
"symfony/http-foundation": "^7.0",
"symfony/http-kernel": "^7.0"
},
Expand All @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
20 changes: 10 additions & 10 deletions src/Illuminate/Database/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"php": "^8.2",
"ext-pdo": "*",
"brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
"illuminate/collections": "^11.0",
"illuminate/container": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/support": "^11.0"
"illuminate/collections": "^12.0",
"illuminate/container": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -31,16 +31,16 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"suggest": {
"ext-filter": "Required to use the Postgres database driver.",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.21).",
"illuminate/console": "Required to use the database commands (^11.0).",
"illuminate/events": "Required to use the observers with Eloquent (^11.0).",
"illuminate/filesystem": "Required to use the migrations (^11.0).",
"illuminate/pagination": "Required to paginate the result set (^11.0).",
"illuminate/console": "Required to use the database commands (^12.0).",
"illuminate/events": "Required to use the observers with Eloquent (^12.0).",
"illuminate/filesystem": "Required to use the migrations (^12.0).",
"illuminate/pagination": "Required to paginate the result set (^12.0).",
"symfony/finder": "Required to use Eloquent model factories (^7.0)."
},
"config": {
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Encryption/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"ext-hash": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"illuminate/contracts": "^11.0",
"illuminate/support": "^11.0"
"illuminate/contracts": "^12.0",
"illuminate/support": "^12.0"
},
"autoload": {
"psr-4": {
Expand All @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "11.x-dev"
"dev-master": "12.x-dev"
}
},
"config": {
Expand Down
Loading
Loading