Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents d036c6c + 7bb2f44 commit ee0f7ed
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Node/ElementNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Node/SelectorNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Parser/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion XPath/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit ee0f7ed

Please sign in to comment.