Merge branch '6.2' into 6.3

* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`

Author: nicolas-grekas

Tests/Authorization/AuthorizationCheckerTest.php

@@ -57,7 +57,7 @@ public function testIsGranted($decide)
         $this->assertSame($decide, $this->authorizationChecker->isGranted('ROLE_FOO'));
     }
 
-    public function isGrantedProvider()
+    public static function isGrantedProvider()
     {
         return [[true], [false]];
     }

Tests/Authorization/ExpressionLanguageTest.php

@@ -44,7 +44,7 @@ public function testIsAuthenticated($token, $expression, $result)
         $this->assertEquals($result, $expressionLanguage->evaluate($expression, $context));
     }
 
-    public function provider()
+    public static function provider()
     {
         $roles = ['ROLE_USER', 'ROLE_ADMIN'];
         $user = new InMemoryUser('username', 'password', $roles);

Tests/Authorization/Voter/AuthenticatedVoterTest.php

@@ -33,7 +33,7 @@ public function testVote($authenticated, $attributes, $expected)
         $this->assertSame($expected, $voter->vote($this->getToken($authenticated), null, $attributes));
     }
 
-    public function getVoteTests()
+    public static function getVoteTests()
     {
         return [
             ['fully', [], VoterInterface::ACCESS_ABSTAIN],
@@ -63,7 +63,7 @@ public function testSupportsAttribute(string $attribute, bool $expected)
         $this->assertSame($expected, $voter->supportsAttribute($attribute));
     }
 
-    public function provideAttributes()
+    public static function provideAttributes()
     {
         yield [AuthenticatedVoter::IS_AUTHENTICATED_FULLY, true];
         yield [AuthenticatedVoter::IS_AUTHENTICATED_REMEMBERED, true];

Tests/Authorization/Voter/RoleHierarchyVoterTest.php

@@ -27,7 +27,7 @@ public function testVoteUsingTokenThatReturnsRoleNames($roles, $attributes, $exp
         $this->assertSame($expected, $voter->vote($this->getTokenWithRoleNames($roles), null, $attributes));
     }
 
-    public function getVoteTests()
+    public static function getVoteTests()
     {
         return array_merge(parent::getVoteTests(), [
             [['ROLE_FOO'], ['ROLE_FOOBAR'], VoterInterface::ACCESS_GRANTED],
@@ -44,7 +44,7 @@ public function testVoteWithEmptyHierarchyUsingTokenThatReturnsRoleNames($roles,
         $this->assertSame($expected, $voter->vote($this->getTokenWithRoleNames($roles), null, $attributes));
     }
 
-    public function getVoteWithEmptyHierarchyTests()
+    public static function getVoteWithEmptyHierarchyTests()
     {
         return parent::getVoteTests();
     }

Tests/Authorization/Voter/RoleVoterTest.php

@@ -30,7 +30,7 @@ public function testVoteUsingTokenThatReturnsRoleNames($roles, $attributes, $exp
         $this->assertSame($expected, $voter->vote($this->getTokenWithRoleNames($roles), null, $attributes));
     }
 
-    public function getVoteTests()
+    public static function getVoteTests()
     {
         return [
             [[], [], VoterInterface::ACCESS_ABSTAIN],
@@ -56,7 +56,7 @@ public function testSupportsAttribute(string $prefix, string $attribute, bool $e
         $this->assertSame($expected, $voter->supportsAttribute($attribute));
     }
 
-    public function provideAttributes()
+    public static function provideAttributes()
     {
         yield ['ROLE_', 'ROLE_foo', true];
         yield ['ROLE_', 'ROLE_', true];

Tests/Resources/TranslationFilesTest.php

@@ -42,7 +42,7 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)
         $this->assertCount(0, $errors, sprintf('"%s" is invalid:%s', $filePath, \PHP_EOL.implode(\PHP_EOL, array_column($errors, 'message'))));
     }
 
-    public function provideTranslationFiles()
+    public static function provideTranslationFiles()
     {
         return array_map(
             fn ($filePath) => (array) $filePath,

Tests/SecurityTest.php

@@ -61,7 +61,7 @@ public function testGetUser($userInToken, $expectedUser)
         $this->assertSame($expectedUser, $security->getUser());
     }
 
-    public function getUserTests()
+    public static function getUserTests()
     {
         yield [null, null];
 

Tests/Validator/Constraints/UserPasswordTest.php

@@ -33,7 +33,7 @@ public function testValidatedByService(UserPassword $constraint)
         self::assertSame('my_service', $constraint->validatedBy());
     }
 
-    public function provideServiceValidatedConstraints(): iterable
+    public static function provideServiceValidatedConstraints(): iterable
     {
         yield 'Doctrine style' => [new UserPassword(['service' => 'my_service'])];
 

Tests/Validator/Constraints/UserPasswordValidatorTestCase.php

@@ -91,7 +91,7 @@ public function testPasswordIsNotValid(UserPassword $constraint)
             ->assertRaised();
     }
 
-    public function provideConstraints(): iterable
+    public static function provideConstraints(): iterable
     {
         yield 'Doctrine style' => [new UserPassword(['message' => 'myMessage'])];
 
@@ -113,7 +113,7 @@ public function testEmptyPasswordsAreNotValid($password)
             ->assertRaised();
     }
 
-    public function emptyPasswordData()
+    public static function emptyPasswordData()
     {
         return [
             [null],