symfony
diff --git a/‎src/Symfony/Component/DomCrawler/Crawler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+42-52Lines changed: 42 additions & 52 deletions b/‎src/Symfony/Component/DomCrawler/Crawler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+42-52Lines changed: 42 additions & 52 deletions
@@ -860,18 +860,42 @@ private function relativize($xpath)
         // We cannot simply drop
         $nonMatchingExpression = 'a[name() = "b"]';
 
-        // Split any unions into individual expressions.
-        foreach ($this->splitUnionParts($xpath) as $expression) {
-            $expression = trim($expression);
-            $parenthesis = '';
-
-            // If the union is inside some braces, we need to preserve the opening braces and apply
-            // the change only inside it.
-            if (preg_match('/^[\(\s*]+/', $expression, $matches)) {
-                $parenthesis = $matches[0];
-                $expression = substr($expression, strlen($parenthesis));
+        $xpathLen = strlen($xpath);
+        $openedBrackets = 0;
+        $lastUnion = strspn($xpath, " \t\n\r\0\x0B");
+
+        for ($i = $lastUnion; $i <= $xpathLen; ++$i) {
+            $i += strcspn($xpath, '"\'[]|', $i);
+
+            if ($i < $xpathLen) {
+                switch ($xpath[$i]) {
+                    case '"':
+                    case "'":
+                        if (false === $i = strpos($xpath, $xpath[$i], $i + 1)) {
+                            return $xpath; // The XPath expression is invalid
+                        }
+                        continue 2;
+                    case '[':
+                    case ']':
+                        $openedBrackets += '[' === $xpath[$i] ? 1 : -1;
+                        continue 2;
+                }
+            }
+            if ($openedBrackets) {
+                continue;
             }
 
+            if ('(' === $xpath[$lastUnion]) {
+                // If the union is inside some braces, we need to preserve the opening braces and apply
+                // the change only inside it.
+                $j = 1 + strspn($xpath, "( \t\n\r\0\x0B", $lastUnion + 1);
+                $parenthesis = substr($xpath, $lastUnion, $j);
+                $lastUnion += $j;
+            } else {
+                $parenthesis = '';
+            }
+            $expression = rtrim(substr($xpath, $lastUnion, $i - $lastUnion));
+
             // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
             if (0 === strpos($expression, '/_root/')) {
                 $expression = './'.substr($expression, 7);
@@ -880,7 +904,7 @@ private function relativize($xpath)
             }
 
             // add prefix before absolute element selector
-            if (empty($expression)) {
+            if ('' === $expression) {
                 $expression = $nonMatchingExpression;
             } elseif (0 === strpos($expression, '//')) {
                 $expression = 'descendant-or-self::'.substr($expression, 2);
@@ -898,58 +922,24 @@ private function relativize($xpath)
                 // '.' is the fake root element in Symfony 2.4 and lower, which is excluded from results
                 $expression = $nonMatchingExpression;
             } elseif (0 === strpos($expression, 'descendant::')) {
-                $expression = 'descendant-or-self::'.substr($expression, strlen('descendant::'));
+                $expression = 'descendant-or-self::'.substr($expression, 12);
             } elseif (preg_match('/^(ancestor|ancestor-or-self|attribute|following|following-sibling|namespace|parent|preceding|preceding-sibling)::/', $expression)) {
                 // the fake root has no parent, preceding or following nodes and also no attributes (even no namespace attributes)
                 $expression = $nonMatchingExpression;
             } elseif (0 !== strpos($expression, 'descendant-or-self::')) {
                 $expression = 'self::'.$expression;
             }
             $expressions[] = $parenthesis.$expression;
-        }
 
-        return implode(' | ', $expressions);
-    }
-
-    /**
-     * Splits the XPath into parts that are separated by the union operator.
-     *
-     * @param string $xpath
-     *
-     * @return string[]
-     */
-    private function splitUnionParts($xpath)
-    {
-        // Split any unions into individual expressions. We need to iterate
-        // through the string to correctly parse opening/closing quotes and
-        // braces which is not possible with regular expressions.
-        $unionParts = array();
-        $inSingleQuotedString = false;
-        $inDoubleQuotedString = false;
-        $openedBrackets = 0;
-        $lastUnion = 0;
-        $xpathLength = strlen($xpath);
-        for ($i = 0; $i < $xpathLength; ++$i) {
-            $char = $xpath[$i];
-
-            if ($char === "'" && !$inDoubleQuotedString) {
-                $inSingleQuotedString = !$inSingleQuotedString;
-            } elseif ($char === '"' && !$inSingleQuotedString) {
-                $inDoubleQuotedString = !$inDoubleQuotedString;
-            } elseif (!$inSingleQuotedString && !$inDoubleQuotedString) {
-                if ($char === '[') {
-                    ++$openedBrackets;
-                } elseif ($char === ']') {
-                    --$openedBrackets;
-                } elseif ($char === '|' && $openedBrackets === 0) {
-                    $unionParts[] = substr($xpath, $lastUnion, $i - $lastUnion);
-                    $lastUnion = $i + 1;
-                }
+            if ($i === $xpathLen) {
+                return implode(' | ', $expressions);
             }
+
+            $i += strspn($xpath, " \t\n\r\0\x0B", $i + 1);
+            $lastUnion = $i + 1;
         }
-        $unionParts[] = substr($xpath, $lastUnion);
 
-        return $unionParts;
+        return $xpath; // The XPath expression is invalid
     }
 
     /**