Merge branch '2.7' into 2.8

* 2.7:
  [DI] minor docblock fixes

Author: nicolas-grekas

Authentication/AuthenticationTrustResolverInterface.php

@@ -26,8 +26,6 @@ interface AuthenticationTrustResolverInterface
      *
      * If null is passed, the method must return false.
      *
-     * @param TokenInterface $token
-     *
      * @return bool
      */
     public function isAnonymous(TokenInterface $token = null);
@@ -36,17 +34,13 @@ public function isAnonymous(TokenInterface $token = null);
      * Resolves whether the passed token implementation is authenticated
      * using remember-me capabilities.
      *
-     * @param TokenInterface $token
-     *
      * @return bool
      */
     public function isRememberMe(TokenInterface $token = null);
 
     /**
      * Resolves whether the passed token implementation is fully authenticated.
      *
-     * @param TokenInterface $token
-     *
      * @return bool
      */
     public function isFullFledged(TokenInterface $token = null);

Authentication/Provider/AuthenticationProviderInterface.php

@@ -27,8 +27,6 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface
     /**
      * Checks whether this provider supports the given token.
      *
-     * @param TokenInterface $token A TokenInterface instance
-     *
      * @return bool true if the implementation supports the Token, false otherwise
      */
     public function supports(TokenInterface $token);

Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

@@ -34,11 +34,6 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
     private $userChecker;
     private $providerKey;
 
-    /**
-     * @param UserProviderInterface $userProvider An UserProviderInterface instance
-     * @param UserCheckerInterface  $userChecker  An UserCheckerInterface instance
-     * @param string                $providerKey  The provider key
-     */
     public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey)
     {
         $this->userProvider = $userProvider;

Authentication/Provider/UserAuthenticationProvider.php

@@ -108,9 +108,6 @@ public function supports(TokenInterface $token)
     /**
      * Retrieves roles from user and appends SwitchUserRole if original token contained one.
      *
-     * @param UserInterface  $user  The user
-     * @param TokenInterface $token The token
-     *
      * @return array The user roles
      */
     private function getRoles(UserInterface $user, TokenInterface $token)
@@ -144,9 +141,6 @@ abstract protected function retrieveUser($username, UsernamePasswordToken $token
      * Does additional checks on the user and token (like validating the
      * credentials).
      *
-     * @param UserInterface         $user  The retrieved UserInterface instance
-     * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated
-     *
      * @throws AuthenticationException if the credentials could not be validated
      */
     abstract protected function checkAuthentication(UserInterface $user, UsernamePasswordToken $token);

Authentication/RememberMe/TokenProviderInterface.php

@@ -51,8 +51,6 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed);
 
     /**
      * Creates a new token.
-     *
-     * @param PersistentTokenInterface $token
      */
     public function createNewToken(PersistentTokenInterface $token);
 }

Authorization/Voter/AuthenticatedVoter.php

@@ -31,9 +31,6 @@ class AuthenticatedVoter implements VoterInterface
 
     private $authenticationTrustResolver;
 
-    /**
-     * @param AuthenticationTrustResolverInterface $authenticationTrustResolver
-     */
     public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver)
     {
         $this->authenticationTrustResolver = $authenticationTrustResolver;

Authorization/Voter/ExpressionVoter.php

@@ -30,11 +30,6 @@ class ExpressionVoter implements VoterInterface
     private $trustResolver;
     private $roleHierarchy;
 
-    /**
-     * @param ExpressionLanguage                   $expressionLanguage
-     * @param AuthenticationTrustResolverInterface $trustResolver
-     * @param RoleHierarchyInterface|null          $roleHierarchy
-     */
     public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
     {
         $this->expressionLanguage = $expressionLanguage;

Encoder/EncoderFactory.php

@@ -61,8 +61,6 @@ public function getEncoder($user)
     /**
      * Creates the actual encoder instance.
      *
-     * @param array $config
-     *
      * @return PasswordEncoderInterface
      *
      * @throws \InvalidArgumentException

Encoder/UserPasswordEncoder.php

@@ -20,14 +20,8 @@
  */
 class UserPasswordEncoder implements UserPasswordEncoderInterface
 {
-    /**
-     * @var EncoderFactoryInterface
-     */
     private $encoderFactory;
 
-    /**
-     * @param EncoderFactoryInterface $encoderFactory The encoder factory
-     */
     public function __construct(EncoderFactoryInterface $encoderFactory)
     {
         $this->encoderFactory = $encoderFactory;

Exception/AccountStatusException.php

@@ -34,11 +34,6 @@ public function getUser()
         return $this->user;
     }
 
-    /**
-     * Set the user.
-     *
-     * @param UserInterface $user
-     */
     public function setUser(UserInterface $user)
     {
         $this->user = $user;

Exception/AuthenticationException.php

@@ -33,11 +33,6 @@ public function getToken()
         return $this->token;
     }
 
-    /**
-     * Set the token.
-     *
-     * @param TokenInterface $token
-     */
     public function setToken(TokenInterface $token)
     {
         $this->token = $token;

User/EquatableInterface.php

@@ -29,8 +29,6 @@ interface EquatableInterface
      * Also implementation should consider that $user instance may implement
      * the extended user interface `AdvancedUserInterface`.
      *
-     * @param UserInterface $user
-     *
      * @return bool
      */
     public function isEqualTo(UserInterface $user);

User/InMemoryUserProvider.php

@@ -47,8 +47,6 @@ public function __construct(array $users = array())
     /**
      * Adds a new User to the provider.
      *
-     * @param UserInterface $user A UserInterface instance
-     *
      * @throws \LogicException
      */
     public function createUser(UserInterface $user)

User/UserCheckerInterface.php

@@ -26,17 +26,13 @@ interface UserCheckerInterface
     /**
      * Checks the user account before authentication.
      *
-     * @param UserInterface $user a UserInterface instance
-     *
      * @throws AccountStatusException
      */
     public function checkPreAuth(UserInterface $user);
 
     /**
      * Checks the user account after authentication.
      *
-     * @param UserInterface $user a UserInterface instance
-     *
      * @throws AccountStatusException
      */
     public function checkPostAuth(UserInterface $user);

User/UserProviderInterface.php

@@ -55,8 +55,6 @@ public function loadUserByUsername($username);
      * object can just be merged into some internal array of users / identity
      * map.
      *
-     * @param UserInterface $user
-     *
      * @return UserInterface
      *
      * @throws UnsupportedUserException if the user is not supported