bug #29869 [Debug][ErrorHandler] Preserve our error handler when a logger sets another one (fancyweb)

This PR was merged into the 3.4 branch. Discussion ---------- [Debug][ErrorHandler] Preserve our error handler when a logger sets another one | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When logging errors handled by the `ErrorHandler::handleError()` method, the logger can temporarily set its own custom error handler. This is for example the case of `Monolog` in the `StreamHandler` class (cf ebb804e432/src/Monolog/Handler/StreamHandler.php (L101)). However, when the previous error handler is restored by the logger, it "skips" the real previous handler (the `ErrorHandler::handleError()` one) in the pile and goes back directly to the one before. I guess this is because the `restore_error_handler()` call is technically done in the error handler itself, so it logically restore it to the one before and not to itself. Here is an easy small example that shows the PHP behavior : https://3v4l.org/4OZNZ The only solution I have found to fix it is to set our error handler everytime an error is logged. Here are the things I discovered while trying to find a cleaner fix : - Setting the same error handler in the error handler itself doesn't actually add it to the pile. This is why adding a check is useless. - Checking if the logger modified the error handler is impossible anyway : to get the current error handler, you need to set a new one temporarirly and then revert it. However, when you revert it by calling `restore_error_handler()` you end up having the same problem you are trying to fix... - Also trying to get the current error handler in the error handler itself will return NULL if it is itself. Commits ------- b979fff6b8 [Debug][ErrorHandler] Preserve our error handler when a logger set another one
[Debug][ErrorHandler] Preserve our error handler when a logger set another one
2026-03-25 17:52:07 +01:00 · 2019-01-25 11:19:25 +01:00 · 2019-01-24 21:41:57 +01:00 · 2019-01-17 18:28:22 +01:00 · 2019-01-16 14:27:11 +01:00 · 2019-01-16 10:39:14 +01:00
48 changed files with 1817 additions and 489 deletions
--- a/BufferingLogger.php
+++ b/BufferingLogger.php
@@ -20,17 +20,17 @@ use Psr\Log\AbstractLogger;
 */
 class BufferingLogger extends AbstractLogger
 {
-    private $logs = array();
+    private $logs = [];

-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
    {
-        $this->logs[] = array($level, $message, $context);
+        $this->logs[] = [$level, $message, $context];
    }

    public function cleanLogs()
    {
        $logs = $this->logs;
-        $this->logs = array();
+        $this->logs = [];

        return $logs;
    }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,6 @@
 CHANGELOG
 =========

-4.0.0
-----
-
-* removed the symfony_debug extension
-* removed `ContextErrorException`
-
 3.4.0
 -----

--- a/Debug.php
+++ b/Debug.php
@@ -23,7 +23,7 @@ class Debug
    /**
     * Enables the debug tools.
     *
-     * This method registers an error handler and an exception handler.
+     * This method registers an error handler, an exception handler and a special class loader.
     *
     * @param int  $errorReportingLevel The level of error reporting you want
     * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
@@ -42,7 +42,7 @@ class Debug
            error_reporting(E_ALL);
        }

-        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
            ini_set('display_errors', 0);
            ExceptionHandler::register();
        } elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -26,15 +26,16 @@ class DebugClassLoader
 {
    private $classLoader;
    private $isFinder;
-    private $loaded = array();
+    private $loaded = [];
    private static $caseCheck;
-    private static $checkedClasses = array();
-    private static $final = array();
-    private static $finalMethods = array();
-    private static $deprecated = array();
-    private static $internal = array();
-    private static $internalMethods = array();
-    private static $darwinCache = array('/' => array('/', array()));
+    private static $checkedClasses = [];
+    private static $final = [];
+    private static $finalMethods = [];
+    private static $deprecated = [];
+    private static $internal = [];
+    private static $internalMethods = [];
+    private static $php7Reserved = ['int' => 1, 'float' => 1, 'bool' => 1, 'string' => 1, 'true' => 1, 'false' => 1, 'null' => 1];
+    private static $darwinCache = ['/' => ['/', []]];

    public function __construct(callable $classLoader)
    {
@@ -94,7 +95,7 @@ class DebugClassLoader

        foreach ($functions as $function) {
            if (!\is_array($function) || !$function[0] instanceof self) {
-                $function = array(new static($function), 'loadClass');
+                $function = [new static($function), 'loadClass'];
            }

            spl_autoload_register($function);
@@ -123,6 +124,14 @@ class DebugClassLoader
        }
    }

+    /**
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        return $this->isFinder ? $this->classLoader[0]->findFile($class) ?: null : null;
+    }
+
    /**
     * Loads the given class or interface.
     *
@@ -137,14 +146,14 @@ class DebugClassLoader
        try {
            if ($this->isFinder && !isset($this->loaded[$class])) {
                $this->loaded[$class] = true;
-                if ($file = $this->classLoader[0]->findFile($class) ?: false) {
-                    $wasCached = \function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file);
-
+                if (!$file = $this->classLoader[0]->findFile($class) ?: false) {
+                    // no-op
+                } elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) {
                    require $file;

-                    if ($wasCached) {
-                        return;
-                    }
+                    return;
+                } else {
+                    require $file;
                }
            } else {
                \call_user_func($this->classLoader, $class);
@@ -183,6 +192,10 @@ class DebugClassLoader

            $deprecations = $this->checkAnnotations($refl, $name);

+            if (isset(self::$php7Reserved[\strtolower($refl->getShortName())])) {
+                $deprecations[] = sprintf('The "%s" class uses the reserved name "%s", it will break on PHP 7 and higher', $name, $refl->getShortName());
+            }
+
            foreach ($deprecations as $message) {
                @trigger_error($message, E_USER_DEPRECATED);
            }
@@ -207,21 +220,21 @@ class DebugClassLoader

    public function checkAnnotations(\ReflectionClass $refl, $class)
    {
-        $deprecations = array();
+        $deprecations = [];

        // Don't trigger deprecations for classes in the same vendor
        if (2 > $len = 1 + (\strpos($class, '\\') ?: \strpos($class, '_'))) {
            $len = 0;
            $ns = '';
        } else {
-            $ns = \substr($class, 0, $len);
+            $ns = \str_replace('_', '\\', \substr($class, 0, $len));
        }

        // Detect annotations on the class
        if (false !== $doc = $refl->getDocComment()) {
-            foreach (array('final', 'deprecated', 'internal') as $annotation) {
-                if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
-                    self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+            foreach (['final', 'deprecated', 'internal'] as $annotation) {
+                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
+                    self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
                }
            }
        }
@@ -245,13 +258,13 @@ class DebugClassLoader
            if (!isset(self::$checkedClasses[$use])) {
                $this->checkClass($use);
            }
-            if (isset(self::$deprecated[$use]) && \strncmp($ns, $use, $len)) {
+            if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) {
                $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
                $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');

                $deprecations[] = sprintf('The "%s" %s %s "%s" that is deprecated%s.', $class, $type, $verb, $use, self::$deprecated[$use]);
            }
-            if (isset(self::$internal[$use]) && \strncmp($ns, $use, $len)) {
+            if (isset(self::$internal[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) {
                $deprecations[] = sprintf('The "%s" %s is considered internal%s. It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $class);
            }
        }
@@ -261,10 +274,10 @@ class DebugClassLoader
        }

        // Inherit @final and @internal annotations for methods
-        self::$finalMethods[$class] = array();
-        self::$internalMethods[$class] = array();
+        self::$finalMethods[$class] = [];
+        self::$internalMethods[$class] = [];
        foreach ($parentAndOwnInterfaces as $use) {
-            foreach (array('finalMethods', 'internalMethods') as $property) {
+            foreach (['finalMethods', 'internalMethods'] as $property) {
                if (isset(self::${$property}[$use])) {
                    self::${$property}[$class] = self::${$property}[$class] ? self::${$property}[$use] + self::${$property}[$class] : self::${$property}[$use];
                }
@@ -293,10 +306,10 @@ class DebugClassLoader
                continue;
            }

-            foreach (array('final', 'internal') as $annotation) {
+            foreach (['final', 'internal'] as $annotation) {
                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
-                    $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
-                    self::${$annotation.'Methods'}[$class][$method->name] = array($class, $message);
+                    $message = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
+                    self::${$annotation.'Methods'}[$class][$method->name] = [$class, $message];
                }
            }
        }
@@ -334,7 +347,7 @@ class DebugClassLoader
        if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
            && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
        ) {
-            return array(substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1));
+            return [substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)];
        }
    }

@@ -364,7 +377,7 @@ class DebugClassLoader
                $k = $kDir;
                $i = \strlen($dir) - 1;
                while (!isset(self::$darwinCache[$k])) {
-                    self::$darwinCache[$k] = array($dir, array());
+                    self::$darwinCache[$k] = [$dir, []];
                    self::$darwinCache[$dir] = &self::$darwinCache[$k];

                    while ('/' !== $dir[--$i]) {
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Debug;

 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
+use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
@@ -47,7 +48,7 @@ use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
 */
 class ErrorHandler
 {
-    private $levels = array(
+    private $levels = [
        E_DEPRECATED => 'Deprecated',
        E_USER_DEPRECATED => 'User Deprecated',
        E_NOTICE => 'Notice',
@@ -63,25 +64,25 @@ class ErrorHandler
        E_PARSE => 'Parse Error',
        E_ERROR => 'Error',
        E_CORE_ERROR => 'Core Error',
-    );
+    ];

-    private $loggers = array(
-        E_DEPRECATED => array(null, LogLevel::INFO),
-        E_USER_DEPRECATED => array(null, LogLevel::INFO),
-        E_NOTICE => array(null, LogLevel::WARNING),
-        E_USER_NOTICE => array(null, LogLevel::WARNING),
-        E_STRICT => array(null, LogLevel::WARNING),
-        E_WARNING => array(null, LogLevel::WARNING),
-        E_USER_WARNING => array(null, LogLevel::WARNING),
-        E_COMPILE_WARNING => array(null, LogLevel::WARNING),
-        E_CORE_WARNING => array(null, LogLevel::WARNING),
-        E_USER_ERROR => array(null, LogLevel::CRITICAL),
-        E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-        E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-        E_PARSE => array(null, LogLevel::CRITICAL),
-        E_ERROR => array(null, LogLevel::CRITICAL),
-        E_CORE_ERROR => array(null, LogLevel::CRITICAL),
-    );
+    private $loggers = [
+        E_DEPRECATED => [null, LogLevel::INFO],
+        E_USER_DEPRECATED => [null, LogLevel::INFO],
+        E_NOTICE => [null, LogLevel::WARNING],
+        E_USER_NOTICE => [null, LogLevel::WARNING],
+        E_STRICT => [null, LogLevel::WARNING],
+        E_WARNING => [null, LogLevel::WARNING],
+        E_USER_WARNING => [null, LogLevel::WARNING],
+        E_COMPILE_WARNING => [null, LogLevel::WARNING],
+        E_CORE_WARNING => [null, LogLevel::WARNING],
+        E_USER_ERROR => [null, LogLevel::CRITICAL],
+        E_RECOVERABLE_ERROR => [null, LogLevel::CRITICAL],
+        E_COMPILE_ERROR => [null, LogLevel::CRITICAL],
+        E_PARSE => [null, LogLevel::CRITICAL],
+        E_ERROR => [null, LogLevel::CRITICAL],
+        E_CORE_ERROR => [null, LogLevel::CRITICAL],
+    ];

    private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
    private $scopedErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
@@ -96,8 +97,10 @@ class ErrorHandler
    private $bootstrappingLogger;

    private static $reservedMemory;
+    private static $stackedErrors = [];
+    private static $stackedErrorLevels = [];
    private static $toStringException = null;
-    private static $silencedErrorCache = array();
+    private static $silencedErrorCache = [];
    private static $silencedErrorCount = 0;
    private static $exitCode = 0;

@@ -120,10 +123,10 @@ class ErrorHandler
            $handler = new static();
        }

-        if (null === $prev = set_error_handler(array($handler, 'handleError'))) {
+        if (null === $prev = set_error_handler([$handler, 'handleError'])) {
            restore_error_handler();
            // Specifying the error types earlier would expose us to https://bugs.php.net/63206
-            set_error_handler(array($handler, 'handleError'), $handler->thrownErrors | $handler->loggedErrors);
+            set_error_handler([$handler, 'handleError'], $handler->thrownErrors | $handler->loggedErrors);
            $handler->isRoot = true;
        }

@@ -137,12 +140,12 @@ class ErrorHandler
        } else {
            $handlerIsRegistered = true;
        }
-        if (\is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
+        if (\is_array($prev = set_exception_handler([$handler, 'handleException'])) && $prev[0] instanceof self) {
            restore_exception_handler();
            if (!$handlerIsRegistered) {
                $handler = $prev[0];
            } elseif ($handler !== $prev[0] && $replace) {
-                set_exception_handler(array($handler, 'handleException'));
+                set_exception_handler([$handler, 'handleException']);
                $p = $prev[0]->setExceptionHandler(null);
                $handler->setExceptionHandler($p);
                $prev[0]->setExceptionHandler($p);
@@ -175,12 +178,12 @@ class ErrorHandler
     */
    public function setDefaultLogger(LoggerInterface $logger, $levels = E_ALL, $replace = false)
    {
-        $loggers = array();
+        $loggers = [];

        if (\is_array($levels)) {
            foreach ($levels as $type => $logLevel) {
                if (empty($this->loggers[$type][0]) || $replace || $this->loggers[$type][0] === $this->bootstrappingLogger) {
-                    $loggers[$type] = array($logger, $logLevel);
+                    $loggers[$type] = [$logger, $logLevel];
                }
            }
        } else {
@@ -211,14 +214,14 @@ class ErrorHandler
    {
        $prevLogged = $this->loggedErrors;
        $prev = $this->loggers;
-        $flush = array();
+        $flush = [];

        foreach ($loggers as $type => $log) {
            if (!isset($prev[$type])) {
                throw new \InvalidArgumentException('Unknown error type: '.$type);
            }
            if (!\is_array($log)) {
-                $log = array($log);
+                $log = [$log];
            } elseif (!array_key_exists(0, $log)) {
                throw new \InvalidArgumentException('No logger provided');
            }
@@ -355,9 +358,9 @@ class ErrorHandler
            if ($handler === $this) {
                restore_error_handler();
                if ($this->isRoot) {
-                    set_error_handler(array($this, 'handleError'), $this->thrownErrors | $this->loggedErrors);
+                    set_error_handler([$this, 'handleError'], $this->thrownErrors | $this->loggedErrors);
                } else {
-                    set_error_handler(array($this, 'handleError'));
+                    set_error_handler([$this, 'handleError']);
                }
            }
        }
@@ -394,9 +397,11 @@ class ErrorHandler
        $scope = $this->scopedErrors & $type;

        if (4 < $numArgs = \func_num_args()) {
-            $context = $scope ? (func_get_arg(4) ?: array()) : array();
+            $context = $scope ? (func_get_arg(4) ?: []) : [];
+            $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
        } else {
-            $context = array();
+            $context = [];
+            $backtrace = null;
        }

        if (isset($context['GLOBALS']) && $scope) {
@@ -405,6 +410,15 @@ class ErrorHandler
            $context = $e;
        }

+        if (null !== $backtrace && $type & E_ERROR) {
+            // E_ERROR fatal errors are triggered on HHVM when
+            // hhvm.error_handling.call_user_handler_on_fatals=1
+            // which is the way to get their backtrace.
+            $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
+
+            return true;
+        }
+
        $logMessage = $this->levels[$type].': '.$message;

        if (null !== self::$toStringException) {
@@ -412,19 +426,19 @@ class ErrorHandler
            self::$toStringException = null;
        } elseif (!$throw && !($type & $level)) {
            if (!isset(self::$silencedErrorCache[$id = $file.':'.$line])) {
-                $lightTrace = $this->tracedErrors & $type ? $this->cleanTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3), $type, $file, $line, false) : array();
+                $lightTrace = $this->tracedErrors & $type ? $this->cleanTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3), $type, $file, $line, false) : [];
                $errorAsException = new SilencedErrorContext($type, $file, $line, $lightTrace);
            } elseif (isset(self::$silencedErrorCache[$id][$message])) {
                $lightTrace = null;
                $errorAsException = self::$silencedErrorCache[$id][$message];
                ++$errorAsException->count;
            } else {
-                $lightTrace = array();
+                $lightTrace = [];
                $errorAsException = null;
            }

            if (100 < ++self::$silencedErrorCount) {
-                self::$silencedErrorCache = $lightTrace = array();
+                self::$silencedErrorCache = $lightTrace = [];
                self::$silencedErrorCount = 1;
            }
            if ($errorAsException) {
@@ -434,16 +448,19 @@ class ErrorHandler
                return;
            }
        } else {
-            $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
+            if ($scope) {
+                $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
+            } else {
+                $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
+            }

            // Clean the trace by removing function arguments and the first frames added by the error handler itself.
            if ($throw || $this->tracedErrors & $type) {
-                $backtrace = $errorAsException->getTrace();
+                $backtrace = $backtrace ?: $errorAsException->getTrace();
                $lightTrace = $this->cleanTrace($backtrace, $type, $file, $line, $throw);
                $this->traceReflector->setValue($errorAsException, $lightTrace);
            } else {
-                $this->traceReflector->setValue($errorAsException, array());
-                $backtrace = array();
+                $this->traceReflector->setValue($errorAsException, []);
            }
        }

@@ -457,25 +474,32 @@ class ErrorHandler
                        && ('trigger_error' === $backtrace[$i - 1]['function'] || 'user_error' === $backtrace[$i - 1]['function'])
                    ) {
                        // Here, we know trigger_error() has been called from __toString().
-                        // PHP triggers a fatal error when throwing from __toString().
+                        // HHVM is fine with throwing from __toString() but PHP triggers a fatal error instead.
                        // A small convention allows working around the limitation:
                        // given a caught $e exception in __toString(), quitting the method with
                        // `return trigger_error($e, E_USER_ERROR);` allows this error handler
                        // to make $e get through the __toString() barrier.

                        foreach ($context as $e) {
-                            if ($e instanceof \Throwable && $e->__toString() === $message) {
+                            if (($e instanceof \Exception || $e instanceof \Throwable) && $e->__toString() === $message) {
+                                if (1 === $i) {
+                                    // On HHVM
+                                    $errorAsException = $e;
+                                    break;
+                                }
                                self::$toStringException = $e;

                                return true;
                            }
                        }

-                        // Display the original error message instead of the default one.
-                        $this->handleException($errorAsException);
+                        if (1 < $i) {
+                            // On PHP (not on HHVM), display the original error message instead of the default one.
+                            $this->handleException($errorAsException);

-                        // Stop the process by giving back the error to the native handler.
-                        return false;
+                            // Stop the process by giving back the error to the native handler.
+                            return false;
+                        }
                    }
                }
            }
@@ -485,13 +509,24 @@ class ErrorHandler

        if ($this->isRecursive) {
            $log = 0;
+        } elseif (self::$stackedErrorLevels) {
+            self::$stackedErrors[] = [
+                $this->loggers[$type][0],
+                ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG,
+                $logMessage,
+                $errorAsException ? ['exception' => $errorAsException] : [],
+            ];
        } else {
            try {
                $this->isRecursive = true;
                $level = ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG;
-                $this->loggers[$type][0]->log($level, $logMessage, $errorAsException ? array('exception' => $errorAsException) : array());
+                $this->loggers[$type][0]->log($level, $logMessage, $errorAsException ? ['exception' => $errorAsException] : []);
            } finally {
                $this->isRecursive = false;
+
+                if (!\defined('HHVM_VERSION')) {
+                    set_error_handler([$this, __FUNCTION__]);
+                }
            }
        }

@@ -520,12 +555,12 @@ class ErrorHandler
        if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
            if ($exception instanceof FatalErrorException) {
                if ($exception instanceof FatalThrowableError) {
-                    $error = array(
+                    $error = [
                        'type' => $type,
                        'message' => $message = $exception->getMessage(),
                        'file' => $exception->getFile(),
                        'line' => $exception->getLine(),
-                    );
+                    ];
                } else {
                    $message = 'Fatal '.$exception->getMessage();
                }
@@ -537,7 +572,8 @@ class ErrorHandler
        }
        if ($this->loggedErrors & $type) {
            try {
-                $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
+                $this->loggers[$type][0]->log($this->loggers[$type][1], $message, ['exception' => $exception]);
+            } catch (\Exception $handlerException) {
            } catch (\Throwable $handlerException) {
            }
        }
@@ -556,6 +592,7 @@ class ErrorHandler
                return \call_user_func($exceptionHandler, $exception);
            }
            $handlerException = $handlerException ?: $exception;
