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;

Encoder/MigratingPasswordEncoder.php

@@ -34,15 +34,15 @@ public function __construct(PasswordEncoderInterface $bestEncoder, PasswordEncod
     /**
      * {@inheritdoc}
      */
-    public function encodePassword($raw, $salt)
+    public function encodePassword($raw, $salt): string
     {
         return $this->bestEncoder->encodePassword($raw, $salt);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isPasswordValid($encoded, $raw, $salt)
+    public function isPasswordValid($encoded, $raw, $salt): bool
     {
         if ($this->bestEncoder->isPasswordValid($encoded, $raw, $salt)) {
             return true;

Encoder/NativePasswordEncoder.php

@@ -78,7 +78,7 @@ public function encodePassword($raw, $salt): string
     /**
      * {@inheritdoc}
      */
-    public function isPasswordValid($encoded, $raw, $salt)
+    public function isPasswordValid($encoded, $raw, $salt): bool
     {
         if (72 < \strlen($raw) && 0 === strpos($encoded, '$2')) {
             // BCrypt encodes only the first 72 chars

Encoder/SodiumPasswordEncoder.php

@@ -54,7 +54,7 @@ public static function isSupported(): bool
     /**
      * {@inheritdoc}
      */
-    public function encodePassword($raw, $salt)
+    public function encodePassword($raw, $salt): string
     {
         if (\strlen($raw) > self::MAX_PASSWORD_LENGTH) {
             throw new BadCredentialsException('Invalid password.');
@@ -74,7 +74,7 @@ public function encodePassword($raw, $salt)
     /**
      * {@inheritdoc}
      */
-    public function isPasswordValid($encoded, $raw, $salt)
+    public function isPasswordValid($encoded, $raw, $salt): bool
     {
         if (\strlen($raw) > self::MAX_PASSWORD_LENGTH) {
             return false;

Security.php

@@ -34,10 +34,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    /**
-     * @return UserInterface|null
-     */
-    public function getUser()
+    public function getUser(): ?UserInterface
     {
         if (!$token = $this->getToken()) {
             return null;

Tests/Authentication/AuthenticationTrustResolverTest.php

@@ -164,11 +164,11 @@ public function unserialize($serialized)
     {
     }
 
-    public function __toString()
+    public function __toString(): string
     {
     }
 
-    public function getRoles()
+    public function getRoles(): array
     {
     }
 
@@ -184,11 +184,11 @@ public function setUser($user)
     {
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
     }
 
-    public function isAuthenticated()
+    public function isAuthenticated(): bool
     {
     }
 
@@ -200,15 +200,15 @@ public function eraseCredentials()
     {
     }
 
-    public function getAttributes()
+    public function getAttributes(): array
     {
     }
 
     public function setAttributes(array $attributes)
     {
     }
 
-    public function hasAttribute($name)
+    public function hasAttribute($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($attribute, $object, TokenInterface $token)
+    protected function voteOnAttribute($attribute, $object, TokenInterface $token): bool
     {
         return 'EDIT' === $attribute;
     }
 
-    protected function supports($attribute, $object)
+    protected function supports($attribute, $object): bool
     {
         return $object instanceof \stdClass && \in_array($attribute, ['EDIT', 'CREATE']);
     }

Tests/Encoder/BasePasswordEncoderTest.php

@@ -16,11 +16,11 @@
 
 class PasswordEncoder extends BasePasswordEncoder
 {
-    public function encodePassword($raw, $salt)
+    public function encodePassword($raw, $salt): string
     {
     }
 
-    public function isPasswordValid($encoded, $raw, $salt)
+    public function isPasswordValid($encoded, $raw, $salt): bool
     {
     }
 }

Tests/Encoder/EncoderFactoryTest.php

@@ -139,15 +139,15 @@ public function getRoles()
     {
     }
 
-    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' => [