From 93434851f54a453fbd74eb4c5d52ff2f380847f7 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 13 Jun 2025 11:13:22 +0800 Subject: [PATCH 1/7] [13.x] Supports Symfony 7.4 Signed-off-by: Mior Muhammad Zaki --- composer.json | 30 ++++++++++++------------ src/Illuminate/Cache/composer.json | 2 +- src/Illuminate/Collections/composer.json | 2 +- src/Illuminate/Console/composer.json | 4 ++-- src/Illuminate/Cookie/composer.json | 4 ++-- src/Illuminate/Database/composer.json | 2 +- src/Illuminate/Filesystem/composer.json | 6 ++--- src/Illuminate/Http/composer.json | 6 ++--- src/Illuminate/Mail/composer.json | 8 +++---- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Routing/composer.json | 8 +++---- src/Illuminate/Session/composer.json | 4 ++-- src/Illuminate/Support/composer.json | 6 ++--- src/Illuminate/Validation/composer.json | 4 ++-- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index 82a743fab87e..85b6d4ef7a85 100644 --- a/composer.json +++ b/composer.json @@ -44,17 +44,17 @@ "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.2.0", - "symfony/error-handler": "^7.2.0", - "symfony/finder": "^7.2.0", - "symfony/http-foundation": "^7.2.0", - "symfony/http-kernel": "^7.2.0", - "symfony/mailer": "^7.2.0", - "symfony/mime": "^7.2.0", - "symfony/process": "^7.2.0", - "symfony/routing": "^7.2.0", - "symfony/uid": "^7.2.0", - "symfony/var-dumper": "^7.2.0", + "symfony/console": "^7.4.0", + "symfony/error-handler": "^7.4.0", + "symfony/finder": "^7.4.0", + "symfony/http-foundation": "^7.4.0", + "symfony/http-kernel": "^7.4.0", + "symfony/mailer": "^7.4.0", + "symfony/mime": "^7.4.0", + "symfony/process": "^7.4.0", + "symfony/routing": "^7.4.0", + "symfony/uid": "^7.4.0", + "symfony/var-dumper": "^7.4.0", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0.2" @@ -117,10 +117,10 @@ "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1", "predis/predis": "^2.3|^3.0", "resend/resend-php": "^0.10.0", - "symfony/cache": "^7.2.0", - "symfony/http-client": "^7.2.0", - "symfony/psr-http-message-bridge": "^7.2.0", - "symfony/translation": "^7.2.0" + "symfony/cache": "^7.4.0", + "symfony/http-client": "^7.4.0", + "symfony/psr-http-message-bridge": "^7.4.0", + "symfony/translation": "^7.4.0" }, "conflict": { "tightenco/collect": "<5.5.33" diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index dea22e5a6d83..3302ff1fbb6f 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -40,7 +40,7 @@ "illuminate/database": "Required to use the database cache driver (^13.0).", "illuminate/filesystem": "Required to use the file cache driver (^13.0).", "illuminate/redis": "Required to use the redis cache driver (^13.0).", - "symfony/cache": "Required to use PSR-6 cache bridge (^7.2)." + "symfony/cache": "Required to use PSR-6 cache bridge (^7.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index b7cad15cc091..d37537bdf8da 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -35,7 +35,7 @@ }, "suggest": { "illuminate/http": "Required to convert collections to API resources (^12.0).", - "symfony/var-dumper": "Required to use the dump method (^7.2)." + "symfony/var-dumper": "Required to use the dump method (^7.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index d7ccfaa2ed0f..fef45648e765 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -23,8 +23,8 @@ "illuminate/view": "^13.0", "laravel/prompts": "^0.3.0", "nunomaduro/termwind": "^2.0", - "symfony/console": "^7.2.0", - "symfony/process": "^7.2.0" + "symfony/console": "^7.4.0", + "symfony/process": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index 75ad9b0bef1c..2f63971fa77d 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.2.0", - "symfony/http-kernel": "^7.2.0" + "symfony/http-foundation": "^7.4.0", + "symfony/http-kernel": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index 0ad4d12d8a05..c42006af5706 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -43,7 +43,7 @@ "illuminate/filesystem": "Required to use the migrations (^13.0).", "illuminate/http": "Required to convert Eloquent models to API resources (^13.0).", "illuminate/pagination": "Required to paginate the result set (^13.0).", - "symfony/finder": "Required to use Eloquent model factories (^7.2)." + "symfony/finder": "Required to use Eloquent model factories (^7.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index 2f0edda1a1ef..84e1146bc3f2 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/finder": "^7.2.0" + "symfony/finder": "^7.4.0" }, "autoload": { "psr-4": { @@ -44,8 +44,8 @@ "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).", - "symfony/mime": "Required to enable support for guessing extensions (^7.2)." + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4).", + "symfony/mime": "Required to enable support for guessing extensions (^7.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 0aaf1f34e773..b117d8a7fca2 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -23,9 +23,9 @@ "illuminate/macroable": "^13.0", "illuminate/session": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.2.0", - "symfony/http-kernel": "^7.2.0", - "symfony/mime": "^7.2.0" + "symfony/http-foundation": "^7.4.0", + "symfony/http-kernel": "^7.4.0", + "symfony/mime": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index f834704a3600..2781377d4375 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^13.0", "league/commonmark": "^2.7", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.2.0", + "symfony/mailer": "^7.4.0", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { @@ -38,9 +38,9 @@ "suggest": { "aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/http-client": "Required to use the Symfony API mail transports (^7.2).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2)." + "symfony/http-client": "Required to use the Symfony API mail transports (^7.4).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index 55bf46f2203d..6f90b1c9c6bb 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/process": "^7.2.0" + "symfony/process": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index 12c8a2a0a771..da8966f54b06 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^13.0", "laravel/serializable-closure": "^1.3|^2.0", "ramsey/uuid": "^4.7", - "symfony/process": "^7.2.0" + "symfony/process": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 3a54fba26192..6947e0a85ea2 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,9 +25,9 @@ "illuminate/pipeline": "^13.0", "illuminate/session": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.2.0", - "symfony/http-kernel": "^7.2.0", - "symfony/routing": "^7.2.0" + "symfony/http-foundation": "^7.4.0", + "symfony/http-kernel": "^7.4.0", + "symfony/routing": "^7.4.0" }, "autoload": { "psr-4": { @@ -42,7 +42,7 @@ "suggest": { "illuminate/console": "Required to use the make commands (^13.0).", "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4)." }, "config": { "sort-packages": true, diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index 3b0cbfed6897..124e5d42df64 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -21,8 +21,8 @@ "illuminate/contracts": "^13.0", "illuminate/filesystem": "^13.0", "illuminate/support": "^13.0", - "symfony/finder": "^7.2.0", - "symfony/http-foundation": "^7.2.0" + "symfony/finder": "^7.4.0", + "symfony/http-foundation": "^7.4.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 9032e8eda274..1bbb71740c40 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -52,9 +52,9 @@ "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.7).", "league/uri": "Required to use the Uri class (^7.5.1).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the Composer class (^7.2).", - "symfony/uid": "Required to use Str::ulid() (^7.2).", - "symfony/var-dumper": "Required to use the dd function (^7.2).", + "symfony/process": "Required to use the Composer class (^7.4).", + "symfony/uid": "Required to use Str::ulid() (^7.4).", + "symfony/var-dumper": "Required to use the dd function (^7.4).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index fbf8110c008f..ca845f6803cd 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,8 +25,8 @@ "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", "illuminate/translation": "^13.0", - "symfony/http-foundation": "^7.2", - "symfony/mime": "^7.2" + "symfony/http-foundation": "^7.4.0", + "symfony/mime": "^7.4.0" }, "autoload": { "psr-4": { From 23dda007173ccc65ce137f906fe5c60d85f5afc3 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 13 Jun 2025 11:32:50 +0800 Subject: [PATCH 2/7] Update `Application` to use `addCommand` insteads of deprecated `add` Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Console/Application.php | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php index 8a5755231b79..a32f92c75c94 100755 --- a/src/Illuminate/Console/Application.php +++ b/src/Illuminate/Console/Application.php @@ -205,20 +205,6 @@ public function output() : ''; } - /** - * Add an array of commands to the console. - * - * @param array $commands - * @return void - */ - #[\Override] - public function addCommands(array $commands): void - { - foreach ($commands as $command) { - $this->add($command); - } - } - /** * Add a command to the console. * @@ -226,7 +212,7 @@ public function addCommands(array $commands): void * @return \Symfony\Component\Console\Command\Command|null */ #[\Override] - public function add(SymfonyCommand $command): ?SymfonyCommand + public function addCommand(SymfonyCommand|callable $command): ?SymfonyCommand { if ($command instanceof Command) { $command->setLaravel($this->laravel); @@ -238,12 +224,12 @@ public function add(SymfonyCommand $command): ?SymfonyCommand /** * Add the command to the parent instance. * - * @param \Symfony\Component\Console\Command\Command $command + * @param \Symfony\Component\Console\Command\Command|callable $command * @return \Symfony\Component\Console\Command\Command */ - protected function addToParent(SymfonyCommand $command) + protected function addToParent(SymfonyCommand|callable $command) { - return parent::add($command); + return parent::addCommand($command); } /** From b0fdc291def99ebd85b2aea72f2cf1c6d26c659c Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 13 Jun 2025 11:34:20 +0800 Subject: [PATCH 3/7] wip Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Console/Application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php index a32f92c75c94..2c59d8eec3e7 100755 --- a/src/Illuminate/Console/Application.php +++ b/src/Illuminate/Console/Application.php @@ -255,10 +255,10 @@ public function resolve($command) } if ($command instanceof Command) { - return $this->add($command); + return $this->addCommand($command); } - return $this->add($this->laravel->make($command)); + return $this->addCommand($this->laravel->make($command)); } /** From 7cf2aa7d7d6ccdfebad673f26681d1ade1023f43 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 13 Jun 2025 15:19:49 +0800 Subject: [PATCH 4/7] Remove `addToParent()` method. Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Console/Application.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php index 2c59d8eec3e7..1f0d3f545cad 100755 --- a/src/Illuminate/Console/Application.php +++ b/src/Illuminate/Console/Application.php @@ -208,7 +208,7 @@ public function output() /** * Add a command to the console. * - * @param \Symfony\Component\Console\Command\Command $command + * @param \Symfony\Component\Console\Command\Command|callable $command * @return \Symfony\Component\Console\Command\Command|null */ #[\Override] @@ -218,17 +218,6 @@ public function addCommand(SymfonyCommand|callable $command): ?SymfonyCommand $command->setLaravel($this->laravel); } - return $this->addToParent($command); - } - - /** - * Add the command to the parent instance. - * - * @param \Symfony\Component\Console\Command\Command|callable $command - * @return \Symfony\Component\Console\Command\Command - */ - protected function addToParent(SymfonyCommand|callable $command) - { return parent::addCommand($command); } From be33c861e4c4130a38bacf82dc74f3c26ec32f53 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 13 Jun 2025 15:34:20 +0800 Subject: [PATCH 5/7] Revert "Remove `addToParent()` method." This reverts commit 7cf2aa7d7d6ccdfebad673f26681d1ade1023f43. --- src/Illuminate/Console/Application.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php index 1f0d3f545cad..2c59d8eec3e7 100755 --- a/src/Illuminate/Console/Application.php +++ b/src/Illuminate/Console/Application.php @@ -208,7 +208,7 @@ public function output() /** * Add a command to the console. * - * @param \Symfony\Component\Console\Command\Command|callable $command + * @param \Symfony\Component\Console\Command\Command $command * @return \Symfony\Component\Console\Command\Command|null */ #[\Override] @@ -218,6 +218,17 @@ public function addCommand(SymfonyCommand|callable $command): ?SymfonyCommand $command->setLaravel($this->laravel); } + return $this->addToParent($command); + } + + /** + * Add the command to the parent instance. + * + * @param \Symfony\Component\Console\Command\Command|callable $command + * @return \Symfony\Component\Console\Command\Command + */ + protected function addToParent(SymfonyCommand|callable $command) + { return parent::addCommand($command); } From 4bc71d840460e9fe940721680d6e42c51dfe1071 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sat, 14 Jun 2025 08:58:09 +0800 Subject: [PATCH 6/7] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 40 ++++++++++++------------ src/Illuminate/Cache/composer.json | 2 +- src/Illuminate/Collections/composer.json | 2 +- src/Illuminate/Console/composer.json | 4 +-- src/Illuminate/Cookie/composer.json | 4 +-- src/Illuminate/Database/composer.json | 2 +- src/Illuminate/Filesystem/composer.json | 6 ++-- src/Illuminate/Http/composer.json | 6 ++-- src/Illuminate/Mail/composer.json | 8 ++--- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Routing/composer.json | 8 ++--- src/Illuminate/Session/composer.json | 4 +-- src/Illuminate/Support/composer.json | 6 ++-- src/Illuminate/Validation/composer.json | 4 +-- 15 files changed, 50 insertions(+), 50 deletions(-) diff --git a/composer.json b/composer.json index 85b6d4ef7a85..1053c5cbee78 100644 --- a/composer.json +++ b/composer.json @@ -44,17 +44,17 @@ "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.4.0", - "symfony/error-handler": "^7.4.0", - "symfony/finder": "^7.4.0", - "symfony/http-foundation": "^7.4.0", - "symfony/http-kernel": "^7.4.0", - "symfony/mailer": "^7.4.0", - "symfony/mime": "^7.4.0", - "symfony/process": "^7.4.0", - "symfony/routing": "^7.4.0", - "symfony/uid": "^7.4.0", - "symfony/var-dumper": "^7.4.0", + "symfony/console": "^7.4.0|^8.0.0", + "symfony/error-handler": "^7.4.0|^8.0.0", + "symfony/finder": "^7.4.0|^8.0.0", + "symfony/http-foundation": "^7.4.0|^8.0.0", + "symfony/http-kernel": "^7.4.0|^8.0.0", + "symfony/mailer": "^7.4.0|^8.0.0", + "symfony/mime": "^7.4.0|^8.0.0", + "symfony/process": "^7.4.0|^8.0.0", + "symfony/routing": "^7.4.0|^8.0.0", + "symfony/uid": "^7.4.0|^8.0.0", + "symfony/var-dumper": "^7.4.0|^8.0.0", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0.2" @@ -117,9 +117,9 @@ "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1", "predis/predis": "^2.3|^3.0", "resend/resend-php": "^0.10.0", - "symfony/cache": "^7.4.0", - "symfony/http-client": "^7.4.0", - "symfony/psr-http-message-bridge": "^7.4.0", + "symfony/cache": "^7.4.0|^8.0.0", + "symfony/http-client": "^7.4.0|^8.0.0", + "symfony/psr-http-message-bridge": "^7.4.0|^8.0.0", "symfony/translation": "^7.4.0" }, "conflict": { @@ -192,12 +192,12 @@ "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^7.2).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).", - "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)." + "symfony/cache": "Required to PSR-6 cache bridge (^7.4|^8.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4|^8.0).", + "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.4|^8.0).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4|^8.0).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4|^8.0).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4|^8.0)." }, "config": { "sort-packages": true, diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index 3302ff1fbb6f..07628f3c6ed9 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -40,7 +40,7 @@ "illuminate/database": "Required to use the database cache driver (^13.0).", "illuminate/filesystem": "Required to use the file cache driver (^13.0).", "illuminate/redis": "Required to use the redis cache driver (^13.0).", - "symfony/cache": "Required to use PSR-6 cache bridge (^7.4)." + "symfony/cache": "Required to use PSR-6 cache bridge (^7.4|^8.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index d37537bdf8da..965a8398cd6e 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -35,7 +35,7 @@ }, "suggest": { "illuminate/http": "Required to convert collections to API resources (^12.0).", - "symfony/var-dumper": "Required to use the dump method (^7.4)." + "symfony/var-dumper": "Required to use the dump method (^7.4|^8.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index fef45648e765..4b8974ad8bdd 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -23,8 +23,8 @@ "illuminate/view": "^13.0", "laravel/prompts": "^0.3.0", "nunomaduro/termwind": "^2.0", - "symfony/console": "^7.4.0", - "symfony/process": "^7.4.0" + "symfony/console": "^7.4.0|^8.0.0", + "symfony/process": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index 2f63971fa77d..ca7be9b040c5 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.4.0", - "symfony/http-kernel": "^7.4.0" + "symfony/http-foundation": "^7.4.0|^8.0.0", + "symfony/http-kernel": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index c42006af5706..a5ce5414590d 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -43,7 +43,7 @@ "illuminate/filesystem": "Required to use the migrations (^13.0).", "illuminate/http": "Required to convert Eloquent models to API resources (^13.0).", "illuminate/pagination": "Required to paginate the result set (^13.0).", - "symfony/finder": "Required to use Eloquent model factories (^7.4)." + "symfony/finder": "Required to use Eloquent model factories (^7.4|^8.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index 84e1146bc3f2..13deb8c174fb 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/finder": "^7.4.0" + "symfony/finder": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { @@ -44,8 +44,8 @@ "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4).", - "symfony/mime": "Required to enable support for guessing extensions (^7.4)." + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4|^8.0).", + "symfony/mime": "Required to enable support for guessing extensions (^7.4|^8.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index b117d8a7fca2..5c12169ddeb6 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -23,9 +23,9 @@ "illuminate/macroable": "^13.0", "illuminate/session": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.4.0", - "symfony/http-kernel": "^7.4.0", - "symfony/mime": "^7.4.0" + "symfony/http-foundation": "^7.4.0|^8.0.0", + "symfony/http-kernel": "^7.4.0|^8.0.0", + "symfony/mime": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 2781377d4375..20b22c2ab390 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^13.0", "league/commonmark": "^2.7", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.4.0", + "symfony/mailer": "^7.4.0|^8.0.0", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { @@ -38,9 +38,9 @@ "suggest": { "aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/http-client": "Required to use the Symfony API mail transports (^7.4).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4)." + "symfony/http-client": "Required to use the Symfony API mail transports (^7.4|^8.0).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4|^8.0).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4|^8.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index 6f90b1c9c6bb..b48f20d70fb5 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", - "symfony/process": "^7.4.0" + "symfony/process": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index da8966f54b06..61c652bfe38e 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^13.0", "laravel/serializable-closure": "^1.3|^2.0", "ramsey/uuid": "^4.7", - "symfony/process": "^7.4.0" + "symfony/process": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 6947e0a85ea2..d5f0cd50a1bb 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,9 +25,9 @@ "illuminate/pipeline": "^13.0", "illuminate/session": "^13.0", "illuminate/support": "^13.0", - "symfony/http-foundation": "^7.4.0", - "symfony/http-kernel": "^7.4.0", - "symfony/routing": "^7.4.0" + "symfony/http-foundation": "^7.4.0|^8.0.0", + "symfony/http-kernel": "^7.4.0|^8.0.0", + "symfony/routing": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { @@ -42,7 +42,7 @@ "suggest": { "illuminate/console": "Required to use the make commands (^13.0).", "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4|^8.0)." }, "config": { "sort-packages": true, diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index 124e5d42df64..ac65e2df88ee 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -21,8 +21,8 @@ "illuminate/contracts": "^13.0", "illuminate/filesystem": "^13.0", "illuminate/support": "^13.0", - "symfony/finder": "^7.4.0", - "symfony/http-foundation": "^7.4.0" + "symfony/finder": "^7.4.0|^8.0.0", + "symfony/http-foundation": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 1bbb71740c40..e1e435673099 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -52,9 +52,9 @@ "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.7).", "league/uri": "Required to use the Uri class (^7.5.1).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the Composer class (^7.4).", - "symfony/uid": "Required to use Str::ulid() (^7.4).", - "symfony/var-dumper": "Required to use the dd function (^7.4).", + "symfony/process": "Required to use the Composer class (^7.4|^8.0).", + "symfony/uid": "Required to use Str::ulid() (^7.4|^8.0).", + "symfony/var-dumper": "Required to use the dd function (^7.4|^8.0).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index ca845f6803cd..9429bfb62a01 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,8 +25,8 @@ "illuminate/macroable": "^13.0", "illuminate/support": "^13.0", "illuminate/translation": "^13.0", - "symfony/http-foundation": "^7.4.0", - "symfony/mime": "^7.4.0" + "symfony/http-foundation": "^7.4.0|^8.0.0", + "symfony/mime": "^7.4.0|^8.0.0" }, "autoload": { "psr-4": { From d5ad7072e7c93ee4ded2b8d2326a4d5fb35bf9e7 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sat, 14 Jun 2025 17:56:37 +0800 Subject: [PATCH 7/7] Update Application.php --- src/Illuminate/Console/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php index 2c59d8eec3e7..3db2e9bb3bfe 100755 --- a/src/Illuminate/Console/Application.php +++ b/src/Illuminate/Console/Application.php @@ -208,7 +208,7 @@ public function output() /** * Add a command to the console. * - * @param \Symfony\Component\Console\Command\Command $command + * @param \Symfony\Component\Console\Command\Command|callable $command * @return \Symfony\Component\Console\Command\Command|null */ #[\Override]