Merge branch '6.0' into 6.1

* 6.0:
  [6.0] cs fixes
  [5.4] cs fixes
  [5.3] cs fixes
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  fix merge
  Remove pointless assignment
  [HttpClient] Fix tracing requests made after calling withOptions()
  [Cache] disable lock on CLI
  Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)"
  [HttpKernel] fix how configuring log-level and status-code by exception works
  [VarDumper] add more "transient-on-macos" groups

Author: nicolas-grekas

Controller/ControllerResolver.php

@@ -45,7 +45,7 @@ public function getController(Request $request): callable|false
             if (isset($controller[0]) && \is_string($controller[0]) && isset($controller[1])) {
                 try {
                     $controller[0] = $this->instantiateController($controller[0]);
-                } catch (\Error | \LogicException $e) {
+                } catch (\Error|\LogicException $e) {
                     if (\is_callable($controller)) {
                         return $controller;
                     }
@@ -107,7 +107,7 @@ protected function createController(string $controller): callable
 
         try {
             $controller = [$this->instantiateController($class), $method];
-        } catch (\Error | \LogicException $e) {
+        } catch (\Error|\LogicException $e) {
             try {
                 if ((new \ReflectionMethod($class, $method))->isStatic()) {
                     return $class.'::'.$method;

DataCollector/ExceptionDataCollector.php

@@ -47,9 +47,6 @@ public function hasException(): bool
         return isset($this->data['exception']);
     }
 
-    /**
-     * @return \Exception|FlattenException
-     */
     public function getException(): \Exception|FlattenException
     {
         return $this->data['exception'];

EventListener/DebugHandlersListener.php

@@ -55,7 +55,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
-        $this->exceptionHandler = $exceptionHandler === null || $exceptionHandler instanceof \Closure ? $exceptionHandler : \Closure::fromCallable($exceptionHandler);
+        $this->exceptionHandler = null === $exceptionHandler || $exceptionHandler instanceof \Closure ? $exceptionHandler : \Closure::fromCallable($exceptionHandler);
         $this->logger = $logger;
         $this->levels = $levels ?? \E_ALL;
         $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? \E_ALL : null));

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,13 +47,26 @@ public function logKernelException(ExceptionEvent $event)
     {
         $throwable = $event->getThrowable();
         $logLevel = null;
+
         foreach ($this->exceptionsMapping as $class => $config) {
             if ($throwable instanceof $class && $config['log_level']) {
                 $logLevel = $config['log_level'];
                 break;
             }
         }
 
+        foreach ($this->exceptionsMapping as $class => $config) {
+            if (!$throwable instanceof $class || !$config['status_code']) {
+                continue;
+            }
+            if (!$throwable instanceof HttpExceptionInterface || $throwable->getStatusCode() !== $config['status_code']) {
+                $headers = $throwable instanceof HttpExceptionInterface ? $throwable->getHeaders() : [];
+                $throwable = new HttpException($config['status_code'], $throwable->getMessage(), $throwable, $headers);
+                $event->setThrowable($throwable);
+            }
+            break;
+        }
+
         $e = FlattenException::createFromThrowable($throwable);
 
         $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()), $logLevel);
@@ -88,13 +102,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) {

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');
     }
 }