Fix parser issue always returning direct descendant

franckranaivo · franckranaivo · commit 899c929fcf2b · 2023-02-26T16:21:28.000+01:00
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -271,7 +271,7 @@ private function parseRelativeNode($stream): array {
         $next = $stream->getNext();
 
         if($next->isDelimiter(['+','-','>','~'])) {
-            $combinator = $stream->getNext()->getValue();
+            $combinator = $next->getValue();
             $stream->skipWhitespace();
             $next = $stream->getNext();
         } else {
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -183,10 +183,9 @@ public function translateElement(Node\ElementNode $node): XPathExpr
 
     public function translateRelation(Node\RelationNode $node, Translator $translator): XPathExpr
     {
-        $xpath = $translator->nodeToXPath($node->getSelector());
         $combinator = $node->getCombinator();
 
-        return $xpath->addCondition(sprintf('count(%s) > 0', $translator->addRelativeCombination($combinator,$node->getSelector(),$node->getSubSelector())));
+        return  $translator->addRelativeCombination($combinator,$node->getSelector(),$node->getSubSelector());
     }
 
     public function getName(): string
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/RelationExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/RelationExtension.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\CssSelector\XPath\Extension;
+
+use Symfony\Component\CssSelector\XPath\XPathExpr;
+
+/**
+ * XPath expression translator combination extension.
+ *
+ * This component is a port of the Python cssselect library,
+ * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
+ *
+ * @author Franck Ranaivo-Harisoa <franckranaivo@gmail.com>
+ *
+ * @internal
+ */
+class RelationExtension extends AbstractExtension
+{
+    public function getRelativeCombinationTranslators(): array
+    {
+        return [
+            ' ' => $this->translateRelationDescendant(...),
+            '>' => $this->translateRelationChild(...),
+            '+' => $this->translateRelationDirectAdjacent(...),
+            '~' => $this->translateRelationIndirectAdjacent(...),
+        ];
+    }
+
+    public function translateRelationDescendant(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
+    {
+        return $xpath->join('[descendant-or-self::', $combinedXpath, ']', true);
+    }
+
+    public function translateRelationChild(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
+    {
+        return $xpath->join('[./', $combinedXpath,']');
+    }
+
+    public function translateRelationDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
+    {
+        return $xpath
+            ->addCondition(sprintf('following-sibling::*[(name() = \'%s\') and (position() = 1)]',$combinedXpath->getElement()));
+    }
+
+    public function translateRelationIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
+    {
+        return $xpath->join('[following-sibling::', $combinedXpath,']');
+    } 
+
+    public function getName(): string
+    {
+        return 'relation';
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,9 @@ public function translateElement(Node\ElementNode $node): XPathExpr`
`183`	`183`
`184`	`184`	`public function translateRelation(Node\RelationNode $node, Translator $translator): XPathExpr`
`185`	`185`	`{`
`186`		`- $xpath = $translator->nodeToXPath($node->getSelector());`
`187`	`186`	`$combinator = $node->getCombinator();`
`188`	`187`
`189`		`- return $xpath->addCondition(sprintf('count(%s) > 0', $translator->addRelativeCombination($combinator,$node->getSelector(),$node->getSubSelector())));`
	`188`	`+ return $translator->addRelativeCombination($combinator,$node->getSelector(),$node->getSubSelector());`
`190`	`189`	`}`
`191`	`190`
`192`	`191`	`public function getName(): string`