[Console] Fix restoring exception handler

nicolas-grekas · nicolas-grekas · commit 3fa1ad9c81c9 · 2018-01-16T18:22:47.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -163,7 +163,12 @@ public function run(InputInterface $input = null, OutputInterface $output = null
                 $exitCode = 1;
             }
         } finally {
+            // if the exception handler changed, keep it
+            // otherwise, unregister $renderException
             if (!$phpHandler) {
+                if (set_exception_handler($renderException) === $renderException) {
+                    restore_exception_handler();
+                }
                 restore_exception_handler();
             } elseif (!$debugHandler) {
                 $phpHandler[0]->setExceptionHandler(null);
