Fix: remove unused method

Franck RANAIVO-HARISOA · Franck · commit 9dc472a2227e · 2025-02-14T18:13:02.000+01:00
diff --git a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -48,11 +48,6 @@ public static function notAtTheStartOfASelector(string $pseudoElement): self
         return new self(\sprintf('Got immediate child pseudo-element ":%s" not at the start of a selector', $pseudoElement));
     }
 
-    public static function nestedHas(): self
-    {
-        return new self('Got nested :has().');
-    }
-
     public static function stringAsFunctionArgument(): self
     {
         return new self('String not allowed as function argument.');
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\CssSelector\Parser;
 
+use Symfony\Component\CssSelector\Exception\InternalErrorException;
 use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
 use Symfony\Component\CssSelector\Node;
 use Symfony\Component\CssSelector\Parser\Tokenizer\Tokenizer;
@@ -144,10 +145,42 @@ private function parserSelectorNode(TokenStream $stream, bool $isArgument = fals
         return new Node\SelectorNode($result, $pseudoElement);
     }
 
+    /**
+     * @throws InternalErrorException
+     * @throws SyntaxErrorException
+     */
+    function parseRelativeSelector(TokenStream $stream): array
+    {
+        $stream->skipWhitespace();
+        $subSelector = '';
+        $next = $stream->getNext();
+
+        if ($next->isDelimiter(['-', '+', '>', '~'])) {
+            $combinator = $next->getValue();
+            $stream->skipWhitespace();
+            $next = $stream->getNext();
+        } else {
+            $combinator = new Token(Token::TYPE_DELIMITER, ' ', 0);
+        }
+
+        while(true){
+            if ($next->isString() || $next->isIdentifier() || $next->isNumber()
+                || $next->isDelimiter(['.', '*'])) {
+                $subSelector .= $next->getValue();
+            } elseif ($next->isDelimiter([')'])) {
+                $result = $this->parse($subSelector);
+                return [$combinator, $result[0]];
+            } else {
+                throw SyntaxErrorException::unexpectedToken('an argument', $next);
+            }
+            $next = $stream->getNext();
+        }
+    }
+
     /**
      * Parses next simple node (hash, class, pseudo, negation).
      *
-     * @throws SyntaxErrorException
+     * @throws SyntaxErrorException|InternalErrorException
      */
     private function parseSimpleSelector(TokenStream $stream, bool $insideNegation = false, bool $isArgument = false): array
     {
@@ -253,6 +286,9 @@ private function parseSimpleSelector(TokenStream $stream, bool $insideNegation =
                     }
 
                     $result = new Node\SpecificityAdjustmentNode($result, $selectors);
+                } elseif('has' === strtolower($identifier)) {
+                    [$combinator, $arguments] = $this->parseRelativeSelector($stream);
+                    $result = new Node\RelationNode($result, $combinator ,$arguments);
                 } else {
                     $arguments = [];
                     $next = null;
diff --git a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
@@ -235,6 +235,10 @@ public static function getCssToXPathTestData()
             [':scope', '*[1]'],
             ['e:is(section, article) h1', "e[(name() = 'section') or (name() = 'article')]/descendant-or-self::*/h1"],
             ['e:where(section, article) h1', "e[(name() = 'section') or (name() = 'article')]/descendant-or-self::*/h1"],
+            ['div:has(> .foo)', "div[./*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]]"],
+            ['div:has(~ .foo)', "div[following-sibling::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]]"],
+            ['div:has(+ .foo)', "div[following-sibling::*[(@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')) and (position() = 1)]]"],
+            ['div:has(+ .foo)', "div[following-sibling::*[(@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')) and (position() = 1)]]"],
         ];
     }
 
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
@@ -15,7 +15,7 @@
  * XPath expression translator abstract extension.
  *
  * 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>
  *

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,6 @@ public static function notAtTheStartOfASelector(string $pseudoElement): self`
`48`	`48`	`return new self(\sprintf('Got immediate child pseudo-element ":%s" not at the start of a selector', $pseudoElement));`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static function nestedHas(): self`
`52`		`- {`
`53`		`- return new self('Got nested :has().');`
`54`		`- }`
`55`		`-`
`56`	`51`	`public static function stringAsFunctionArgument(): self`
`57`	`52`	`{`
`58`	`53`	`return new self('String not allowed as function argument.');`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* XPath expression translator abstract extension.`
`16`	`16`	`*`
`17`	`17`	`* This component is a port of the Python cssselect library,`
`18`		`- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.`
	`18`	`+ * which is copyright Ian Bicking, @see https://github.com/scrapy/cssselect.`
`19`	`19`	`*`
`20`	`20`	`* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>`
`21`	`21`	`*`