From 7bd0873550f205ec120a7bb4d967db79a68ec446 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 22 May 2014 19:23:16 +0200 Subject: [PATCH 1/5] updated CHANGELOG for 2.3.15 --- CHANGELOG-2.3.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG-2.3.md b/CHANGELOG-2.3.md index d1ee162f3e..7d1982188b 100644 --- a/CHANGELOG-2.3.md +++ b/CHANGELOG-2.3.md @@ -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) From 424a567d2c1fb918a32f302b5c2bcb67d2661e76 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 22 May 2014 19:23:49 +0200 Subject: [PATCH 2/5] updated VERSION for 2.3.15 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index e772a031fc..bff30683e2 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -60,12 +60,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.3.15-DEV'; + const VERSION = '2.3.15'; const VERSION_ID = '20315'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '3'; const RELEASE_VERSION = '15'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From 29341fab1bbbc284a9bf12cc3bc602633a412a4d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 22 May 2014 22:22:15 +0200 Subject: [PATCH 3/5] bumped Symfony version to 2.3.16 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index bff30683e2..5362d05883 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -60,12 +60,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.3.15'; - const VERSION_ID = '20315'; + const VERSION = '2.3.16-DEV'; + const VERSION_ID = '20316'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '3'; - const RELEASE_VERSION = '15'; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = '16'; + const EXTRA_VERSION = 'DEV'; /** * Constructor. From a9de61e86d70f2b6f1f86361f2d418b2f738e1e8 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Sat, 24 May 2014 19:15:07 +0200 Subject: [PATCH 4/5] [DomCrawler] Fixed a forgotten case of complex XPath queries --- src/Symfony/Component/DomCrawler/Crawler.php | 2 ++ src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index de65978614..558d35b2b6 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -839,6 +839,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]) { diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php index 04921f693c..fc7524b292 100644 --- a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php +++ b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php @@ -376,6 +376,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')); From d176ffca512893d3c01246d9e8e3a6cb72b76962 Mon Sep 17 00:00:00 2001 From: Abdellatif AitBoudad Date: Mon, 26 May 2014 14:22:36 +0100 Subject: [PATCH 5/5] [TwigBridge][Trans]set %count% only on transChoice --- src/Symfony/Bridge/Twig/Node/TransNode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php index d459290b6f..71823a1b78 100644 --- a/src/Symfony/Bridge/Twig/Node/TransNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransNode.php @@ -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());