[HttpKernel] Provide status code in fragment handler exception

gonzalovilaseca · gonzalovilaseca · commit 81ca1f00a37f · 2020-08-04T11:02:58.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * Renders a URI that represents a resource fragment.
@@ -97,7 +98,8 @@ public function render($uri, string $renderer = 'inline', array $options = [])
     protected function deliver(Response $response)
     {
         if (!$response->isSuccessful()) {
-            throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $response->getStatusCode()));
+            $responseStatusCode = $response->getStatusCode();
+            throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $responseStatusCode), 0, new HttpException($responseStatusCode));
         }
 
         if (!$response instanceof StreamedResponse) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
 /**
@@ -53,11 +54,20 @@ public function testRenderWithUnknownRenderer()
 
     public function testDeliverWithUnsuccessfulResponse()
     {
-        $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Error when rendering "http://localhost/" (Status code is 404).');
         $handler = $this->getHandler($this->returnValue(new Response('foo', 404)));
-
-        $handler->render('/', 'foo');
+        try {
+            $handler->render('/', 'foo');
+            $this->fail('->render() throws a \RuntimeException exception if response is not successful');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e);
+            $this->assertEquals(0, $e->getCode());
+            $this->assertEquals('Error when rendering "http://localhost/" (Status code is 404).', $e->getMessage());
+
+            $previousException = $e->getPrevious();
+            $this->assertInstanceOf(HttpException::class, $previousException);
+            $this->assertEquals(404, $previousException->getStatusCode());
+            $this->assertEquals(0, $previousException->getCode());
+        }
     }
 
     public function testRender()
