Merge branch '2.3' into 2.4

* 2.3:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
This commit is contained in:
Fabien Potencier 2014-04-30 08:22:28 +02:00
commit 272490312a

View File

@ -144,6 +144,9 @@ class ErrorHandler
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']);