[HttpKernel] Create responses for unhandled HttpExceptionInterface exceptions

nicolas-grekas · nicolas-grekas · commit aaa172a35a51 · 2018-04-20T13:41:10.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 4.1.0
 -----
 
+ * create `Reponse` objects for unhandled `HttpExceptionInterface` instead of throwing them
  * added orphaned events support to `EventDataCollector`
  * `ExceptionListener` now logs and collects exceptions at priority `2048` (previously logged at `-128` and collected at `0`)
  * Deprecated `service:action` syntax with a single colon to reference controllers. Use `service::method` instead.
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -221,14 +221,17 @@ private function handleException(\Exception $e, Request $request, int $type): Re
         // a listener might have replaced the exception
         $e = $event->getException();
 
-        if (!$event->hasResponse()) {
+        if ($event->hasResponse()) {
+            $response = $event->getResponse();
+        } elseif ($e instanceof HttpExceptionInterface) {
+            $code = $e->getStatusCode();
+            $response = new Response(isset(Response::$statusTexts[$code]) ? $code.' '.Response::$statusTexts[$code] : $code);
+        } else {
             $this->finishRequest($request, $type);
 
             throw $e;
         }
 
-        $response = $event->getResponse();
-
         // the developer asked for a specific status code
         if (!$event->isAllowingCustomResponseCode() && !$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
             // ensure that we actually have an error response
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -159,15 +159,15 @@ public function testHandleWhenAListenerReturnsAResponse()
         $this->assertEquals('hello', $kernel->handle(new Request())->getContent());
     }
 
-    /**
-     * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
     public function testHandleWhenNoControllerIsFound()
     {
         $dispatcher = new EventDispatcher();
         $kernel = $this->getHttpKernel($dispatcher, false);
 
-        $kernel->handle(new Request());
+        $response = $kernel->handle(new Request());
+
+        $this->assertSame(404, $response->getStatusCode());
+        $this->assertSame('404 Not Found', $response->getContent());
     }
 
     public function testHandleWhenTheControllerIsAClosure()

Original file line number	Diff line number	Diff line change
`@@ -159,15 +159,15 @@ public function testHandleWhenAListenerReturnsAResponse()`
`159`	`159`	`$this->assertEquals('hello', $kernel->handle(new Request())->getContent());`
`160`	`160`	`}`
`161`	`161`
`162`		`- /**`
`163`		`- * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException`
`164`		`- */`
`165`	`162`	`public function testHandleWhenNoControllerIsFound()`
`166`	`163`	`{`
`167`	`164`	`$dispatcher = new EventDispatcher();`
`168`	`165`	`$kernel = $this->getHttpKernel($dispatcher, false);`
`169`	`166`
`170`		`- $kernel->handle(new Request());`
	`167`	`+ $response = $kernel->handle(new Request());`
	`168`	`+`
	`169`	`+ $this->assertSame(404, $response->getStatusCode());`
	`170`	`+ $this->assertSame('404 Not Found', $response->getContent());`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`public function testHandleWhenTheControllerIsAClosure()`