Merge branch '2.3' into 2.4

* 2.3: fixed various inconsistencies reduced recursion when building DumperPrefixCollection renamed variables - making next change more readable removing dead code. [DomCrawler] Fixed filterXPath() chaining [DomCrawler] Fixed incorrect handling of image inputs Conflicts: src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
fixed various inconsistencies
2026-03-25 01:32:09 +01:00 · 2014-02-11 14:52:09 +01:00 · 2014-02-11 11:29:24 +01:00 · 2014-02-04 11:54:30 +01:00 · 2014-02-04 08:06:39 +01:00 · 2014-01-07 14:28:54 +01:00
3 changed files with 3 additions and 3 deletions
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -249,7 +249,7 @@ class FlattenException
                if ($level > 10) {
                    $result[$key] = array('array', '*DEEP NESTED ARRAY*');
                } else {
-                    $result[$key] = array('array', $this->flattenArgs($value, ++$level));
+                    $result[$key] = array('array', $this->flattenArgs($value, $level + 1));
                }
            } elseif (null === $value) {
                $result[$key] = array('null', null);
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 Fabien Potencier
+Copyright (c) 2004-2014 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/Tests/ExceptionHandlerTest.php
+++ b/Tests/ExceptionHandlerTest.php
@@ -57,6 +57,6 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
    public function testNestedExceptions()
    {
        $handler = new ExceptionHandler(true);
-        $response = $handler->createResponse(new \RuntimeException('Foo', null, new \RuntimeException('Bar')));
+        $response = $handler->createResponse(new \RuntimeException('Foo', 0, new \RuntimeException('Bar')));
    }
 }
Author	SHA1	Message	Date
Fabien Potencier	23b5f4fcad	Merge branch '2.3' into 2.4 * 2.3: fixed various inconsistencies reduced recursion when building DumperPrefixCollection renamed variables - making next change more readable removing dead code. [DomCrawler] Fixed filterXPath() chaining [DomCrawler] Fixed incorrect handling of image inputs Conflicts: src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php	2014-02-11 14:52:09 +01:00
Fabien Potencier	4885c636af	fixed various inconsistencies	2014-02-11 11:29:24 +01:00
Fabien Potencier	684a4c9e5f	Merge branch '2.3' into 2.4 * 2.3: added missing @deprecated tag Fixed recursion level incrementing in FlattenException::flattenArgs(). [HttpKernel] fixed wrong reference in TraceableEventDispatcher Conflicts: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php	2014-02-04 11:54:30 +01:00
sun	6a55635898	Fixed recursion level incrementing in FlattenException::flattenArgs().	2014-02-04 08:06:39 +01:00
Fabien Potencier	7bd04476b5	Merge branch '2.3' into 2.4 * 2.3: update year on licenses rundown and typo fix [Process] Fix #9861 : Revert TTY mode [Form] Update minimal requirement in composer.json Fix Empty translations with Qt files Update UPGRADE-2.3.md to account for #9388 Conflicts: src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php	2014-01-07 14:28:54 +01:00
Luis Cordova	7f875d2aae	update year on licenses	2014-01-07 08:19:25 -05:00