From 749354821fd50a4fac724fc22e3d9e19fe344dc3 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 13 Jan 2022 15:50:08 +0100 Subject: [PATCH 1/5] [10.x] Prepare Laravel 10 (#40382) * 10.x-dev * version * Update splitter * Prepare Laravel 10 components * Bump testbench --- bin/release.sh | 2 +- composer.json | 4 ++-- src/Illuminate/Auth/composer.json | 20 ++++++++++---------- src/Illuminate/Broadcasting/composer.json | 12 ++++++------ src/Illuminate/Bus/composer.json | 10 +++++----- src/Illuminate/Cache/composer.json | 16 ++++++++-------- src/Illuminate/Collections/composer.json | 8 ++++---- src/Illuminate/Conditionable/composer.json | 2 +- src/Illuminate/Config/composer.json | 6 +++--- src/Illuminate/Console/composer.json | 18 +++++++++--------- src/Illuminate/Container/composer.json | 4 ++-- src/Illuminate/Contracts/composer.json | 2 +- src/Illuminate/Cookie/composer.json | 10 +++++----- src/Illuminate/Database/composer.json | 20 ++++++++++---------- src/Illuminate/Encryption/composer.json | 6 +++--- src/Illuminate/Events/composer.json | 14 +++++++------- src/Illuminate/Filesystem/composer.json | 10 +++++----- src/Illuminate/Foundation/Application.php | 2 +- src/Illuminate/Hashing/composer.json | 6 +++--- src/Illuminate/Http/composer.json | 10 +++++----- src/Illuminate/Log/composer.json | 6 +++--- src/Illuminate/Macroable/composer.json | 2 +- src/Illuminate/Mail/composer.json | 12 ++++++------ src/Illuminate/Notifications/composer.json | 22 +++++++++++----------- src/Illuminate/Pagination/composer.json | 8 ++++---- src/Illuminate/Pipeline/composer.json | 6 +++--- src/Illuminate/Queue/composer.json | 20 ++++++++++---------- src/Illuminate/Redis/composer.json | 10 +++++----- src/Illuminate/Routing/composer.json | 20 ++++++++++---------- src/Illuminate/Session/composer.json | 12 ++++++------ src/Illuminate/Support/composer.json | 12 ++++++------ src/Illuminate/Testing/composer.json | 16 ++++++++-------- src/Illuminate/Translation/composer.json | 12 ++++++------ src/Illuminate/Validation/composer.json | 16 ++++++++-------- src/Illuminate/View/composer.json | 16 ++++++++-------- 35 files changed, 186 insertions(+), 186 deletions(-) diff --git a/bin/release.sh b/bin/release.sh index 85d34a4ea738..9f40db21a010 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -10,7 +10,7 @@ then exit 1 fi -RELEASE_BRANCH="9.x" +RELEASE_BRANCH="master" CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) VERSION=$1 diff --git a/composer.json b/composer.json index 721729c9ff4d..85534a28a54a 100644 --- a/composer.json +++ b/composer.json @@ -87,7 +87,7 @@ "league/flysystem-ftp": "^2.0", "league/flysystem-sftp-v3": "^2.4", "mockery/mockery": "^1.4.4", - "orchestra/testbench-core": "^7.0", + "orchestra/testbench-core": "^8.0", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.0", "predis/predis": "^1.1.9", @@ -127,7 +127,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json index ae928a33bb36..20d845068418 100644 --- a/src/Illuminate/Auth/composer.json +++ b/src/Illuminate/Auth/composer.json @@ -15,12 +15,12 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/http": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/queue": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/http": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/queue": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -29,13 +29,13 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { - "illuminate/console": "Required to use the auth:clear-resets command (^9.0).", - "illuminate/queue": "Required to fire login / logout events (^9.0).", - "illuminate/session": "Required to use the session based guard (^9.0)." + "illuminate/console": "Required to use the auth:clear-resets command (^10.0).", + "illuminate/queue": "Required to fire login / logout events (^10.0).", + "illuminate/session": "Required to use the session based guard (^10.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json index f0736a37dacb..99406e511ffd 100644 --- a/src/Illuminate/Broadcasting/composer.json +++ b/src/Illuminate/Broadcasting/composer.json @@ -17,11 +17,11 @@ "php": "^8.0.2", "ext-json": "*", "psr/log": "^1.0|^2.0|^3.0", - "illuminate/bus": "^9.0", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/queue": "^9.0", - "illuminate/support": "^9.0" + "illuminate/bus": "^10.0", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/queue": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -30,7 +30,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Bus/composer.json b/src/Illuminate/Bus/composer.json index 44e795a4d6b2..093bb8a598b8 100644 --- a/src/Illuminate/Bus/composer.json +++ b/src/Illuminate/Bus/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/pipeline": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/pipeline": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -27,7 +27,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index 92dd4fb03f23..19453dbd5b43 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0" }, "provide": { "psr/simple-cache-implementation": "1.0|2.0|3.0" @@ -30,14 +30,14 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "ext-memcached": "Required to use the memcache cache driver.", - "illuminate/database": "Required to use the database cache driver (^9.0).", - "illuminate/filesystem": "Required to use the file cache driver (^9.0).", - "illuminate/redis": "Required to use the redis cache driver (^9.0).", + "illuminate/database": "Required to use the database cache driver (^10.0).", + "illuminate/filesystem": "Required to use the file cache driver (^10.0).", + "illuminate/redis": "Required to use the redis cache driver (^10.0).", "symfony/cache": "Required to use PSR-6 cache bridge (^6.0)." }, "config": { diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index cc9aad3429bc..d468a0f6460a 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -15,9 +15,9 @@ ], "require": { "php": "^8.0.2", - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0" + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0" }, "autoload": { "psr-4": { @@ -29,7 +29,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Conditionable/composer.json b/src/Illuminate/Conditionable/composer.json index a423aad17b6b..40b0808060c3 100644 --- a/src/Illuminate/Conditionable/composer.json +++ b/src/Illuminate/Conditionable/composer.json @@ -23,7 +23,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json index bc2e8e5c9643..26456dd1055f 100755 --- a/src/Illuminate/Config/composer.json +++ b/src/Illuminate/Config/composer.json @@ -15,8 +15,8 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0" }, "autoload": { "psr-4": { @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index 5a768863bc01..a42e4f50c665 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", "symfony/console": "^6.0", "symfony/process": "^6.0" }, @@ -29,16 +29,16 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "dragonmantank/cron-expression": "Required to use scheduler (^3.1).", "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.2).", - "illuminate/bus": "Required to use the scheduled job dispatcher (^9.0).", - "illuminate/container": "Required to use the scheduler (^9.0).", - "illuminate/filesystem": "Required to use the generator command (^9.0).", - "illuminate/queue": "Required to use closures for scheduled jobs (^9.0)." + "illuminate/bus": "Required to use the scheduled job dispatcher (^10.0).", + "illuminate/container": "Required to use the scheduler (^10.0).", + "illuminate/filesystem": "Required to use the generator command (^10.0).", + "illuminate/queue": "Required to use closures for scheduled jobs (^10.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json index 8944b5bc5d42..d1b7a91628e8 100755 --- a/src/Illuminate/Container/composer.json +++ b/src/Illuminate/Container/composer.json @@ -15,7 +15,7 @@ ], "require": { "php": "^8.0.2", - "illuminate/contracts": "^9.0", + "illuminate/contracts": "^10.0", "psr/container": "^1.1.1|^2.0.1" }, "provide": { @@ -28,7 +28,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json index 9296ba9e5a9e..6f0bf99fe99c 100644 --- a/src/Illuminate/Contracts/composer.json +++ b/src/Illuminate/Contracts/composer.json @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index a7a444cc333a..88c6878e8807 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", "symfony/http-foundation": "^6.0", "symfony/http-kernel": "^6.0" }, @@ -29,7 +29,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index df3d06cbac66..3394191e8147 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -17,11 +17,11 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", "symfony/console": "^6.0" }, "autoload": { @@ -31,16 +31,16 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", - "illuminate/console": "Required to use the database commands (^9.0).", - "illuminate/events": "Required to use the observers with Eloquent (^9.0).", - "illuminate/filesystem": "Required to use the migrations (^9.0).", - "illuminate/pagination": "Required to paginate the result set (^9.0).", + "illuminate/console": "Required to use the database commands (^10.0).", + "illuminate/events": "Required to use the observers with Eloquent (^10.0).", + "illuminate/filesystem": "Required to use the migrations (^10.0).", + "illuminate/pagination": "Required to paginate the result set (^10.0).", "symfony/finder": "Required to use Eloquent model factories (^6.0)." }, "config": { diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json index 333e57dfdfd0..9064115c2424 100644 --- a/src/Illuminate/Encryption/composer.json +++ b/src/Illuminate/Encryption/composer.json @@ -18,8 +18,8 @@ "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", - "illuminate/contracts": "^9.0", - "illuminate/support": "^9.0" + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -28,7 +28,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json index d07421220ca5..fbf09072de28 100755 --- a/src/Illuminate/Events/composer.json +++ b/src/Illuminate/Events/composer.json @@ -15,12 +15,12 @@ ], "require": { "php": "^8.0.2", - "illuminate/bus": "^9.0", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0" + "illuminate/bus": "^10.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index 94b4dc97fb4f..0d694be519b4 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", "symfony/finder": "^6.0" }, "autoload": { @@ -28,7 +28,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index d0e6b921b90c..023c9251f7b3 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -35,7 +35,7 @@ class Application extends Container implements ApplicationContract, CachesConfig * * @var string */ - const VERSION = '9.x-dev'; + const VERSION = '10.x-dev'; /** * The base path for the Laravel installation. diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json index 77f9280b8ea2..e614589f0c72 100755 --- a/src/Illuminate/Hashing/composer.json +++ b/src/Illuminate/Hashing/composer.json @@ -15,8 +15,8 @@ ], "require": { "php": "^8.0.2", - "illuminate/contracts": "^9.0", - "illuminate/support": "^9.0" + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 6d0f3d634cf5..ce40a35527a9 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -16,10 +16,10 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/session": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/session": "^10.0", + "illuminate/support": "^10.0", "symfony/http-foundation": "^6.0", "symfony/http-kernel": "^6.0", "symfony/mime": "^6.0" @@ -35,7 +35,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json index f6bfd0e9dc5a..0e16170e9d59 100755 --- a/src/Illuminate/Log/composer.json +++ b/src/Illuminate/Log/composer.json @@ -15,8 +15,8 @@ ], "require": { "php": "^8.0.2", - "illuminate/contracts": "^9.0", - "illuminate/support": "^9.0", + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0", "monolog/monolog": "^2.0" }, "autoload": { @@ -26,7 +26,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Macroable/composer.json b/src/Illuminate/Macroable/composer.json index 0417dbe40dd4..bb7245df925d 100644 --- a/src/Illuminate/Macroable/composer.json +++ b/src/Illuminate/Macroable/composer.json @@ -23,7 +23,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 34038e55e66a..bded7854a4db 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -16,11 +16,11 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", "league/commonmark": "^2.0.2", "psr/log": "^1.0|^2.0|^3.0", "symfony/mailer": "^6.0", @@ -33,7 +33,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json index 1fd402ef9764..d3612d0a8e97 100644 --- a/src/Illuminate/Notifications/composer.json +++ b/src/Illuminate/Notifications/composer.json @@ -15,15 +15,15 @@ ], "require": { "php": "^8.0.2", - "illuminate/broadcasting": "^9.0", - "illuminate/bus": "^9.0", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/filesystem": "^9.0", - "illuminate/mail": "^9.0", - "illuminate/queue": "^9.0", - "illuminate/support": "^9.0" + "illuminate/broadcasting": "^10.0", + "illuminate/bus": "^10.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/mail": "^10.0", + "illuminate/queue": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -32,11 +32,11 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { - "illuminate/database": "Required to use the database transport (^9.0)." + "illuminate/database": "Required to use the database transport (^10.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json index 3edd0d73ff0e..c045614b21b0 100755 --- a/src/Illuminate/Pagination/composer.json +++ b/src/Illuminate/Pagination/composer.json @@ -16,9 +16,9 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -27,7 +27,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Pipeline/composer.json b/src/Illuminate/Pipeline/composer.json index 7e640af36408..dec1404e4915 100644 --- a/src/Illuminate/Pipeline/composer.json +++ b/src/Illuminate/Pipeline/composer.json @@ -15,8 +15,8 @@ ], "require": { "php": "^8.0.2", - "illuminate/contracts": "^9.0", - "illuminate/support": "^9.0" + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index bce68d4254cd..cc82f0d07b19 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -16,14 +16,14 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/console": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/database": "^9.0", - "illuminate/filesystem": "^9.0", - "illuminate/pipeline": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/console": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/database": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/pipeline": "^10.0", + "illuminate/support": "^10.0", "laravel/serializable-closure": "^1.0", "ramsey/uuid": "^4.2.2", "symfony/process": "^6.0" @@ -35,14 +35,14 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.198.1).", - "illuminate/redis": "Required to use the Redis queue driver (^9.0).", + "illuminate/redis": "Required to use the Redis queue driver (^10.0).", "pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)." }, "config": { diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json index 99e2ad4ed655..6734c5f7fa2e 100755 --- a/src/Illuminate/Redis/composer.json +++ b/src/Illuminate/Redis/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -31,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 2b3aa1a7a443..16dfcac5d79a 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -16,14 +16,14 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/http": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/pipeline": "^9.0", - "illuminate/session": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/http": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/pipeline": "^10.0", + "illuminate/session": "^10.0", + "illuminate/support": "^10.0", "symfony/http-foundation": "^6.0", "symfony/http-kernel": "^6.0", "symfony/routing": "^6.0" @@ -35,11 +35,11 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { - "illuminate/console": "Required to use the make commands (^9.0).", + "illuminate/console": "Required to use the make commands (^10.0).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)." }, diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index f29d59d4d0f1..90bc109e41d7 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -16,10 +16,10 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/filesystem": "^9.0", - "illuminate/support": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/support": "^10.0", "symfony/finder": "^6.0", "symfony/http-foundation": "^6.0" }, @@ -30,11 +30,11 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { - "illuminate/console": "Required to use the session:table command (^9.0)." + "illuminate/console": "Required to use the session:table command (^10.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index e48ac3097b44..9d6f644585f0 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -18,10 +18,10 @@ "ext-json": "*", "ext-mbstring": "*", "doctrine/inflector": "^2.0", - "illuminate/collections": "^9.0", - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", "nesbot/carbon": "^2.53.1", "voku/portable-ascii": "^1.4.8" }, @@ -38,11 +38,11 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (^9.0).", + "illuminate/filesystem": "Required to use the composer class (^10.0).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.2.2).", "symfony/process": "Required to use the composer class (^6.0).", diff --git a/src/Illuminate/Testing/composer.json b/src/Illuminate/Testing/composer.json index 63f1f1e9cf80..0548ba37584c 100644 --- a/src/Illuminate/Testing/composer.json +++ b/src/Illuminate/Testing/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -27,14 +27,14 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "brianium/paratest": "Required to run tests in parallel (^6.0).", - "illuminate/console": "Required to assert console commands (^9.0).", - "illuminate/database": "Required to assert databases (^9.0).", - "illuminate/http": "Required to assert responses (^9.0).", + "illuminate/console": "Required to assert console commands (^10.0).", + "illuminate/database": "Required to assert databases (^10.0).", + "illuminate/http": "Required to assert responses (^10.0).", "mockery/mockery": "Required to use mocking (^1.4.4).", "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8)." }, diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json index fc6bd262d3d2..7d76aab58d44 100755 --- a/src/Illuminate/Translation/composer.json +++ b/src/Illuminate/Translation/composer.json @@ -16,11 +16,11 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/filesystem": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -29,7 +29,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index 281cec4b88a4..eb0eadc0238a 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -17,12 +17,12 @@ "php": "^8.0.2", "ext-json": "*", "egulias/email-validator": "^3.1", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", - "illuminate/translation": "^9.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "illuminate/translation": "^10.0", "symfony/http-foundation": "^6.0", "symfony/mime": "^6.0" }, @@ -33,12 +33,12 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "suggest": { "ext-bcmath": "Required to use the multiple_of validation rule.", - "illuminate/database": "Required to use the database presence verifier (^9.0)." + "illuminate/database": "Required to use the database presence verifier (^10.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json index 7487d55d7bf5..e6268e8e20fe 100644 --- a/src/Illuminate/View/composer.json +++ b/src/Illuminate/View/composer.json @@ -16,13 +16,13 @@ "require": { "php": "^8.0.2", "ext-json": "*", - "illuminate/collections": "^9.0", - "illuminate/container": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/events": "^9.0", - "illuminate/filesystem": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0" + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/events": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0" }, "autoload": { "psr-4": { @@ -31,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "config": { From 49e616b229c66dd7cd377fb7cbf8be465d4cabb3 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 14 Jan 2022 06:25:55 -0600 Subject: [PATCH 2/5] wip --- bin/split.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/split.sh b/bin/split.sh index 113b10963803..806fee08bf74 100755 --- a/bin/split.sh +++ b/bin/split.sh @@ -3,7 +3,7 @@ set -e set -x -CURRENT_BRANCH="9.x" +CURRENT_BRANCH="master" function split() { From 26e8c46fb93f6c691d33be465b99c7833a02f7dd Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 14 Jan 2022 13:59:13 +0100 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36add2674f8c..66ec515e5c98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -# Release Notes for 9.x +# Release Notes for 10.x -## [Unreleased](https://github.com/laravel/framework/compare/v9.0.0...9.x) +## [Unreleased](https://github.com/laravel/framework/compare/v10.0.0..master) -## [v9.0.0 (2021-??-??)](https://github.com/laravel/framework/compare/v8.79.0...v9.0.0) +## [v10.0.0 (2021-??-??)](https://github.com/laravel/framework/compare/v9.0.0...master) Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/9.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/9.x/releases). From 724452f494fedf78f09d03cf5746fc0eb8e30563 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 20 Jan 2022 10:05:28 +0100 Subject: [PATCH 4/5] wip --- tests/Support/SupportJsTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Support/SupportJsTest.php b/tests/Support/SupportJsTest.php index 3b19e9721662..256566deed8e 100644 --- a/tests/Support/SupportJsTest.php +++ b/tests/Support/SupportJsTest.php @@ -53,7 +53,7 @@ public function testJsonSerializable() public $bar = 'not world'; - public function jsonSerialize() + public function jsonSerialize(): mixed { return ['foo' => 'hello', 'bar' => 'world']; } @@ -85,7 +85,7 @@ public function toJson($options = 0) return json_encode(['foo' => 'hello', 'bar' => 'world'], $options); } - public function jsonSerialize() + public function jsonSerialize(): mixed { return ['foo' => 'not hello', 'bar' => 'not world']; } From 8ff43a884977064e22d7b0bda5014c72dc14c01e Mon Sep 17 00:00:00 2001 From: Rodrigo Pedra Brum Date: Mon, 24 Jan 2022 23:26:37 -0300 Subject: [PATCH 5/5] Handle unicode characters on TrimStrings middleware --- src/Illuminate/Foundation/Http/Middleware/TrimStrings.php | 2 +- tests/Foundation/Http/Middleware/TrimStringsTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php index 857baf4b49d3..d3902276752a 100644 --- a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php +++ b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php @@ -53,7 +53,7 @@ protected function transform($key, $value) return $value; } - return is_string($value) ? trim($value, "  \t\n\r\0\x0B") : $value; + return is_string($value) ? preg_replace('~^\s+|\s+$~iu', '', $value) : $value; } /** diff --git a/tests/Foundation/Http/Middleware/TrimStringsTest.php b/tests/Foundation/Http/Middleware/TrimStringsTest.php index e03631876b4d..2d8aa672a8e8 100644 --- a/tests/Foundation/Http/Middleware/TrimStringsTest.php +++ b/tests/Foundation/Http/Middleware/TrimStringsTest.php @@ -35,12 +35,20 @@ public function testTrimStringsNBSP() $symfonyRequest = new SymfonyRequest([ // Here has some NBSP, but it still display to space. 'abc' => '  123   ', + 'xyz' => 'だ', + 'foo' => 'ム', + 'bar' => '  だ   ', + 'baz' => '  ム   ', ]); $symfonyRequest->server->set('REQUEST_METHOD', 'GET'); $request = Request::createFromBase($symfonyRequest); $middleware->handle($request, function (Request $request) { $this->assertSame('123', $request->get('abc')); + $this->assertSame('だ', $request->get('xyz')); + $this->assertSame('ム', $request->get('foo')); + $this->assertSame('だ', $request->get('bar')); + $this->assertSame('ム', $request->get('baz')); }); } }