Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit d69e174979fa · 2019-08-20T18:53:57.000+02:00
* 4.4:
  some backports from master
  Add return types to internal|final|private methods
  [HttpFoundation] Precalculate session expiry timestamp
diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -32,18 +32,12 @@ public function __construct(string $namespace = null, string $element = null)
         $this->element = $element;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getNamespace()
+    public function getNamespace(): ?string
     {
         return $this->namespace;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getElement()
+    public function getElement(): ?string
     {
         return $this->element;
     }
diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -52,7 +52,7 @@ public function getName(): string
     /**
      * @return Token[]
      */
-    public function getArguments()
+    public function getArguments(): array
     {
         return $this->arguments;
     }
diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -32,18 +32,12 @@ public function __construct(NodeInterface $selector, NodeInterface $subSelector)
         $this->subSelector = $subSelector;
     }
 
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
+    public function getSelector(): NodeInterface
     {
         return $this->selector;
     }
 
-    /**
-     * @return NodeInterface
-     */
-    public function getSubSelector()
+    public function getSubSelector(): NodeInterface
     {
         return $this->subSelector;
     }
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -76,11 +76,9 @@ public function freeze()
     /**
      * Returns next token.
      *
-     * @return Token
-     *
      * @throws InternalErrorException If there is no more token
      */