+        } catch (\Exception $handlerException) {
        } catch (\Throwable $handlerException) {
        }
        if ($exception === $handlerException) {
@@ -579,7 +616,7 @@ class ErrorHandler
        }

        $handler = self::$reservedMemory = null;
-        $handlers = array();
+        $handlers = [];
        $previousHandler = null;
        $sameHandlerLimit = 10;

@@ -610,12 +647,22 @@ class ErrorHandler
            $handler[0]->setExceptionHandler($h);
        }
        $handler = $handler[0];
-        $handlers = array();
+        $handlers = [];

        if ($exit = null === $error) {
            $error = error_get_last();
        }

+        try {
+            while (self::$stackedErrorLevels) {
+                static::unstackErrors();
+            }
+        } catch (\Exception $exception) {
+            // Handled below
+        } catch (\Throwable $exception) {
+            // Handled below
+        }
+
        if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
            // Let's not throw anymore but keep logging
            $handler->throwAt(0, true);
@@ -626,12 +673,10 @@ class ErrorHandler
            } else {
                $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
            }
-        } else {
-            $exception = null;
        }

        try {
-            if (null !== $exception) {
+            if (isset($exception)) {
                self::$exitCode = 255;
                $handler->handleException($exception, $error);
            }
@@ -645,6 +690,55 @@ class ErrorHandler
        }
    }

