[HttpKernel] fix how configuring log-level and status-code by exception works

nicolas-grekas · nicolas-grekas · commit fbf6d926d4e9 · 2021-12-15T18:17:02.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -19,6 +19,7 @@
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -46,9 +47,19 @@ public function logKernelException(ExceptionEvent $event)
     {
         $throwable = $event->getThrowable();
         $logLevel = null;
+
         foreach ($this->exceptionsMapping as $class => $config) {
-            if ($throwable instanceof $class && $config['log_level']) {
+            if (!$throwable instanceof $class) {
+                continue;
+            }
+            if ($config['log_level'] && null === $logLevel) {
                 $logLevel = $config['log_level'];
+            }
+            if ($config['status_code'] && $event->getThrowable() === $throwable) {
+                $throwable = new HttpException($config['status_code'], $throwable->getMessage(), $throwable);
+                $event->setThrowable($throwable);
+            }
+            if (null !== $logLevel && $event->getThrowable() !== $throwable) {
                 break;
             }
         }
@@ -88,13 +99,6 @@ public function onKernelException(ExceptionEvent $event)
             throw $e;
         }
 
-        foreach ($this->exceptionsMapping as $exception => $config) {
-            if ($throwable instanceof $exception && $config['status_code']) {
-                $response->setStatusCode($config['status_code']);
-                break;
-            }
-        }
-
         $event->setResponse($response);
 
         if ($this->debug) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -22,6 +22,7 @@
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\ErrorListener;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
@@ -231,6 +232,11 @@ class TestKernel implements HttpKernelInterface
 {
     public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true): Response
     {
+        $e = $request->attributes->get('exception');
+        if ($e instanceof HttpExceptionInterface) {
+            return new Response('foo', $e->getStatusCode(), $e->getHeaders());
+        }
+
         return new Response('foo');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`use Symfony\Component\HttpKernel\Event\ExceptionEvent;`
`23`	`23`	`use Symfony\Component\HttpKernel\Event\ResponseEvent;`
`24`	`24`	`use Symfony\Component\HttpKernel\EventListener\ErrorListener;`
	`25`	`+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;`
`25`	`26`	`use Symfony\Component\HttpKernel\HttpKernelInterface;`
`26`	`27`	`use Symfony\Component\HttpKernel\KernelEvents;`
`27`	`28`	`use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;`
`@@ -231,6 +232,11 @@ class TestKernel implements HttpKernelInterface`
`231`	`232`	`{`
`232`	`233`	`public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true): Response`
`233`	`234`	`{`
	`235`	`+ $e = $request->attributes->get('exception');`
	`236`	`+ if ($e instanceof HttpExceptionInterface) {`
	`237`	`+ return new Response('foo', $e->getStatusCode(), $e->getHeaders());`
	`238`	`+ }`
	`239`	`+`
`234`	`240`	`return new Response('foo');`
`235`	`241`	`}`
`236`	`242`	`}`