Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 55a64595417d · 2024-01-23T15:51:35.000+01:00
* 6.3:
  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
diff --git a/PhpEngine.php b/PhpEngine.php
@@ -224,7 +224,7 @@ public function setHelpers(array $helpers)
     /**
      * @return void
      */
-    public function set(HelperInterface $helper, string $alias = null)
+    public function set(HelperInterface $helper, ?string $alias = null)
     {
         $this->helpers[$helper->getName()] = $helper;
         if (null !== $alias) {
diff --git a/TemplateReference.php b/TemplateReference.php
@@ -24,7 +24,7 @@ class TemplateReference implements TemplateReferenceInterface
 {
     protected $parameters;
 
-    public function __construct(string $name = null, string $engine = null)
+    public function __construct(?string $name = null, ?string $engine = null)
     {
         $this->parameters = [
             'name' => $name,

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public function setHelpers(array $helpers)`
`224`	`224`	`/**`
`225`	`225`	`* @return void`
`226`	`226`	`*/`
`227`		`- public function set(HelperInterface $helper, string $alias = null)`
	`227`	`+ public function set(HelperInterface $helper, ?string $alias = null)`
`228`	`228`	`{`
`229`	`229`	`$this->helpers[$helper->getName()] = $helper;`
`230`	`230`	`if (null !== $alias) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class TemplateReference implements TemplateReferenceInterface`
`24`	`24`	`{`
`25`	`25`	`protected $parameters;`
`26`	`26`
`27`		`- public function __construct(string $name = null, string $engine = null)`
	`27`	`+ public function __construct(?string $name = null, ?string $engine = null)`
`28`	`28`	`{`
`29`	`29`	`$this->parameters = [`
`30`	`30`	`'name' => $name,`