From 3f611709a785bebe25aa124a22b46747e38e0b21 Mon Sep 17 00:00:00 2001
From: Krzysztof Pyrkosz <pyrkosz@o2.pl>
Date: Thu, 13 Oct 2022 17:34:04 +0200
Subject: [PATCH] [HttpKernel] Fix empty request stack when terminating with
 exception

---
 HttpKernel.php           | 12 +++++++++++-
 Tests/HttpKernelTest.php | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/HttpKernel.php b/HttpKernel.php
index d53b80665b..e23023d3c4 100644
--- a/HttpKernel.php
+++ b/HttpKernel.php
@@ -112,7 +112,17 @@ public function terminateWithException(\Throwable $exception, Request $request =
             throw $exception;
         }
 
-        $response = $this->handleThrowable($exception, $request, self::MASTER_REQUEST);
+        if ($pop = $request !== $this->requestStack->getMasterRequest()) {
+            $this->requestStack->push($request);
+        }
+
+        try {
+            $response = $this->handleThrowable($exception, $request, self::MASTER_REQUEST);
+        } finally {
+            if ($pop) {
+                $this->requestStack->pop();
+            }
+        }
 
         $response->sendHeaders();
         $response->sendContent();
diff --git a/Tests/HttpKernelTest.php b/Tests/HttpKernelTest.php
index 53e5f547d2..a163715f81 100644
--- a/Tests/HttpKernelTest.php
+++ b/Tests/HttpKernelTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\ControllerDoesNotReturnResponseException;
@@ -340,6 +341,22 @@ public function testTerminate()
         $this->assertEquals($response, $capturedResponse);
     }
 
+    public function testTerminateWithException()
+    {
+        $dispatcher = new EventDispatcher();
+        $requestStack = new RequestStack();
+        $kernel = $this->getHttpKernel($dispatcher, null, $requestStack);
+
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function (ExceptionEvent $event) use (&$capturedRequest, $requestStack) {
+            $capturedRequest = $requestStack->getCurrentRequest();
+            $event->setResponse(new Response());
+        });
+
+        $kernel->terminateWithException(new \Exception('boo'), $request = Request::create('/'));
+        $this->assertSame($request, $capturedRequest);
+        $this->assertNull($requestStack->getCurrentRequest());
+    }
+
     public function testVerifyRequestStackPushPopDuringHandle()
     {
         $request = new Request();