Keep has check

VincentLanglet · VincentLanglet · commit a17bfcd0eb0e · 2024-07-29T11:38:45.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -66,7 +66,7 @@ private function getFirewallContext(Request $request): ?FirewallContext
                 /** @var FirewallContext $context */
                 $context = $this->container->get($contextId);
 
-                if ($context->getConfig()?->isStateless() && null === $request->isStateless()) {
+                if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {
                     $request->setStateless();
                 }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -54,7 +54,7 @@ public function testGetListenersWithInvalidParameter()
         $this->assertEquals([[], null, null], $firewallMap->getListeners($request));
         $this->assertNull($firewallMap->getFirewallConfig($request));
         $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
-        $this->assertNull($request->isStateless());
+        $this->assertFalse($request->attributes->has('_stateless'));
     }
 
     /** @dataProvider providesStatefulStatelessRequests */
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -657,12 +657,8 @@ public function setStateless(bool $stateless = true): void
         $this->attributes->set('_stateless', $stateless);
     }
 
-    public function isStateless(): ?bool
+    public function isStateless(): bool
     {
-        if (!$this->attributes->has('_stateless')) {
-            return null;
-        }
-
         return $this->attributes->getBoolean('_stateless');
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -124,7 +124,7 @@ protected function createSubRequest(string $uri, Request $request): Request
         if ($request->getDefaultLocale() !== $request->getLocale()) {
             $subRequest->setLocale($request->getLocale());
         }
-        if (null !== $request->isStateless()) {
+        if ($request->attributes->has('_stateless')) {
             $subRequest->setStateless($request->isStateless());
         }
         if ($request->attributes->has('_check_controller_is_allowed')) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private function getFirewallContext(Request $request): ?FirewallContext`
`66`	`66`	`/** @var FirewallContext $context */`
`67`	`67`	`$context = $this->container->get($contextId);`
`68`	`68`
`69`		`- if ($context->getConfig()?->isStateless() && null === $request->isStateless()) {`
	`69`	`+ if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {`
`70`	`70`	`$request->setStateless();`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function testGetListenersWithInvalidParameter()`
`54`	`54`	`$this->assertEquals([[], null, null], $firewallMap->getListeners($request));`
`55`	`55`	`$this->assertNull($firewallMap->getFirewallConfig($request));`
`56`	`56`	`$this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));`
`57`		`- $this->assertNull($request->isStateless());`
	`57`	`+ $this->assertFalse($request->attributes->has('_stateless'));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/** @dataProvider providesStatefulStatelessRequests */`
Original file line number	Diff line number	Diff line change
`@@ -657,12 +657,8 @@ public function setStateless(bool $stateless = true): void`
`657`	`657`	`$this->attributes->set('_stateless', $stateless);`
`658`	`658`	`}`
`659`	`659`
`660`		`- public function isStateless(): ?bool`
	`660`	`+ public function isStateless(): bool`
`661`	`661`	`{`
`662`		`- if (!$this->attributes->has('_stateless')) {`
`663`		`- return null;`
`664`		`- }`
`665`		`-`
`666`	`662`	`return $this->attributes->getBoolean('_stateless');`
`667`	`663`	`}`
`668`	`664`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ protected function createSubRequest(string $uri, Request $request): Request`
`124`	`124`	`if ($request->getDefaultLocale() !== $request->getLocale()) {`
`125`	`125`	`$subRequest->setLocale($request->getLocale());`
`126`	`126`	`}`
`127`		`- if (null !== $request->isStateless()) {`
	`127`	`+ if ($request->attributes->has('_stateless')) {`
`128`	`128`	`$subRequest->setStateless($request->isStateless());`
`129`	`129`	`}`
`130`	`130`	`if ($request->attributes->has('_check_controller_is_allowed')) {`