-    public function getNext()
+    public function getNext(): Token
     {
         if ($this->peeking) {
             $this->peeking = false;
@@ -98,10 +96,8 @@ public function getNext()
 
     /**
      * Returns peeked token.
-     *
-     * @return Token
      */
-    public function getPeek()
+    public function getPeek(): Token
     {
         if (!$this->peeking) {
             $this->peeked = $this->getNext();
@@ -116,7 +112,7 @@ public function getPeek()
      *
      * @return Token[]
      */
-    public function getUsed()
+    public function getUsed(): array
     {
         return $this->used;
     }
@@ -128,7 +124,7 @@ public function getUsed()
      *
      * @throws SyntaxErrorException If next token is not an identifier
      */
-    public function getNextIdentifier()
+    public function getNextIdentifier(): string
     {
         $next = $this->getNext();
 
@@ -146,7 +142,7 @@ public function getNextIdentifier()
      *
      * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
      */
-    public function getNextIdentifierOrStar()
+    public function getNextIdentifierOrStar(): ?string
     {
         $next = $this->getNext();
 
diff --git a/Parser/Tokenizer/Tokenizer.php b/Parser/Tokenizer/Tokenizer.php
@@ -50,10 +50,8 @@ public function __construct()
 
     /**
      * Tokenize selector source code.
-     *
-     * @return TokenStream
      */
-    public function tokenize(Reader $reader)
+    public function tokenize(Reader $reader): TokenStream
     {
         $stream = new TokenStream();
 
diff --git a/XPath/Extension/AbstractExtension.php b/XPath/Extension/AbstractExtension.php
@@ -26,39 +26,39 @@ abstract class AbstractExtension implements ExtensionInterface
     /**
      * {@inheritdoc}
      */
-    public function getNodeTranslators()
+    public function getNodeTranslators(): array
     {
         return [];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getCombinationTranslators()
+    public function getCombinationTranslators(): array
     {
         return [];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getFunctionTranslators()
+    public function getFunctionTranslators(): array
     {
         return [];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPseudoClassTranslators()
+    public function getPseudoClassTranslators(): array
     {
         return [];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getAttributeMatchingTranslators()
+    public function getAttributeMatchingTranslators(): array
     {
         return [];
     }
diff --git a/XPath/Extension/AttributeMatchingExtension.php b/XPath/Extension/AttributeMatchingExtension.php
@@ -29,7 +29,7 @@ class AttributeMatchingExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    public function getAttributeMatchingTranslators()
+    public function getAttributeMatchingTranslators(): array
     {
         return [
             'exists' => [$this, 'translateExists'],
@@ -112,7 +112,7 @@ public function translateDifferent(XPathExpr $xpath, string $attribute, ?string
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'attribute-matching';
     }
diff --git a/XPath/Extension/CombinationExtension.php b/XPath/Extension/CombinationExtension.php
@@ -43,37 +43,28 @@ public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath):
         return $xpath->join('/descendant-or-self::*/', $combinedXpath);
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath)
+    public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
     {
         return $xpath->join('/', $combinedXpath);
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)
+    public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
     {
         return $xpath
             ->join('/following-sibling::', $combinedXpath)
             ->addNameTest()
             ->addCondition('position() = 1');
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)
+    public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
     {
         return $xpath->join('/following-sibling::', $combinedXpath);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'combination';
     }
diff --git a/XPath/Extension/FunctionExtension.php b/XPath/Extension/FunctionExtension.php
@@ -33,7 +33,7 @@ class FunctionExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    public function getFunctionTranslators()
+    public function getFunctionTranslators(): array
     {
         return [
             'nth-child' => [$this, 'translateNthChild'],
@@ -164,7 +164,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathEx
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'function';
     }
diff --git a/XPath/Extension/HtmlExtension.php b/XPath/Extension/HtmlExtension.php
@@ -39,7 +39,7 @@ public function __construct(Translator $translator)
     /**
      * {@inheritdoc}
      */
-    public function getPseudoClassTranslators()
+    public function getPseudoClassTranslators(): array
     {
         return [
             'checked' => [$this, 'translateChecked'],
@@ -56,17 +56,14 @@ public function getPseudoClassTranslators()
     /**
      * {@inheritdoc}
      */
-    public function getFunctionTranslators()
+    public function getFunctionTranslators(): array
     {
         return [
             'lang' => [$this, 'translateLang'],
         ];
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateChecked(XPathExpr $xpath)
+    public function translateChecked(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition(
             '(@checked '
@@ -75,18 +72,12 @@ public function translateChecked(XPathExpr $xpath)
         );
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateLink(XPathExpr $xpath)
+    public function translateLink(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition("@href and (name(.) = 'a' or name(.) = 'link' or name(.) = 'area')");
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateDisabled(XPathExpr $xpath)
+    public function translateDisabled(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition(
             '('
@@ -112,10 +103,7 @@ public function translateDisabled(XPathExpr $xpath)
         // todo: in the second half, add "and is not a descendant of that fieldset element's first legend element child, if any."
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateEnabled(XPathExpr $xpath)
+    public function translateEnabled(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition(
             '('
@@ -149,11 +137,9 @@ public function translateEnabled(XPathExpr $xpath)
     }
 
     /**
-     * @return XPathExpr
-     *
      * @throws ExpressionErrorException
      */
-    public function translateLang(XPathExpr $xpath, FunctionNode $function)
+    public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathExpr
     {
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
@@ -171,42 +157,30 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function)
         ));
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateSelected(XPathExpr $xpath)
+    public function translateSelected(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition("(@selected and name(.) = 'option')");
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateInvalid(XPathExpr $xpath)
+    public function translateInvalid(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition('0');
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateHover(XPathExpr $xpath)
+    public function translateHover(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition('0');
     }
 
-    /**
-     * @return XPathExpr
-     */
-    public function translateVisited(XPathExpr $xpath)
+    public function translateVisited(XPathExpr $xpath): XPathExpr
     {
         return $xpath->addCondition('0');
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'html';
     }
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
@@ -62,7 +62,7 @@ public function hasFlag(int $flag): bool
     /**
      * {@inheritdoc}
      */
-    public function getNodeTranslators()
+    public function getNodeTranslators(): array
     {
         return [
             'Selector' => [$this, 'translateSelector'],
@@ -185,7 +185,7 @@ public function translateElement(Node\ElementNode $node): XPathExpr
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'node';
     }
diff --git a/XPath/Extension/PseudoClassExtension.php b/XPath/Extension/PseudoClassExtension.php
diff --git a/XPath/Translator.php b/XPath/Translator.php

Original file line number	Diff line number	Diff line change
`@@ -32,18 +32,12 @@ public function __construct(string $namespace = null, string $element = null)`
`32`	`32`	`$this->element = $element;`
`33`	`33`	`}`
`34`	`34`
`35`		`- /**`
`36`		`- * @return string\|null`
`37`		`- */`
`38`		`- public function getNamespace()`
	`35`	`+ public function getNamespace(): ?string`
`39`	`36`	`{`
`40`	`37`	`return $this->namespace;`
`41`	`38`	`}`
`42`	`39`
`43`		`- /**`
`44`		`- * @return string\|null`
`45`		`- */`
`46`		`- public function getElement()`
	`40`	`+ public function getElement(): ?string`
`47`	`41`	`{`
`48`	`42`	`return $this->element;`
`49`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getName(): string`
`52`	`52`	`/**`
`53`	`53`	`* @return Token[]`
`54`	`54`	`*/`
`55`		`- public function getArguments()`
	`55`	`+ public function getArguments(): array`
`56`	`56`	`{`
`57`	`57`	`return $this->arguments;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,9 @@ public function freeze()`
`76`	`76`	`/**`
`77`	`77`	`* Returns next token.`
`78`	`78`	`*`
`79`		`- * @return Token`
`80`		`- *`
`81`	`79`	`* @throws InternalErrorException If there is no more token`
`82`	`80`	`*/`
`83`		`- public function getNext()`
	`81`	`+ public function getNext(): Token`
`84`	`82`	`{`
`85`	`83`	`if ($this->peeking) {`
`86`	`84`	`$this->peeking = false;`
`@@ -98,10 +96,8 @@ public function getNext()`
`98`	`96`
`99`	`97`	`/**`
`100`	`98`	`* Returns peeked token.`
`101`		`- *`
`102`		`- * @return Token`
`103`	`99`	`*/`
`104`		`- public function getPeek()`
	`100`	`+ public function getPeek(): Token`
`105`	`101`	`{`
`106`	`102`	`if (!$this->peeking) {`
`107`	`103`	`$this->peeked = $this->getNext();`
`@@ -116,7 +112,7 @@ public function getPeek()`
`116`	`112`	`*`
`117`	`113`	`* @return Token[]`
`118`	`114`	`*/`
`119`		`- public function getUsed()`
	`115`	`+ public function getUsed(): array`
`120`	`116`	`{`
`121`	`117`	`return $this->used;`
`122`	`118`	`}`
`@@ -128,7 +124,7 @@ public function getUsed()`
`128`	`124`	`*`
`129`	`125`	`* @throws SyntaxErrorException If next token is not an identifier`
`130`	`126`	`*/`
`131`		`- public function getNextIdentifier()`
	`127`	`+ public function getNextIdentifier(): string`
`132`	`128`	`{`
`133`	`129`	`$next = $this->getNext();`
`134`	`130`
`@@ -146,7 +142,7 @@ public function getNextIdentifier()`
`146`	`142`	`*`
`147`	`143`	`* @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`148`	`144`	`*/`
`149`		`- public function getNextIdentifierOrStar()`
	`145`	`+ public function getNextIdentifierOrStar(): ?string`
`150`	`146`	`{`
`151`	`147`	`$next = $this->getNext();`
`152`	`148`
Original file line number	Diff line number	Diff line change
`@@ -26,39 +26,39 @@ abstract class AbstractExtension implements ExtensionInterface`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function getNodeTranslators()`
	`29`	`+ public function getNodeTranslators(): array`
`30`	`30`	`{`
`31`	`31`	`return [];`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* {@inheritdoc}`
`36`	`36`	`*/`
`37`		`- public function getCombinationTranslators()`
	`37`	`+ public function getCombinationTranslators(): array`
`38`	`38`	`{`
`39`	`39`	`return [];`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`43`	`43`	`* {@inheritdoc}`
`44`	`44`	`*/`
`45`		`- public function getFunctionTranslators()`
	`45`	`+ public function getFunctionTranslators(): array`
`46`	`46`	`{`
`47`	`47`	`return [];`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`	`51`	`* {@inheritdoc}`
`52`	`52`	`*/`
`53`		`- public function getPseudoClassTranslators()`
	`53`	`+ public function getPseudoClassTranslators(): array`
`54`	`54`	`{`
`55`	`55`	`return [];`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* {@inheritdoc}`
`60`	`60`	`*/`
`61`		`- public function getAttributeMatchingTranslators()`
	`61`	`+ public function getAttributeMatchingTranslators(): array`
`62`	`62`	`{`
`63`	`63`	`return [];`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class AttributeMatchingExtension extends AbstractExtension`
`29`	`29`	`/**`
`30`	`30`	`* {@inheritdoc}`
`31`	`31`	`*/`
`32`		`- public function getAttributeMatchingTranslators()`
	`32`	`+ public function getAttributeMatchingTranslators(): array`
`33`	`33`	`{`
`34`	`34`	`return [`
`35`	`35`	`'exists' => [$this, 'translateExists'],`
`@@ -112,7 +112,7 @@ public function translateDifferent(XPathExpr $xpath, string $attribute, ?string`
`112`	`112`	`/**`
`113`	`113`	`* {@inheritdoc}`
`114`	`114`	`*/`
`115`		`- public function getName()`
	`115`	`+ public function getName(): string`
`116`	`116`	`{`
`117`	`117`	`return 'attribute-matching';`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,37 +43,28 @@ public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath):`
`43`	`43`	`return $xpath->join('/descendant-or-self::*/', $combinedXpath);`
`44`	`44`	`}`
`45`	`45`
`46`		`- /**`
`47`		`- * @return XPathExpr`
`48`		`- */`
`49`		`- public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath)`
	`46`	`+ public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr`
`50`	`47`	`{`
`51`	`48`	`return $xpath->join('/', $combinedXpath);`
`52`	`49`	`}`
`53`	`50`
`54`		`- /**`
`55`		`- * @return XPathExpr`
`56`		`- */`
`57`		`- public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)`
	`51`	`+ public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr`
`58`	`52`	`{`
`59`	`53`	`return $xpath`
`60`	`54`	`->join('/following-sibling::', $combinedXpath)`
`61`	`55`	`->addNameTest()`
`62`	`56`	`->addCondition('position() = 1');`
`63`	`57`	`}`
`64`	`58`
`65`		`- /**`
`66`		`- * @return XPathExpr`
`67`		`- */`
`68`		`- public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)`
	`59`	`+ public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr`
`69`	`60`	`{`
`70`	`61`	`return $xpath->join('/following-sibling::', $combinedXpath);`
`71`	`62`	`}`
`72`	`63`
`73`	`64`	`/**`
`74`	`65`	`* {@inheritdoc}`
`75`	`66`	`*/`
`76`		`- public function getName()`
	`67`	`+ public function getName(): string`
`77`	`68`	`{`
`78`	`69`	`return 'combination';`
`79`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class FunctionExtension extends AbstractExtension`
`33`	`33`	`/**`
`34`	`34`	`* {@inheritdoc}`
`35`	`35`	`*/`
`36`		`- public function getFunctionTranslators()`
	`36`	`+ public function getFunctionTranslators(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`'nth-child' => [$this, 'translateNthChild'],`
`@@ -164,7 +164,7 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathEx`
`164`	`164`	`/**`
`165`	`165`	`* {@inheritdoc}`
`166`	`166`	`*/`
`167`		`- public function getName()`
	`167`	`+ public function getName(): string`
`168`	`168`	`{`
`169`	`169`	`return 'function';`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct(Translator $translator)`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function getPseudoClassTranslators()`
	`42`	`+ public function getPseudoClassTranslators(): array`
`43`	`43`	`{`
`44`	`44`	`return [`
`45`	`45`	`'checked' => [$this, 'translateChecked'],`
`@@ -56,17 +56,14 @@ public function getPseudoClassTranslators()`
`56`	`56`	`/**`
`57`	`57`	`* {@inheritdoc}`
`58`	`58`	`*/`
`59`		`- public function getFunctionTranslators()`
	`59`	`+ public function getFunctionTranslators(): array`
`60`	`60`	`{`
`61`	`61`	`return [`
`62`	`62`	`'lang' => [$this, 'translateLang'],`
`63`	`63`	`];`
`64`	`64`	`}`
`65`	`65`
`66`		`- /**`
`67`		`- * @return XPathExpr`
`68`		`- */`
`69`		`- public function translateChecked(XPathExpr $xpath)`
	`66`	`+ public function translateChecked(XPathExpr $xpath): XPathExpr`
`70`	`67`	`{`
`71`	`68`	`return $xpath->addCondition(`
`72`	`69`	`'(@checked '`
`@@ -75,18 +72,12 @@ public function translateChecked(XPathExpr $xpath)`
`75`	`72`	`);`
`76`	`73`	`}`
`77`	`74`
`78`		`- /**`
`79`		`- * @return XPathExpr`
`80`		`- */`
`81`		`- public function translateLink(XPathExpr $xpath)`
	`75`	`+ public function translateLink(XPathExpr $xpath): XPathExpr`
`82`	`76`	`{`
`83`	`77`	`return $xpath->addCondition("@href and (name(.) = 'a' or name(.) = 'link' or name(.) = 'area')");`
`84`	`78`	`}`
`85`	`79`
`86`		`- /**`
`87`		`- * @return XPathExpr`
`88`		`- */`
`89`		`- public function translateDisabled(XPathExpr $xpath)`
	`80`	`+ public function translateDisabled(XPathExpr $xpath): XPathExpr`
`90`	`81`	`{`
`91`	`82`	`return $xpath->addCondition(`
`92`	`83`	`'('`
`@@ -112,10 +103,7 @@ public function translateDisabled(XPathExpr $xpath)`
`112`	`103`	`// todo: in the second half, add "and is not a descendant of that fieldset element's first legend element child, if any."`
`113`	`104`	`}`
`114`	`105`
`115`		`- /**`
`116`		`- * @return XPathExpr`
`117`		`- */`
`118`		`- public function translateEnabled(XPathExpr $xpath)`
	`106`	`+ public function translateEnabled(XPathExpr $xpath): XPathExpr`
`119`	`107`	`{`
`120`	`108`	`return $xpath->addCondition(`
`121`	`109`	`'('`
`@@ -149,11 +137,9 @@ public function translateEnabled(XPathExpr $xpath)`
`149`	`137`	`}`
`150`	`138`
`151`	`139`	`/**`
`152`		`- * @return XPathExpr`
`153`		`- *`
`154`	`140`	`* @throws ExpressionErrorException`
`155`	`141`	`*/`
`156`		`- public function translateLang(XPathExpr $xpath, FunctionNode $function)`
	`142`	`+ public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathExpr`
`157`	`143`	`{`
`158`	`144`	`$arguments = $function->getArguments();`
`159`	`145`	`foreach ($arguments as $token) {`
`@@ -171,42 +157,30 @@ public function translateLang(XPathExpr $xpath, FunctionNode $function)`
`171`	`157`	`));`
`172`	`158`	`}`
`173`	`159`
`174`		`- /**`
`175`		`- * @return XPathExpr`
`176`		`- */`
`177`		`- public function translateSelected(XPathExpr $xpath)`
	`160`	`+ public function translateSelected(XPathExpr $xpath): XPathExpr`
`178`	`161`	`{`
`179`	`162`	`return $xpath->addCondition("(@selected and name(.) = 'option')");`
`180`	`163`	`}`
`181`	`164`
`182`		`- /**`
`183`		`- * @return XPathExpr`
`184`		`- */`
`185`		`- public function translateInvalid(XPathExpr $xpath)`
	`165`	`+ public function translateInvalid(XPathExpr $xpath): XPathExpr`
`186`	`166`	`{`
`187`	`167`	`return $xpath->addCondition('0');`
`188`	`168`	`}`
`189`	`169`
`190`		`- /**`
`191`		`- * @return XPathExpr`
`192`		`- */`
`193`		`- public function translateHover(XPathExpr $xpath)`
	`170`	`+ public function translateHover(XPathExpr $xpath): XPathExpr`
`194`	`171`	`{`
`195`	`172`	`return $xpath->addCondition('0');`
`196`	`173`	`}`
`197`	`174`
`198`		`- /**`
`199`		`- * @return XPathExpr`
`200`		`- */`
`201`		`- public function translateVisited(XPathExpr $xpath)`
	`175`	`+ public function translateVisited(XPathExpr $xpath): XPathExpr`
`202`	`176`	`{`
`203`	`177`	`return $xpath->addCondition('0');`
`204`	`178`	`}`
`205`	`179`
`206`	`180`	`/**`
`207`	`181`	`* {@inheritdoc}`
`208`	`182`	`*/`
`209`		`- public function getName()`
	`183`	`+ public function getName(): string`
`210`	`184`	`{`
`211`	`185`	`return 'html';`
`212`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function hasFlag(int $flag): bool`
`62`	`62`	`/**`
`63`	`63`	`* {@inheritdoc}`
`64`	`64`	`*/`
`65`		`- public function getNodeTranslators()`
	`65`	`+ public function getNodeTranslators(): array`
`66`	`66`	`{`
`67`	`67`	`return [`
`68`	`68`	`'Selector' => [$this, 'translateSelector'],`
`@@ -185,7 +185,7 @@ public function translateElement(Node\ElementNode $node): XPathExpr`
`185`	`185`	`/**`
`186`	`186`	`* {@inheritdoc}`
`187`	`187`	`*/`
`188`		`- public function getName()`
	`188`	`+ public function getName(): string`
`189`	`189`	`{`
`190`	`190`	`return 'node';`
`191`	`191`	`}`