Fixed how promises are resolved with GetRequestPromise

Author: mmoreram

AsyncHttpKernel.php

@@ -109,14 +109,13 @@ public function handleAsync(
 
         $request->headers->set('X-Php-Ob-Level', ob_get_level());
 
-        return $this->handleAsyncRaw(
-            $request,
-            $type
-        )
-            ->then(
-                function (Response $response) {
-                    return $response;
-                }, function (\Exception $e) use ($request, $type, $catch) {
+        return
+            $this->handleAsyncRaw(
+                $request,
+                $type
+            )
+            ->then(null,
+                function (\Exception $e) use ($request, $type, $catch) {
                     if ($e instanceof RequestExceptionInterface) {
                         $e = new BadRequestHttpException($e->getMessage(), $e);
                     }
@@ -128,7 +127,8 @@ function (Response $response) {
                     }
 
                     return $this->handleExceptionPromise($e, $request, $type);
-                });
+                }
+            );
     }
 
     /**
@@ -167,40 +167,59 @@ private function handleAsyncRaw(
             ->asyncDispatch(AsyncKernelEvents::ASYNC_REQUEST, $event)
             ->then(function (PromiseEvent $event) use ($request, $type) {
                 if ($event->hasPromise()) {
-                    return $this->filterResponsePromise(
-                        $event->getPromise(),
-                        $request,
-                        $type
-                    );
+                    return $event
+                        ->getPromise()
+                        ->then(function ($response) use ($request, $type) {
+                            return $response instanceof Response
+                                ? $this->filterResponsePromise(
+                                    new FulfilledPromise($response),
+                                    $request,
+                                    $type
+                                )
+                                : $this->callAsyncController($request, $type);
+                        });
                 }
 
-                if (false === $controller = $this->resolver->getController($request)) {
-                    throw new NotFoundHttpException(
-                        sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo())
-                    );
-                }
+                return $this->callAsyncController($request, $type);
+            });
+    }
+
+    /**
+     * Call async controller.
+     *
+     * @param Request $request
+     * @param int     $type
+     *
+     * @return PromiseInterface
+     */
+    private function callAsyncController(Request $request, int $type): PromiseInterface
+    {
+        if (false === $controller = $this->resolver->getController($request)) {
+            throw new NotFoundHttpException(
+                sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo())
+            );
+        }
 
-                $event = new FilterControllerEvent($this, $controller, $request, $type);
-                $this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event);
-                $controller = $event->getController();
+        $event = new FilterControllerEvent($this, $controller, $request, $type);
+        $this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event);
+        $controller = $event->getController();
 
-                // controller arguments
-                $arguments = $this->argumentResolver->getArguments($request, $controller);
+        // controller arguments
+        $arguments = $this->argumentResolver->getArguments($request, $controller);
 
-                $event = new FilterControllerArgumentsEvent($this, $controller, $arguments, $request, $type);
-                $this->dispatcher->dispatch(KernelEvents::CONTROLLER_ARGUMENTS, $event);
-                $controller = $event->getController();
-                $arguments = $event->getArguments();
+        $event = new FilterControllerArgumentsEvent($this, $controller, $arguments, $request, $type);
+        $this->dispatcher->dispatch(KernelEvents::CONTROLLER_ARGUMENTS, $event);
+        $controller = $event->getController();
+        $arguments = $event->getArguments();
 
-                /**
-                 * Call controller.
-                 *
-                 * @var PromiseInterface
-                 */
-                $promise = $controller(...$arguments);
+        /**
+         * Call controller.
+         *
+         * @var PromiseInterface
+         */
+        $promise = $controller(...$arguments);
 
-                return $this->filterResponsePromise($promise, $request, $type);
-            });
+        return $this->filterResponsePromise($promise, $request, $type);
     }
 
     /**
@@ -221,12 +240,12 @@ private function filterResponsePromise(PromiseInterface $promise, Request $reque
         return $this
             ->dispatcher
             ->asyncDispatch(AsyncKernelEvents::ASYNC_RESPONSE, $event)
-            ->then(function (PromiseEvent $event) use ($request, $type) {
+            ->then(function (PromiseEvent $event) use ($request, $type, $promise) {
                 $this->finishRequestPromise($request, $type);
 
                 return $event->hasPromise()
                     ? $event->getPromise()
-                    : new FulfilledPromise();
+                    : $promise;
             });
     }
 

AsyncKernel.php

@@ -48,7 +48,7 @@ public function handleAsync(
 
         $httpKernel = $this->getHttpKernel();
         if (!$httpKernel instanceof AsyncHttpKernel) {
-            throw new AsyncHttpKernelNeededException();
+            throw new AsyncHttpKernelNeededException('In order to use this AsyncKernel, you need to have the HttpAsyncKernel installed');
         }
 
         return $httpKernel->handleAsync(

CompilerPass/AsyncHttpKernelCompilerPass.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony Async Kernel
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+declare(strict_types=1);
+
+namespace Symfony\Component\HttpKernel\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\AsyncEventDispatcher;
+use Symfony\Component\HttpKernel\AsyncHttpKernel;
+
+/**
+ * Class AsyncHttpKernelCompilerPass.
+ */
+class AsyncHttpKernelCompilerPass implements CompilerPassInterface
+{
+    /**
+     * You can modify the container here before it is dumped to PHP code.
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $container
+            ->getDefinition('event_dispatcher')
+            ->setClass(AsyncEventDispatcher::class);
+
+        $container
+            ->getDefinition('http_kernel')
+            ->setClass(AsyncHttpKernel::class);
+    }
+}