Merge branch '3.4' into 4.3

* 3.4:
  Remove superfluous phpdoc tags

Author: nicolas-grekas

Authentication/DefaultAuthenticationSuccessHandler.php

@@ -40,8 +40,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     ];
 
     /**
-     * @param HttpUtils $httpUtils
-     * @param array     $options   Options for processing a successful authentication attempt
+     * @param array $options Options for processing a successful authentication attempt
      */
     public function __construct(HttpUtils $httpUtils, array $options = [])
     {

EntryPoint/FormAuthenticationEntryPoint.php

@@ -29,10 +29,9 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
     private $httpUtils;
 
     /**
-     * @param HttpKernelInterface $kernel
-     * @param HttpUtils           $httpUtils  An HttpUtils instance
-     * @param string              $loginPath  The path to the login form
-     * @param bool                $useForward Whether to forward or redirect to the login form
+     * @param HttpUtils $httpUtils  An HttpUtils instance
+     * @param string    $loginPath  The path to the login form
+     * @param bool      $useForward Whether to forward or redirect to the login form
      */
     public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, string $loginPath, bool $useForward = false)
     {

Firewall/LogoutListener.php

@@ -42,7 +42,6 @@ class LogoutListener implements ListenerInterface
     private $csrfTokenManager;
 
     /**
-     * @param TokenStorageInterface          $tokenStorage
      * @param HttpUtils                      $httpUtils        An HttpUtils instance
      * @param LogoutSuccessHandlerInterface  $successHandler   A LogoutSuccessHandlerInterface instance
      * @param array                          $options          An array of options to process a logout attempt

Logout/LogoutUrlGenerator.php

@@ -46,7 +46,6 @@ public function __construct(RequestStack $requestStack = null, UrlGeneratorInter
      * @param string                         $csrfTokenId      The ID of the CSRF token
      * @param string                         $csrfParameter    The CSRF token parameter name
      * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
-     * @param string|null                    $context          The listener context
      */
     public function registerListener($key, $logoutPath, $csrfTokenId, $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null, string $context = null)
     {

Util/TargetPathTrait.php

@@ -23,9 +23,8 @@ trait TargetPathTrait
      *
      * Usually, you do not need to set this directly.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
-     * @param string           $uri         The URI to set as the target path
+     * @param string $providerKey The name of your firewall
+     * @param string $uri         The URI to set as the target path
      */
     private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
     {
@@ -35,8 +34,7 @@ private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
     /**
      * Returns the URL (if any) the user visited that forced them to login.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
+     * @param string $providerKey The name of your firewall
      *
      * @return string|null
      */
@@ -48,8 +46,7 @@ private function getTargetPath(SessionInterface $session, $providerKey)
     /**
      * Removes the target path from the session.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
+     * @param string $providerKey The name of your firewall
      */
     private function removeTargetPath(SessionInterface $session, $providerKey)
     {