[HttpKernel] Fix missing import in GetResponseForExceptionEvent

fancyweb · nicolas-grekas · commit bc46a3a6ddb8 · 2019-11-12T10:28:52.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php b/src/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
+use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -106,7 +106,7 @@ public function onControllerArguments(ControllerArgumentsEvent $event)
         }
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             KernelEvents::CONTROLLER_ARGUMENTS => 'onControllerArguments',
@@ -119,11 +119,8 @@ public static function getSubscribedEvents()
 
     /**
      * Logs an exception.
-     *
-     * @param \Exception $exception The \Exception instance
-     * @param string     $message   The error message to log
      */
-    protected function logException(\Exception $exception, $message)
+    protected function logException(\Throwable $exception, string $message): void
     {
         if (null !== $this->logger) {
             if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
@@ -136,10 +133,8 @@ protected function logException(\Exception $exception, $message)
 
     /**
      * Clones the request for the exception.
-     *
-     * @return Request The cloned request
      */
-    protected function duplicateRequest(\Exception $exception, Request $request)
+    protected function duplicateRequest(\Throwable $exception, Request $request): Request
     {
         $attributes = [
             '_controller' => $this->controller,

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function onControllerArguments(ControllerArgumentsEvent $event)`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- public static function getSubscribedEvents()`
	`109`	`+ public static function getSubscribedEvents(): array`
`110`	`110`	`{`
`111`	`111`	`return [`
`112`	`112`	`KernelEvents::CONTROLLER_ARGUMENTS => 'onControllerArguments',`
`@@ -119,11 +119,8 @@ public static function getSubscribedEvents()`
`119`	`119`
`120`	`120`	`/**`
`121`	`121`	`* Logs an exception.`
`122`		`- *`
`123`		`- * @param \Exception $exception The \Exception instance`
`124`		`- * @param string $message The error message to log`
`125`	`122`	`*/`
`126`		`- protected function logException(\Exception $exception, $message)`
	`123`	`+ protected function logException(\Throwable $exception, string $message): void`
`127`	`124`	`{`
`128`	`125`	`if (null !== $this->logger) {`
`129`	`126`	`if (!$exception instanceof HttpExceptionInterface \|\| $exception->getStatusCode() >= 500) {`
`@@ -136,10 +133,8 @@ protected function logException(\Exception $exception, $message)`
`136`	`133`
`137`	`134`	`/**`
`138`	`135`	`* Clones the request for the exception.`
`139`		`- *`
`140`		`- * @return Request The cloned request`
`141`	`136`	`*/`
`142`		`- protected function duplicateRequest(\Exception $exception, Request $request)`
	`137`	`+ protected function duplicateRequest(\Throwable $exception, Request $request): Request`
`143`	`138`	`{`
`144`	`139`	`$attributes = [`
`145`	`140`	`'_controller' => $this->controller,`