Working with Throwables instead of Exceptions

Author: mmoreram

AsyncHttpKernel.php

@@ -15,7 +15,6 @@
 
 namespace Symfony\Component\HttpKernel;
 
-use Exception;
 use React\Promise\FulfilledPromise;
 use React\Promise\PromiseInterface;
 use React\Promise\RejectedPromise;
@@ -38,6 +37,7 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 
 /**
  * Class AsyncHttpKernel.
@@ -115,18 +115,18 @@ public function handleAsync(
                 $type
             )
             ->then(null,
-                function (\Exception $e) use ($request, $type, $catch) {
-                    if ($e instanceof RequestExceptionInterface) {
-                        $e = new BadRequestHttpException($e->getMessage(), $e);
+                function (Throwable $exception) use ($request, $type, $catch) {
+                    if ($exception instanceof RequestExceptionInterface) {
+                        $exception = new BadRequestHttpException($exception->getMessage(), $exception);
                     }
 
                     if (false === $catch) {
                         $this->finishRequestPromise($request, $type);
 
-                        throw $e;
+                        throw $exception;
                     }
 
-                    return $this->handleExceptionPromise($e, $request, $type);
+                    return $this->handleExceptionPromise($exception, $request, $type);
                 }
             );
     }
@@ -269,20 +269,20 @@ private function finishRequestPromise(Request $request, int $type)
     /**
      * Handles an exception by trying to convert it to a Response.
      *
-     * @param \Exception $e       An \Exception instance
-     * @param Request    $request A Request instance
-     * @param int        $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+     * @param Throwable $exception
+     * @param Request   $request
+     * @param int       $type
      *
      * @return PromiseInterface
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
     private function handleExceptionPromise(
-        Exception $e,
+        Throwable $exception,
         Request $request,
         int $type
     ): PromiseInterface {
-        $event = new GetResponsePromiseForExceptionEvent($this, $request, $type, $e);
+        $event = new GetResponsePromiseForExceptionEvent($this, $request, $type, $exception);
         $promise = $this
             ->dispatcher
             ->asyncDispatch(AsyncKernelEvents::ASYNC_EXCEPTION, $event)

AsyncKernel.php

@@ -77,9 +77,8 @@ public function process(ContainerBuilder $container)
 
         $loop = new Definition(LoopInterface::class);
         $loop->setSynthetic(true);
-        
+
         $container->setDefinition('reactphp.event_loop', $loop);
         $container->setAlias(LoopInterface::class, 'reactphp.event_loop');
-
     }
 }

Event/GetResponsePromiseForExceptionEvent.php

@@ -15,9 +15,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Exception;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Throwable;
 
 /**
  * Class GetResponsePromiseForExceptionEvent.
@@ -27,7 +27,7 @@ class GetResponsePromiseForExceptionEvent extends GetResponsePromiseEvent
     /**
      * The exception object.
      *
-     * @var \Exception
+     * @var Throwable
      */
     private $exception;
 
@@ -42,13 +42,13 @@ class GetResponsePromiseForExceptionEvent extends GetResponsePromiseEvent
      * @param HttpKernelInterface $kernel
      * @param Request             $request
      * @param int                 $requestType
-     * @param Exception           $exception
+     * @param Throwable           $exception
      */
     public function __construct(
         HttpKernelInterface $kernel,
         Request $request,
         int $requestType,
-        Exception $exception
+        Throwable $exception
     ) {
         parent::__construct($kernel, $request, $requestType);
 
@@ -58,9 +58,9 @@ public function __construct(
     /**
      * Returns the thrown exception.
      *
-     * @return \Exception The thrown exception
+     * @return Throwable
      */
-    public function getException()
+    public function getException(): Throwable
     {
         return $this->exception;
     }
@@ -70,9 +70,9 @@ public function getException()
      *
      * This exception will be thrown if no response is set in the event.
      *
-     * @param \Exception $exception The thrown exception
+     * @param Throwable $exception
      */
-    public function setException(\Exception $exception)
+    public function setException(Throwable $exception)
     {
         $this->exception = $exception;
     }