diff --git a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
index 8c09267d0facc..7bcfc39438dd9 100644
--- a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
+++ b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
@@ -36,8 +36,7 @@ public function supports(Request $request)
      * Shortcut to create a PostAuthenticationGuardToken for you, if you don't really
      * care about which authenticated token you're using.
      *
-     * @param UserInterface $user
-     * @param string        $providerKey
+     * @param string $providerKey
      *
      * @return PostAuthenticationGuardToken
      */
diff --git a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php
index 7986b16b4c11f..a9c565b6bb9b2 100644
--- a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php
+++ b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php
@@ -55,9 +55,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
     /**
      * Override to change what happens after successful authentication.
      *
-     * @param Request        $request
-     * @param TokenInterface $token
-     * @param string         $providerKey
+     * @param string $providerKey
      *
      * @return RedirectResponse
      */
diff --git a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
index 90df7610ad2bb..4912cb3bad594 100644
--- a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
@@ -30,8 +30,6 @@ interface AuthenticatorInterface extends GuardAuthenticatorInterface
      *
      * If this returns false, the authenticator will be skipped.
      *
-     * @param Request $request
-     *
      * @return bool
      */
     public function supports(Request $request);
@@ -53,8 +51,6 @@ public function supports(Request $request);
      *
      *      return ['api_key' => $request->headers->get('X-API-TOKEN')];
      *
-     * @param Request $request
-     *
      * @return mixed Any non-null value
      *
      * @throws \UnexpectedValueException If null is returned
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index 1cdcf6b967ed3..24a16e3f0c523 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -70,10 +70,7 @@ public function authenticateWithToken(TokenInterface $token, Request $request/*,
     /**
      * Returns the "on success" response for the given GuardAuthenticator.
      *
-     * @param TokenInterface         $token
-     * @param Request                $request
-     * @param AuthenticatorInterface $guardAuthenticator
-     * @param string                 $providerKey        The provider (i.e. firewall) key
+     * @param string $providerKey The provider (i.e. firewall) key
      *
      * @return Response|null
      */
@@ -93,10 +90,7 @@ public function handleAuthenticationSuccess(TokenInterface $token, Request $requ
      * Convenience method for authenticating the user and returning the
      * Response *if any* for success.
      *
-     * @param UserInterface          $user
-     * @param Request                $request
-     * @param AuthenticatorInterface $authenticator
-     * @param string                 $providerKey   The provider (i.e. firewall) key
+     * @param string $providerKey The provider (i.e. firewall) key
      *
      * @return Response|null
      */
@@ -115,10 +109,7 @@ public function authenticateUserAndHandleSuccess(UserInterface $user, Request $r
      * Handles an authentication failure and returns the Response for the
      * GuardAuthenticator.
      *
-     * @param AuthenticationException $authenticationException
-     * @param Request                 $request
-     * @param AuthenticatorInterface  $guardAuthenticator
-     * @param string                  $providerKey             The key of the firewall
+     * @param string $providerKey The provider (i.e. firewall) key
      *
      * @return Response|null
      */
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
index 3a9828dfd607f..7372eb844a6d0 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorInterface.php
@@ -55,8 +55,6 @@ interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
      *
      *     return ['api_key' => $request->headers->get('X-API-TOKEN')];
      *
-     * @param Request $request
-     *
      * @return mixed|null
      */
     public function getCredentials(Request $request);
@@ -69,9 +67,6 @@ public function getCredentials(Request $request);
      * You may throw an AuthenticationException if you wish. If you return
      * null, then a UsernameNotFoundException is thrown for you.
      *
-     * @param mixed                 $credentials
-     * @param UserProviderInterface $userProvider
-     *
      * @throws AuthenticationException
      *
      * @return UserInterface|null
@@ -87,9 +82,6 @@ public function getUser($credentials, UserProviderInterface $userProvider);
      *
      * The *credentials* are the return value from getCredentials()
      *
-     * @param mixed         $credentials
-     * @param UserInterface $user
-     *
      * @return bool
      *
      * @throws AuthenticationException
@@ -105,8 +97,7 @@ public function checkCredentials($credentials, UserInterface $user);
      *
      * @see AbstractGuardAuthenticator
      *
-     * @param UserInterface $user
-     * @param string        $providerKey The provider (i.e. firewall) key
+     * @param string $providerKey The provider (i.e. firewall) key
      *
      * @return GuardTokenInterface
      */
@@ -121,9 +112,6 @@ public function createAuthenticatedToken(UserInterface $user, $providerKey);
      * If you return null, the request will continue, but the user will
      * not be authenticated. This is probably not what you want to do.
      *
-     * @param Request                 $request
-     * @param AuthenticationException $exception
-     *
      * @return Response|null
      */
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
@@ -137,9 +125,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
      * If you return null, the current request will continue, and the user
      * will be authenticated. This makes sense, for example, with an API.
      *
-     * @param Request        $request
-     * @param TokenInterface $token
-     * @param string         $providerKey The provider (i.e. firewall) key
+     * @param string $providerKey The provider (i.e. firewall) key
      *
      * @return Response|null
      */