Skip to content

Commit 37a74cd

Browse files
crynobonecrynobone
authored
[13.x] Supports Symfony 7.4 & 8.0 (#56029)
* [13.x] Supports Symfony 7.4 Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update `Application` to use `addCommand` insteads of deprecated `add` Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Remove `addToParent()` method. Signed-off-by: Mior Muhammad Zaki <[email protected]> * Revert "Remove `addToParent()` method." This reverts commit 7cf2aa7. * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update Application.php --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
1 parent f515026 commit 37a74cd

File tree

16 files changed

+58
-72
lines changed

16 files changed

+58
-72
lines changed

‎composer.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444
"psr/log": "^1.0|^2.0|^3.0",
4545
"psr/simple-cache": "^1.0|^2.0|^3.0",
4646
"ramsey/uuid": "^4.7",
47-
"symfony/console": "^7.2.0",
48-
"symfony/error-handler": "^7.2.0",
49-
"symfony/finder": "^7.2.0",
50-
"symfony/http-foundation": "^7.2.0",
51-
"symfony/http-kernel": "^7.2.0",
52-
"symfony/mailer": "^7.2.0",
53-
"symfony/mime": "^7.2.0",
54-
"symfony/process": "^7.2.0",
55-
"symfony/routing": "^7.2.0",
56-
"symfony/uid": "^7.2.0",
57-
"symfony/var-dumper": "^7.2.0",
47+
"symfony/console": "^7.4.0|^8.0.0",
48+
"symfony/error-handler": "^7.4.0|^8.0.0",
49+
"symfony/finder": "^7.4.0|^8.0.0",
50+
"symfony/http-foundation": "^7.4.0|^8.0.0",
51+
"symfony/http-kernel": "^7.4.0|^8.0.0",
52+
"symfony/mailer": "^7.4.0|^8.0.0",
53+
"symfony/mime": "^7.4.0|^8.0.0",
54+
"symfony/process": "^7.4.0|^8.0.0",
55+
"symfony/routing": "^7.4.0|^8.0.0",
56+
"symfony/uid": "^7.4.0|^8.0.0",
57+
"symfony/var-dumper": "^7.4.0|^8.0.0",
5858
"tijsverkoyen/css-to-inline-styles": "^2.2.5",
5959
"vlucas/phpdotenv": "^5.6.1",
6060
"voku/portable-ascii": "^2.0.2"
@@ -117,10 +117,10 @@
117117
"phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
118118
"predis/predis": "^2.3|^3.0",
119119
"resend/resend-php": "^0.10.0",
120-
"symfony/cache": "^7.2.0",
121-
"symfony/http-client": "^7.2.0",
122-
"symfony/psr-http-message-bridge": "^7.2.0",
123-
"symfony/translation": "^7.2.0"
120+
"symfony/cache": "^7.4.0|^8.0.0",
121+
"symfony/http-client": "^7.4.0|^8.0.0",
122+
"symfony/psr-http-message-bridge": "^7.4.0|^8.0.0",
123+
"symfony/translation": "^7.4.0"
124124
},
125125
"conflict": {
126126
"tightenco/collect": "<5.5.33"
@@ -192,12 +192,12 @@
192192
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
193193
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
194194
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
195-
"symfony/cache": "Required to PSR-6 cache bridge (^7.2).",
196-
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
197-
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
198-
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
199-
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).",
200-
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
195+
"symfony/cache": "Required to PSR-6 cache bridge (^7.4|^8.0).",
196+
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.4|^8.0).",
197+
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.4|^8.0).",
198+
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4|^8.0).",
199+
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4|^8.0).",
200+
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4|^8.0)."
201201
},
202202
"config": {
203203
"sort-packages": true,

‎src/Illuminate/Cache/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"illuminate/database": "Required to use the database cache driver (^13.0).",
4141
"illuminate/filesystem": "Required to use the file cache driver (^13.0).",
4242
"illuminate/redis": "Required to use the redis cache driver (^13.0).",
43-
"symfony/cache": "Required to use PSR-6 cache bridge (^7.2)."
43+
"symfony/cache": "Required to use PSR-6 cache bridge (^7.4|^8.0)."
4444
},
4545
"config": {
4646
"sort-packages": true

‎src/Illuminate/Collections/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"suggest": {
3737
"illuminate/http": "Required to convert collections to API resources (^12.0).",
38-
"symfony/var-dumper": "Required to use the dump method (^7.2)."
38+
"symfony/var-dumper": "Required to use the dump method (^7.4|^8.0)."
3939
},
4040
"config": {
4141
"sort-packages": true

‎src/Illuminate/Console/Application.php‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -205,28 +205,14 @@ public function output()
205205
: '';
206206
}
207207

208-
/**
209-
* Add an array of commands to the console.
210-
*
211-
* @param array<int, \Symfony\Component\Console\Command\Command> $commands
212-
* @return void
213-
*/
214-
#[\Override]
215-
public function addCommands(array $commands): void
216-
{
217-
foreach ($commands as $command) {
218-
$this->add($command);
219-
}
220-
}
221-
222208
/**
223209
* Add a command to the console.
224210
*
225-
* @param \Symfony\Component\Console\Command\Command $command
211+
* @param \Symfony\Component\Console\Command\Command|callable $command
226212
* @return \Symfony\Component\Console\Command\Command|null
227213
*/
228214
#[\Override]
229-
public function add(SymfonyCommand $command): ?SymfonyCommand
215+
public function addCommand(SymfonyCommand|callable $command): ?SymfonyCommand
230216
{
231217
if ($command instanceof Command) {
232218
$command->setLaravel($this->laravel);
@@ -238,12 +224,12 @@ public function add(SymfonyCommand $command): ?SymfonyCommand
238224
/**
239225
* Add the command to the parent instance.
240226
*
241-
* @param \Symfony\Component\Console\Command\Command $command
227+
* @param \Symfony\Component\Console\Command\Command|callable $command
242228
* @return \Symfony\Component\Console\Command\Command
243229
*/
244-
protected function addToParent(SymfonyCommand $command)
230+
protected function addToParent(SymfonyCommand|callable $command)
245231
{
246-
return parent::add($command);
232+
return parent::addCommand($command);
247233
}
248234

249235
/**
@@ -269,10 +255,10 @@ public function resolve($command)
269255
}
270256

271257
if ($command instanceof Command) {
272-
return $this->add($command);
258+
return $this->addCommand($command);
273259
}
274260

275-
return $this->add($this->laravel->make($command));
261+
return $this->addCommand($this->laravel->make($command));
276262
}
277263

278264
/**

‎src/Illuminate/Console/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"illuminate/view": "^13.0",
2424
"laravel/prompts": "^0.3.0",
2525
"nunomaduro/termwind": "^2.0",
26-
"symfony/console": "^7.2.0",
27-
"symfony/process": "^7.2.0"
26+
"symfony/console": "^7.4.0|^8.0.0",
27+
"symfony/process": "^7.4.0|^8.0.0"
2828
},
2929
"autoload": {
3030
"psr-4": {

‎src/Illuminate/Cookie/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"illuminate/contracts": "^13.0",
2121
"illuminate/macroable": "^13.0",
2222
"illuminate/support": "^13.0",
23-
"symfony/http-foundation": "^7.2.0",
24-
"symfony/http-kernel": "^7.2.0"
23+
"symfony/http-foundation": "^7.4.0|^8.0.0",
24+
"symfony/http-kernel": "^7.4.0|^8.0.0"
2525
},
2626
"autoload": {
2727
"psr-4": {

‎src/Illuminate/Database/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"illuminate/filesystem": "Required to use the migrations (^13.0).",
4444
"illuminate/http": "Required to convert Eloquent models to API resources (^13.0).",
4545
"illuminate/pagination": "Required to paginate the result set (^13.0).",
46-
"symfony/finder": "Required to use Eloquent model factories (^7.2)."
46+
"symfony/finder": "Required to use Eloquent model factories (^7.4|^8.0)."
4747
},
4848
"config": {
4949
"sort-packages": true

‎src/Illuminate/Filesystem/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"illuminate/contracts": "^13.0",
2020
"illuminate/macroable": "^13.0",
2121
"illuminate/support": "^13.0",
22-
"symfony/finder": "^7.2.0"
22+
"symfony/finder": "^7.4.0|^8.0.0"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -44,8 +44,8 @@
4444
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
4545
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
4646
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
47-
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
48-
"symfony/mime": "Required to enable support for guessing extensions (^7.2)."
47+
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.4|^8.0).",
48+
"symfony/mime": "Required to enable support for guessing extensions (^7.4|^8.0)."
4949
},
5050
"config": {
5151
"sort-packages": true

‎src/Illuminate/Http/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"illuminate/macroable": "^13.0",
2424
"illuminate/session": "^13.0",
2525
"illuminate/support": "^13.0",
26-
"symfony/http-foundation": "^7.2.0",
27-
"symfony/http-kernel": "^7.2.0",
28-
"symfony/mime": "^7.2.0"
26+
"symfony/http-foundation": "^7.4.0|^8.0.0",
27+
"symfony/http-kernel": "^7.4.0|^8.0.0",
28+
"symfony/mime": "^7.4.0|^8.0.0"
2929
},
3030
"autoload": {
3131
"psr-4": {

‎src/Illuminate/Mail/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"illuminate/support": "^13.0",
2323
"league/commonmark": "^2.7",
2424
"psr/log": "^1.0|^2.0|^3.0",
25-
"symfony/mailer": "^7.2.0",
25+
"symfony/mailer": "^7.4.0|^8.0.0",
2626
"tijsverkoyen/css-to-inline-styles": "^2.2.5"
2727
},
2828
"autoload": {
@@ -38,9 +38,9 @@
3838
"suggest": {
3939
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).",
4040
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
41-
"symfony/http-client": "Required to use the Symfony API mail transports (^7.2).",
42-
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
43-
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2)."
41+
"symfony/http-client": "Required to use the Symfony API mail transports (^7.4|^8.0).",
42+
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4|^8.0).",
43+
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4|^8.0)."
4444
},
4545
"config": {
4646
"sort-packages": true

0 commit comments

Comments
 (0)