diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
This commit is contained in:
Fabien Potencier 2014-10-09 16:28:21 +02:00
parent 6df49bb9e1 38e9623ca4
commit a45c187132
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/CssSelector/XPath/Translator.php
View File

@ -123,17 +123,15 @@ class Translator implements TranslatorInterface
$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.');
}
$selectors[$index] = $this->selectorToXPath($selector, $prefix);
}
$translator = $this;
return implode(' | ', array_map(function (SelectorNode $selector) use ($translator, $prefix) {
return $translator->selectorToXPath($selector, $prefix);
}, $selectors));
return implode(' | ', $selectors);
}
/**