Skip to content

Commit 4cb3d3c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: Migrate to `static` data providers using `rector/rector`
2 parents b47d7fe + f4ea109 commit 4cb3d3c

14 files changed

+28
-28
lines changed

‎Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testEventIsPropagated(string $configuredEvent, string $registere
6969
]);
7070
}
7171

72-
public function providePropagatedEvents(): array
72+
public static function providePropagatedEvents(): array
7373
{
7474
return [
7575
[CheckPassportEvent::class, CheckPassportEvent::class],

‎Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
6060
}
6161
}
6262

63-
public function getFailureHandlers()
63+
public static function getFailureHandlers()
6464
{
6565
return [
6666
[null, true],
@@ -107,7 +107,7 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
107107
}
108108
}
109109

110-
public function getSuccessHandlers()
110+
public static function getSuccessHandlers()
111111
{
112112
return [
113113
[null, true],

‎Tests/DependencyInjection/SecurityExtensionTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public function testRegisterAccessControlWithRequestMatcherAndAdditionalOptionsT
306306
$container->compile();
307307
}
308308

309-
public function provideAdditionalRequestMatcherConstraints()
309+
public static function provideAdditionalRequestMatcherConstraints()
310310
{
311311
yield 'Invalid configuration with path' => [['path' => '^/url']];
312312
yield 'Invalid configuration with host' => [['host' => 'example.com']];
@@ -606,7 +606,7 @@ public function sessionConfigurationProvider()
606606
];
607607
}
608608

609-
public function acceptableIpsProvider(): iterable
609+
public static function acceptableIpsProvider(): iterable
610610
{
611611
yield [['127.0.0.1']];
612612
yield ['127.0.0.1'];
@@ -711,7 +711,7 @@ public function testEntryPointRequired(array $firewall, $messageRegex)
711711
$container->compile();
712712
}
713713

714-
public function provideEntryPointRequiredData()
714+
public static function provideEntryPointRequiredData()
715715
{
716716
// more than one entry point available and not explicitly set
717717
yield [
@@ -742,7 +742,7 @@ public function testConfigureCustomAuthenticator(array $firewall, array $expecte
742742
$this->assertEquals($expectedAuthenticators, array_map('strval', $container->getDefinition('security.authenticator.manager.main')->getArgument(0)));
743743
}
744744

745-
public function provideConfigureCustomAuthenticatorData()
745+
public static function provideConfigureCustomAuthenticatorData()
746746
{
747747
yield [
748748
['custom_authenticator' => TestAuthenticator::class],
@@ -819,7 +819,7 @@ public function testUserCheckerWithAuthenticatorManager(array $config, string $e
819819
$this->assertEquals($expectedUserCheckerClass, $container->findDefinition($userCheckerId)->getClass());
820820
}
821821

822-
public function provideUserCheckerConfig()
822+
public static function provideUserCheckerConfig()
823823
{
824824
yield [[], InMemoryUserChecker::class];
825825
yield [['user_checker' => TestUserChecker::class], TestUserChecker::class];

‎Tests/Functional/AccessTokenTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ public function testCustomMissingFormEncodedBodyShouldFail()
113113
$this->assertSame(401, $response->getStatusCode());
114114
}
115115

116-
public function defaultFormEncodedBodyFailureData(): iterable
116+
public static function defaultFormEncodedBodyFailureData(): iterable
117117
{
118118
yield [['access_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];
119119
}
120120

121-
public function customFormEncodedBodyFailure(): iterable
121+
public static function customFormEncodedBodyFailure(): iterable
122122
{
123123
yield [['secured_token' => 'INVALID_ACCESS_TOKEN'], ['CONTENT_TYPE' => 'application/x-www-form-urlencoded']];
124124
}
@@ -211,24 +211,24 @@ public function testCustomMissingHeaderAccessTokenShouldFail(array $headers)
211211
$this->assertSame(401, $response->getStatusCode());
212212
}
213213

214-
public function defaultHeaderAccessTokenFailureData(): iterable
214+
public static function defaultHeaderAccessTokenFailureData(): iterable
215215
{
216216
yield [['HTTP_AUTHORIZATION' => 'Bearer INVALID_ACCESS_TOKEN']];
217217
}
218218

219-
public function defaultMissingHeaderAccessTokenFailData(): iterable
219+
public static function defaultMissingHeaderAccessTokenFailData(): iterable
220220
{
221221
yield [['HTTP_AUTHORIZATION' => 'JWT INVALID_TOKEN_TYPE']];
222222
yield [['HTTP_X_FOO' => 'Missing-Header']];
223223
yield [['HTTP_X_AUTH_TOKEN' => 'this is not a token']];
224224
}
225225

226-
public function customHeaderAccessTokenFailure(): iterable
226+
public static function customHeaderAccessTokenFailure(): iterable
227227
{
228228
yield [['HTTP_X_AUTH_TOKEN' => 'INVALID_ACCESS_TOKEN'], 500];
229229
}
230230

231-
public function customMissingHeaderAccessTokenShouldFail(): iterable
231+
public static function customMissingHeaderAccessTokenShouldFail(): iterable
232232
{
233233
yield [[]];
234234
yield [['HTTP_AUTHORIZATION' => 'Bearer this is not a token']];
@@ -306,12 +306,12 @@ public function testCustomMissingQueryAccessTokenShouldFail()
306306
$this->assertSame(401, $response->getStatusCode());
307307
}
308308

309-
public function defaultQueryAccessTokenFailureData(): iterable
309+
public static function defaultQueryAccessTokenFailureData(): iterable
310310
{
311311
yield ['/foo?access_token=INVALID_ACCESS_TOKEN'];
312312
}
313313

314-
public function customQueryAccessTokenFailure(): iterable
314+
public static function customQueryAccessTokenFailure(): iterable
315315
{
316316
yield ['/foo?protection_token=INVALID_ACCESS_TOKEN'];
317317
}

‎Tests/Functional/AuthenticatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testWithoutUserProvider($email)
6060
$this->assertJsonStringEqualsJsonString('{"email":"'.$email.'"}', $client->getResponse()->getContent());
6161
}
6262

63-
public function provideEmails()
63+
public static function provideEmails()
6464
{
6565
yield ['[email protected]', true];
6666
yield ['[email protected]', false];
@@ -84,7 +84,7 @@ public function testLoginUsersWithMultipleFirewalls(string $username, string $fi
8484
$this->assertEquals('Welcome '.$username.'!', $client->getResponse()->getContent());
8585
}
8686

87-
public function provideEmailsWithFirewalls()
87+
public static function provideEmailsWithFirewalls()
8888
{
8989
yield ['[email protected]', 'main'];
9090
yield ['[email protected]', 'custom'];

‎Tests/Functional/CsrfFormLoginTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function testFormLoginRedirectsToProtectedResourceAfterLogin($options)
122122
$this->assertStringContainsString('You\'re browsing to path "/protected-resource".', $text);
123123
}
124124

125-
public function provideClientOptions()
125+
public static function provideClientOptions()
126126
{
127127
yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'config.yml']];
128128
yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'routes_as_path.yml']];

‎Tests/Functional/FormLoginTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function testLoginThrottling()
147147
}
148148
}
149149