+    /**
+     * Configures the error handler for delayed handling.
+     * Ensures also that non-catchable fatal errors are never silenced.
+     *
+     * As shown by http://bugs.php.net/42098 and http://bugs.php.net/60724
+     * PHP has a compile stage where it behaves unusually. To workaround it,
+     * we plug an error handler that only stacks errors for later.
+     *
+     * The most important feature of this is to prevent
+     * autoloading until unstackErrors() is called.
+     *
+     * @deprecated since version 3.4, to be removed in 4.0.
+     */
+    public static function stackErrors()
+    {
+        @trigger_error('Support for stacking errors is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
+        self::$stackedErrorLevels[] = error_reporting(error_reporting() | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
+    }
+
+    /**
+     * Unstacks stacked errors and forwards to the logger.
+     *
+     * @deprecated since version 3.4, to be removed in 4.0.
+     */
+    public static function unstackErrors()
+    {
+        @trigger_error('Support for unstacking errors is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
+        $level = array_pop(self::$stackedErrorLevels);
+
+        if (null !== $level) {
+            $errorReportingLevel = error_reporting($level);
+            if ($errorReportingLevel !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
+                // If the user changed the error level, do not overwrite it
+                error_reporting($errorReportingLevel);
+            }
+        }
+
+        if (empty(self::$stackedErrorLevels)) {
+            $errors = self::$stackedErrors;
+            self::$stackedErrors = [];
+
+            foreach ($errors as $error) {
+                $error[0]->log($error[1], $error[2], $error[3]);
+            }
+        }
+    }
+
    /**
     * Gets the fatal error handlers.
     *
@@ -654,11 +748,11 @@ class ErrorHandler
     */
    protected function getFatalErrorHandlers()
    {
-        return array(
+        return [
            new UndefinedFunctionFatalErrorHandler(),
            new UndefinedMethodFatalErrorHandler(),
            new ClassNotFoundFatalErrorHandler(),
-        );
+        ];
    }

    private function cleanTrace($backtrace, $type, $file, $line, $throw)
--- a/Exception/ClassNotFoundException.php
+++ b/Exception/ClassNotFoundException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
 */
 class ClassNotFoundException extends FatalErrorException
 {
-    public function __construct(string $message, \ErrorException $previous)
+    public function __construct($message, \ErrorException $previous)
    {
        parent::__construct(
            $message,
--- a/Exception/ContextErrorException.php
+++ b/Exception/ContextErrorException.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Debug\Exception;
+
+/**
+ * Error Exception with Variable Context.
+ *
+ * @author Christian Sciberras <uuf6429@gmail.com>
+ *
+ * @deprecated since version 3.3. Instead, \ErrorException will be used directly in 4.0.
+ */
+class ContextErrorException extends \ErrorException
+{
+    private $context = [];
+
+    public function __construct($message, $code, $severity, $filename, $lineno, $context = [])
+    {
+        parent::__construct($message, $code, $severity, $filename, $lineno);
+        $this->context = $context;
+    }
+
+    /**
+     * @return array Array of variables that existed when the exception occurred
+     */
+    public function getContext()
+    {
+        @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+
+        return $this->context;
+    }
+}
--- a/Exception/FatalErrorException.php
+++ b/Exception/FatalErrorException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
 */
 class FatalErrorException extends \ErrorException
 {
-    public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null, \Throwable $previous = null)
+    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null, $previous = null)
    {
        parent::__construct($message, $code, $severity, $filename, $lineno, $previous);

@@ -60,8 +60,13 @@ class FatalErrorException extends \ErrorException

                unset($frame);
                $trace = array_reverse($trace);
+            } elseif (\function_exists('symfony_debug_backtrace')) {
+                $trace = symfony_debug_backtrace();
+                if (0 < $traceOffset) {
+                    array_splice($trace, 0, $traceOffset);
+                }
            } else {
-                $trace = array();
+                $trace = [];
            }

            $this->setTrace($trace);
--- a/Exception/FatalThrowableError.php
+++ b/Exception/FatalThrowableError.php
@@ -18,22 +18,21 @@ namespace Symfony\Component\Debug\Exception;
 */
 class FatalThrowableError extends FatalErrorException
 {
-    private $originalClassName;
-
    public function __construct(\Throwable $e)
    {
-        $this->originalClassName = \get_class($e);
-
        if ($e instanceof \ParseError) {
+            $message = 'Parse error: '.$e->getMessage();
            $severity = E_PARSE;
        } elseif ($e instanceof \TypeError) {
+            $message = 'Type error: '.$e->getMessage();
            $severity = E_RECOVERABLE_ERROR;
        } else {
+            $message = $e->getMessage();
            $severity = E_ERROR;
        }

        \ErrorException::__construct(
-            $e->getMessage(),
+            $message,
            $e->getCode(),
            $severity,
            $e->getFile(),
@@ -43,9 +42,4 @@ class FatalThrowableError extends FatalErrorException

        $this->setTrace($e->getTrace());
    }
-
-    public function getOriginalClassName(): string
-    {
-        return $this->originalClassName;
-    }
 }
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;

 /**
- * FlattenException wraps a PHP Error or Exception to be able to serialize it.
+ * FlattenException wraps a PHP Exception to be able to serialize it.
 *
 * Basically, this class removes all objects from the trace.
 *
@@ -33,12 +33,7 @@ class FlattenException
    private $file;
    private $line;

-    public static function create(\Exception $exception, $statusCode = null, array $headers = array())
-    {
-        return static::createFromThrowable($exception, $statusCode, $headers);
-    }
-
-    public static function createFromThrowable(\Throwable $exception, ?int $statusCode = null, array $headers = array()): self
+    public static function create(\Exception $exception, $statusCode = null, array $headers = [])
    {
        $e = new static();
        $e->setMessage($exception->getMessage());
@@ -57,15 +52,17 @@ class FlattenException

        $e->setStatusCode($statusCode);
        $e->setHeaders($headers);
-        $e->setTraceFromThrowable($exception);
-        $e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
+        $e->setTraceFromException($exception);
+        $e->setClass(\get_class($exception));
        $e->setFile($exception->getFile());
        $e->setLine($exception->getLine());

        $previous = $exception->getPrevious();

-        if ($previous instanceof \Throwable) {
-            $e->setPrevious(static::createFromThrowable($previous));
+        if ($previous instanceof \Exception) {
+            $e->setPrevious(static::create($previous));
+        } elseif ($previous instanceof \Throwable) {
+            $e->setPrevious(static::create(new FatalThrowableError($previous)));
        }

        return $e;
@@ -73,13 +70,13 @@ class FlattenException

    public function toArray()
    {
-        $exceptions = array();
-        foreach (array_merge(array($this), $this->getAllPrevious()) as $exception) {
-            $exceptions[] = array(
+        $exceptions = [];
+        foreach (array_merge([$this], $this->getAllPrevious()) as $exception) {
+            $exceptions[] = [
                'message' => $exception->getMessage(),
                'class' => $exception->getClass(),
                'trace' => $exception->getTrace(),
-            );
+            ];
        }

        return $exceptions;
@@ -167,7 +164,7 @@ class FlattenException

    public function getAllPrevious()
    {
-        $exceptions = array();
+        $exceptions = [];
        $e = $this;
        while ($e = $e->getPrevious()) {
            $exceptions[] = $e;
@@ -181,25 +178,15 @@ class FlattenException
        return $this->trace;
    }

-    /**
-     * @deprecated since 4.1, use {@see setTraceFromThrowable()} instead.
-     */
    public function setTraceFromException(\Exception $exception)
    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use "setTraceFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->setTraceFromThrowable($exception);
-    }
-
-    public function setTraceFromThrowable(\Throwable $throwable): void
-    {
-        $this->setTrace($throwable->getTrace(), $throwable->getFile(), $throwable->getLine());
+        $this->setTrace($exception->getTrace(), $exception->getFile(), $exception->getLine());
    }

    public function setTrace($trace, $file, $line)
    {
-        $this->trace = array();
-        $this->trace[] = array(
+        $this->trace = [];
+        $this->trace[] = [
            'namespace' => '',
            'short_class' => '',
            'class' => '',
@@ -207,8 +194,8 @@ class FlattenException
            'function' => '',
            'file' => $file,
            'line' => $line,
-            'args' => array(),
-        );
+            'args' => [],
+        ];
        foreach ($trace as $entry) {
            $class = '';
            $namespace = '';
@@ -218,7 +205,7 @@ class FlattenException
                $namespace = implode('\\', $parts);
            }

-            $this->trace[] = array(
+            $this->trace[] = [
                'namespace' => $namespace,
                'short_class' => $class,
                'class' => isset($entry['class']) ? $entry['class'] : '',
@@ -226,41 +213,41 @@ class FlattenException
                'function' => isset($entry['function']) ? $entry['function'] : null,
                'file' => isset($entry['file']) ? $entry['file'] : null,
                'line' => isset($entry['line']) ? $entry['line'] : null,
-                'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),
-            );
+                'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : [],
+            ];
        }
    }

    private function flattenArgs($args, $level = 0, &$count = 0)
    {
-        $result = array();
+        $result = [];
        foreach ($args as $key => $value) {
            if (++$count > 1e4) {
-                return array('array', '*SKIPPED over 10000 entries*');
+                return ['array', '*SKIPPED over 10000 entries*'];
            }
            if ($value instanceof \__PHP_Incomplete_Class) {
                // is_object() returns false on PHP<=7.1
-                $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
+                $result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
            } elseif (\is_object($value)) {
-                $result[$key] = array('object', \get_class($value));
+                $result[$key] = ['object', \get_class($value)];
            } elseif (\is_array($value)) {
                if ($level > 10) {
-                    $result[$key] = array('array', '*DEEP NESTED ARRAY*');
+                    $result[$key] = ['array', '*DEEP NESTED ARRAY*'];
                } else {
-                    $result[$key] = array('array', $this->flattenArgs($value, $level + 1, $count));
+                    $result[$key] = ['array', $this->flattenArgs($value, $level + 1, $count)];
                }
            } elseif (null === $value) {
-                $result[$key] = array('null', null);
+                $result[$key] = ['null', null];
            } elseif (\is_bool($value)) {
-                $result[$key] = array('boolean', $value);
+                $result[$key] = ['boolean', $value];
            } elseif (\is_int($value)) {
-                $result[$key] = array('integer', $value);
+                $result[$key] = ['integer', $value];
            } elseif (\is_float($value)) {
-                $result[$key] = array('float', $value);
+                $result[$key] = ['float', $value];
            } elseif (\is_resource($value)) {
-                $result[$key] = array('resource', get_resource_type($value));
+                $result[$key] = ['resource', get_resource_type($value)];
            } else {
-                $result[$key] = array('string', (string) $value);
+                $result[$key] = ['string', (string) $value];
            }
        }

--- a/Exception/SilencedErrorContext.php
+++ b/Exception/SilencedErrorContext.php
@@ -25,7 +25,7 @@ class SilencedErrorContext implements \JsonSerializable
    private $line;
    private $trace;

-    public function __construct(int $severity, string $file, int $line, array $trace = array(), int $count = 1)
+    public function __construct($severity, $file, $line, array $trace = [], $count = 1)
    {
        $this->severity = $severity;
        $this->file = $file;
@@ -56,12 +56,12 @@ class SilencedErrorContext implements \JsonSerializable

    public function JsonSerialize()
    {
-        return array(
+        return [
            'severity' => $this->severity,
            'file' => $this->file,
            'line' => $this->line,
            'trace' => $this->trace,
            'count' => $this->count,
-        );
+        ];
    }
 }
--- a/Exception/UndefinedFunctionException.php
+++ b/Exception/UndefinedFunctionException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
 */
 class UndefinedFunctionException extends FatalErrorException
 {
-    public function __construct(string $message, \ErrorException $previous)
+    public function __construct($message, \ErrorException $previous)
    {
        parent::__construct(
            $message,
--- a/Exception/UndefinedMethodException.php
+++ b/Exception/UndefinedMethodException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
 */
 class UndefinedMethodException extends FatalErrorException
 {
-    public function __construct(string $message, \ErrorException $previous)
+    public function __construct($message, \ErrorException $previous)
    {
        parent::__construct(
            $message,
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -36,7 +36,7 @@ class ExceptionHandler
    private $caughtLength;
    private $fileLinkFormat;

-    public function __construct(bool $debug = true, string $charset = null, $fileLinkFormat = null)
+    public function __construct($debug = true, $charset = null, $fileLinkFormat = null)
    {
        $this->debug = $debug;
        $this->charset = $charset ?: ini_get('default_charset') ?: 'UTF-8';
@@ -56,10 +56,10 @@ class ExceptionHandler
    {
        $handler = new static($debug, $charset, $fileLinkFormat);

-        $prev = set_exception_handler(array($handler, 'handle'));
+        $prev = set_exception_handler([$handler, 'handle']);
        if (\is_array($prev) && $prev[0] instanceof ErrorHandler) {
            restore_exception_handler();
-            $prev[0]->setExceptionHandler(array($handler, 'handle'));
+            $prev[0]->setExceptionHandler([$handler, 'handle']);
        }

        return $handler;
@@ -377,7 +377,7 @@ EOF;

        if (\is_string($fmt)) {
            $i = strpos($f = $fmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
-            $fmt = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
+            $fmt = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);

            for ($i = 1; isset($fmt[$i]); ++$i) {
                if (0 === strpos($path, $k = $fmt[$i++])) {
@@ -386,7 +386,7 @@ EOF;
                }
            }

-            $link = strtr($fmt[0], array('%f' => $path, '%l' => $line));
+            $link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
        } else {
            $link = $fmt->format($path, $line);
        }
@@ -403,7 +403,7 @@ EOF;
     */
    private function formatArgs(array $args)
    {
-        $result = array();
+        $result = [];
        foreach ($args as $key => $item) {
            if ('object' === $item[0]) {
                $formattedValue = sprintf('<em>object</em>(%s)', $this->formatClass($item[1]));
--- a/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -40,7 +40,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
            return;
        }

-        foreach (array('class', 'interface', 'trait') as $typeName) {
+        foreach (['class', 'interface', 'trait'] as $typeName) {
            $prefix = ucfirst($typeName).' \'';
            $prefixLen = \strlen($prefix);
            if (0 !== strpos($error['message'], $prefix)) {
@@ -83,14 +83,14 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     *
     * @return array An array of possible fully qualified class names
     */
-    private function getClassCandidates(string $class): array
+    private function getClassCandidates($class)
    {
        if (!\is_array($functions = spl_autoload_functions())) {
-            return array();
+            return [];
        }

        // find Symfony and Composer autoloaders
-        $classes = array();
+        $classes = [];

        foreach ($functions as $function) {
            if (!\is_array($function)) {
@@ -124,13 +124,20 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
        return array_unique($classes);
    }

-    private function findClassInPath(string $path, string $class, string $prefix): array
+    /**
+     * @param string $path
+     * @param string $class
+     * @param string $prefix
+     *
+     * @return array
+     */
+    private function findClassInPath($path, $class, $prefix)
    {
        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
-            return array();
+            return [];
        }

-        $classes = array();
+        $classes = [];
        $filename = $class.'.php';
        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
            if ($filename == $file->getFileName() && $class = $this->convertFileToClass($path, $file->getPathName(), $prefix)) {
@@ -141,11 +148,18 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
        return $classes;
    }

-    private function convertFileToClass(string $path, string $file, string $prefix): ?string
+    /**
+     * @param string $path
+     * @param string $file
+     * @param string $prefix
+     *
+     * @return string|null
+     */
+    private function convertFileToClass($path, $file, $prefix)
    {
-        $candidates = array(
+        $candidates = [
            // namespaced class
-            $namespacedClass = str_replace(array($path.\DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
+            $namespacedClass = str_replace([$path.\DIRECTORY_SEPARATOR, '.php', '/'], ['', '', '\\'], $file),
            // namespaced class (with target dir)
            $prefix.$namespacedClass,
            // namespaced class (with target dir and separator)
@@ -156,7 +170,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
            str_replace('\\', '_', $prefix.$namespacedClass),
            // PEAR class (with target dir and separator)
            str_replace('\\', '_', $prefix.'\\'.$namespacedClass),
-        );
+        ];

        if ($prefix) {
            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
@@ -178,11 +192,14 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
                return $candidate;
            }
        }
-
-        return null;
    }

-    private function classExists(string $class): bool
+    /**
+     * @param string $class
+     *
+     * @return bool
+     */
+    private function classExists($class)
    {
        return class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false);
    }
--- a/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ b/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -53,7 +53,7 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
            $message = sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
        }

-        $candidates = array();
+        $candidates = [];
        foreach (get_defined_functions() as $type => $definedFunctionNames) {
            foreach ($definedFunctionNames as $definedFunctionName) {
                if (false !== $namespaceSeparatorIndex = strrpos($definedFunctionName, '\\')) {
--- a/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -41,7 +41,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
            return new UndefinedMethodException($message, $exception);
        }

-        $candidates = array();
+        $candidates = [];
        foreach ($methods as $definedMethodName) {
            $lev = levenshtein($methodName, $definedMethodName);
            if ($lev <= \strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2019 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/Resources/ext/README.md
+++ b/Resources/ext/README.md
@@ -0,0 +1,134 @@
+Symfony Debug Extension for PHP 5
+=================================
+
+This extension publishes several functions to help building powerful debugging tools.
+It is compatible with PHP 5.3, 5.4, 5.5 and 5.6; with ZTS and non-ZTS modes.
+It is not required thus not provided for PHP 7.
+
+symfony_zval_info()
+-------------------
+
+- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
+- does work with references, preventing memory copying.
+
+Its behavior is about the same as:
+
+```php
+<?php
+
+function symfony_zval_info($key, $array, $options = 0)
+{
+
+    // $options is currently not used, but could be in future version.
+
+    if (!array_key_exists($key, $array)) {
+        return null;
+    }
+
+    $info = [
+        'type' => gettype($array[$key]),
+        'zval_hash' => /* hashed memory address of $array[$key] */,
+        'zval_refcount' => /* internal zval refcount of $array[$key] */,
+        'zval_isref' => /* is_ref status of $array[$key] */,
+    ];
+
+    switch ($info['type']) {
+        case 'object':
+            $info += [
+                'object_class' => get_class($array[$key]),
+                'object_refcount' => /* internal object refcount of $array[$key] */,
+                'object_hash' => spl_object_hash($array[$key]),
+                'object_handle' => /* internal object handle $array[$key] */,
+            ];
+            break;
+
+        case 'resource':
+            $info += [
+                'resource_handle' => (int) $array[$key],
+                'resource_type' => get_resource_type($array[$key]),
+                'resource_refcount' => /* internal resource refcount of $array[$key] */,
+            ];
+            break;
+
+        case 'array':
+            $info += [
+                'array_count' => count($array[$key]),
+            ];
+            break;
+
+        case 'string':
+            $info += [
+                'strlen' => strlen($array[$key]),
+            ];
+            break;
+    }
+
+    return $info;
+}
+```
+
+symfony_debug_backtrace()
+-------------------------
+
+This function works like debug_backtrace(), except that it can fetch the full backtrace in case of fatal errors:
+
+```php
+function foo() { fatal(); }
+function bar() { foo(); }
+
+function sd() { var_dump(symfony_debug_backtrace()); }
+
+register_shutdown_function('sd');
+
+bar();
+
+/* Will output
+Fatal error: Call to undefined function fatal() in foo.php on line 42
+array(3) {
+  [0]=>
+  array(2) {
+    ["function"]=>
+    string(2) "sd"
+    ["args"]=>
+    array(0) {
+    }
+  }
+  [1]=>
+  array(4) {
+    ["file"]=>
+    string(7) "foo.php"
+    ["line"]=>
+    int(1)
+    ["function"]=>
+    string(3) "foo"
+    ["args"]=>
+    array(0) {
+    }
+  }
+  [2]=>
+  array(4) {
+    ["file"]=>
+    string(102) "foo.php"
+    ["line"]=>
+    int(2)
+    ["function"]=>
+    string(3) "bar"
+    ["args"]=>
+    array(0) {
+    }
+  }
+}
+*/
+```
+
+Usage
+-----
+
+To enable the extension from source, run:
+
+```
+    phpize
+    ./configure
+    make
+    sudo make install
+```
--- a/Resources/ext/config.m4
+++ b/Resources/ext/config.m4
@@ -0,0 +1,63 @@
+dnl $Id$
+dnl config.m4 for extension symfony_debug
+
+dnl Comments in this file start with the string 'dnl'.
+dnl Remove where necessary. This file will not work
+dnl without editing.
+
+dnl If your extension references something external, use with:
+
+dnl PHP_ARG_WITH(symfony_debug, for symfony_debug support,
+dnl Make sure that the comment is aligned:
+dnl [  --with-symfony_debug             Include symfony_debug support])
+
+dnl Otherwise use enable:
+
+PHP_ARG_ENABLE(symfony_debug, whether to enable symfony_debug support,
+dnl Make sure that the comment is aligned:
+[  --enable-symfony_debug           Enable symfony_debug support])
+
+if test "$PHP_SYMFONY_DEBUG" != "no"; then
+  dnl Write more examples of tests here...
+
+  dnl # --with-symfony_debug -> check with-path
+  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
+  dnl SEARCH_FOR="/include/symfony_debug.h"  # you most likely want to change this
+  dnl if test -r $PHP_SYMFONY_DEBUG/$SEARCH_FOR; then # path given as parameter
+  dnl   SYMFONY_DEBUG_DIR=$PHP_SYMFONY_DEBUG
+  dnl else # search default path list
+  dnl   AC_MSG_CHECKING([for symfony_debug files in default path])
+  dnl   for i in $SEARCH_PATH ; do
+  dnl     if test -r $i/$SEARCH_FOR; then
+  dnl       SYMFONY_DEBUG_DIR=$i
+  dnl       AC_MSG_RESULT(found in $i)
+  dnl     fi
+  dnl   done
+  dnl fi
+  dnl
+  dnl if test -z "$SYMFONY_DEBUG_DIR"; then
+  dnl   AC_MSG_RESULT([not found])
+  dnl   AC_MSG_ERROR([Please reinstall the symfony_debug distribution])
+  dnl fi
+
+  dnl # --with-symfony_debug -> add include path
+  dnl PHP_ADD_INCLUDE($SYMFONY_DEBUG_DIR/include)
+
+  dnl # --with-symfony_debug -> check for lib and symbol presence
+  dnl LIBNAME=symfony_debug # you may want to change this
+  dnl LIBSYMBOL=symfony_debug # you most likely want to change this 
+
+  dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+  dnl [
+  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SYMFONY_DEBUG_DIR/lib, SYMFONY_DEBUG_SHARED_LIBADD)
+  dnl   AC_DEFINE(HAVE_SYMFONY_DEBUGLIB,1,[ ])
+  dnl ],[
+  dnl   AC_MSG_ERROR([wrong symfony_debug lib version or lib not found])
+  dnl ],[
+  dnl   -L$SYMFONY_DEBUG_DIR/lib -lm
+  dnl ])
+  dnl
+  dnl PHP_SUBST(SYMFONY_DEBUG_SHARED_LIBADD)
+
+  PHP_NEW_EXTENSION(symfony_debug, symfony_debug.c, $ext_shared)
+fi
--- a/Resources/ext/config.w32
+++ b/Resources/ext/config.w32
@@ -0,0 +1,13 @@
+// $Id$
+// vim:ft=javascript
+
+// If your extension references something external, use ARG_WITH
+// ARG_WITH("symfony_debug", "for symfony_debug support", "no");
+
+// Otherwise, use ARG_ENABLE
+// ARG_ENABLE("symfony_debug", "enable symfony_debug support", "no");
+
+if (PHP_SYMFONY_DEBUG != "no") {
+	EXTENSION("symfony_debug", "symfony_debug.c");
+}
+
--- a/Resources/ext/php_symfony_debug.h
+++ b/Resources/ext/php_symfony_debug.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+#ifndef PHP_SYMFONY_DEBUG_H
+#define PHP_SYMFONY_DEBUG_H
+
+extern zend_module_entry symfony_debug_module_entry;
+#define phpext_symfony_debug_ptr &symfony_debug_module_entry
+
+#define PHP_SYMFONY_DEBUG_VERSION "2.7"
+
+#ifdef PHP_WIN32
+#	define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_SYMFONY_DEBUG_API __attribute__ ((visibility("default")))
+#else
+#	define PHP_SYMFONY_DEBUG_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
+	intptr_t req_rand_init;
+	void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+	zval *debug_bt;
+ZEND_END_MODULE_GLOBALS(symfony_debug)
+
+PHP_MINIT_FUNCTION(symfony_debug);
+PHP_MSHUTDOWN_FUNCTION(symfony_debug);
+PHP_RINIT_FUNCTION(symfony_debug);
+PHP_RSHUTDOWN_FUNCTION(symfony_debug);
+PHP_MINFO_FUNCTION(symfony_debug);
+PHP_GINIT_FUNCTION(symfony_debug);
+PHP_GSHUTDOWN_FUNCTION(symfony_debug);
+
+PHP_FUNCTION(symfony_zval_info);
+PHP_FUNCTION(symfony_debug_backtrace);
+
+static char *_symfony_debug_memory_address_hash(void * TSRMLS_DC);
+static const char *_symfony_debug_zval_type(zval *);
+static const char* _symfony_debug_get_resource_type(long TSRMLS_DC);
+static int _symfony_debug_get_resource_refcount(long TSRMLS_DC);
+
+void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+
+#ifdef ZTS
+#define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)
+#else
+#define SYMFONY_DEBUG_G(v) (symfony_debug_globals.v)
+#endif
+
+#endif	/* PHP_SYMFONY_DEBUG_H */
--- a/Resources/ext/symfony_debug.c
+++ b/Resources/ext/symfony_debug.c
@@ -0,0 +1,283 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_symfony_debug.h"
+#include "ext/standard/php_rand.h"
+#include "ext/standard/php_lcg.h"
+#include "ext/spl/php_spl.h"
+#include "Zend/zend_gc.h"
+#include "Zend/zend_builtin_functions.h"
+#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
+#include "ext/standard/php_array.h"
+#include "Zend/zend_interfaces.h"
+#include "SAPI.h"
+
+#define IS_PHP_53 ZEND_EXTENSION_API_NO == 220090626
+
+ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
+
+ZEND_BEGIN_ARG_INFO_EX(symfony_zval_arginfo, 0, 0, 2)
+	ZEND_ARG_INFO(0, key)
+	ZEND_ARG_ARRAY_INFO(0, array, 0)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+const zend_function_entry symfony_debug_functions[] = {
+	PHP_FE(symfony_zval_info,	symfony_zval_arginfo)
+	PHP_FE(symfony_debug_backtrace, NULL)
+	PHP_FE_END
+};
+
+PHP_FUNCTION(symfony_debug_backtrace)
+{
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+#if IS_PHP_53
+	zend_fetch_debug_backtrace(return_value, 1, 0 TSRMLS_CC);
+#else
+	zend_fetch_debug_backtrace(return_value, 1, 0, 0 TSRMLS_CC);
+#endif
+
+	if (!SYMFONY_DEBUG_G(debug_bt)) {
+		return;
+	}
+
+	php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_P(SYMFONY_DEBUG_G(debug_bt)), 0 TSRMLS_CC);
+}
+
+PHP_FUNCTION(symfony_zval_info)
+{
+	zval *key = NULL, *arg = NULL;
+	zval **data = NULL;
+	HashTable *array = NULL;
+	long options = 0;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zh|l", &key, &array, &options) == FAILURE) {
+		return;
+	}
+
+	switch (Z_TYPE_P(key)) {
+		case IS_STRING:
+			if (zend_symtable_find(array, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&data) == FAILURE) {
+				return;
+			}
+		break;
+		case IS_LONG:
+			if (zend_hash_index_find(array, Z_LVAL_P(key), (void **)&data)) {
+				return;
+			}
+		break;
+	}
+
+	arg = *data;
+
+	array_init(return_value);
+
+	add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
+	add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg TSRMLS_CC), 16, 0);
+	add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
+	add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
+
+	if (Z_TYPE_P(arg) == IS_OBJECT) {
+		char hash[33] = {0};
+
+		php_spl_object_hash(arg, (char *)hash TSRMLS_CC);
+		add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
+		add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
+		add_assoc_string(return_value, "object_hash", hash, 1);
+		add_assoc_long(return_value, "object_handle", Z_OBJ_HANDLE_P(arg));
+	} else if (Z_TYPE_P(arg) == IS_ARRAY) {
+		add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
+	} else if(Z_TYPE_P(arg) == IS_RESOURCE) {
+		add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
+		add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg) TSRMLS_CC), 1);
+		add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg) TSRMLS_CC));
+	} else if (Z_TYPE_P(arg) == IS_STRING) {
+		add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
+	}
+}
+
+void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
+{
+	TSRMLS_FETCH();
+	zval *retval;
+
+	switch (type) {
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_CORE_WARNING:
+		case E_COMPILE_ERROR:
+		case E_COMPILE_WARNING:
+			ALLOC_INIT_ZVAL(retval);
+#if IS_PHP_53
+			zend_fetch_debug_backtrace(retval, 1, 0 TSRMLS_CC);
+#else
+			zend_fetch_debug_backtrace(retval, 1, 0, 0 TSRMLS_CC);
+#endif
+			SYMFONY_DEBUG_G(debug_bt) = retval;
+	}
+
+	SYMFONY_DEBUG_G(old_error_cb)(type, error_filename, error_lineno, format, args);
+}
+
+static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
+{
+	const char *res_type;
+	res_type = zend_rsrc_list_get_rsrc_type(rsid TSRMLS_CC);
+
+	if (!res_type) {
+		return "Unknown";
+	}
+
+	return res_type;
+}
+
+static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
+{
+	zend_rsrc_list_entry *le;
+
+	if (zend_hash_index_find(&EG(regular_list), rsid, (void **) &le)==SUCCESS) {
+		return le->refcount;
+	}
+
+	return 0;
+}
+
+static char *_symfony_debug_memory_address_hash(void *address TSRMLS_DC)
+{
+	char *result = NULL;
+	intptr_t address_rand;
+
+	if (!SYMFONY_DEBUG_G(req_rand_init)) {
+		if (!BG(mt_rand_is_seeded)) {
+			php_mt_srand(GENERATE_SEED() TSRMLS_CC);
+		}
+		SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand(TSRMLS_C);
+	}
+
+	address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
+
+	spprintf(&result, 17, "%016zx", address_rand);
+
+	return result;
+}
+
+static const char *_symfony_debug_zval_type(zval *zv)
+{
+	switch (Z_TYPE_P(zv)) {
+		case IS_NULL:
+			return "NULL";
+			break;
+
+		case IS_BOOL:
+			return "boolean";
+			break;
+
+		case IS_LONG:
+			return "integer";
+			break;
+
+		case IS_DOUBLE:
+			return "double";
+			break;
+
+		case IS_STRING:
+			return "string";
+			break;
+
+		case IS_ARRAY:
+			return "array";
+			break;
+
+		case IS_OBJECT:
+			return "object";
+
+		case IS_RESOURCE:
+			return "resource";
+
+		default:
+			return "unknown type";
+	}
+}
+
+zend_module_entry symfony_debug_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"symfony_debug",
+	symfony_debug_functions,
+	PHP_MINIT(symfony_debug),
+	PHP_MSHUTDOWN(symfony_debug),
+	PHP_RINIT(symfony_debug),
+	PHP_RSHUTDOWN(symfony_debug),
+	PHP_MINFO(symfony_debug),
+	PHP_SYMFONY_DEBUG_VERSION,
+	PHP_MODULE_GLOBALS(symfony_debug),
+	PHP_GINIT(symfony_debug),
+	PHP_GSHUTDOWN(symfony_debug),
+	NULL,
+	STANDARD_MODULE_PROPERTIES_EX
+};
+
+#ifdef COMPILE_DL_SYMFONY_DEBUG
+ZEND_GET_MODULE(symfony_debug)
+#endif
+
+PHP_GINIT_FUNCTION(symfony_debug)
+{
+	memset(symfony_debug_globals, 0 , sizeof(*symfony_debug_globals));
+}
+
+PHP_GSHUTDOWN_FUNCTION(symfony_debug)
+{
+
+}
+
+PHP_MINIT_FUNCTION(symfony_debug)
+{
+	SYMFONY_DEBUG_G(old_error_cb) = zend_error_cb;
+	zend_error_cb                 = symfony_debug_error_cb;
+
+	return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(symfony_debug)
+{
+	zend_error_cb = SYMFONY_DEBUG_G(old_error_cb);
+
+	return SUCCESS;
+}
+
+PHP_RINIT_FUNCTION(symfony_debug)
+{
+	return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(symfony_debug)
+{
+	return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(symfony_debug)
+{
+	php_info_print_table_start();
+	php_info_print_table_header(2, "Symfony Debug support", "enabled");
+	php_info_print_table_header(2, "Symfony Debug version", PHP_SYMFONY_DEBUG_VERSION);
+	php_info_print_table_end();
+}
--- a/Resources/ext/tests/001.phpt
+++ b/Resources/ext/tests/001.phpt
@@ -0,0 +1,155 @@
+--TEST--
+Test symfony_zval_info API
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
+--FILE--
+<?php
+
+$int = 42;
+$float = 42.42;
+$str = 'foobar';
+$object = new StdClass();
+$array = ['foo', 'bar'];
+$resource = tmpfile();
+$null = null;
+$bool = true;
+
+$anotherint = 42;
+$refcount2 = &$anotherint;
+
+$var = [
+    'int' => $int,
+    'float' => $float,
+    'str' => $str,
+    'object' => $object,
+    'array' => $array,
+    'resource' => $resource,
+    'null' => $null,
+    'bool' => $bool,
+    'refcount' => &$refcount2,
+];
+
+var_dump(symfony_zval_info('int', $var));
+var_dump(symfony_zval_info('float', $var));
+var_dump(symfony_zval_info('str', $var));
+var_dump(symfony_zval_info('object', $var));
+var_dump(symfony_zval_info('array', $var));
+var_dump(symfony_zval_info('resource', $var));
+var_dump(symfony_zval_info('null', $var));
+var_dump(symfony_zval_info('bool', $var));
+
+var_dump(symfony_zval_info('refcount', $var));
+var_dump(symfony_zval_info('not-exist', $var));
+?>
+--EXPECTF--
+array(4) {
+  ["type"]=>
+  string(7) "integer"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+}
+array(4) {
+  ["type"]=>
+  string(6) "double"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+}
+array(5) {
+  ["type"]=>
+  string(6) "string"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+  ["strlen"]=>
+  int(6)
+}
+array(8) {
+  ["type"]=>
+  string(6) "object"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+  ["object_class"]=>
+  string(8) "stdClass"
+  ["object_refcount"]=>
+  int(1)
+  ["object_hash"]=>
+  string(32) "%s"
+  ["object_handle"]=>
+  int(%d)
+}
+array(5) {
+  ["type"]=>
+  string(5) "array"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+  ["array_count"]=>
+  int(2)
+}
+array(7) {
+  ["type"]=>
+  string(8) "resource"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+  ["resource_handle"]=>
+  int(%d)
+  ["resource_type"]=>
+  string(6) "stream"
+  ["resource_refcount"]=>
+  int(1)
+}
+array(4) {
+  ["type"]=>
+  string(4) "NULL"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+}
+array(4) {
+  ["type"]=>
+  string(7) "boolean"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(2)
+  ["zval_isref"]=>
+  bool(false)
+}
+array(4) {
+  ["type"]=>
+  string(7) "integer"
+  ["zval_hash"]=>
+  string(16) "%s"
+  ["zval_refcount"]=>
+  int(3)
+  ["zval_isref"]=>
+  bool(true)
+}
+NULL
--- a/Resources/ext/tests/002.phpt
+++ b/Resources/ext/tests/002.phpt
@@ -0,0 +1,65 @@
+--TEST--
+Test symfony_debug_backtrace in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
+--FILE--
+<?php
+
+function bar()
+{
+    foo();
+}
+
+function foo()
+{
+    notexist();
+}
+
+function bt()
+{
+    print_r(symfony_debug_backtrace());
+}
+
+register_shutdown_function('bt');
+
+bar();
+
+?>
+--EXPECTF--
+Fatal error: Call to undefined function notexist() in %s on line %d
+Array
+(
+    [0] => Array
+        (
+            [function] => bt
+            [args] => Array
+                (
+                )
+
+        )
+
+    [1] => Array
+        (
+            [file] => %s
+            [line] => %d
+            [function] => foo
+            [args] => Array
+                (
+                )
+
+        )
+
+    [2] => Array
+        (
+            [file] => %s
+            [line] => %d
+            [function] => bar
+            [args] => Array
+                (
+                )
+
+        )
+
+)
--- a/Resources/ext/tests/002_1.phpt
+++ b/Resources/ext/tests/002_1.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test symfony_debug_backtrace in case of non fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
+--FILE--
+<?php
+
+function bar()
+{
+    bt();
+}
+
+function bt()
+{
+    print_r(symfony_debug_backtrace());
+}
+
+bar();
+
+?>
+--EXPECTF--
+Array
+(
+    [0] => Array
+        (
+            [file] => %s
+            [line] => %d
+            [function] => bt
+            [args] => Array
+                (
+                )
+
+        )
+
+    [1] => Array
+        (
+            [file] => %s
+            [line] => %d
+            [function] => bar
+            [args] => Array
+                (
+                )
+
+        )
+
+)
--- a/Resources/ext/tests/003.phpt
+++ b/Resources/ext/tests/003.phpt
@@ -0,0 +1,87 @@
+--TEST--
+Test ErrorHandler in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
+--FILE--
+<?php
+
+namespace Psr\Log;
+
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT = 'alert';
+    const CRITICAL = 'critical';
+    const ERROR = 'error';
+    const WARNING = 'warning';
+    const NOTICE = 'notice';
+    const INFO = 'info';
+    const DEBUG = 'debug';
+}
+
+namespace Symfony\Component\Debug;
+
+$dir = __DIR__.'/../../../';
+require $dir.'ErrorHandler.php';
+require $dir.'Exception/FatalErrorException.php';
+require $dir.'Exception/UndefinedFunctionException.php';
+require $dir.'FatalErrorHandler/FatalErrorHandlerInterface.php';
+require $dir.'FatalErrorHandler/ClassNotFoundFatalErrorHandler.php';
+require $dir.'FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php';
+require $dir.'FatalErrorHandler/UndefinedMethodFatalErrorHandler.php';
+
+function bar()
+{
+    foo();
+}
+
+function foo()
+{
+    notexist();
+}
+
+$handler = ErrorHandler::register();
+$handler->setExceptionHandler('print_r');
+
+if (\function_exists('xdebug_disable')) {
+    xdebug_disable();
+}
+
+bar();
+?>
+--EXPECTF--
+Fatal error: Call to undefined function Symfony\Component\Debug\notexist() in %s on line %d
+Symfony\Component\Debug\Exception\UndefinedFunctionException Object
+(
+    [message:protected] => Attempted to call function "notexist" from namespace "Symfony\Component\Debug".
+    [string:Exception:private] => 
+    [code:protected] => 0
+    [file:protected] => %s
+    [line:protected] => %d
+    [trace:Exception:private] => Array
+        (
+            [0] => Array
+                (
+%A                    [function] => Symfony\Component\Debug\foo
+%A                    [args] => Array
+                        (
+                        )
+
+                )
+
+            [1] => Array
+                (
+%A                    [function] => Symfony\Component\Debug\bar
+%A                    [args] => Array
+                        (
+                        )
+
+                )
+%A
+        )
+
+    [previous:Exception:private] => 
+    [severity:protected] => 1
+)
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Debug\Tests;

 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Debug\DebugClassLoader;
+use Symfony\Component\Debug\ErrorHandler;

 class DebugClassLoaderTest extends TestCase
 {
@@ -27,14 +28,14 @@ class DebugClassLoaderTest extends TestCase
    {
        $this->errorReporting = error_reporting(E_ALL);
        $this->loader = new ClassLoader();
-        spl_autoload_register(array($this->loader, 'loadClass'), true, true);
+        spl_autoload_register([$this->loader, 'loadClass'], true, true);
        DebugClassLoader::enable();
    }

    protected function tearDown()
    {
        DebugClassLoader::disable();
-        spl_autoload_unregister(array($this->loader, 'loadClass'));
+        spl_autoload_unregister([$this->loader, 'loadClass']);
        error_reporting($this->errorReporting);
    }

@@ -44,7 +45,7 @@ class DebugClassLoaderTest extends TestCase

        $functions = spl_autoload_functions();
        foreach ($functions as $function) {
-            if (is_array($function) && $function[0] instanceof DebugClassLoader) {
+            if (\is_array($function) && $function[0] instanceof DebugClassLoader) {
                $reflClass = new \ReflectionClass($function[0]);
                $reflProp = $reflClass->getProperty('classLoader');
                $reflProp->setAccessible(true);
@@ -75,8 +76,72 @@ class DebugClassLoaderTest extends TestCase
        class_exists(__NAMESPACE__.'\Fixtures\Throwing');
    }

+    public function testUnsilencing()
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('PHP7 throws exceptions, unsilencing is not required anymore.');
+        }
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
+
+        ob_start();
+
+        $this->iniSet('log_errors', 0);
+        $this->iniSet('display_errors', 1);
+
+        // See below: this will fail with parse error
+        // but this should not be @-silenced.
+        @class_exists(__NAMESPACE__.'\TestingUnsilencing', true);
+
+        $output = ob_get_clean();
+
+        $this->assertStringMatchesFormat('%aParse error%a', $output);
+    }
+
+    public function testStacking()
+    {
+        // the ContextErrorException must not be loaded to test the workaround
+        // for https://bugs.php.net/65322.
+        if (class_exists('Symfony\Component\Debug\Exception\ContextErrorException', false)) {
+            $this->markTestSkipped('The ContextErrorException class is already loaded.');
+        }
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
+
+        ErrorHandler::register();
+
+        try {
+            // Trigger autoloading + E_STRICT at compile time
+            // which in turn triggers $errorHandler->handle()
+            // that again triggers autoloading for ContextErrorException.
+            // Error stacking works around the bug above and everything is fine.
+
+            eval('
+                namespace '.__NAMESPACE__.';
+                class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
+            ');
+            $this->fail('ContextErrorException expected');
+        } catch (\ErrorException $exception) {
+            // if an exception is thrown, the test passed
+            $this->assertStringStartsWith(__FILE__, $exception->getFile());
+            if (\PHP_VERSION_ID < 70000) {
+                $this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
+                $this->assertEquals(E_STRICT, $exception->getSeverity());
+            } else {
+                $this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
+                $this->assertEquals(E_WARNING, $exception->getSeverity());
+            }
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
    /**
     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Case mismatch between loaded and declared class names
     */
    public function testNameCaseMismatch()
    {
@@ -98,6 +163,7 @@ class DebugClassLoaderTest extends TestCase

    /**
     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Case mismatch between loaded and declared class names
     */
    public function testPsr4CaseMismatch()
    {
@@ -126,7 +192,7 @@ class DebugClassLoaderTest extends TestCase
    {
        set_error_handler(function () { return false; });
        $e = error_reporting(0);
-        trigger_error('', E_USER_DEPRECATED);
+        @trigger_error('', E_USER_DEPRECATED);

        class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);

@@ -136,20 +202,20 @@ class DebugClassLoaderTest extends TestCase
        $lastError = error_get_last();
        unset($lastError['file'], $lastError['line']);

-        $xError = array(
+        $xError = [
            'type' => E_USER_DEPRECATED,
            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
-        );
+        ];

        $this->assertSame($xError, $lastError);
    }

    public function provideDeprecatedSuper()
    {
-        return array(
-            array('DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'),
-            array('DeprecatedParentClass', 'DeprecatedClass', 'extends'),
-        );
+        return [
+            ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],
+            ['DeprecatedParentClass', 'DeprecatedClass', 'extends'],
+        ];
    }

    public function testInterfaceExtendsDeprecatedInterface()
@@ -166,10 +232,10 @@ class DebugClassLoaderTest extends TestCase
        $lastError = error_get_last();
        unset($lastError['file'], $lastError['line']);

-        $xError = array(
+        $xError = [
            'type' => E_USER_NOTICE,
            'message' => '',
-        );
+        ];

        $this->assertSame($xError, $lastError);
    }
@@ -188,21 +254,25 @@ class DebugClassLoaderTest extends TestCase
        $lastError = error_get_last();
        unset($lastError['file'], $lastError['line']);

-        $xError = array(
+        $xError = [
            'type' => E_USER_NOTICE,
            'message' => '',
-        );
+        ];

        $this->assertSame($xError, $lastError);
    }

-    public function testExtendedFinalClass()
+    public function testReservedForPhp7()
    {
+        if (\PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('PHP7 already prevents using reserved names.');
+        }
+
        set_error_handler(function () { return false; });
        $e = error_reporting(0);
        trigger_error('', E_USER_NOTICE);

-        class_exists('Test\\'.__NAMESPACE__.'\\ExtendsFinalClass', true);
+        class_exists('Test\\'.__NAMESPACE__.'\\Float', true);

        error_reporting($e);
        restore_error_handler();
@@ -210,17 +280,46 @@ class DebugClassLoaderTest extends TestCase
        $lastError = error_get_last();
        unset($lastError['file'], $lastError['line']);

-        $xError = array(
+        $xError = [
            'type' => E_USER_DEPRECATED,
-            'message' => 'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass".',
-        );
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\Float" class uses the reserved name "Float", it will break on PHP 7 and higher',
+        ];

        $this->assertSame($xError, $lastError);
    }

+    public function testExtendedFinalClass()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        require __DIR__.'/Fixtures/FinalClasses.php';
+
+        $i = 1;
+        while(class_exists($finalClass = __NAMESPACE__.'\\Fixtures\\FinalClass'.$i++, false)) {
+            spl_autoload_call($finalClass);
+            class_exists('Test\\'.__NAMESPACE__.'\\Extends'.substr($finalClass, strrpos($finalClass, '\\') + 1), true);
+        }
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame([
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass1" class is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass1".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass2" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass2".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass3" class is considered final comment with @@@ and ***. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass3".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass4" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass4".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass5" class is considered final multiline comment. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass5".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass6" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass6".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass7" class is considered final another multiline comment... It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass7".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass8" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass8".',
+        ], $deprecations);
+    }
+
    public function testExtendedFinalMethod()
    {
-        $deprecations = array();
+        $deprecations = [];
        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
        $e = error_reporting(E_USER_DEPRECATED);

@@ -229,10 +328,10 @@ class DebugClassLoaderTest extends TestCase
        error_reporting($e);
        restore_error_handler();

-        $xError = array(
-            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+        $xError = [
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
-        );
+        ];

        $this->assertSame($xError, $deprecations);
    }
@@ -251,12 +350,12 @@ class DebugClassLoaderTest extends TestCase
        $lastError = error_get_last();
        unset($lastError['file'], $lastError['line']);

-        $this->assertSame(array('type' => E_USER_NOTICE, 'message' => ''), $lastError);
+        $this->assertSame(['type' => E_USER_NOTICE, 'message' => ''], $lastError);
    }

    public function testInternalsUse()
    {
-        $deprecations = array();
+        $deprecations = [];
        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
        $e = error_reporting(E_USER_DEPRECATED);

@@ -265,17 +364,17 @@ class DebugClassLoaderTest extends TestCase
        error_reporting($e);
        restore_error_handler();

-        $this->assertSame($deprecations, array(
+        $this->assertSame($deprecations, [
            'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
            'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait" trait is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
-        ));
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal since version 3.4. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+        ]);
    }

    public function testUseTraitWithInternalMethod()
    {
-        $deprecations = array();
+        $deprecations = [];
        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
        $e = error_reporting(E_USER_DEPRECATED);

@@ -284,7 +383,7 @@ class DebugClassLoaderTest extends TestCase
        error_reporting($e);
        restore_error_handler();

-        $this->assertSame(array(), $deprecations);
+        $this->assertSame([], $deprecations);
    }
 }

@@ -296,12 +395,12 @@ class ClassLoader

    public function getClassMap()
    {
-        return array(__NAMESPACE__.'\Fixtures\NotPSR0bis' => __DIR__.'/Fixtures/notPsr0Bis.php');
+        return [__NAMESPACE__.'\Fixtures\NotPSR0bis' => __DIR__.'/Fixtures/notPsr0Bis.php'];
    }

    public function findFile($class)
    {
-        $fixtureDir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR;
+        $fixtureDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;

        if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
            eval('-- parse error --');
@@ -310,7 +409,7 @@ class ClassLoader
        } elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
            eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
        } elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
-            return $fixtureDir.'psr4'.DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
+            return $fixtureDir.'psr4'.\DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
        } elseif (__NAMESPACE__.'\Fixtures\NotPSR0' === $class) {
            return $fixtureDir.'reallyNotPsr0.php';
        } elseif (__NAMESPACE__.'\Fixtures\NotPSR0bis' === $class) {
@@ -325,8 +424,9 @@ class ClassLoader
            eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
        } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
-        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsFinalClass' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsFinalClass extends \\'.__NAMESPACE__.'\Fixtures\FinalClass {}');
+        } elseif (0 === strpos($class, 'Test\\'.__NAMESPACE__.'\ExtendsFinalClass')) {
+            $classShortName = substr($class, strrpos($class, '\\') + 1);
+            eval('namespace Test\\'.__NAMESPACE__.'; class '.$classShortName.' extends \\'.__NAMESPACE__.'\Fixtures\\'.substr($classShortName, 7).' {}');
        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsAnnotatedClass' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsAnnotatedClass extends \\'.__NAMESPACE__.'\Fixtures\AnnotatedClass {
                public function deprecatedMethod() { }
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\Debug\Tests;

 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
 use Symfony\Component\Debug\BufferingLogger;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\Debug\Exception\SilencedErrorContext;
+use Symfony\Component\Debug\Tests\Fixtures\LoggerThatSetAnErrorHandler;

 /**
 * ErrorHandlerTest.
@@ -38,13 +41,13 @@ class ErrorHandlerTest extends TestCase
            $this->assertSame($handler, ErrorHandler::register($newHandler, false));
            $h = set_error_handler('var_dump');
            restore_error_handler();
-            $this->assertSame(array($handler, 'handleError'), $h);
+            $this->assertSame([$handler, 'handleError'], $h);

            try {
                $this->assertSame($newHandler, ErrorHandler::register($newHandler, true));
                $h = set_error_handler('var_dump');
                restore_error_handler();
-                $this->assertSame(array($newHandler, 'handleError'), $h);
+                $this->assertSame([$newHandler, 'handleError'], $h);
            } catch (\Exception $e) {
            }

@@ -74,12 +77,12 @@ class ErrorHandlerTest extends TestCase

        try {
            @trigger_error('Hello', E_USER_WARNING);
-            $expected = array(
+            $expected = [
                'type' => E_USER_WARNING,
                'message' => 'Hello',
                'file' => __FILE__,
                'line' => __LINE__ - 5,
-            );
+            ];
            $this->assertSame($expected, error_get_last());
        } catch (\Exception $e) {
            restore_error_handler();
@@ -145,26 +148,26 @@ class ErrorHandlerTest extends TestCase
            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();

            $handler->setDefaultLogger($logger, E_NOTICE);
-            $handler->setDefaultLogger($logger, array(E_USER_NOTICE => LogLevel::CRITICAL));
+            $handler->setDefaultLogger($logger, [E_USER_NOTICE => LogLevel::CRITICAL]);

-            $loggers = array(
-                E_DEPRECATED => array(null, LogLevel::INFO),
-                E_USER_DEPRECATED => array(null, LogLevel::INFO),
-                E_NOTICE => array($logger, LogLevel::WARNING),
-                E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
-                E_STRICT => array(null, LogLevel::WARNING),
-                E_WARNING => array(null, LogLevel::WARNING),
-                E_USER_WARNING => array(null, LogLevel::WARNING),
-                E_COMPILE_WARNING => array(null, LogLevel::WARNING),
-                E_CORE_WARNING => array(null, LogLevel::WARNING),
-                E_USER_ERROR => array(null, LogLevel::CRITICAL),
-                E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-                E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-                E_PARSE => array(null, LogLevel::CRITICAL),
-                E_ERROR => array(null, LogLevel::CRITICAL),
-                E_CORE_ERROR => array(null, LogLevel::CRITICAL),
-            );
-            $this->assertSame($loggers, $handler->setLoggers(array()));
+            $loggers = [
+                E_DEPRECATED => [null, LogLevel::INFO],
+                E_USER_DEPRECATED => [null, LogLevel::INFO],
+                E_NOTICE => [$logger, LogLevel::WARNING],
+                E_USER_NOTICE => [$logger, LogLevel::CRITICAL],
+                E_STRICT => [null, LogLevel::WARNING],
+                E_WARNING => [null, LogLevel::WARNING],
+                E_USER_WARNING => [null, LogLevel::WARNING],
+                E_COMPILE_WARNING => [null, LogLevel::WARNING],
+                E_CORE_WARNING => [null, LogLevel::WARNING],
+                E_USER_ERROR => [null, LogLevel::CRITICAL],
+                E_RECOVERABLE_ERROR => [null, LogLevel::CRITICAL],
+                E_COMPILE_ERROR => [null, LogLevel::CRITICAL],
+                E_PARSE => [null, LogLevel::CRITICAL],
+                E_ERROR => [null, LogLevel::CRITICAL],
+                E_CORE_ERROR => [null, LogLevel::CRITICAL],
+            ];
+            $this->assertSame($loggers, $handler->setLoggers([]));
        } finally {
            restore_error_handler();
            restore_exception_handler();
@@ -176,14 +179,14 @@ class ErrorHandlerTest extends TestCase
        try {
            $handler = ErrorHandler::register();
            $handler->throwAt(0, true);
-            $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, []));

            restore_error_handler();
            restore_exception_handler();

            $handler = ErrorHandler::register();
            $handler->throwAt(3, true);
-            $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, []));

            restore_error_handler();
            restore_exception_handler();
@@ -191,7 +194,7 @@ class ErrorHandlerTest extends TestCase
            $handler = ErrorHandler::register();
            $handler->throwAt(3, true);
            try {
-                $handler->handleError(4, 'foo', 'foo.php', 12, array());
+                $handler->handleError(4, 'foo', 'foo.php', 12, []);
            } catch (\ErrorException $e) {
                $this->assertSame('Parse Error: foo', $e->getMessage());
                $this->assertSame(4, $e->getSeverity());
@@ -204,14 +207,14 @@ class ErrorHandlerTest extends TestCase

            $handler = ErrorHandler::register();
            $handler->throwAt(E_USER_DEPRECATED, true);
-            $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));

            restore_error_handler();
            restore_exception_handler();

            $handler = ErrorHandler::register();
            $handler->throwAt(E_DEPRECATED, true);
-            $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, []));

            restore_error_handler();
            restore_exception_handler();
@@ -236,7 +239,7 @@ class ErrorHandlerTest extends TestCase

            $handler = ErrorHandler::register();
            $handler->setDefaultLogger($logger, E_USER_DEPRECATED);
-            $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));

            restore_error_handler();
            restore_exception_handler();
@@ -320,9 +323,14 @@ class ErrorHandlerTest extends TestCase

        $handler = new ErrorHandler();
        $handler->setDefaultLogger($logger);
-        @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, array());
+        @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);
+
+        restore_error_handler();
    }

+    /**
+     * @group no-hhvm
+     */
    public function testHandleException()
    {
        try {
@@ -364,32 +372,64 @@ class ErrorHandlerTest extends TestCase
        }
    }

+    /**
+     * @group legacy
+     */
+    public function testErrorStacking()
+    {
+        try {
+            $handler = ErrorHandler::register();
+            $handler->screamAt(E_USER_WARNING);
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+            $logger
+                ->expects($this->exactly(2))
+                ->method('log')
+                ->withConsecutive(
+                    [$this->equalTo(LogLevel::WARNING), $this->equalTo('Dummy log')],
+                    [$this->equalTo(LogLevel::DEBUG), $this->equalTo('User Warning: Silenced warning')]
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, [E_USER_WARNING => LogLevel::WARNING]);
+
+            ErrorHandler::stackErrors();
+            @trigger_error('Silenced warning', E_USER_WARNING);
+            $logger->log(LogLevel::WARNING, 'Dummy log');
+            ErrorHandler::unstackErrors();
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
    public function testBootstrappingLogger()
    {
        $bootLogger = new BufferingLogger();
        $handler = new ErrorHandler($bootLogger);

-        $loggers = array(
-            E_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_USER_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_USER_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_STRICT => array($bootLogger, LogLevel::WARNING),
-            E_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_COMPILE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_CORE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_RECOVERABLE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_COMPILE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_PARSE => array($bootLogger, LogLevel::CRITICAL),
-            E_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_CORE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-        );
+        $loggers = [
+            E_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_USER_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_USER_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_STRICT => [$bootLogger, LogLevel::WARNING],
+            E_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_COMPILE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_CORE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_RECOVERABLE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_COMPILE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_PARSE => [$bootLogger, LogLevel::CRITICAL],
+            E_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_CORE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+        ];

-        $this->assertSame($loggers, $handler->setLoggers(array()));
+        $this->assertSame($loggers, $handler->setLoggers([]));

-        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, array());
+        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, []);

        $logs = $bootLogger->cleanLogs();

@@ -405,16 +445,19 @@ class ErrorHandlerTest extends TestCase
        $this->assertSame(123, $exception->getLine());
        $this->assertSame(E_DEPRECATED, $exception->getSeverity());

-        $bootLogger->log(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
+        $bootLogger->log(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);

        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
        $mockLogger->expects($this->once())
            ->method('log')
-            ->with(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
+            ->with(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);

-        $handler->setLoggers(array(E_DEPRECATED => array($mockLogger, LogLevel::WARNING)));
+        $handler->setLoggers([E_DEPRECATED => [$mockLogger, LogLevel::WARNING]]);
    }

+    /**
+     * @group no-hhvm
+     */
    public function testSettingLoggerWhenExceptionIsBuffered()
    {
        $bootLogger = new BufferingLogger();
@@ -425,7 +468,7 @@ class ErrorHandlerTest extends TestCase
        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
        $mockLogger->expects($this->once())
            ->method('log')
-            ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', array('exception' => $exception));
+            ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', ['exception' => $exception]);

        $handler->setExceptionHandler(function () use ($handler, $mockLogger) {
            $handler->setDefaultLogger($mockLogger);
@@ -434,17 +477,20 @@ class ErrorHandlerTest extends TestCase
        $handler->handleException($exception);
    }

+    /**
+     * @group no-hhvm
+     */
    public function testHandleFatalError()
    {
        try {
            $handler = ErrorHandler::register();

-            $error = array(
+            $error = [
                'type' => E_PARSE,
                'message' => 'foo',
                'file' => 'bar',
                'line' => 123,
-            );
+            ];

            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();

@@ -474,6 +520,9 @@ class ErrorHandlerTest extends TestCase
        }
    }

+    /**
+     * @requires PHP 7
+     */
    public function testHandleErrorException()
    {
        $exception = new \Error("Class 'Foo' not found");
@@ -489,8 +538,46 @@ class ErrorHandlerTest extends TestCase
        $this->assertStringStartsWith("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage());
    }

+    /**
+     * @group no-hhvm
+     */
+    public function testHandleFatalErrorOnHHVM()
+    {
+        try {
+            $handler = ErrorHandler::register();
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->with(
+                    $this->equalTo(LogLevel::CRITICAL),
+                    $this->equalTo('Fatal Error: foo')
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, E_ERROR);
+
+            $error = [
+                'type' => E_ERROR + 0x1000000, // This error level is used by HHVM for fatal errors
+                'message' => 'foo',
+                'file' => 'bar',
+                'line' => 123,
+                'context' => [123],
+                'backtrace' => [456],
+            ];
+
+            \call_user_func_array([$handler, 'handleError'], $error);
+            $handler->handleFatalError($error);
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
    /**
     * @expectedException \Exception
+     * @group no-hhvm
     */
    public function testCustomExceptionHandler()
    {
@@ -501,4 +588,43 @@ class ErrorHandlerTest extends TestCase

        $handler->handleException(new \Exception());
    }
+
+    /**
+     * @dataProvider errorHandlerIsNotLostWhenLoggingProvider
+     */
+    public function testErrorHandlerIsNotLostWhenLogging($customErrorHandlerHasBeenPreviouslyDefined, LoggerInterface $logger)
+    {
+        try {
+            if ($customErrorHandlerHasBeenPreviouslyDefined) {
+                set_error_handler('count');
+            }
+
+            $handler = ErrorHandler::register();
+            $handler->setDefaultLogger($logger);
+
+            @trigger_error('foo', E_USER_DEPRECATED);
+            @trigger_error('bar', E_USER_DEPRECATED);
+
+            $this->assertSame([$handler, 'handleError'], set_error_handler('var_dump'));
+
+            restore_error_handler();
+
+            if ($customErrorHandlerHasBeenPreviouslyDefined) {
+                restore_error_handler();
+            }
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function errorHandlerIsNotLostWhenLoggingProvider()
+    {
+        return [
+            [false, new NullLogger()],
+            [true, new NullLogger()],
+            [false, new LoggerThatSetAnErrorHandler()],
+            [true, new LoggerThatSetAnErrorHandler()],
+        ];
+    }
 }
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Debug\Tests\Exception;

 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -40,12 +39,6 @@ class FlattenExceptionTest extends TestCase
        $flattened = FlattenException::create(new \RuntimeException());
        $this->assertEquals('500', $flattened->getStatusCode());

-        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError(), 403);
-        $this->assertEquals('403', $flattened->getStatusCode());
-
-        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError());
-        $this->assertEquals('500', $flattened->getStatusCode());
-
        $flattened = FlattenException::create(new NotFoundHttpException());
        $this->assertEquals('404', $flattened->getStatusCode());

@@ -61,7 +54,7 @@ class FlattenExceptionTest extends TestCase
        $flattened = FlattenException::create(new ConflictHttpException());
        $this->assertEquals('409', $flattened->getStatusCode());

-        $flattened = FlattenException::create(new MethodNotAllowedHttpException(array('POST')));
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
        $this->assertEquals('405', $flattened->getStatusCode());

        $flattened = FlattenException::create(new AccessDeniedHttpException());
@@ -96,32 +89,32 @@ class FlattenExceptionTest extends TestCase

    public function testHeadersForHttpException()
    {
-        $flattened = FlattenException::create(new MethodNotAllowedHttpException(array('POST')));
-        $this->assertEquals(array('Allow' => 'POST'), $flattened->getHeaders());
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
+        $this->assertEquals(['Allow' => 'POST'], $flattened->getHeaders());

        $flattened = FlattenException::create(new UnauthorizedHttpException('Basic realm="My Realm"'));
-        $this->assertEquals(array('WWW-Authenticate' => 'Basic realm="My Realm"'), $flattened->getHeaders());
+        $this->assertEquals(['WWW-Authenticate' => 'Basic realm="My Realm"'], $flattened->getHeaders());

        $flattened = FlattenException::create(new ServiceUnavailableHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
-        $this->assertEquals(array('Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());

        $flattened = FlattenException::create(new ServiceUnavailableHttpException(120));
-        $this->assertEquals(array('Retry-After' => 120), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());

        $flattened = FlattenException::create(new TooManyRequestsHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
-        $this->assertEquals(array('Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());

        $flattened = FlattenException::create(new TooManyRequestsHttpException(120));
-        $this->assertEquals(array('Retry-After' => 120), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testFlattenHttpException(\Throwable $exception)
+    public function testFlattenHttpException(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
-        $flattened2 = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);

        $flattened->setPrevious($flattened2);

@@ -130,109 +123,78 @@ class FlattenExceptionTest extends TestCase
        $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
    }

-    public function testWrappedThrowable()
-    {
-        $exception = new FatalThrowableError(new \DivisionByZeroError('Ouch', 42));
-        $flattened = FlattenException::create($exception);
-
-        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
-        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
-        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
-    }
-
-    public function testThrowable()
-    {
-        $error = new \DivisionByZeroError('Ouch', 42);
-        $flattened = FlattenException::createFromThrowable($error);
-
-        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
-        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
-        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
-    }
-
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testPrevious(\Throwable $exception)
+    public function testPrevious(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
-        $flattened2 = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);

        $flattened->setPrevious($flattened2);

        $this->assertSame($flattened2, $flattened->getPrevious());

-        $this->assertSame(array($flattened2), $flattened->getAllPrevious());
+        $this->assertSame([$flattened2], $flattened->getAllPrevious());
    }

+    /**
+     * @requires PHP 7.0
+     */
    public function testPreviousError()
    {
        $exception = new \Exception('test', 123, new \ParseError('Oh noes!', 42));

        $flattened = FlattenException::create($exception)->getPrevious();

-        $this->assertEquals($flattened->getMessage(), 'Oh noes!', 'The message is copied from the original exception.');
+        $this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
        $this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
-        $this->assertEquals($flattened->getClass(), 'ParseError', 'The class is set to the class of the original exception');
+        $this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testLine(\Throwable $exception)
+    public function testLine(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
        $this->assertSame($exception->getLine(), $flattened->getLine());
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testFile(\Throwable $exception)
+    public function testFile(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
        $this->assertSame($exception->getFile(), $flattened->getFile());
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testToArray(\Throwable $exception, string $expectedClass)
+    public function testToArray(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
-        $flattened->setTrace(array(), 'foo.php', 123);
+        $flattened = FlattenException::create($exception);
+        $flattened->setTrace([], 'foo.php', 123);

-        $this->assertEquals(array(
-            array(
+        $this->assertEquals([
+            [
                'message' => 'test',
-                'class' => $expectedClass,
-                'trace' => array(array(
+                'class' => 'Exception',
+                'trace' => [[
                    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
-                    'args' => array(),
-                )),
-            ),
-        ), $flattened->toArray());
-    }
-
-    public function testCreate()
-    {
-        $exception = new NotFoundHttpException(
-            'test',
-            new \RuntimeException('previous', 123)
-        );
-
-        $this->assertSame(
-            FlattenException::createFromThrowable($exception)->toArray(),
-            FlattenException::create($exception)->toArray()
-        );
+                    'args' => [],
+                ]],
+            ],
+        ], $flattened->toArray());
    }

    public function flattenDataProvider()
    {
-        return array(
-            array(new \Exception('test', 123), 'Exception'),
-            array(new \Error('test', 123), 'Error'),
-        );
+        return [
+            [new \Exception('test', 123)],
+        ];
    }

    public function testArguments()
@@ -242,15 +204,15 @@ class FlattenExceptionTest extends TestCase

        $incomplete = unserialize('O:14:"BogusTestClass":0:{}');

-        $exception = $this->createException(array(
-            (object) array('foo' => 1),
+        $exception = $this->createException([
+            (object) ['foo' => 1],
            new NotFoundHttpException(),
            $incomplete,
            $dh,
            $fh,
            function () {},
-            array(1, 2),
-            array('foo' => 123),
+            [1, 2],
+            ['foo' => 123],
            null,
            true,
            false,
@@ -260,7 +222,7 @@ class FlattenExceptionTest extends TestCase
            '',
            INF,
            NAN,
-        ));
+        ]);

        $flattened = FlattenException::create($exception);
        $trace = $flattened->getTrace();
@@ -271,26 +233,26 @@ class FlattenExceptionTest extends TestCase
        fclose($fh);

        $i = 0;
-        $this->assertSame(array('object', 'stdClass'), $array[$i++]);
-        $this->assertSame(array('object', 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'), $array[$i++]);
-        $this->assertSame(array('incomplete-object', 'BogusTestClass'), $array[$i++]);
-        $this->assertSame(array('resource', 'stream'), $array[$i++]);
-        $this->assertSame(array('resource', 'stream'), $array[$i++]);
+        $this->assertSame(['object', 'stdClass'], $array[$i++]);
+        $this->assertSame(['object', 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'], $array[$i++]);
+        $this->assertSame(['incomplete-object', 'BogusTestClass'], $array[$i++]);
+        $this->assertSame(['resource', \defined('HHVM_VERSION') ? 'Directory' : 'stream'], $array[$i++]);
+        $this->assertSame(['resource', 'stream'], $array[$i++]);

        $args = $array[$i++];
        $this->assertSame($args[0], 'object');
        $this->assertTrue('Closure' === $args[1] || is_subclass_of($args[1], '\Closure'), 'Expect object class name to be Closure or a subclass of Closure.');

-        $this->assertSame(array('array', array(array('integer', 1), array('integer', 2))), $array[$i++]);
-        $this->assertSame(array('array', array('foo' => array('integer', 123))), $array[$i++]);
-        $this->assertSame(array('null', null), $array[$i++]);
-        $this->assertSame(array('boolean', true), $array[$i++]);
-        $this->assertSame(array('boolean', false), $array[$i++]);
-        $this->assertSame(array('integer', 0), $array[$i++]);
-        $this->assertSame(array('float', 0.0), $array[$i++]);
-        $this->assertSame(array('string', '0'), $array[$i++]);
-        $this->assertSame(array('string', ''), $array[$i++]);
-        $this->assertSame(array('float', INF), $array[$i++]);
+        $this->assertSame(['array', [['integer', 1], ['integer', 2]]], $array[$i++]);
+        $this->assertSame(['array', ['foo' => ['integer', 123]]], $array[$i++]);
+        $this->assertSame(['null', null], $array[$i++]);
+        $this->assertSame(['boolean', true], $array[$i++]);
+        $this->assertSame(['boolean', false], $array[$i++]);
+        $this->assertSame(['integer', 0], $array[$i++]);
+        $this->assertSame(['float', 0.0], $array[$i++]);
+        $this->assertSame(['string', '0'], $array[$i++]);
+        $this->assertSame(['string', ''], $array[$i++]);
+        $this->assertSame(['float', INF], $array[$i++]);

        // assertEquals() does not like NAN values.
        $this->assertEquals($array[$i][0], 'float');
@@ -300,7 +262,7 @@ class FlattenExceptionTest extends TestCase
    public function testRecursionInArguments()
    {
        $a = null;
-        $a = array('foo', array(2, &$a));
+        $a = ['foo', [2, &$a]];
        $exception = $this->createException($a);

        $flattened = FlattenException::create($exception);
@@ -310,7 +272,7 @@ class FlattenExceptionTest extends TestCase

    public function testTooBigArray()
    {
-        $a = array();
+        $a = [];
        for ($i = 0; $i < 20; ++$i) {
            for ($j = 0; $j < 50; ++$j) {
                for ($k = 0; $k < 10; ++$k) {
@@ -325,7 +287,7 @@ class FlattenExceptionTest extends TestCase
        $flattened = FlattenException::create($exception);
        $trace = $flattened->getTrace();

-        $this->assertSame($trace[1]['args'][0], array('array', array('array', '*SKIPPED over 10000 entries*')));
+        $this->assertSame($trace[1]['args'][0], ['array', ['array', '*SKIPPED over 10000 entries*']]);

        $serializeTrace = serialize($trace);

--- a/Tests/ExceptionHandlerTest.php
+++ b/Tests/ExceptionHandlerTest.php
@@ -62,10 +62,10 @@ class ExceptionHandlerTest extends TestCase

        $this->assertContains('Sorry, the page you are looking for could not be found.', $response);

-        $expectedHeaders = array(
-            array('HTTP/1.0 404', true, null),
-            array('Content-Type: text/html; charset=iso8859-1', true, null),
-        );
+        $expectedHeaders = [
+            ['HTTP/1.0 404', true, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];

        $this->assertSame($expectedHeaders, testHeader());
    }
@@ -75,14 +75,14 @@ class ExceptionHandlerTest extends TestCase
        $handler = new ExceptionHandler(false, 'iso8859-1');

        ob_start();
-        $handler->sendPhpResponse(new MethodNotAllowedHttpException(array('POST')));
+        $handler->sendPhpResponse(new MethodNotAllowedHttpException(['POST']));
        $response = ob_get_clean();

-        $expectedHeaders = array(
-            array('HTTP/1.0 405', true, null),
-            array('Allow: POST', false, null),
-            array('Content-Type: text/html; charset=iso8859-1', true, null),
-        );
+        $expectedHeaders = [
+            ['HTTP/1.0 405', true, null],
+            ['Allow: POST', false, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];

        $this->assertSame($expectedHeaders, testHeader());
    }
@@ -101,7 +101,7 @@ class ExceptionHandlerTest extends TestCase
    {
        $exception = new \Exception('foo');

-        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
+        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock();
        $handler
            ->expects($this->exactly(2))
            ->method('sendPhpResponse');
@@ -119,7 +119,7 @@ class ExceptionHandlerTest extends TestCase
    {
        $exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__);

-        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
+        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock();
        $handler
            ->expects($this->once())
            ->method('sendPhpResponse');
--- a/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -72,85 +72,85 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
        $autoloader = new ComposerClassLoader();
        $autoloader->add('Symfony\Component\Debug\Exception\\', realpath(__DIR__.'/../../Exception'));

-        $debugClassLoader = new DebugClassLoader(array($autoloader, 'loadClass'));
+        $debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']);

-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'WhizBangFactory\' not found',
-                ),
+                ],
                "Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
-                ),
+                ],
                "Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'UndefinedFunctionException\' not found',
-                ),
+                ],
                "Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'PEARClass\' not found',
-                ),
+                ],
                "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-                array($autoloader, 'loadClass'),
-            ),
-            array(
-                array(
+                [$autoloader, 'loadClass'],
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-                array($debugClassLoader, 'loadClass'),
-            ),
-            array(
-                array(
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
                function ($className) { /* do nothing here */ },
-            ),
-        );
+            ],
+        ];
    }

    public function testCannotRedeclareClass()
@@ -161,12 +161,12 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase

        require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';

-        $error = array(
+        $error = [
            'type' => 1,
            'line' => 12,
            'file' => 'foo.php',
            'message' => 'Class \'Foo\\Bar\\RequiredTwice\' not found',
-        );
+        ];

        $handler = new ClassNotFoundFatalErrorHandler();
        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
--- a/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ b/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -26,7 +26,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase
        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));

        $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
-        // class names are case insensitive and PHP do not return the same
+        // class names are case insensitive and PHP/HHVM do not return the same
        $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
        $this->assertSame($error['type'], $exception->getSeverity());
        $this->assertSame($error['file'], $exception->getFile());
@@ -35,44 +35,44 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase

    public function provideUndefinedFunctionData()
    {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined function test_namespaced_function()',
-                ),
+                ],
                "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()',
-                ),
+                ],
                "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined function foo()',
-                ),
+                ],
                'Attempted to call function "foo" from the global namespace.',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined function Foo\\Bar\\Baz\\foo()',
-                ),
+                ],
                'Attempted to call function "foo" from namespace "Foo\Bar\Baz".',
-            ),
-        );
+            ],
+        ];
    }
 }

--- a/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -34,43 +34,43 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase

    public function provideUndefinedMethodData()
    {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined method SplObjectStorage::what()',
-                ),
+                ],
                'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined method SplObjectStorage::walid()',
-                ),
+                ],
                "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'line' => 12,
                    'file' => 'foo.php',
                    'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
-                ),
+                ],
                "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                    'type' => 1,
                    'message' => 'Call to undefined method class@anonymous::test()',
                    'file' => '/home/possum/work/symfony/test.php',
                    'line' => 11,
-                ),
+                ],
                'Attempted to call an undefined method named "test" of class "class@anonymous".',
