Merge branch '2.4'

fabpot · fabpot · commit 49bc4f146936 · 2014-04-30T08:22:38.000+02:00
* 2.4: [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
@@ -165,6 +165,9 @@ function ($row) {
 
                 return true;
             }
+            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
`@@ -165,6 +165,9 @@ function ($row) {`
`165`	`165`
`166`	`166`	`return true;`
`167`	`167`	`}`
	`168`	`+ if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {`
	`169`	`+ require __DIR__.'/Exception/FlattenException.php';`
	`170`	`+ }`
`168`	`171`
`169`	`172`	`if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {`
`170`	`173`	`unset($context['GLOBALS']);`