bug #10817 [Debug] fix #10313: FlattenException not found (nicolas-grekas)

fabpot · fabpot · commit c18bf19016cc · 2014-04-30T08:22:14.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Debug] fix #10313: FlattenException not found | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10313 | License | MIT | Doc PR | none Note that this patch should be ignored while merging into 2.5/master (it will conflict because 2.5/master has a much stronger workaround, not suitable for a minor release IMHO). Commits ------- b147cfa [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
@@ -125,6 +125,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
`@@ -125,6 +125,9 @@ function ($row) {`
`125`	`125`	`if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {`
`126`	`126`	`require __DIR__.'/Exception/ContextErrorException.php';`
`127`	`127`	`}`
	`128`	`+ if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {`
	`129`	`+ require __DIR__.'/Exception/FlattenException.php';`
	`130`	`+ }`
`128`	`131`
`129`	`132`	`if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {`
`130`	`133`	`unset($context['GLOBALS']);`