[HttpKernel] Create responses for unhandled HttpExceptionInterface exceptions

nicolas-grekas · nicolas-grekas · commit 1e1d73e985ab · 2018-04-14T11:02:14.000-05:00
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -230,14 +230,16 @@ private function handleException(\Exception $e, $request, $type)
         // a listener might have replaced the exception
         $e = $event->getException();
 
-        if (!$event->hasResponse()) {
+        if ($event->hasResponse()) {
+            $response = $event->getResponse();
+        } elseif ($e instanceof HttpExceptionInterface) {
+            $response = new Response($e->getMessage());
+        } else {
             $this->finishRequest($request, $type);
 
             throw $e;
         }
 
-        $response = $event->getResponse();
-
         // the developer asked for a specific status code
         if ($response->headers->has('X-Status-Code')) {
             @trigger_error(sprintf('Using the X-Status-Code header is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::allowCustomResponseCode() instead.', GetResponseForExceptionEvent::class), E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -177,15 +177,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('Unable to find the controller for path "/". The route is wrongly configured.', $response->getContent());
     }
 
     public function testHandleWhenTheControllerIsAClosure()

Original file line number	Diff line number	Diff line change
`@@ -177,15 +177,15 @@ public function testHandleWhenAListenerReturnsAResponse()`
`177`	`177`	`$this->assertEquals('hello', $kernel->handle(new Request())->getContent());`
`178`	`178`	`}`
`179`	`179`
`180`		`- /**`
`181`		`- * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException`
`182`		`- */`
`183`	`180`	`public function testHandleWhenNoControllerIsFound()`
`184`	`181`	`{`
`185`	`182`	`$dispatcher = new EventDispatcher();`
`186`	`183`	`$kernel = $this->getHttpKernel($dispatcher, false);`
`187`	`184`
`188`		`- $kernel->handle(new Request());`
	`185`	`+ $response = $kernel->handle(new Request());`
	`186`	`+`
	`187`	`+ $this->assertSame(404, $response->getStatusCode());`
	`188`	`+ $this->assertSame('Unable to find the controller for path "/". The route is wrongly configured.', $response->getContent());`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public function testHandleWhenTheControllerIsAClosure()`