Merge branch '2.3' into 2.4

fabpot · fabpot · commit 272490312a1a · 2014-04-30T08:22:28.000+02:00
* 2.3: [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -144,6 +144,9 @@ function ($row) {
             if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                 require __DIR__.'/Exception/ContextErrorException.php';
             }
+            if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {
+                require __DIR__.'/Exception/FlattenException.php';
+            }
 
             if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
                 unset($context['GLOBALS']);

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ function ($row) {`
`144`	`144`	`if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {`
`145`	`145`	`require __DIR__.'/Exception/ContextErrorException.php';`
`146`	`146`	`}`
	`147`	`+ if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {`
	`148`	`+ require __DIR__.'/Exception/FlattenException.php';`
	`149`	`+ }`
`147`	`150`
`148`	`151`	`if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {`
`149`	`152`	`unset($context['GLOBALS']);`