Fixes

webda2l · webda2l · commit ec51c2333f2f · 2025-09-09T17:33:26.000Z
diff --git a/src/Symfony/Component/Security/Http/Attribute/IsCsrfTokenValid.php b/src/Symfony/Component/Security/Http/Attribute/IsCsrfTokenValid.php
@@ -29,7 +29,7 @@ public function __construct(
         /**
          * Sets the key of the request that contains the actual token value that should be validated.
          */
-        public string $tokenKey = '_token',
+        public ?string $tokenKey = '_token',
 
         /**
          * Sets the available http methods that can be used to validate the token.
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/IsCsrfTokenValidAttributeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/IsCsrfTokenValidAttributeListenerTest.php
@@ -53,8 +53,7 @@ public function testNothingHappensWithNoConfig()
     {
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -165,16 +164,15 @@ public function testIsCsrfTokenValidCalledCorrectlyWithCustomTokenKey()
         $listener->onKernelControllerArguments($event);
     }
 
-    public function testIsCsrfTokenValidThrowExceptionWhenInvalidToken()
+    public function testIsCsrfTokenValidThrowExceptionWhenInvalidMatchingToken()
     {
         $this->expectException(InvalidCsrfTokenException::class);
 
         $request = new Request(request: ['_token' => 'bar']);
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -188,14 +186,13 @@ public function testIsCsrfTokenValidThrowExceptionWhenInvalidToken()
         $listener->onKernelControllerArguments($event);
     }
 
-    public function testIsCsrfTokenValidThrowExceptionWhenInvalidToken2()
+    public function testIsCsrfTokenValidThrowExceptionWhenMissingRequestToken()
     {
         $this->expectException(InvalidCsrfTokenException::class);
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -239,8 +236,7 @@ public function testIsCsrfTokenValidIgnoredWithNonMatchingMethod()
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -284,8 +280,7 @@ public function testIsCsrfTokenValidIgnoredWithGetOrPostMethodWithPutMethod()
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -308,8 +303,7 @@ public function testIsCsrfTokenValidThrowExceptionWithInvalidTokenKeyAndPostMeth
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -330,8 +324,7 @@ public function testIsCsrfTokenValidIgnoredWithInvalidTokenKeyAndUnavailableMeth
 
         $csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
         $csrfTokenManager->expects($this->never())
-            ->method('isTokenValid')
-            ->withAnyParameters();
+            ->method('isTokenValid');
 
         $event = new ControllerArgumentsEvent(
             $this->createMock(HttpKernelInterface::class),
