bug #33752 [4.4] Fix some leftovers (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 2b71c6f221c5 · 2019-09-30T12:04:15.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [4.4] Fix some leftovers | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #33756 | License | MIT | Doc PR | - Found while running console commands with the Symfony Demo. Commits ------- b416c12 [4.4] Fix some leftovers
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -96,7 +96,7 @@
             <argument type="collection">
                 <argument type="service" key="cli">
                     <service class="Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor">
-                        <argument type="service" id="var_dumper.cli_dumper" />
+                        <argument type="service" id="var_dumper.contextualized_cli_dumper.inner" />
                     </service>
                 </argument>
                 <argument type="service" key="html">
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -125,7 +125,11 @@ public function configure(Event $event = null)
                 if ($output instanceof ConsoleOutputInterface) {
                     $output = $output->getErrorOutput();
                 }
-                $this->exceptionHandler = function ($e) use ($app, $output) {
+                $this->exceptionHandler = static function (\Throwable $e) use ($app, $output) {
+                    if (!$e instanceof \Exception) {
+                        $e = new FatalThrowableError($e);
+                    }
+
                     $app->renderException($e, $output);
                 };
             }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,11 @@ public function configure(Event $event = null)`
`125`	`125`	`if ($output instanceof ConsoleOutputInterface) {`
`126`	`126`	`$output = $output->getErrorOutput();`
`127`	`127`	`}`
`128`		`- $this->exceptionHandler = function ($e) use ($app, $output) {`
	`128`	`+ $this->exceptionHandler = static function (\Throwable $e) use ($app, $output) {`
	`129`	`+ if (!$e instanceof \Exception) {`
	`130`	`+ $e = new FatalThrowableError($e);`
	`131`	`+ }`
	`132`	`+`
`129`	`133`	`$app->renderException($e, $output);`
`130`	`134`	`};`
`131`	`135`	`}`