Merge branch '2.5'

* 2.5: [TwigBridge][Trans]set %count% only on transChoice [Debug] throw even in stacking mode to preserve code paths [Debug] preserve modified error level [DomCrawler] Fixed a forgotten case of complex XPath queries bumped Symfony version to 2.4.6 updated VERSION for 2.4.5 updated CHANGELOG for 2.4.5 bumped Symfony version to 2.3.16 updated VERSION for 2.3.15 updated CHANGELOG for 2.3.15

Author: fabpot

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)

CHANGELOG-2.4.md

@@ -7,6 +7,38 @@ in 2.4 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.4.0...v2.4.1
 
+* 2.4.5 (2014-05-22)
+
+ * bug #10849 [WIP][Finder] Fix wrong implementation on sortable callback comparator (ProPheT777)
+ * bug #10929 [Process] Add validation on Process input (romainneutron)
+ * bug #10958 [DomCrawler] Fixed filterXPath() chaining loosing the parent DOM nodes (stof, robbertkl)
+ * bug #10953 [HttpKernel] fixed file uploads in functional tests without file selected (realmfoo)
+ * bug #10947 [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations (webmozart)
+ * bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)
+ * bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)
+ * bug #10926 [DomCrawler] Fixed the initial state for options without value attribute (stof)
+ * bug #10925 [DomCrawler] Fixed the handling of boolean attributes in ChoiceFormField (stof)
+ * bug #10777 [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed (tucksaun)
+ * bug #10909 [PropertyAccess] Fixed plurals for -ves words (csarrazi)
+ * bug #10904 [HttpKernel] Replace sha1 with sha256 in recently added tests (jakzal)
+ * bug #10899 Explicitly define the encoding. (jakzal)
+ * bug #10897 [Console] Fix a console test (jakzal)
+ * bug #10896 [HttpKernel] Fixed cache behavior when TTL has expired and a default "global" TTL is defined (alquerci, fabpot)
+ * bug #10841 [DomCrawler] Fixed image input case sensitive (geoffrey-brier)
+ * bug #10714 [Console]Improve formatter for double-width character (denkiryokuhatsuden)
+ * bug #10872 [Form] Fixed TrimListenerTest as of PHP 5.5 (webmozart)
+ * bug #10762 [BrowserKit] Allow URLs that don't contain a path when creating a cookie from a string (thewilkybarkid)
+ * bug #10863 [Security] Add check for supported attributes in AclVoter (artursvonda)
+ * bug #10833 [TwigBridge][Transchoice] set %count% from the current context. (aitboudad)
+ * bug #10820 [WebProfilerBundle] Fixed profiler seach/homepage with empty token (tucksaun)
+ * bug #10815 Fixed issue #5427 (umpirsky)
+ * bug #10817 [Debug] fix #10313: FlattenException not found (nicolas-grekas)
+ * bug #10803 [Debug] fix ErrorHandlerTest when context is not an array (nicolas-grekas)
+ * bug #10801 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 (nicolas-grekas)
+ * bug #10797 [HttpFoundation] Allow File instance to be passed to BinaryFileResponse (anlutro)
+ * bug #10643 [TwigBridge] Removed strict check when found variables inside a translation (goetas)
+ * bug #10605 [ExpressionLanguage] Strict in_array check in Parser.php (parnas)
+
 * 2.4.4 (2014-04-27)
 
  * bug #10789 [Console] Fixed the rendering of exceptions on HHVM with a terminal width (stof)

src/Symfony/Bridge/Twig/Node/TransNode.php

@@ -98,7 +98,7 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
  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());

src/Symfony/Component/Debug/ErrorHandler.php

@@ -117,7 +117,7 @@ public static function setLogger(LoggerInterface $logger, $channel = 'deprecatio
  }
 
  /**
- * @throws ContextErrorException When error_reporting returns error
+ * @throws \ErrorException When error_reporting returns error
  */
  public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
  {
@@ -145,18 +145,19 @@ function ($row) {
  return true;
  }
  } elseif ($this->displayErrors && error_reporting() & $level && $this->level & $level) {
- if (self::$stackedErrorLevels) {
- self::$stackedErrors[] = func_get_args();
-
- return true;
- }
-
  if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
- unset($context['GLOBALS']);
+ $c = $context; // Whatever the signature of the method,
+ unset($c['GLOBALS'], $context); // $context is always a reference in 5.3
+ $context = $c;
  }
 
  $exception = sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line);
- $exception = new ContextErrorException($exception, 0, $level, $file, $line, $context);
+ if ($context && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
+ // Checking for class existence is a work around for https://bugs.php.net/42098
+ $exception = new ContextErrorException($exception, 0, $level, $file, $line, $context);
+ } else {
+ $exception = new \ErrorException($exception, 0, $level, $file, $line);
+ }
 
  if (PHP_VERSION_ID <= 50407 && (PHP_VERSION_ID >= 50400 || PHP_VERSION_ID <= 50317)) {
  // Exceptions thrown from error handlers are sometimes not caught by the exception
@@ -225,7 +226,11 @@ public static function unstackErrors()
  $level = array_pop(self::$stackedErrorLevels);
 
  if (null !== $level) {
- error_reporting($level);
+ $e = error_reporting($level);
+ if ($e !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
+ // If the user changed the error level, do not overwrite it
+ error_reporting($e);
+ }
  }
 
  if (empty(self::$stackedErrorLevels)) {

src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

@@ -99,7 +99,7 @@ public function testStacking()
  class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
  ');
  $this->fail('ContextErrorException expected');
- } catch (ContextErrorException $exception) {
+ } catch (\ErrorException $exception) {
  // if an exception is thrown, the test passed
  restore_error_handler();
  restore_exception_handler();

src/Symfony/Component/DomCrawler/Crawler.php

@@ -874,6 +874,8 @@ private function relativize($xpath)
  $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]) {

src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php

@@ -388,6 +388,8 @@ public function testFilterXpathComplexQueries()
  $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'));