[CssSelector] Fix BC break by adding @method instead of directly adding it

franckranaivo · franckranaivo · commit 590fc9a70ad9 · 2023-03-02T11:30:51.000+01:00
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -108,7 +108,7 @@ private function parseSelectorList(TokenStream $stream): array
 
     private function parserSelectorNode(TokenStream $stream): Node\SelectorNode
     {
-        [$result, $pseudoElement] = $this->parseSimpleSelector($stream, false);
+        [$result, $pseudoElement] = $this->parseSimpleSelector($stream);
 
         while (true) {
             $stream->skipWhitespace();
@@ -129,7 +129,7 @@ private function parserSelectorNode(TokenStream $stream): Node\SelectorNode
                 $combinator = ' ';
             }
 
-            [$nextSelector, $pseudoElement] = $this->parseSimpleSelector($stream, false);
+            [$nextSelector, $pseudoElement] = $this->parseSimpleSelector($stream);
             $result = new Node\CombinedSelectorNode($result, $combinator, $nextSelector);
         }
 
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php b/src/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php
@@ -15,10 +15,12 @@
  * XPath expression translator extension interface.
  *
  * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
+ * which is copyright Ian Bicking, @see https://github.com/scrapy/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- *
+ * 
+ * @method array<string, callable(XPathExpr, XPathExpr): XPathExpr> getRelativeCombinationTranslators() Returns combination translators found inside ":has()" relation.
+ * 
  * @internal
  */
 interface ExtensionInterface
@@ -60,13 +62,6 @@ public function getPseudoClassTranslators(): array;
      */
     public function getAttributeMatchingTranslators(): array;
 
-    /**
-     * Returns relative combinators translators.
-     *
-     * @return callable[]
-     */
-    public function getRelativeCombinationTranslators(): array;
-
     /**
      * Returns extension name.
      */

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private function parseSelectorList(TokenStream $stream): array`
`108`	`108`
`109`	`109`	`private function parserSelectorNode(TokenStream $stream): Node\SelectorNode`
`110`	`110`	`{`
`111`		`- [$result, $pseudoElement] = $this->parseSimpleSelector($stream, false);`
	`111`	`+ [$result, $pseudoElement] = $this->parseSimpleSelector($stream);`
`112`	`112`
`113`	`113`	`while (true) {`
`114`	`114`	`$stream->skipWhitespace();`
`@@ -129,7 +129,7 @@ private function parserSelectorNode(TokenStream $stream): Node\SelectorNode`
`129`	`129`	`$combinator = ' ';`
`130`	`130`	`}`
`131`	`131`
`132`		`- [$nextSelector, $pseudoElement] = $this->parseSimpleSelector($stream, false);`
	`132`	`+ [$nextSelector, $pseudoElement] = $this->parseSimpleSelector($stream);`
`133`	`133`	`$result = new Node\CombinedSelectorNode($result, $combinator, $nextSelector);`
`134`	`134`	`}`
`135`	`135`