Add types to constructors and private/final/internal methods (Batch II)

Author: derrabus

Authentication/Token/AbstractToken.php

@@ -299,7 +299,7 @@ public function __toString()
         return sprintf('%s(user="%s", authenticated=%s, roles="%s")', $class, $this->getUsername(), json_encode($this->authenticated), implode(', ', $roles));
     }
 
-    private function hasUserChanged(UserInterface $user)
+    private function hasUserChanged(UserInterface $user): bool
     {
         if (!($this->user instanceof UserInterface)) {
             throw new \BadMethodCallException('Method "hasUserChanged" should be called when current user class is instance of "UserInterface".');

Authorization/Voter/ExpressionVoter.php

@@ -93,7 +93,7 @@ public function vote(TokenInterface $token, $subject, array $attributes)
         return $result;
     }
 
-    private function getVariables(TokenInterface $token, $subject)
+    private function getVariables(TokenInterface $token, $subject): array
     {
         if (method_exists($token, 'getRoleNames')) {
             $roleNames = $token->getRoleNames();

Encoder/Argon2iPasswordEncoder.php

@@ -102,12 +102,12 @@ public function isPasswordValid($encoded, $raw, $salt)
         throw new \LogicException('Argon2i algorithm is not supported. Please install the libsodium extension or upgrade to PHP 7.2+.');
     }
 
-    private function encodePasswordNative(string $raw)
+    private function encodePasswordNative(string $raw): string
     {
         return password_hash($raw, \PASSWORD_ARGON2I, $this->config);
     }
 
-    private function encodePasswordSodiumFunction(string $raw)
+    private function encodePasswordSodiumFunction(string $raw): string
     {
         $hash = sodium_crypto_pwhash_str(
             $raw,
@@ -119,7 +119,7 @@ private function encodePasswordSodiumFunction(string $raw)
         return $hash;
     }
 
-    private function encodePasswordSodiumExtension(string $raw)
+    private function encodePasswordSodiumExtension(string $raw): string
     {
         $hash = \Sodium\crypto_pwhash_str(
             $raw,

Encoder/EncoderFactory.php

@@ -80,7 +80,7 @@ private function createEncoder(array $config): PasswordEncoderInterface
         return $reflection->newInstanceArgs($config['arguments']);
     }
 
-    private function getEncoderConfigFromAlgorithm(array $config)
+    private function getEncoderConfigFromAlgorithm(array $config): array
     {
         if ('auto' === $config['algorithm']) {
             $encoderChain = [];

User/User.php

@@ -53,7 +53,7 @@ public function __toString(): string
     /**
      * {@inheritdoc}
      */
-    public function getRoles()
+    public function getRoles(): array
     {
         return $this->roles;
     }