minor #33709 Add types to constructors and private/final/internal methods (Batch II) (derrabus)

This PR was squashed before being merged into the 4.4 branch (closes #33709). Discussion ---------- Add types to constructors and private/final/internal methods (Batch II) | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | #32179, #33228 | License | MIT | Doc PR | N/A Followup to #33519, this time with: * Form * HttpClient * HttpKernel * intl * Ldap * Ldap * Lock * Messenger * Processor * PropertyInfo * Routing * Security * Serializer * Stopwatch * Translation Commits ------- 9378eb4858 Add types to constructors and private/final/internal methods (Batch II)

Author: Tobion

Core/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".');

Core/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();

Core/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,

Core/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 = [];

Core/User/User.php

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

Csrf/CsrfTokenManager.php

@@ -114,7 +114,7 @@ public function isTokenValid(CsrfToken $token)
  return hash_equals($this->storage->getToken($namespacedId), $token->getValue());
  }
 
- private function getNamespace()
+ private function getNamespace(): string
  {
  return \is_callable($ns = $this->namespace) ? $ns() : $ns;
  }

Csrf/Tests/CsrfTokenManagerTest.php

@@ -202,7 +202,7 @@ public function getManagerGeneratorAndStorage()
  return $data;
  }
 
- private function getGeneratorAndStorage()
+ private function getGeneratorAndStorage(): array
  {
  return [
  $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface')->getMock(),

Guard/Provider/GuardAuthenticationProvider.php

@@ -99,7 +99,7 @@ public function authenticate(TokenInterface $token)
  return $this->authenticateViaGuard($guardAuthenticator, $token);
  }
 
- private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator, PreAuthenticationGuardToken $token)
+ private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator, PreAuthenticationGuardToken $token): GuardTokenInterface
  {
  // get the user from the GuardAuthenticator
  $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider);
@@ -134,7 +134,7 @@ private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator
  return $authenticatedToken;
  }
 
- private function findOriginatingAuthenticator(PreAuthenticationGuardToken $token)
+ private function findOriginatingAuthenticator(PreAuthenticationGuardToken $token): ?AuthenticatorInterface
  {
  // find the *one* GuardAuthenticator that this token originated from
  foreach ($this->guardAuthenticators as $key => $guardAuthenticator) {

Http/Firewall/AbstractAuthenticationListener.php

@@ -171,7 +171,7 @@ protected function requiresAuthentication(Request $request)
  */
  abstract protected function attemptAuthentication(Request $request);
 
- private function onFailure(Request $request, AuthenticationException $failed)
+ private function onFailure(Request $request, AuthenticationException $failed): Response
  {
  if (null !== $this->logger) {
  $this->logger->error('Authentication request failed.', ['exception' => $failed]);
@@ -191,7 +191,7 @@ private function onFailure(Request $request, AuthenticationException $failed)
  return $response;
  }
 
- private function onSuccess(Request $request, TokenInterface $token)
+ private function onSuccess(Request $request, TokenInterface $token): Response
  {
  if (null !== $this->logger) {
  $this->logger->info('User has been authenticated successfully.', ['username' => $token->getUsername()]);

Http/Firewall/UsernamePasswordJsonAuthenticationListener.php

@@ -168,7 +168,7 @@ private function onSuccess(Request $request, TokenInterface $token): ?Response
  return $response;
  }
 
- private function onFailure(Request $request, AuthenticationException $failed)
+ private function onFailure(Request $request, AuthenticationException $failed): Response
  {
  if (null !== $this->logger) {
  $this->logger->info('Authentication request failed.', ['exception' => $failed]);