[4.4] Fix some leftovers

nicolas-grekas · nicolas-grekas · commit d39759c6470c · 2019-09-29T14:13:01.000+02:00
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
@@ -126,6 +126,10 @@ public function configure(Event $event = null)
                     $output = $output->getErrorOutput();
                 }
                 $this->exceptionHandler = function ($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
`@@ -126,6 +126,10 @@ public function configure(Event $event = null)`
`126`	`126`	`$output = $output->getErrorOutput();`
`127`	`127`	`}`
`128`	`128`	`$this->exceptionHandler = function ($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`	`}`