Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit ec60a4edf94e · 2024-01-23T16:02:46.000+01:00
* 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
diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -26,7 +26,7 @@ class ElementNode extends AbstractNode
     private ?string $namespace;
     private ?string $element;
 
-    public function __construct(string $namespace = null, string $element = null)
+    public function __construct(?string $namespace = null, ?string $element = null)
     {
         $this->namespace = $namespace;
         $this->element = $element;
diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -26,7 +26,7 @@ class SelectorNode extends AbstractNode
     private NodeInterface $tree;
     private ?string $pseudoElement;
 
-    public function __construct(NodeInterface $tree, string $pseudoElement = null)
+    public function __construct(NodeInterface $tree, ?string $pseudoElement = null)
     {
         $this->tree = $tree;
         $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;
diff --git a/Parser/Parser.php b/Parser/Parser.php
@@ -29,7 +29,7 @@ class Parser implements ParserInterface
 {
     private Tokenizer $tokenizer;
 
-    public function __construct(Tokenizer $tokenizer = null)
+    public function __construct(?Tokenizer $tokenizer = null)
     {
         $this->tokenizer = $tokenizer ?? new Tokenizer();
     }
diff --git a/XPath/Translator.php b/XPath/Translator.php
@@ -48,7 +48,7 @@ class Translator implements TranslatorInterface
     private array $pseudoClassTranslators = [];
     private array $attributeMatchingTranslators = [];
 
-    public function __construct(ParserInterface $parser = null)
+    public function __construct(?ParserInterface $parser = null)
     {
         $this->mainParser = $parser ?? new Parser();
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ElementNode extends AbstractNode`
`26`	`26`	`private ?string $namespace;`
`27`	`27`	`private ?string $element;`
`28`	`28`
`29`		`- public function __construct(string $namespace = null, string $element = null)`
	`29`	`+ public function __construct(?string $namespace = null, ?string $element = null)`
`30`	`30`	`{`
`31`	`31`	`$this->namespace = $namespace;`
`32`	`32`	`$this->element = $element;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class SelectorNode extends AbstractNode`
`26`	`26`	`private NodeInterface $tree;`
`27`	`27`	`private ?string $pseudoElement;`
`28`	`28`
`29`		`- public function __construct(NodeInterface $tree, string $pseudoElement = null)`
	`29`	`+ public function __construct(NodeInterface $tree, ?string $pseudoElement = null)`
`30`	`30`	`{`
`31`	`31`	`$this->tree = $tree;`
`32`	`32`	`$this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Parser implements ParserInterface`
`29`	`29`	`{`
`30`	`30`	`private Tokenizer $tokenizer;`
`31`	`31`
`32`		`- public function __construct(Tokenizer $tokenizer = null)`
	`32`	`+ public function __construct(?Tokenizer $tokenizer = null)`
`33`	`33`	`{`
`34`	`34`	`$this->tokenizer = $tokenizer ?? new Tokenizer();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class Translator implements TranslatorInterface`
`48`	`48`	`private array $pseudoClassTranslators = [];`
`49`	`49`	`private array $attributeMatchingTranslators = [];`
`50`	`50`
`51`		`- public function __construct(ParserInterface $parser = null)`
	`51`	`+ public function __construct(?ParserInterface $parser = null)`
`52`	`52`	`{`
`53`	`53`	`$this->mainParser = $parser ?? new Parser();`
`54`	`54`