minor #32328 [CssSelector] [5.0] Add type-hint whenever possible (Simperfit)

fabpot · fabpot · commit c1fe1faf67e2 · 2019-07-05T06:38:33.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [CssSelector] [5.0] Add type-hint whenever possible | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | contribute to #32179  | License | MIT | Doc PR | none   Add type hint to css selector ;). Commits ------- 3e647d4 [CssSelector] [5.0] Add type-hint whenever possible
diff --git a/src/Symfony/Component/CssSelector/CssSelectorConverter.php b/src/Symfony/Component/CssSelector/CssSelectorConverter.php
@@ -53,12 +53,9 @@ public function __construct(bool $html = true)
      * Optionally, a prefix can be added to the resulting XPath
      * expression with the $prefix parameter.
      *
-     * @param string $cssExpr The CSS expression
-     * @param string $prefix  An optional prefix for the XPath expression
-     *
      * @return string
      */
-    public function toXPath($cssExpr, $prefix = 'descendant-or-self::')
+    public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::')
     {
         return $this->translator->cssToXPath($cssExpr, $prefix);
     }
diff --git a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -29,7 +29,7 @@ class SyntaxErrorException extends ParseException
      *
      * @return self
      */
-    public static function unexpectedToken($expectedValue, Token $foundToken)
+    public static function unexpectedToken(string $expectedValue, Token $foundToken)
     {
         return new self(sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));
     }
@@ -40,7 +40,7 @@ public static function unexpectedToken($expectedValue, Token $foundToken)
      *
      * @return self
      */
-    public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
+    public static function pseudoElementFound(string $pseudoElement, string $unexpectedLocation)
     {
         return new self(sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));
     }
@@ -50,7 +50,7 @@ public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
      *
      * @return self
      */
-    public static function unclosedString($position)
+    public static function unclosedString(int $position)
     {
         return new self(sprintf('Unclosed/invalid string at %s.', $position));
     }

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,9 @@ public function __construct(bool $html = true)`
`53`	`53`	`* Optionally, a prefix can be added to the resulting XPath`
`54`	`54`	`* expression with the $prefix parameter.`
`55`	`55`	`*`
`56`		`- * @param string $cssExpr The CSS expression`
`57`		`- * @param string $prefix An optional prefix for the XPath expression`
`58`		`- *`
`59`	`56`	`* @return string`
`60`	`57`	`*/`
`61`		`- public function toXPath($cssExpr, $prefix = 'descendant-or-self::')`
	`58`	`+ public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::')`
`62`	`59`	`{`
`63`	`60`	`return $this->translator->cssToXPath($cssExpr, $prefix);`
`64`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class SyntaxErrorException extends ParseException`
`29`	`29`	`*`
`30`	`30`	`* @return self`
`31`	`31`	`*/`
`32`		`- public static function unexpectedToken($expectedValue, Token $foundToken)`
	`32`	`+ public static function unexpectedToken(string $expectedValue, Token $foundToken)`
`33`	`33`	`{`
`34`	`34`	`return new self(sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));`
`35`	`35`	`}`
`@@ -40,7 +40,7 @@ public static function unexpectedToken($expectedValue, Token $foundToken)`
`40`	`40`	`*`
`41`	`41`	`* @return self`
`42`	`42`	`*/`
`43`		`- public static function pseudoElementFound($pseudoElement, $unexpectedLocation)`
	`43`	`+ public static function pseudoElementFound(string $pseudoElement, string $unexpectedLocation)`
`44`	`44`	`{`
`45`	`45`	`return new self(sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));`
`46`	`46`	`}`
`@@ -50,7 +50,7 @@ public static function pseudoElementFound($pseudoElement, $unexpectedLocation)`
`50`	`50`	`*`
`51`	`51`	`* @return self`
`52`	`52`	`*/`
`53`		`- public static function unclosedString($position)`
	`53`	`+ public static function unclosedString(int $position)`
`54`	`54`	`{`
`55`	`55`	`return new self(sprintf('Unclosed/invalid string at %s.', $position));`
`56`	`56`	`}`