make ExceptionEvent handle all throwables

xabbuh · xabbuh · commit eba2d8efc9a7 · 2019-11-11T12:53:44.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Event/ExceptionEvent.php b/src/Symfony/Component/HttpKernel/Event/ExceptionEvent.php
@@ -29,38 +29,33 @@
  */
 final class ExceptionEvent extends RequestEvent
 {
-    /**
-     * The exception object.
-     *
-     * @var \Exception
-     */
-    private $exception;
+    private $throwable;
 
     /**
      * @var bool
      */
     private $allowCustomResponseCode = false;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Exception $e)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Throwable $e)
     {
         parent::__construct($kernel, $request, $requestType);
 
-        $this->setException($e);
+        $this->setThrowable($e);
     }
 
-    public function getException(): \Exception
+    public function getThrowable(): \Throwable
     {
-        return $this->exception;
+        return $this->throwable;
     }
 
     /**
      * Replaces the thrown exception.
      *
      * This exception will be thrown if no response is set in the event.
      */
-    public function setException(\Exception $exception): void
+    public function setThrowable(\Throwable $exception): void
     {
-        $this->exception = $exception;
+        $this->throwable = $exception;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -42,9 +42,9 @@ public function __construct($controller, LoggerInterface $logger = null, bool $d
 
     public function logKernelException(ExceptionEvent $event)
     {
-        $e = FlattenException::createFromThrowable($event->getException());
+        $e = FlattenException::createFromThrowable($event->getThrowable());
 
-        $this->logException($event->getException(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));
+        $this->logException($event->getThrowable(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));
     }
 
     public function onKernelException(ExceptionEvent $event, string $eventName = null, EventDispatcherInterface $eventDispatcher = null)
@@ -53,7 +53,7 @@ public function onKernelException(ExceptionEvent $event, string $eventName = nul
             return;
         }
 
-        $exception = $event->getException();
+        $exception = $event->getThrowable();
         $request = $this->duplicateRequest($exception, $event->getRequest());
 
         try {
@@ -98,7 +98,7 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    protected function logException(\Exception $exception, string $message)
+    protected function logException(\Throwable $exception, string $message)
     {
         if (null !== $this->logger) {
             if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
@@ -112,7 +112,7 @@ protected function logException(\Exception $exception, string $message)
     /**
      * Clones the request for the exception.
      */
-    protected function duplicateRequest(\Exception $exception, Request $request): Request
+    protected function duplicateRequest(\Throwable $exception, Request $request): Request
     {
         $attributes = [
             '_controller' => $this->controller,

Original file line number	Diff line number	Diff line change
`@@ -29,38 +29,33 @@`
`29`	`29`	`*/`
`30`	`30`	`final class ExceptionEvent extends RequestEvent`
`31`	`31`	`{`
`32`		`- /**`
`33`		`- * The exception object.`
`34`		`- *`
`35`		`- * @var \Exception`
`36`		`- */`
`37`		`- private $exception;`
	`32`	`+ private $throwable;`
`38`	`33`
`39`	`34`	`/**`
`40`	`35`	`* @var bool`
`41`	`36`	`*/`
`42`	`37`	`private $allowCustomResponseCode = false;`
`43`	`38`
`44`		`- public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Exception $e)`
	`39`	`+ public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Throwable $e)`
`45`	`40`	`{`
`46`	`41`	`parent::__construct($kernel, $request, $requestType);`
`47`	`42`
`48`		`- $this->setException($e);`
	`43`	`+ $this->setThrowable($e);`
`49`	`44`	`}`
`50`	`45`
`51`		`- public function getException(): \Exception`
	`46`	`+ public function getThrowable(): \Throwable`
`52`	`47`	`{`
`53`		`- return $this->exception;`
	`48`	`+ return $this->throwable;`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`/**`
`57`	`52`	`* Replaces the thrown exception.`
`58`	`53`	`*`
`59`	`54`	`* This exception will be thrown if no response is set in the event.`
`60`	`55`	`*/`
`61`		`- public function setException(\Exception $exception): void`
	`56`	`+ public function setThrowable(\Throwable $exception): void`
`62`	`57`	`{`
`63`		`- $this->exception = $exception;`
	`58`	`+ $this->throwable = $exception;`
`64`	`59`	`}`
`65`	`60`
`66`	`61`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ public function __construct($controller, LoggerInterface $logger = null, bool $d`
`42`	`42`
`43`	`43`	`public function logKernelException(ExceptionEvent $event)`
`44`	`44`	`{`
`45`		`- $e = FlattenException::createFromThrowable($event->getException());`
	`45`	`+ $e = FlattenException::createFromThrowable($event->getThrowable());`
`46`	`46`
`47`		`- $this->logException($event->getException(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));`
	`47`	`+ $this->logException($event->getThrowable(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function onKernelException(ExceptionEvent $event, string $eventName = null, EventDispatcherInterface $eventDispatcher = null)`
`@@ -53,7 +53,7 @@ public function onKernelException(ExceptionEvent $event, string $eventName = nul`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`	`55`
`56`		`- $exception = $event->getException();`
	`56`	`+ $exception = $event->getThrowable();`
`57`	`57`	`$request = $this->duplicateRequest($exception, $event->getRequest());`
`58`	`58`
`59`	`59`	`try {`
`@@ -98,7 +98,7 @@ public static function getSubscribedEvents(): array`
`98`	`98`	`];`
`99`	`99`	`}`
`100`	`100`
`101`		`- protected function logException(\Exception $exception, string $message)`
	`101`	`+ protected function logException(\Throwable $exception, string $message)`
`102`	`102`	`{`
`103`	`103`	`if (null !== $this->logger) {`
`104`	`104`	`if (!$exception instanceof HttpExceptionInterface \|\| $exception->getStatusCode() >= 500) {`
`@@ -112,7 +112,7 @@ protected function logException(\Exception $exception, string $message)`
`112`	`112`	`/**`
`113`	`113`	`* Clones the request for the exception.`
`114`	`114`	`*/`
`115`		`- protected function duplicateRequest(\Exception $exception, Request $request): Request`
	`115`	`+ protected function duplicateRequest(\Throwable $exception, Request $request): Request`
`116`	`116`	`{`
`117`	`117`	`$attributes = [`
`118`	`118`	`'_controller' => $this->controller,`