Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 4cb3d3cfe378 · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php b/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php
@@ -69,7 +69,7 @@ public function testEventIsPropagated(string $configuredEvent, string $registere
         ]);
     }
 
-    public function providePropagatedEvents(): array
+    public static function providePropagatedEvents(): array
     {
         return [
             [CheckPassportEvent::class, CheckPassportEvent::class],
diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -60,7 +60,7 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
         }
     }
 
-    public function getFailureHandlers()
+    public static function getFailureHandlers()
     {
         return [
             [null, true],
@@ -107,7 +107,7 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
         }
     }
 
-    public function getSuccessHandlers()
+    public static function getSuccessHandlers()
     {
         return [
             [null, true],
diff --git a/Tests/DependencyInjection/SecurityExtensionTest.php b/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -306,7 +306,7 @@ public function testRegisterAccessControlWithRequestMatcherAndAdditionalOptionsT
         $container->compile();
     }
 
-    public function provideAdditionalRequestMatcherConstraints()
+    public static function provideAdditionalRequestMatcherConstraints()
     {
         yield 'Invalid configuration with path' => [['path' => '^/url']];
         yield 'Invalid configuration with host' => [['host' => 'example.com']];
@@ -606,7 +606,7 @@ public function sessionConfigurationProvider()
         ];
     }
 
-    public function acceptableIpsProvider(): iterable
+    public static function acceptableIpsProvider(): iterable
     {
         yield [['127.0.0.1']];
         yield ['127.0.0.1'];
@@ -711,7 +711,7 @@ public function testEntryPointRequired(array $firewall, $messageRegex)
         $container->compile();
     }
 
