bug #12187 [CssSelector] don't raise warnings when exception is thrown (xabbuh)

fabpot · fabpot · commit a45c187132b4 · 2014-10-09T16:28:21.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [CssSelector] don't raise warnings when exception is thrown | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11947 | License | MIT | Doc PR | `array_map()` raises a warning when an exception is thrown inside the callback (see https://bugs.php.net/bug.php?id=55416). To avoid these warnings, `selectorToXPath()` is applied inside the loop. Commits ------- 38e9623 don't raise warnings when exception is thrown
diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -123,17 +123,15 @@ public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::')
         $selectors = $this->parseSelectors($cssExpr);
 
         /** @var SelectorNode $selector */
-        foreach ($selectors as $selector) {
+        foreach ($selectors as $index => $selector) {
             if (null !== $selector->getPseudoElement()) {
                 throw new ExpressionErrorException('Pseudo-elements are not supported.');
             }
-        }
 
-        $translator = $this;
+            $selectors[$index] = $this->selectorToXPath($selector, $prefix);
+        }
 
-        return implode(' | ', array_map(function (SelectorNode $selector) use ($translator, $prefix) {
-            return $translator->selectorToXPath($selector, $prefix);
-        }, $selectors));
+        return implode(' | ', $selectors);
     }
 
     /**
