bug #25753 [Console] Fix restoring exception handler (nicolas-grekas, fancyweb)

nicolas-grekas · nicolas-grekas · commit d8d85f17b583 · 2018-01-16T18:26:02.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Console] Fix restoring exception handler | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | ,p | Tests pass? | yes | Fixed tickets | #25718 | License | MIT | Doc PR | - Commits ------- 0096449 [Console] Keep the modified exception handler 3fa1ad9 [Console] Fix restoring exception handler
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -163,10 +163,18 @@ 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);
+                $finalHandler = $phpHandler[0]->setExceptionHandler(null);
+                if ($finalHandler !== $renderException) {
+                    $phpHandler[0]->setExceptionHandler($finalHandler);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,18 @@ public function run(InputInterface $input = null, OutputInterface $output = null`
`163`	`163`	`$exitCode = 1;`
`164`	`164`	`}`
`165`	`165`	`} finally {`
	`166`	`+ // if the exception handler changed, keep it`
	`167`	`+ // otherwise, unregister $renderException`
`166`	`168`	`if (!$phpHandler) {`
	`169`	`+ if (set_exception_handler($renderException) === $renderException) {`
	`170`	`+ restore_exception_handler();`
	`171`	`+ }`
`167`	`172`	`restore_exception_handler();`
`168`	`173`	`} elseif (!$debugHandler) {`
`169`		`- $phpHandler[0]->setExceptionHandler(null);`
	`174`	`+ $finalHandler = $phpHandler[0]->setExceptionHandler(null);`
	`175`	`+ if ($finalHandler !== $renderException) {`
	`176`	`+ $phpHandler[0]->setExceptionHandler($finalHandler);`
	`177`	`+ }`
`170`	`178`	`}`
`171`	`179`	`}`
`172`	`180`