minor #22574 [Security] Fix phpdoc logout listener (ro0NL)

This PR was squashed before being merged into the 2.7 branch (closes #22574).

Discussion
----------

[Security] Fix phpdoc logout listener

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Separated from #22572

Commits
-------

e843924c03 [Security] Fix phpdoc logout listener
This commit is contained in:
Fabien Potencier 2017-04-28 10:36:26 -07:00
commit af15ead255
5 changed files with 22 additions and 22 deletions

View File

@ -69,14 +69,14 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
* @param TokenStorageInterface $tokenStorage A TokenStorageInterface instance * @param TokenStorageInterface $tokenStorage A TokenStorageInterface instance
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
* @param SessionAuthenticationStrategyInterface $sessionStrategy * @param SessionAuthenticationStrategyInterface $sessionStrategy
* @param HttpUtils $httpUtils An HttpUtilsInterface instance * @param HttpUtils $httpUtils An HttpUtils instance
* @param string $providerKey * @param string $providerKey
* @param AuthenticationSuccessHandlerInterface $successHandler * @param AuthenticationSuccessHandlerInterface $successHandler
* @param AuthenticationFailureHandlerInterface $failureHandler * @param AuthenticationFailureHandlerInterface $failureHandler
* @param array $options An array of options for the processing of a * @param array $options An array of options for the processing of a
* successful, or failed authentication attempt * successful, or failed authentication attempt
* @param LoggerInterface $logger A LoggerInterface instance * @param LoggerInterface|null $logger A LoggerInterface instance
* @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance * @param EventDispatcherInterface|null $dispatcher An EventDispatcherInterface instance
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */

View File

@ -42,11 +42,11 @@ class LogoutListener implements ListenerInterface
/** /**
* Constructor. * Constructor.
* *
* @param TokenStorageInterface $tokenStorage * @param TokenStorageInterface $tokenStorage
* @param HttpUtils $httpUtils An HttpUtilsInterface instance * @param HttpUtils $httpUtils An HttpUtils instance
* @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance * @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance
* @param array $options An array of options to process a logout attempt * @param array $options An array of options to process a logout attempt
* @param CsrfTokenManagerInterface $csrfTokenManager A CsrfTokenManagerInterface instance * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
*/ */
public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, LogoutSuccessHandlerInterface $successHandler, array $options = array(), $csrfTokenManager = null) public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, LogoutSuccessHandlerInterface $successHandler, array $options = array(), $csrfTokenManager = null)
{ {

View File

@ -41,13 +41,13 @@ class RememberMeListener implements ListenerInterface
/** /**
* Constructor. * Constructor.
* *
* @param TokenStorageInterface $tokenStorage * @param TokenStorageInterface $tokenStorage
* @param RememberMeServicesInterface $rememberMeServices * @param RememberMeServicesInterface $rememberMeServices
* @param AuthenticationManagerInterface $authenticationManager * @param AuthenticationManagerInterface $authenticationManager
* @param LoggerInterface $logger * @param LoggerInterface|null $logger
* @param EventDispatcherInterface $dispatcher * @param EventDispatcherInterface|null $dispatcher
* @param bool $catchExceptions * @param bool $catchExceptions
* @param SessionAuthenticationStrategyInterface $sessionStrategy * @param SessionAuthenticationStrategyInterface|null $sessionStrategy
*/ */
public function __construct(TokenStorageInterface $tokenStorage, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $catchExceptions = true, SessionAuthenticationStrategyInterface $sessionStrategy = null) public function __construct(TokenStorageInterface $tokenStorage, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $catchExceptions = true, SessionAuthenticationStrategyInterface $sessionStrategy = null)
{ {

View File

@ -44,16 +44,16 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
* @param TokenStorageInterface $tokenStorage A TokenStorageInterface instance * @param TokenStorageInterface $tokenStorage A TokenStorageInterface instance
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
* @param SessionAuthenticationStrategyInterface $sessionStrategy * @param SessionAuthenticationStrategyInterface $sessionStrategy
* @param HttpUtils $httpUtils An HttpUtilsInterface instance * @param HttpUtils $httpUtils An HttpUtils instance
* @param string $providerKey * @param string $providerKey
* @param AuthenticationSuccessHandlerInterface $successHandler * @param AuthenticationSuccessHandlerInterface $successHandler
* @param AuthenticationFailureHandlerInterface $failureHandler * @param AuthenticationFailureHandlerInterface $failureHandler
* @param array $options An array of options for the processing of a * @param array $options An array of options for the processing of a
* successful, or failed authentication attempt * successful, or failed authentication attempt
* @param LoggerInterface $logger A LoggerInterface instance * @param LoggerInterface|null $logger A LoggerInterface instance
* @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance * @param EventDispatcherInterface|null $dispatcher An EventDispatcherInterface instance
* @param CsrfTokenManagerInterface $csrfTokenManager A CsrfTokenManagerInterface instance * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
* @param SimpleFormAuthenticatorInterface $simpleAuthenticator A SimpleFormAuthenticatorInterface instance * @param SimpleFormAuthenticatorInterface|null $simpleAuthenticator A SimpleFormAuthenticatorInterface instance
* *
* @throws \InvalidArgumentException In case no simple authenticator is provided * @throws \InvalidArgumentException In case no simple authenticator is provided
* @throws InvalidArgumentException In case an invalid CSRF token manager is passed * @throws InvalidArgumentException In case an invalid CSRF token manager is passed

View File

@ -46,8 +46,8 @@ class SimplePreAuthenticationListener implements ListenerInterface
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
* @param string $providerKey * @param string $providerKey
* @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance * @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance
* @param LoggerInterface $logger A LoggerInterface instance * @param LoggerInterface|null $logger A LoggerInterface instance
* @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance * @param EventDispatcherInterface|null $dispatcher An EventDispatcherInterface instance
*/ */
public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
{ {