-            ),
-        );
+            ],
+        ];
    }
 }
--- a/Tests/Fixtures/AnnotatedClass.php
+++ b/Tests/Fixtures/AnnotatedClass.php
@@ -5,7 +5,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 class AnnotatedClass
 {
    /**
-     * @deprecated
+     * @deprecated since version 3.4.
     */
    public function deprecatedMethod()
    {
--- a/Tests/Fixtures/FinalClass.php
+++ b/Tests/Fixtures/FinalClass.php
@@ -1,10 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-/**
- * @final
- */
-class FinalClass
-{
-}
--- a/Tests/Fixtures/FinalClasses.php
+++ b/Tests/Fixtures/FinalClasses.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @final since version 3.3.
+ */
+class FinalClass1
+{
+    // simple comment
+}
+
+/**
+ * @final
+ */
+class FinalClass2
+{
+    // no comment
+}
+
+/**
+ * @final comment with @@@ and ***
+ *
+ * @author John Doe
+ */
+class FinalClass3
+{
+    // with comment and a tag after
+}
+
+/**
+ * @final
+ * @author John Doe
+ */
+class FinalClass4
+{
+    // without comment and a tag after
+}
+
+/**
+ * @author John Doe
+ *
+ *
+ * @final multiline
+ * comment
+ */
+class FinalClass5
+{
+    // with comment and a tag before
+}
+
+/**
+ * @author John Doe
+ *
+ * @final
+ */
+class FinalClass6
+{
+    // without comment and a tag before
+}
+
+/**
+ * @author John Doe
+ *
+ * @final another
+ *
+ *        multiline comment...
+ *
+ * @return string
+ */
+class FinalClass7
+{
+    // with comment and a tag before and after
+}
+
+/**
+ * @author John Doe
+ * @final
+ * @return string
+ */
+class FinalClass8
+{
+    // without comment and a tag before and after
+}
--- a/Tests/Fixtures/FinalMethod.php
+++ b/Tests/Fixtures/FinalMethod.php
@@ -5,7 +5,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 class FinalMethod
 {
    /**
-     * @final
+     * @final since version 3.3.
     */
    public function finalMethod()
    {
--- a/Tests/Fixtures/InternalClass.php
+++ b/Tests/Fixtures/InternalClass.php
@@ -3,7 +3,7 @@
 namespace Symfony\Component\Debug\Tests\Fixtures;

 /**
- * @internal
+ * @internal since version 3.4.
 */
 class InternalClass
 {
--- a/Tests/Fixtures/InternalTrait2.php
+++ b/Tests/Fixtures/InternalTrait2.php
@@ -8,7 +8,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 trait InternalTrait2
 {
    /**
-     * @internal
+     * @internal since version 3.4
     */
    public function internalMethod()
    {
--- a/Tests/Fixtures/LoggerThatSetAnErrorHandler.php
+++ b/Tests/Fixtures/LoggerThatSetAnErrorHandler.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+use Psr\Log\AbstractLogger;
+
+class LoggerThatSetAnErrorHandler extends AbstractLogger
+{
+    public function log($level, $message, array $context = [])
+    {
+        set_error_handler('is_string');
+        restore_error_handler();
+    }
+}
--- a/Tests/Fixtures/ToStringThrower.php
+++ b/Tests/Fixtures/ToStringThrower.php
@@ -18,7 +18,7 @@ class ToStringThrower
        } catch (\Exception $e) {
            // Using user_error() here is on purpose so we do not forget
            // that this alias also should work alongside with trigger_error().
-            return user_error($e, E_USER_ERROR);
+            return trigger_error($e, E_USER_ERROR);
        }
    }
 }
--- a/Tests/HeaderMock.php
+++ b/Tests/HeaderMock.php
@@ -25,11 +25,11 @@ namespace Symfony\Component\Debug\Tests;

 function testHeader()
 {
-    static $headers = array();
+    static $headers = [];

    if (!$h = \func_get_args()) {
        $h = $headers;
-        $headers = array();
+        $headers = [];

        return $h;
    }
--- a/Tests/phpt/debug_class_loader.phpt
+++ b/Tests/phpt/debug_class_loader.phpt
@@ -23,5 +23,5 @@ class_exists(ExtendedFinalMethod::class);

 ?>
 --EXPECTF--
-The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
+The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
 The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
--- a/Tests/phpt/exception_rethrown.phpt
+++ b/Tests/phpt/exception_rethrown.phpt
@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
 if (true) {
    class TestLogger extends \Psr\Log\AbstractLogger
    {
-        public function log($level, $message, array $context = array())
+        public function log($level, $message, array $context = [])
        {
            echo $message, "\n";
        }
--- a/Tests/phpt/fatal_with_nested_handlers.phpt
+++ b/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -17,9 +17,9 @@ ini_set('display_errors', 0);
 $eHandler = set_error_handler('var_dump');
 $xHandler = set_exception_handler('var_dump');

-var_dump(array(
+var_dump([
    $eHandler[0] === $xHandler[0] ? 'Error and exception handlers do match' : 'Error and exception handlers are different',
-));
+]);

 $eHandler[0]->setExceptionHandler('print_r');

--- a/composer.json
+++ b/composer.json
@@ -16,14 +16,14 @@
        }
    ],
    "require": {
-        "php": "^7.1.3",
+        "php": "^5.5.9|>=7.0.8",
        "psr/log": "~1.0"
    },
    "conflict": {
-        "symfony/http-kernel": "<3.4"
+        "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
    },
    "require-dev": {
-        "symfony/http-kernel": "~3.4|~4.0"
+        "symfony/http-kernel": "~2.8|~3.0|~4.0"
    },
    "autoload": {
        "psr-4": { "Symfony\\Component\\Debug\\": "" },
@@ -34,7 +34,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "4.1-dev"
+            "dev-master": "3.4-dev"
        }
    }
 }
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
Author	SHA1	Message	Date
Nicolas Grekas	667a26c4dd	bug #29869 [Debug][ErrorHandler] Preserve our error handler when a logger sets another one (fancyweb) This PR was merged into the 3.4 branch. Discussion ---------- [Debug][ErrorHandler] Preserve our error handler when a logger sets another one \| Q \| A \| ------------- \| --- \| Branch? \| 3.4 \| Bug fix? \| yes \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| yes \| Fixed tickets \| - \| License \| MIT \| Doc PR \| - When logging errors handled by the `ErrorHandler::handleError()` method, the logger can temporarily set its own custom error handler. This is for example the case of `Monolog` in the `StreamHandler` class (cf `ebb804e432/src/Monolog/Handler/StreamHandler.php (L101)`). However, when the previous error handler is restored by the logger, it "skips" the real previous handler (the `ErrorHandler::handleError()` one) in the pile and goes back directly to the one before. I guess this is because the `restore_error_handler()` call is technically done in the error handler itself, so it logically restore it to the one before and not to itself. Here is an easy small example that shows the PHP behavior : https://3v4l.org/4OZNZ The only solution I have found to fix it is to set our error handler everytime an error is logged. Here are the things I discovered while trying to find a cleaner fix : - Setting the same error handler in the error handler itself doesn't actually add it to the pile. This is why adding a check is useless. - Checking if the logger modified the error handler is impossible anyway : to get the current error handler, you need to set a new one temporarirly and then revert it. However, when you revert it by calling `restore_error_handler()` you end up having the same problem you are trying to fix... - Also trying to get the current error handler in the error handler itself will return NULL if it is itself. Commits ------- b979fff6b8 [Debug][ErrorHandler] Preserve our error handler when a logger set another one	2019-01-25 11:19:25 +01:00
Thomas Calvet	b624515da8	[Debug][ErrorHandler] Preserve our error handler when a logger set another one	2019-01-24 21:41:57 +01:00
Thomas Calvet	970d9da53e	[Debug][DebugClassLoader] Match more cases for final, deprecated and internal classes / methods extends	2019-01-17 18:28:22 +01:00
Fabien Potencier	2574a83be3	fixed short array CS in comments	2019-01-16 14:27:11 +01:00
Fabien Potencier	4d92150508	switched array() to []	2019-01-16 10:39:14 +01:00
Christian Flothmann	5ca61fb12e	remove return type hint for PHP 5 compatibility	2019-01-14 09:43:48 +01:00
Thomas Calvet	ce763d24ed	[DebugClassLoader] Readd findFile() method	2019-01-13 17:36:47 +01:00
Christian Flothmann	26d7f23b9b	update year in license files	2019-01-01 14:45:19 +01:00
Nicolas Grekas	6eb115e3a5	[Debug] ignore underscore vs backslash namespaces in DebugClassLoader	2018-12-12 21:57:22 +01:00
Nicolas Grekas	a2233f555d	[Debug] workaround opcache bug mutating "$this" !?!	2018-11-27 13:43:10 +01:00
Nicolas Grekas	2016b3eec2	Merge branch '2.8' into 3.4 * 2.8: [Form] Hardened test suite for empty data Bump phpunit XSD version to 5.2 Add required key attribute	2018-11-11 20:48:54 +01:00
Grégoire Paris	74251c8d50	Bump phpunit XSD version to 5.2 Some attributes being used in the phpunit configuration files, namely failOnRisky and failOnWarning were introduced in phpunit 5.2.0. The Composer configuration shows that tests should run with old versions of phpunit, but phpunit only validates the configuration against the XSD since phpunit 7.2.0. These changes can be tested as follows: wget http://schema.phpunit.de/5.2/phpunit.xsd xargs xmllint --schema phpunit.xsd 1>/dev/null find src -name phpunit.xml.dist\| xargs xmllint --schema phpunit.xsd 1>/dev/null See `7e06a82806` See `46e3745a03/composer.json (L98)`	2018-11-11 12:18:13 +01:00