Add return types - batch 2/n

Author: nicolas-grekas

CssSelectorConverter.php

@@ -59,10 +59,8 @@ public function __construct(bool $html = true)
      *
      * Optionally, a prefix can be added to the resulting XPath
      * expression with the $prefix parameter.
-     *
-     * @return string
      */
-    public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::')
+    public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string
     {
         return $this->cache[$prefix][$cssExpr] ?? $this->cache[$prefix][$cssExpr] = $this->translator->cssToXPath($cssExpr, $prefix);
     }

Exception/SyntaxErrorException.php

@@ -23,42 +23,27 @@
  */
 class SyntaxErrorException extends ParseException
 {
-    /**
-     * @return self
-     */
-    public static function unexpectedToken(string $expectedValue, Token $foundToken)
+    public static function unexpectedToken(string $expectedValue, Token $foundToken): self
     {
         return new self(sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));
     }
 
-    /**
-     * @return self
-     */
-    public static function pseudoElementFound(string $pseudoElement, string $unexpectedLocation)
+    public static function pseudoElementFound(string $pseudoElement, string $unexpectedLocation): self
     {
         return new self(sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));
     }
 
-    /**
-     * @return self
-     */
-    public static function unclosedString(int $position)
+    public static function unclosedString(int $position): self
     {
         return new self(sprintf('Unclosed/invalid string at %s.', $position));
     }
 
-    /**
-     * @return self
-     */
-    public static function nestedNot()
+    public static function nestedNot(): self
     {
         return new self('Got nested ::not().');
     }
 
-    /**
-     * @return self
-     */
-    public static function stringAsFunctionArgument()
+    public static function stringAsFunctionArgument(): self
     {
         return new self('String not allowed as function argument.');
     }

Parser/Reader.php

@@ -63,7 +63,7 @@ public function getOffset(string $string)
     /**
      * @return array|false
      */
-    public function findPattern(string $pattern)
+    public function findPattern(string $pattern): array|false
     {
         $source = substr($this->source, $this->position);
 

Parser/TokenStream.php

@@ -45,7 +45,7 @@ class TokenStream
      *
      * @return $this
      */
-    public function push(Token $token): self
+    public function push(Token $token): static
     {
         $this->tokens[] = $token;
 
@@ -57,7 +57,7 @@ public function push(Token $token): self
      *
      * @return $this
      */
-    public function freeze(): self
+    public function freeze(): static
     {
         return $this;
     }

XPath/Extension/NodeExtension.php

@@ -41,7 +41,7 @@ public function __construct(int $flags = 0)
     /**
      * @return $this
      */
-    public function setFlag(int $flag, bool $on): self
+    public function setFlag(int $flag, bool $on): static
     {
         if ($on && !$this->hasFlag($flag)) {
             $this->flags += $flag;

XPath/Translator.php

@@ -117,7 +117,7 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen
     /**
      * @return $this
      */
-    public function registerExtension(Extension\ExtensionInterface $extension): self
+    public function registerExtension(Extension\ExtensionInterface $extension): static
     {
         $this->extensions[$extension->getName()] = $extension;
 
@@ -145,7 +145,7 @@ public function getExtension(string $name): Extension\ExtensionInterface
     /**
      * @return $this
      */
-    public function registerParserShortcut(ParserInterface $shortcut): self
+    public function registerParserShortcut(ParserInterface $shortcut): static
     {
         $this->shortcutParsers[] = $shortcut;
 

XPath/XPathExpr.php

@@ -77,7 +77,7 @@ public function addStarPrefix(): self
      *
      * @return $this
      */
-    public function join(string $combiner, self $expr): self
+    public function join(string $combiner, self $expr): static
     {
         $path = $this->__toString().$combiner;