Skip to content

Commit b0db5c4

Browse files
Merge branch '6.4' into 7.0
* 6.4: Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 7e540ae + 425c776 commit b0db5c4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Command/ServerDumpPlaceholderCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ServerDumpPlaceholderCommand extends Command
3131
{
3232
private ServerDumpCommand $replacedCommand;
3333

34-
public function __construct(DumpServer $server = null, array $descriptors = [])
34+
public function __construct(?DumpServer $server = null, array $descriptors = [])
3535
{
3636
$this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors);
3737

DebugBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public function boot(): void
3232
// The dump data collector is used by default, so dump output is sent to
3333
// the WDT. In a CLI context, if dump is used too soon, the data collector
3434
// will buffer it, and release it at the end of the script.
35-
VarDumper::setHandler(function ($var, string $label = null) use ($container) {
35+
VarDumper::setHandler(function ($var, ?string $label = null) use ($container) {
3636
$dumper = $container->get('data_collector.dump');
3737
$cloner = $container->get('var_dumper.cloner');
38-
$handler = function ($var, string $label = null) use ($dumper, $cloner) {
38+
$handler = function ($var, ?string $label = null) use ($dumper, $cloner) {
3939
$var = $cloner->cloneVar($var);
4040
if (null !== $label) {
4141
$var = $var->withContext(['label' => $label]);

0 commit comments

Comments
 (0)