[Debug] Fix handling of php7 throwables

nicolas-grekas · nicolas-grekas · commit 829a6b926c32 · 2016-03-28T11:08:12.000+02:00
diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
@@ -46,6 +46,20 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
         ErrorHandler::register($errorReportingLevel, $displayErrors);
         if ('cli' !== PHP_SAPI) {
             ExceptionHandler::register();
+
+            if (PHP_VERSION_ID >= 70000) {
+                $exceptionHandler = set_exception_handler(\Closure::bind(function ($throwable) use (&$exceptionHandler) {
+                    if ($throwable instanceof \Exception) {
+                        $exception = $throwable;
+                    } else {
+                        $exception = new \Exception($throwable->getMessage(), $throwable->getCode());
+                        $exception->file = $throwable->getFile();
+                        $exception->line = $throwable->getLine();
+                        $exception->trace = $throwable->getTrace();
+                    }
+                    $exceptionHandler($exception);
+                }, null, 'Exception'));
+            }
         // CLI - display errors only if they're not already logged to STDERR
         } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
             ini_set('display_errors', 1);
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -197,6 +197,12 @@ public function handleFatal()
         $exceptionHandler = set_exception_handler(function () {});
         restore_exception_handler();
 
+        if (PHP_VERSION_ID >= 70000 && $exceptionHandler instanceof \Closure) {
+            $reflector = new \ReflectionFunction($exceptionHandler);
+            foreach ($reflector->getStaticVariables() as $exceptionHandler) {
+                break;
+            }
+        }
         if (is_array($exceptionHandler) && $exceptionHandler[0] instanceof ExceptionHandler) {
             $level = isset($this->levels[$type]) ? $this->levels[$type] : $type;
             $message = sprintf('%s: %s in %s line %d', $level, $error['message'], $error['file'], $error['line']);
