Fix RequestStack state if throwable is thrown

Warxcell · Warxcell · commit 15baea58ba30 · 2022-08-22T19:35:03.000+03:00
diff --git a/HttpKernel.php b/HttpKernel.php
@@ -76,6 +76,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
     {
         $request->headers->set('X-Php-Ob-Level', (string) ob_get_level());
 
+        $this->requestStack->push($request);
         try {
             return $this->handleRaw($request, $type);
         } catch (\Exception $e) {
@@ -89,6 +90,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
             }
 
             return $this->handleThrowable($e, $request, $type);
+        } finally {
+            $this->requestStack->pop();
         }
     }
 
@@ -127,8 +130,6 @@ public function terminateWithException(\Throwable $exception, Request $request =
      */
     private function handleRaw(Request $request, int $type = self::MASTER_REQUEST): Response
     {
-        $this->requestStack->push($request);
-
         // request
         $event = new RequestEvent($this, $request, $type);
         $this->dispatcher->dispatch($event, KernelEvents::REQUEST);
@@ -205,7 +206,6 @@ private function filterResponse(Response $response, Request $request, int $type)
     private function finishRequest(Request $request, int $type)
     {
         $this->dispatcher->dispatch(new FinishRequestEvent($this, $request, $type), KernelEvents::FINISH_REQUEST);
-        $this->requestStack->pop();
     }
 
     /**
diff --git a/Tests/HttpKernelTest.php b/Tests/HttpKernelTest.php
@@ -39,6 +39,45 @@ public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrue()
         $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
     }
 
+    public function testRequestStackIsNotBrokenWhenControllerThrowsAnExceptionAndCatchIsTrue()
+    {
+        $requestStack = new RequestStack();
+        $kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); }, $requestStack);
+
+        try {
+            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+        } catch (\Throwable $exception) {
+        }
+
+        self::assertNull($requestStack->getCurrentRequest());
+    }
+
+    public function testRequestStackIsNotBrokenWhenControllerThrowsAnExceptionAndCatchIsFalse()
+    {
+        $requestStack = new RequestStack();
+        $kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); }, $requestStack);
+
+        try {
+            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, false);
+        } catch (\Throwable $exception) {
+        }
+
+        self::assertNull($requestStack->getCurrentRequest());
+    }
+
+    public function testRequestStackIsNotBrokenWhenControllerThrowsAnThrowable()
+    {
+        $requestStack = new RequestStack();
+        $kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \Error(); }, $requestStack);
+
+        try {
+            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+        } catch (\Throwable $exception) {
+        }
+
+        self::assertNull($requestStack->getCurrentRequest());
+    }
+
     public function testHandleWhenControllerThrowsAnExceptionAndCatchIsFalseAndNoListenerIsRegistered()
     {
         $this->expectException(\RuntimeException::class);

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ`
`76`	`76`	`{`
`77`	`77`	`$request->headers->set('X-Php-Ob-Level', (string) ob_get_level());`
`78`	`78`
	`79`	`+ $this->requestStack->push($request);`
`79`	`80`	`try {`
`80`	`81`	`return $this->handleRaw($request, $type);`
`81`	`82`	`} catch (\Exception $e) {`
`@@ -89,6 +90,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`return $this->handleThrowable($e, $request, $type);`
	`93`	`+ } finally {`
	`94`	`+ $this->requestStack->pop();`
`92`	`95`	`}`
`93`	`96`	`}`
`94`	`97`
`@@ -127,8 +130,6 @@ public function terminateWithException(\Throwable $exception, Request $request =`
`127`	`130`	`*/`
`128`	`131`	`private function handleRaw(Request $request, int $type = self::MASTER_REQUEST): Response`
`129`	`132`	`{`
`130`		`- $this->requestStack->push($request);`
`131`		`-`
`132`	`133`	`// request`
`133`	`134`	`$event = new RequestEvent($this, $request, $type);`
`134`	`135`	`$this->dispatcher->dispatch($event, KernelEvents::REQUEST);`
`@@ -205,7 +206,6 @@ private function filterResponse(Response $response, Request $request, int $type)`
`205`	`206`	`private function finishRequest(Request $request, int $type)`
`206`	`207`	`{`
`207`	`208`	`$this->dispatcher->dispatch(new FinishRequestEvent($this, $request, $type), KernelEvents::FINISH_REQUEST);`
`208`		`- $this->requestStack->pop();`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/**`