Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^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"
Expand Down Expand Up @@ -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|^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": {
"tightenco/collect": "<5.5.33"
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cache/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0)."
},
"config": {
"sort-packages": true
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0)."
},
"config": {
"sort-packages": true
Expand Down
28 changes: 7 additions & 21 deletions src/Illuminate/Console/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,28 +205,14 @@ public function output()
: '';
}

/**
* Add an array of commands to the console.
*
* @param array<int, \Symfony\Component\Console\Command\Command> $commands
* @return void
*/
#[\Override]
public function addCommands(array $commands): void
{
foreach ($commands as $command) {
$this->add($command);
}
}

/**
* 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]
public function add(SymfonyCommand $command): ?SymfonyCommand
public function addCommand(SymfonyCommand|callable $command): ?SymfonyCommand
{
if ($command instanceof Command) {
$command->setLaravel($this->laravel);
Expand All @@ -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);
}

/**
Expand All @@ -269,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));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/process": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Cookie/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/http-kernel": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0)."
},
"config": {
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0"
},
"autoload": {
"psr-4": {
Expand All @@ -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|^8.0).",
"symfony/mime": "Required to enable support for guessing extensions (^7.4|^8.0)."
},
"config": {
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Http/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/http-kernel": "^7.4.0|^8.0.0",
"symfony/mime": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Mail/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.5"
},
"autoload": {
Expand All @@ -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|^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
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Process/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Queue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Routing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/http-kernel": "^7.4.0|^8.0.0",
"symfony/routing": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand All @@ -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|^8.0)."
},
"config": {
"sort-packages": true,
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Session/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/http-foundation": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Support/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^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": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Validation/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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|^8.0.0",
"symfony/mime": "^7.4.0|^8.0.0"
},
"autoload": {
"psr-4": {
Expand Down