Skip to content

Commit b8d8eb0

Browse files
committed
Merge branch '4.4' into 5.1
2 parents 6cbebda + 5e6efcb commit b8d8eb0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Parser/Parser.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private function parseSelectorList(TokenStream $stream): array
113113

114114
private function parserSelectorNode(TokenStream $stream): Node\SelectorNode
115115
{
116-
list($result, $pseudoElement) = $this->parseSimpleSelector($stream);
116+
[$result, $pseudoElement] = $this->parseSimpleSelector($stream);
117117

118118
while (true) {
119119
$stream->skipWhitespace();
@@ -134,7 +134,7 @@ private function parserSelectorNode(TokenStream $stream): Node\SelectorNode
134134
$combinator = ' ';
135135
}
136136

137-
list($nextSelector, $pseudoElement) = $this->parseSimpleSelector($stream);
137+
[$nextSelector, $pseudoElement] = $this->parseSimpleSelector($stream);
138138
$result = new Node\CombinedSelectorNode($result, $combinator, $nextSelector);
139139
}
140140

@@ -209,7 +209,7 @@ private function parseSimpleSelector(TokenStream $stream, bool $insideNegation =
209209
throw SyntaxErrorException::nestedNot();
210210
}
211211

212-
list($argument, $argumentPseudoElement) = $this->parseSimpleSelector($stream, true);
212+
[$argument, $argumentPseudoElement] = $this->parseSimpleSelector($stream, true);
213213
$next = $stream->getNext();
214214

215215
if (null !== $argumentPseudoElement) {

XPath/Extension/FunctionExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getFunctionTranslators(): array
5151
public function translateNthChild(XPathExpr $xpath, FunctionNode $function, bool $last = false, bool $addNameTest = true): XPathExpr
5252
{
5353
try {
54-
list($a, $b) = Parser::parseSeries($function->getArguments());
54+
[$a, $b] = Parser::parseSeries($function->getArguments());
5555
} catch (SyntaxErrorException $e) {
5656
throw new ExpressionErrorException(sprintf('Invalid series: "%s".', implode('", "', $function->getArguments())), 0, $e);
5757
}

0 commit comments

Comments
 (0)