150-
public function provideClientOptions()
150+
public static function provideClientOptions()
151151
{
152152
yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];
153153
yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];

‎Tests/Functional/LocalizedRoutesAsPathTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testAccessRestrictedResourceWithForward(string $locale)
7373
$this->assertCount(1, $crawler->selectButton('login'), (string) $client->getResponse());
7474
}
7575

76-
public function getLocales()
76+
public static function getLocales()
7777
{
7878
yield ['en'];
7979
yield ['de'];

‎Tests/Functional/RememberMeCookieTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testSessionRememberMeSecureCookieFlagAuto($https, $expectedSecur
3131
$this->assertSame($expectedSecureFlag, $cookies['']['/']['REMEMBERME']->isSecure());
3232
}
3333

34-
public function getSessionRememberMeSecureCookieFlagAutoHttpsMap()
34+
public static function getSessionRememberMeSecureCookieFlagAutoHttpsMap()
3535
{
3636
return [
3737
[true, true],

‎Tests/Functional/RememberMeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function testSessionLessRememberMeLogout()
9393
$this->assertNull($cookieJar->get('REMEMBERME'));
9494
}
9595

96-
public function provideConfigs()
96+
public static function provideConfigs()
9797
{
9898
yield [['root_config' => 'config_session.yml']];
9999
yield [['root_config' => 'config_persistent.yml']];

‎Tests/Functional/SecurityRoutingIntegrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private function assertRestricted($client, $path)
151151
$this->assertEquals(302, $client->getResponse()->getStatusCode());
152152
}
153153

154-
public function provideConfigs()
154+
public static function provideConfigs()
155155
{
156156
yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];
157157
yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];

‎Tests/Functional/SecurityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testUserWillBeMarkedAsChangedIfRolesHasChanged(UserInterface $us
7676
$this->assertEquals(302, $client->getResponse()->getStatusCode());
7777
}
7878

79-
public function userWillBeMarkedAsChangedIfRolesHasChangedProvider()
79+
public static function userWillBeMarkedAsChangedIfRolesHasChangedProvider()
8080
{
8181
return [
8282
[

‎Tests/Functional/SwitchUserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testSwitchUserStateless()
6363
$this->assertSame('dunglas', $client->getProfile()->getCollector('security')->getUser());
6464
}
6565

66-
public function getTestParameters()
66+
public static function getTestParameters()
6767
{
6868
return [
6969
'unauthorized_user_cannot_switch' => ['user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403],

‎Tests/SecurityTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testGetUser($userInToken, $expectedUser)
7474
$this->assertSame($expectedUser, $security->getUser());
7575
}
7676

77-
public function getUserTests()
77+
public static function getUserTests()
7878
{
7979
yield [null, null];
8080

@@ -115,7 +115,7 @@ public function testGetFirewallConfig(Request $request, ?FirewallConfig $expecte
115115
$this->assertSame($expectedFirewallConfig, $security->getFirewallConfig($request));
116116
}
117117

118-
public function getFirewallConfigTests()
118+
public static function getFirewallConfigTests()
119119
{
120120
$request = new Request();
121121

0 commit comments

Comments
 (0)