-    public function provideEntryPointRequiredData()
+    public static function provideEntryPointRequiredData()
     {
         // more than one entry point available and not explicitly set
         yield [
@@ -742,7 +742,7 @@ public function testConfigureCustomAuthenticator(array $firewall, array $expecte
         $this->assertEquals($expectedAuthenticators, array_map('strval', $container->getDefinition('security.authenticator.manager.main')->getArgument(0)));
     }
 
-    public function provideConfigureCustomAuthenticatorData()
+    public static function provideConfigureCustomAuthenticatorData()
     {
         yield [
             ['custom_authenticator' => TestAuthenticator::class],
@@ -819,7 +819,7 @@ public function testUserCheckerWithAuthenticatorManager(array $config, string $e
         $this->assertEquals($expectedUserCheckerClass, $container->findDefinition($userCheckerId)->getClass());
     }
 
-    public function provideUserCheckerConfig()
+    public static function provideUserCheckerConfig()
     {
         yield [[], InMemoryUserChecker::class];
         yield [['user_checker' => TestUserChecker::class], TestUserChecker::class];
diff --git a/Tests/Functional/AccessTokenTest.php b/Tests/Functional/AccessTokenTest.php
@@ -113,12 +113,12 @@ public function testCustomMissingFormEncodedBodyShouldFail()
         $this->assertSame(401, $response->getStatusCode());
     }
 
-    public function defaultFormEncodedBodyFailureData(): iterable
+    public static function defaultFormEncodedBodyFailureData(): iterable
     {
         yield [['access_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];
     }
 
-    public function customFormEncodedBodyFailure(): iterable
+    public static function customFormEncodedBodyFailure(): iterable
     {
         yield [['secured_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];
     }
@@ -211,24 +211,24 @@ public function testCustomMissingHeaderAccessTokenShouldFail(array $headers)
         $this->assertSame(401, $response->getStatusCode());
     }
 
-    public function defaultHeaderAccessTokenFailureData(): iterable
+    public static function defaultHeaderAccessTokenFailureData(): iterable
     {
         yield [['HTTP_AUTHORIZATION' => 'Bearer INVALID_ACCESS_TOKEN']];
     }
 
-    public function defaultMissingHeaderAccessTokenFailData(): iterable
+    public static function defaultMissingHeaderAccessTokenFailData(): iterable
     {
         yield [['HTTP_AUTHORIZATION' => 'JWT INVALID_TOKEN_TYPE']];
         yield [['HTTP_X_FOO' => 'Missing-Header']];
         yield [['HTTP_X_AUTH_TOKEN' => 'this is not a token']];
     }
 
-    public function customHeaderAccessTokenFailure(): iterable
+    public static function customHeaderAccessTokenFailure(): iterable
     {
         yield [['HTTP_X_AUTH_TOKEN' => 'INVALID_ACCESS_TOKEN'], 500];
     }
 
-    public function customMissingHeaderAccessTokenShouldFail(): iterable
+    public static function customMissingHeaderAccessTokenShouldFail(): iterable
     {
         yield [[]];
         yield [['HTTP_AUTHORIZATION' => 'Bearer this is not a token']];
@@ -306,12 +306,12 @@ public function testCustomMissingQueryAccessTokenShouldFail()
         $this->assertSame(401, $response->getStatusCode());
     }
 
-    public function defaultQueryAccessTokenFailureData(): iterable
+    public static function defaultQueryAccessTokenFailureData(): iterable
     {
         yield ['/foo?access_token=INVALID_ACCESS_TOKEN'];
     }
 
-    public function customQueryAccessTokenFailure(): iterable
+    public static function customQueryAccessTokenFailure(): iterable
     {
         yield ['/foo?protection_token=INVALID_ACCESS_TOKEN'];
     }
diff --git a/Tests/Functional/AuthenticatorTest.php b/Tests/Functional/AuthenticatorTest.php
@@ -60,7 +60,7 @@ public function testWithoutUserProvider($email)
         $this->assertJsonStringEqualsJsonString('{"email":"'.$email.'"}', $client->getResponse()->getContent());
     }
 
-    public function provideEmails()
+    public static function provideEmails()
     {
         yield ['jane@example.org', true];
         yield ['john@example.org', false];
@@ -84,7 +84,7 @@ public function testLoginUsersWithMultipleFirewalls(string $username, string $fi
         $this->assertEquals('Welcome '.$username.'!', $client->getResponse()->getContent());
     }
 
-    public function provideEmailsWithFirewalls()
+    public static function provideEmailsWithFirewalls()
     {
         yield ['jane@example.org', 'main'];
         yield ['john@example.org', 'custom'];
diff --git a/Tests/Functional/CsrfFormLoginTest.php b/Tests/Functional/CsrfFormLoginTest.php
@@ -122,7 +122,7 @@ public function testFormLoginRedirectsToProtectedResourceAfterLogin($options)
         $this->assertStringContainsString('You\'re browsing to path "/protected-resource".', $text);
     }
 
-    public function provideClientOptions()
+    public static function provideClientOptions()
     {
         yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'config.yml']];
         yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'routes_as_path.yml']];
diff --git a/Tests/Functional/FormLoginTest.php b/Tests/Functional/FormLoginTest.php
@@ -147,7 +147,7 @@ public function testLoginThrottling()
         }
     }
 
-    public function provideClientOptions()
+    public static function provideClientOptions()
     {
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];
diff --git a/Tests/Functional/LocalizedRoutesAsPathTest.php b/Tests/Functional/LocalizedRoutesAsPathTest.php
@@ -73,7 +73,7 @@ public function testAccessRestrictedResourceWithForward(string $locale)
         $this->assertCount(1, $crawler->selectButton('login'), (string) $client->getResponse());
     }
 
-    public function getLocales()
+    public static function getLocales()
     {
         yield ['en'];
         yield ['de'];
diff --git a/Tests/Functional/RememberMeCookieTest.php b/Tests/Functional/RememberMeCookieTest.php
@@ -31,7 +31,7 @@ public function testSessionRememberMeSecureCookieFlagAuto($https, $expectedSecur
         $this->assertSame($expectedSecureFlag, $cookies['']['/']['REMEMBERME']->isSecure());
     }
 
-    public function getSessionRememberMeSecureCookieFlagAutoHttpsMap()
+    public static function getSessionRememberMeSecureCookieFlagAutoHttpsMap()
     {
         return [
             [true, true],
diff --git a/Tests/Functional/RememberMeTest.php b/Tests/Functional/RememberMeTest.php
@@ -93,7 +93,7 @@ public function testSessionLessRememberMeLogout()
         $this->assertNull($cookieJar->get('REMEMBERME'));
     }
 
-    public function provideConfigs()
+    public static function provideConfigs()
     {
         yield [['root_config' => 'config_session.yml']];
         yield [['root_config' => 'config_persistent.yml']];
diff --git a/Tests/Functional/SecurityRoutingIntegrationTest.php b/Tests/Functional/SecurityRoutingIntegrationTest.php
@@ -151,7 +151,7 @@ private function assertRestricted($client, $path)
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
     }
 
-    public function provideConfigs()
+    public static function provideConfigs()
     {
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];
diff --git a/Tests/Functional/SecurityTest.php b/Tests/Functional/SecurityTest.php
@@ -76,7 +76,7 @@ public function testUserWillBeMarkedAsChangedIfRolesHasChanged(UserInterface $us
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
     }
 
-    public function userWillBeMarkedAsChangedIfRolesHasChangedProvider()
+    public static function userWillBeMarkedAsChangedIfRolesHasChangedProvider()
     {
         return [
             [
diff --git a/Tests/Functional/SwitchUserTest.php b/Tests/Functional/SwitchUserTest.php
@@ -63,7 +63,7 @@ public function testSwitchUserStateless()
         $this->assertSame('dunglas', $client->getProfile()->getCollector('security')->getUser());
     }
 
-    public function getTestParameters()
+    public static function getTestParameters()
     {
         return [
             'unauthorized_user_cannot_switch' => ['user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403],
diff --git a/Tests/SecurityTest.php b/Tests/SecurityTest.php
@@ -74,7 +74,7 @@ public function testGetUser($userInToken, $expectedUser)
         $this->assertSame($expectedUser, $security->getUser());
     }
 
-    public function getUserTests()
+    public static function getUserTests()
     {
         yield [null, null];
 
@@ -115,7 +115,7 @@ public function testGetFirewallConfig(Request $request, ?FirewallConfig $expecte
         $this->assertSame($expectedFirewallConfig, $security->getFirewallConfig($request));
     }
 
-    public function getFirewallConfigTests()
+    public static function getFirewallConfigTests()
     {
         $request = new Request();
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testEventIsPropagated(string $configuredEvent, string $registere`
`69`	`69`	`]);`
`70`	`70`	`}`
`71`	`71`
`72`		`- public function providePropagatedEvents(): array`
	`72`	`+ public static function providePropagatedEvents(): array`
`73`	`73`	`{`
`74`	`74`	`return [`
`75`	`75`	`[CheckPassportEvent::class, CheckPassportEvent::class],`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function getFailureHandlers()`
	`63`	`+ public static function getFailureHandlers()`
`64`	`64`	`{`
`65`	`65`	`return [`
`66`	`66`	`[null, true],`
`@@ -107,7 +107,7 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- public function getSuccessHandlers()`
	`110`	`+ public static function getSuccessHandlers()`
`111`	`111`	`{`
`112`	`112`	`return [`
`113`	`113`	`[null, true],`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ public function testRegisterAccessControlWithRequestMatcherAndAdditionalOptionsT`
`306`	`306`	`$container->compile();`
`307`	`307`	`}`
`308`	`308`
`309`		`- public function provideAdditionalRequestMatcherConstraints()`
	`309`	`+ public static function provideAdditionalRequestMatcherConstraints()`
`310`	`310`	`{`
`311`	`311`	`yield 'Invalid configuration with path' => [['path' => '^/url']];`
`312`	`312`	`yield 'Invalid configuration with host' => [['host' => 'example.com']];`
`@@ -606,7 +606,7 @@ public function sessionConfigurationProvider()`
`606`	`606`	`];`
`607`	`607`	`}`
`608`	`608`
`609`		`- public function acceptableIpsProvider(): iterable`
	`609`	`+ public static function acceptableIpsProvider(): iterable`
`610`	`610`	`{`
`611`	`611`	`yield [['127.0.0.1']];`
`612`	`612`	`yield ['127.0.0.1'];`
`@@ -711,7 +711,7 @@ public function testEntryPointRequired(array $firewall, $messageRegex)`
`711`	`711`	`$container->compile();`
`712`	`712`	`}`
`713`	`713`
`714`		`- public function provideEntryPointRequiredData()`
	`714`	`+ public static function provideEntryPointRequiredData()`
`715`	`715`	`{`
`716`	`716`	`// more than one entry point available and not explicitly set`
`717`	`717`	`yield [`
`@@ -742,7 +742,7 @@ public function testConfigureCustomAuthenticator(array $firewall, array $expecte`
`742`	`742`	`$this->assertEquals($expectedAuthenticators, array_map('strval', $container->getDefinition('security.authenticator.manager.main')->getArgument(0)));`
`743`	`743`	`}`
`744`	`744`
`745`		`- public function provideConfigureCustomAuthenticatorData()`
	`745`	`+ public static function provideConfigureCustomAuthenticatorData()`
`746`	`746`	`{`
`747`	`747`	`yield [`
`748`	`748`	`['custom_authenticator' => TestAuthenticator::class],`
`@@ -819,7 +819,7 @@ public function testUserCheckerWithAuthenticatorManager(array $config, string $e`
`819`	`819`	`$this->assertEquals($expectedUserCheckerClass, $container->findDefinition($userCheckerId)->getClass());`
`820`	`820`	`}`
`821`	`821`
`822`		`- public function provideUserCheckerConfig()`
	`822`	`+ public static function provideUserCheckerConfig()`
`823`	`823`	`{`
`824`	`824`	`yield [[], InMemoryUserChecker::class];`
`825`	`825`	`yield [['user_checker' => TestUserChecker::class], TestUserChecker::class];`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,12 @@ public function testCustomMissingFormEncodedBodyShouldFail()`
`113`	`113`	`$this->assertSame(401, $response->getStatusCode());`
`114`	`114`	`}`
`115`	`115`
`116`		`- public function defaultFormEncodedBodyFailureData(): iterable`
	`116`	`+ public static function defaultFormEncodedBodyFailureData(): iterable`
`117`	`117`	`{`
`118`	`118`	`yield [['access_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];`
`119`	`119`	`}`
`120`	`120`
`121`		`- public function customFormEncodedBodyFailure(): iterable`
	`121`	`+ public static function customFormEncodedBodyFailure(): iterable`
`122`	`122`	`{`
`123`	`123`	`yield [['secured_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];`
`124`	`124`	`}`
`@@ -211,24 +211,24 @@ public function testCustomMissingHeaderAccessTokenShouldFail(array $headers)`
`211`	`211`	`$this->assertSame(401, $response->getStatusCode());`
`212`	`212`	`}`
`213`	`213`
`214`		`- public function defaultHeaderAccessTokenFailureData(): iterable`
	`214`	`+ public static function defaultHeaderAccessTokenFailureData(): iterable`
`215`	`215`	`{`
`216`	`216`	`yield [['HTTP_AUTHORIZATION' => 'Bearer INVALID_ACCESS_TOKEN']];`
`217`	`217`	`}`
`218`	`218`
`219`		`- public function defaultMissingHeaderAccessTokenFailData(): iterable`
	`219`	`+ public static function defaultMissingHeaderAccessTokenFailData(): iterable`
`220`	`220`	`{`
`221`	`221`	`yield [['HTTP_AUTHORIZATION' => 'JWT INVALID_TOKEN_TYPE']];`
`222`	`222`	`yield [['HTTP_X_FOO' => 'Missing-Header']];`
`223`	`223`	`yield [['HTTP_X_AUTH_TOKEN' => 'this is not a token']];`
`224`	`224`	`}`
`225`	`225`
`226`		`- public function customHeaderAccessTokenFailure(): iterable`
	`226`	`+ public static function customHeaderAccessTokenFailure(): iterable`
`227`	`227`	`{`
`228`	`228`	`yield [['HTTP_X_AUTH_TOKEN' => 'INVALID_ACCESS_TOKEN'], 500];`
`229`	`229`	`}`
`230`	`230`
`231`		`- public function customMissingHeaderAccessTokenShouldFail(): iterable`
	`231`	`+ public static function customMissingHeaderAccessTokenShouldFail(): iterable`
`232`	`232`	`{`
`233`	`233`	`yield [[]];`
`234`	`234`	`yield [['HTTP_AUTHORIZATION' => 'Bearer this is not a token']];`
`@@ -306,12 +306,12 @@ public function testCustomMissingQueryAccessTokenShouldFail()`
`306`	`306`	`$this->assertSame(401, $response->getStatusCode());`
`307`	`307`	`}`
`308`	`308`
`309`		`- public function defaultQueryAccessTokenFailureData(): iterable`
	`309`	`+ public static function defaultQueryAccessTokenFailureData(): iterable`
`310`	`310`	`{`
`311`	`311`	`yield ['/foo?access_token=INVALID_ACCESS_TOKEN'];`
`312`	`312`	`}`
`313`	`313`
`314`		`- public function customQueryAccessTokenFailure(): iterable`
	`314`	`+ public static function customQueryAccessTokenFailure(): iterable`
`315`	`315`	`{`
`316`	`316`	`yield ['/foo?protection_token=INVALID_ACCESS_TOKEN'];`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testWithoutUserProvider($email)`
`60`	`60`	`$this->assertJsonStringEqualsJsonString('{"email":"'.$email.'"}', $client->getResponse()->getContent());`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function provideEmails()`
	`63`	`+ public static function provideEmails()`
`64`	`64`	`{`
`65`	`65`	`yield ['jane@example.org', true];`
`66`	`66`	`yield ['john@example.org', false];`
`@@ -84,7 +84,7 @@ public function testLoginUsersWithMultipleFirewalls(string $username, string $fi`
`84`	`84`	`$this->assertEquals('Welcome '.$username.'!', $client->getResponse()->getContent());`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function provideEmailsWithFirewalls()`
	`87`	`+ public static function provideEmailsWithFirewalls()`
`88`	`88`	`{`
`89`	`89`	`yield ['jane@example.org', 'main'];`
`90`	`90`	`yield ['john@example.org', 'custom'];`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function testFormLoginRedirectsToProtectedResourceAfterLogin($options)`
`122`	`122`	`$this->assertStringContainsString('You\'re browsing to path "/protected-resource".', $text);`
`123`	`123`	`}`
`124`	`124`
`125`		`- public function provideClientOptions()`
	`125`	`+ public static function provideClientOptions()`
`126`	`126`	`{`
`127`	`127`	`yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'config.yml']];`
`128`	`128`	`yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'routes_as_path.yml']];`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function testLoginThrottling()`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`- public function provideClientOptions()`
	`150`	`+ public static function provideClientOptions()`
`151`	`151`	`{`
`152`	`152`	`yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];`
`153`	`153`	`yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testAccessRestrictedResourceWithForward(string $locale)`
`73`	`73`	`$this->assertCount(1, $crawler->selectButton('login'), (string) $client->getResponse());`
`74`	`74`	`}`
`75`	`75`
`76`		`- public function getLocales()`
	`76`	`+ public static function getLocales()`
`77`	`77`	`{`
`78`	`78`	`yield ['en'];`
`79`	`79`	`yield ['de'];`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testSessionRememberMeSecureCookieFlagAuto($https, $expectedSecur`
`31`	`31`	`$this->assertSame($expectedSecureFlag, $cookies['']['/']['REMEMBERME']->isSecure());`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function getSessionRememberMeSecureCookieFlagAutoHttpsMap()`
	`34`	`+ public static function getSessionRememberMeSecureCookieFlagAutoHttpsMap()`
`35`	`35`	`{`
`36`	`36`	`return [`
`37`	`37`	`[true, true],`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function testSessionLessRememberMeLogout()`
`93`	`93`	`$this->assertNull($cookieJar->get('REMEMBERME'));`
`94`	`94`	`}`
`95`	`95`
`96`		`- public function provideConfigs()`
	`96`	`+ public static function provideConfigs()`
`97`	`97`	`{`
`98`	`98`	`yield [['root_config' => 'config_session.yml']];`
`99`	`99`	`yield [['root_config' => 'config_persistent.yml']];`