Try introducing setStateless

VincentLanglet · VincentLanglet · commit 466cf5b32b8f · 2024-07-29T10:33:08.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -67,7 +67,7 @@ private function getFirewallContext(Request $request): ?FirewallContext
                 $context = $this->container->get($contextId);
 
                 if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {
-                    $request->attributes->set('_stateless', true);
+                    $request->setStateless();
                 }
 
                 return $context;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -88,7 +88,7 @@ public function testGetListeners(Request $request, bool $expectedState)
         $this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));
         $this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));
         $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
-        $this->assertEquals($expectedState, method_exists($request, 'isStateless') ? $request->isStateless() : $request->attributes->get('_stateless'));
+        $this->assertEquals($expectedState, $request->isStateless());
     }
 
     public static function providesStatefulStatelessRequests(): \Generator
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -24,7 +24,7 @@
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/http-kernel": "^6.4|^7.0",
-        "symfony/http-foundation": "^6.4|^7.0",
+        "symfony/http-foundation": "^7.2",
         "symfony/password-hasher": "^6.4|^7.0",
         "symfony/security-core": "^7.2",
         "symfony/security-csrf": "^6.4|^7.0",
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -127,7 +127,7 @@ public function toolbarAction(Request $request, ?string $token = null): Response
             throw new NotFoundHttpException('The profiler must be enabled.');
         }
 
-        if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()
+        if (!$request->isStateless() && $request->hasSession()
             && ($session = $request->getSession())->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag
         ) {
             // keep current flashes for one more request if using AutoExpireFlashBag
@@ -174,7 +174,7 @@ public function searchBarAction(Request $request): Response
         $this->cspHandler?->disableCsp();
 
         $session = null;
-        if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()) {
+        if (!$request->isStateless() && $request->hasSession()) {
             $session = $request->getSession();
         }
 
@@ -254,7 +254,7 @@ public function searchAction(Request $request): Response
         $token = $request->query->get('token');
         $profileType = $request->query->get('type', 'request');
 
-        if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()) {
+        if (!$request->isStateless() && $request->hasSession()) {
             $session = $request->getSession();
 
             $session->set('_profiler_search_ip', $ip);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -20,6 +20,7 @@
         "symfony/config": "^6.4|^7.0",
         "symfony/framework-bundle": "^6.4|^7.0",
         "symfony/http-kernel": "^6.4|^7.0",
+        "symfony/http-foundation": "^7.2",
         "symfony/routing": "^6.4|^7.0",
         "symfony/twig-bundle": "^6.4|^7.0",
         "twig/twig": "^3.10"
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 7.2
 --
 
- * Add `Request::isStateless()`
+ * Add `Request::isStateless()` and `Request::setStateless()`
 
 7.1
 ---
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -652,6 +652,11 @@ public function get(string $key, mixed $default = null): mixed
         return $default;
     }
 
+    public function setStateless(bool $stateless = true): void
+    {
+        $this->attributes->set('_stateless', $stateless);
+    }
+
     public function isStateless(): bool
     {
         return $this->attributes->getBoolean('_stateless');
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -125,7 +125,7 @@ protected function createSubRequest(string $uri, Request $request): Request
             $subRequest->setLocale($request->getLocale());
         }
         if ($request->attributes->has('_stateless')) {
-            $subRequest->attributes->set('_stateless', $request->attributes->get('_stateless'));
+            $subRequest->setStateless($request->isStateless());
         }
         if ($request->attributes->has('_check_controller_is_allowed')) {
             $subRequest->attributes->set('_check_controller_is_allowed', $request->attributes->get('_check_controller_is_allowed'));
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -318,7 +318,7 @@ public function testStatelessCheck()
 
         $requestStack = new RequestStack();
         $request = $this->createRequest();
-        $request->attributes->set('_stateless', true);
+        $request->setStateless();
         $requestStack->push($request);
 
         $collector = new RequestDataCollector($requestStack);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -753,7 +753,7 @@ public function testSessionUsageExceptionIfStatelessAndSessionUsed()
         $kernel = $this->createMock(HttpKernelInterface::class);
 
         $request = new Request();
-        $request->attributes->set('_stateless', true);
+        $request->setStateless();
         $listener->onKernelRequest(new RequestEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST));
         $request->getSession();
 
@@ -824,7 +824,7 @@ public function testSessionUsageCallbackWhenDebugAndStateless()
         $requestStack = new RequestStack();
 
         $request = new Request();
-        $request->attributes->set('_stateless', true);
+        $request->setStateless();
 
         $requestStack->push(new Request());
         $requestStack->push($request);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -275,7 +275,7 @@ public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
     public function testStatelessAttributeIsForwardedByDefault()
     {
         $request = Request::create('/');
-        $request->attributes->set('_stateless', true);
+        $request->setStateless();
 
         $kernel = $this->createMock(HttpKernelInterface::class);
         $kernel
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
@@ -63,7 +63,7 @@ public function testStatelessRequestRedirections()
         $session->expects($this->never())->method('remove')->with('_security.admin.target_path');
         $statelessRequest = Request::create('/');
         $statelessRequest->setSession($session);
-        $statelessRequest->attributes->set('_stateless', true);
+        $statelessRequest->setStateless();
 
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator->expects($this->any())->method('generate')->willReturn('http://localhost/login');

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private function getFirewallContext(Request $request): ?FirewallContext`
`67`	`67`	`$context = $this->container->get($contextId);`
`68`	`68`
`69`	`69`	`if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {`
`70`		`- $request->attributes->set('_stateless', true);`
	`70`	`+ $request->setStateless();`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`return $context;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function testGetListeners(Request $request, bool $expectedState)`
`88`	`88`	`$this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));`
`89`	`89`	`$this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));`
`90`	`90`	`$this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));`
`91`		`- $this->assertEquals($expectedState, method_exists($request, 'isStateless') ? $request->isStateless() : $request->attributes->get('_stateless'));`
	`91`	`+ $this->assertEquals($expectedState, $request->isStateless());`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public static function providesStatefulStatelessRequests(): \Generator`
Original file line number	Diff line number	Diff line change
`@@ -652,6 +652,11 @@ public function get(string $key, mixed $default = null): mixed`
`652`	`652`	`return $default;`
`653`	`653`	`}`
`654`	`654`
	`655`	`+ public function setStateless(bool $stateless = true): void`
	`656`	`+ {`
	`657`	`+ $this->attributes->set('_stateless', $stateless);`
	`658`	`+ }`
	`659`	`+`
`655`	`660`	`public function isStateless(): bool`
`656`	`661`	`{`
`657`	`662`	`return $this->attributes->getBoolean('_stateless');`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function createSubRequest(string $uri, Request $request): Request`
`125`	`125`	`$subRequest->setLocale($request->getLocale());`
`126`	`126`	`}`
`127`	`127`	`if ($request->attributes->has('_stateless')) {`
`128`		`- $subRequest->attributes->set('_stateless', $request->attributes->get('_stateless'));`
	`128`	`+ $subRequest->setStateless($request->isStateless());`
`129`	`129`	`}`
`130`	`130`	`if ($request->attributes->has('_check_controller_is_allowed')) {`
`131`	`131`	`$subRequest->attributes->set('_check_controller_is_allowed', $request->attributes->get('_check_controller_is_allowed'));`