Merge branch '2.3' into 2.4
* 2.3: [TwigBridge][Trans]set %count% only on transChoice [DomCrawler] Fixed a forgotten case of complex XPath queries bumped Symfony version to 2.3.16 updated VERSION for 2.3.15 updated CHANGELOG for 2.3.15 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
This commit is contained in:
commit
4ba44a786c
@ -7,6 +7,10 @@ in 2.3 minor versions.
|
||||
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
|
||||
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
|
||||
|
||||
* 2.3.15 (2014-05-22)
|
||||
|
||||
* reverted #10908
|
||||
|
||||
* 2.3.14 (2014-05-22)
|
||||
|
||||
* bug #10849 [WIP][Finder] Fix wrong implementation on sortable callback comparator (ProPheT777)
|
||||
|
@ -98,7 +98,7 @@ class TransNode extends \Twig_Node
|
||||
foreach ($matches[1] as $var) {
|
||||
$key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
|
||||
if (!$vars->hasElement($key)) {
|
||||
if ('count' === $var) {
|
||||
if ('count' === $var && null !== $this->getNode('count')) {
|
||||
$vars->addElement($this->getNode('count'), $key);
|
||||
} else {
|
||||
$varExpr = new \Twig_Node_Expression_Name($var, $body->getLine());
|
||||
|
@ -876,6 +876,8 @@ class Crawler extends \SplObjectStorage
|
||||
$expression = $nonMatchingExpression;
|
||||
} elseif (0 === strpos($expression, '//')) {
|
||||
$expression = 'descendant-or-self::' . substr($expression, 2);
|
||||
} elseif (0 === strpos($expression, './/')) {
|
||||
$expression = 'descendant-or-self::' . substr($expression, 3);
|
||||
} elseif (0 === strpos($expression, './')) {
|
||||
$expression = 'self::' . substr($expression, 2);
|
||||
} elseif ('/' === $expression[0]) {
|
||||
|
@ -388,6 +388,8 @@ EOF
|
||||
$this->assertCount(0, $crawler->filterXPath('/body'));
|
||||
$this->assertCount(1, $crawler->filterXPath('/_root/body'));
|
||||
$this->assertCount(1, $crawler->filterXPath('./body'));
|
||||
$this->assertCount(1, $crawler->filterXPath('.//body'));
|
||||
$this->assertCount(5, $crawler->filterXPath('.//input'));
|
||||
$this->assertCount(4, $crawler->filterXPath('//form')->filterXPath('//button | //input'));
|
||||
$this->assertCount(1, $crawler->filterXPath('body'));
|
||||
$this->assertCount(6, $crawler->filterXPath('//button | //input'));
|
||||
|
Reference in New Issue
Block a user