Fix merge

Author: nicolas-grekas

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/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];