Merge branch '4.4'

* 4.4:
  Fixed tests on the Security and Form components
  Add return types to tests and final|internal|private methods

Author: nicolas-grekas

Authorization/TraceableAccessDecisionManager.php

@@ -83,9 +83,6 @@ public function addVoterVote(VoterInterface $voter, array $attributes, int $vote
         ];
     }
 
-    /**
-     * @return string
-     */
     public function getStrategy(): string
     {
         // The $strategy property is misleading because it stores the name of its
@@ -102,9 +99,6 @@ public function getVoters(): iterable
         return $this->voters;
     }
 
-    /**
-     * @return array
-     */
     public function getDecisionLog(): array
     {
         return $this->decisionLog;

Tests/Authentication/AuthenticationTrustResolverTest.php

@@ -131,7 +131,7 @@ public function unserialize($serialized)
     {
     }
 
-    public function __toString()
+    public function __toString(): string
     {
     }
 
@@ -151,11 +151,11 @@ public function setUser($user)
     {
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
     }
 
-    public function isAuthenticated()
+    public function isAuthenticated(): bool
     {
     }
 
@@ -167,15 +167,15 @@ public function eraseCredentials()
     {
     }
 
-    public function getAttributes()
+    public function getAttributes(): array
     {
     }
 
     public function setAttributes(array $attributes)
     {
     }
 
-    public function hasAttribute(string $name)
+    public function hasAttribute(string $name): bool
     {
     }
 

Tests/Authorization/Voter/VoterTest.php

@@ -59,12 +59,12 @@ public function testVote(array $attributes, $expectedVote, $object, $message)
 
 class VoterTest_Voter extends Voter
 {
-    protected function voteOnAttribute(string $attribute, $object, TokenInterface $token)
+    protected function voteOnAttribute(string $attribute, $object, TokenInterface $token): bool
     {
         return 'EDIT' === $attribute;
     }
 
-    protected function supports(string $attribute, $object)
+    protected function supports(string $attribute, $object): bool
     {
         return $object instanceof \stdClass && \in_array($attribute, ['EDIT', 'CREATE']);
     }

Tests/Encoder/EncoderFactoryTest.php

@@ -135,19 +135,19 @@ public function testGetEncoderForEncoderAwareWithClassName()
 
 class SomeUser implements UserInterface
 {
-    public function getRoles()
+    public function getRoles(): array
     {
     }
 
-    public function getPassword()
+    public function getPassword(): ?string
     {
     }
 
-    public function getSalt()
+    public function getSalt(): ?string
     {
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
     }
 
@@ -164,7 +164,7 @@ class EncAwareUser extends SomeUser implements EncoderAwareInterface
 {
     public $encoderName = 'encoder_name';
 
-    public function getEncoderName()
+    public function getEncoderName(): ?string
     {
         return $this->encoderName;
     }

Tests/User/InMemoryUserProviderTest.php

@@ -40,10 +40,7 @@ public function testRefresh()
         $this->assertFalse($refreshedUser->isCredentialsNonExpired());
     }
 
-    /**
-     * @return InMemoryUserProvider
-     */
-    protected function createProvider()
+    protected function createProvider(): InMemoryUserProvider
     {
         return new InMemoryUserProvider([
             'fabien' => [