Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit a7c57aecdb22 · 2024-01-23T15:35:58.000+01:00
* 5.4:
  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
diff --git a/Command/ServerDumpPlaceholderCommand.php b/Command/ServerDumpPlaceholderCommand.php
@@ -31,7 +31,7 @@ class ServerDumpPlaceholderCommand extends Command
 {
     private $replacedCommand;
 
-    public function __construct(DumpServer $server = null, array $descriptors = [])
+    public function __construct(?DumpServer $server = null, array $descriptors = [])
     {
         $this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors);
 
diff --git a/DebugBundle.php b/DebugBundle.php
@@ -35,10 +35,10 @@ public function boot()
             // The dump data collector is used by default, so dump output is sent to
             // the WDT. In a CLI context, if dump is used too soon, the data collector
             // will buffer it, and release it at the end of the script.
-            VarDumper::setHandler(function ($var, string $label = null) use ($container) {
+            VarDumper::setHandler(function ($var, ?string $label = null) use ($container) {
                 $dumper = $container->get('data_collector.dump');
                 $cloner = $container->get('var_dumper.cloner');
-                $handler = function ($var, string $label = null) use ($dumper, $cloner) {
+                $handler = function ($var, ?string $label = null) use ($dumper, $cloner) {
                     $var = $cloner->cloneVar($var);
                     if (null !== $label) {
                         $var = $var->withContext(['label' => $label]);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class ServerDumpPlaceholderCommand extends Command`
`31`	`31`	`{`
`32`	`32`	`private $replacedCommand;`
`33`	`33`
`34`		`- public function __construct(DumpServer $server = null, array $descriptors = [])`
	`34`	`+ public function __construct(?DumpServer $server = null, array $descriptors = [])`
`35`	`35`	`{`
`36`	`36`	`$this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors);`
`37`	`37`