Fix merge

Author: nicolas-grekas

Tests/Authenticator/AccessToken/ChainedAccessTokenExtractorsTest.php

@@ -48,7 +48,7 @@ public function testSupport($request)
         $this->assertNull($this->authenticator->supports($request));
     }
 
-    public function provideSupportData(): iterable
+    public static function provideSupportData(): iterable
     {
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer VALID_ACCESS_TOKEN'])];
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer INVALID_ACCESS_TOKEN'])];
@@ -77,7 +77,7 @@ public function testAuthenticateInvalid($request, $errorMessage, $exceptionType
         $this->authenticator->authenticate($request);
     }
 
-    public function provideInvalidAuthenticateData(): iterable
+    public static function provideInvalidAuthenticateData(): iterable
     {
         $request = new Request();
         yield [$request, 'Invalid credentials.', BadCredentialsException::class];

Tests/Authenticator/AccessToken/FormEncodedBodyAccessTokenAuthenticatorTest.php

@@ -92,7 +92,7 @@ public function testAuthenticateInvalid($request, $errorMessage, $exceptionType
         $this->authenticator->authenticate($request);
     }
 
-    public function provideInvalidAuthenticateData(): iterable
+    public static function provideInvalidAuthenticateData(): iterable
     {
         $request = new Request();
         $request->setMethod(Request::METHOD_GET);

Tests/Authenticator/AccessToken/HeaderAccessTokenAuthenticatorTest.php

@@ -45,7 +45,7 @@ public function testSupport($request)
         $this->assertNull($this->authenticator->supports($request));
     }
 
-    public function provideSupportData(): iterable
+    public static function provideSupportData(): iterable
     {
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer VALID_ACCESS_TOKEN'])];
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer INVALID_ACCESS_TOKEN'])];
@@ -61,7 +61,7 @@ public function testSupportsWithCustomTokenType($request, $result)
         $this->assertSame($result, $this->authenticator->supports($request));
     }
 
-    public function provideSupportsWithCustomTokenTypeData(): iterable
+    public static function provideSupportsWithCustomTokenTypeData(): iterable
     {
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'JWT VALID_ACCESS_TOKEN']), null];
         yield [new Request([], [], [], [], [], ['HTTP_AUTHORIZATION' => 'JWT INVALID_ACCESS_TOKEN']), null];
@@ -79,7 +79,7 @@ public function testSupportsWithCustomHeaderParameter($request, $result)
         $this->assertSame($result, $this->authenticator->supports($request));
     }
 
-    public function provideSupportsWithCustomHeaderParameter(): iterable
+    public static function provideSupportsWithCustomHeaderParameter(): iterable
     {
         yield [new Request([], [], [], [], [], ['HTTP_X_FOO' => 'Bearer VALID_ACCESS_TOKEN']), null];
         yield [new Request([], [], [], [], [], ['HTTP_X_FOO' => 'Bearer INVALID_ACCESS_TOKEN']), null];
@@ -120,7 +120,7 @@ public function testAuthenticateInvalid($request, $errorMessage, $exceptionType
         $this->authenticator->authenticate($request);
     }
 
-    public function provideInvalidAuthenticateData(): iterable
+    public static function provideInvalidAuthenticateData(): iterable
     {
         $request = new Request();
         yield [$request, 'Invalid credentials.', BadCredentialsException::class];

Tests/Authenticator/AccessToken/QueryAccessTokenAuthenticatorTest.php

@@ -88,7 +88,7 @@ public function testAuthenticateInvalid($request, $errorMessage, $exceptionType
         $this->authenticator->authenticate($request);
     }
 
-    public function provideInvalidAuthenticateData(): iterable
+    public static function provideInvalidAuthenticateData(): iterable
     {
         $request = new Request();
         yield [$request, 'Invalid credentials.', BadCredentialsException::class];

Tests/Authenticator/JsonLoginAuthenticatorTest.php

@@ -142,7 +142,7 @@ public function testAuthenticationForEmptyCredentialDeprecation($request)
         $this->authenticator->authenticate($request);
     }
 
-    public function provideEmptyAuthenticateData()
+    public static function provideEmptyAuthenticateData()
     {
         $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "", "password": "notempty"}');
         yield [$request];

Tests/EventListener/IsGrantedAttributeListenerTest.php

@@ -249,7 +249,7 @@ public function testAccessDeniedMessages(string|Expression $attribute, string|ar
         }
     }
 
-    public function getAccessDeniedMessageTests()
+    public static function getAccessDeniedMessageTests()
     {
         yield ['ROLE_ADMIN', null, 'admin', 0, 'Access Denied by #[IsGranted("ROLE_ADMIN")] on controller'];
         yield ['ROLE_ADMIN', 'bar', 'withSubject', 2, 'Access Denied by #[IsGranted("ROLE_ADMIN", "arg2Name")] on controller'];

Tests/Firewall/LogoutListenerTest.php

@@ -163,7 +163,7 @@ public function testCsrfValidationFails($invalidToken)
         $listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
     }
 
-    public function provideInvalidCsrfTokens(): array
+    public static function provideInvalidCsrfTokens(): array
     {
         return [
             ['invalid'],

Tests/HttpUtilsTest.php

@@ -69,7 +69,7 @@ public function testCreateRedirectResponseWithBadRequestsDomain($url)
         $this->assertTrue($response->isRedirect('http://localhost/'));
     }
 
-    public function badRequestDomainUrls()
+    public static function badRequestDomainUrls()
     {
         return [
             ['http://pirate.net/foo'],
@@ -175,7 +175,7 @@ public function testCreateRequestPassesSecurityRequestAttributesToTheNewRequest(
         $this->assertSame('foo', $subRequest->attributes->get($attribute));
     }
 
-    public function provideSecurityRequestAttributes()
+    public static function provideSecurityRequestAttributes()
     {
         return [
             [SecurityRequestAttributes::AUTHENTICATION_ERROR],