Merge branch '6.4' into 7.1

* 6.4:
  remove custom CSV escape character from tests
  [HttpKernel] ESI fragment content may be missing in conditional requests
  [SecurityBundle] Revert adding `_stateless` attribute to the request when firewall is stateless and the attribute is not already set
  fix compatibility with Twig 3.12 and 4.0
  Improve and add tests for Last-Modified computation with ESI responses

Author: xabbuh

Security/FirewallMap.php

@@ -66,14 +66,7 @@ private function getFirewallContext(Request $request): ?FirewallContext
             if (null === $requestMatcher || $requestMatcher->matches($request)) {
                 $request->attributes->set('_firewall_context', $contextId);
 
-                /** @var FirewallContext $context */
-                $context = $this->container->get($contextId);
-
-                if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {
-                    $request->attributes->set('_stateless', true);
-                }
-
-                return $context;
+                return $this->container->get($contextId);
             }
         }
 

Tests/Security/FirewallMapTest.php

@@ -63,7 +63,7 @@ public function testGetListeners(Request $request, bool $expectedState)
         $firewallContext = $this->createMock(FirewallContext::class);
 
         $firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true);
-        $firewallContext->expects($this->exactly(2))->method('getConfig')->willReturn($firewallConfig);
+        $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);
 
         $listener = function () {};
         $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);
@@ -93,7 +93,7 @@ public function testGetListeners(Request $request, bool $expectedState)
 
     public static function providesStatefulStatelessRequests(): \Generator
     {
-        yield [new Request(), true];
+        yield [new Request(), false];
         yield [new Request(attributes: ['_stateless' => false]), false];
         yield [new Request(attributes: ['_stateless' => true]), true];
     }