diff options
21 files changed, 62 insertions, 61 deletions
diff --git a/Http/Authentication/AuthenticationFailureHandlerInterface.php b/Http/Authentication/AuthenticationFailureHandlerInterface.php index 4e6c694..b35c232 100644 --- a/Http/Authentication/AuthenticationFailureHandlerInterface.php +++ b/Http/Authentication/AuthenticationFailureHandlerInterface.php @@ -2,7 +2,7 @@ namespace Symfony\Component\Security\Http\Authentication; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpFoundation\Request; @@ -22,12 +22,12 @@ interface AuthenticationFailureHandlerInterface * called by authentication listeners inheriting from * AbstractAuthenticationListener. * - * @param RequestEventArgs $eventArgs the "onCoreSecurity" event, this event always + * @param GetResponseEventArgs $eventArgs the "onCoreSecurity" event, this event always * has the kernel as target * @param Request $request * @param AuthenticationException $exception * * @return Response the response to return */ - function onAuthenticationFailure(RequestEventArgs $eventArgs, Request $request, AuthenticationException $exception); + function onAuthenticationFailure(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $exception); }
\ No newline at end of file diff --git a/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/Http/Authentication/AuthenticationSuccessHandlerInterface.php index e781cbd..30b5e26 100644 --- a/Http/Authentication/AuthenticationSuccessHandlerInterface.php +++ b/Http/Authentication/AuthenticationSuccessHandlerInterface.php @@ -2,7 +2,7 @@ namespace Symfony\Component\Security\Http\Authentication; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\HttpFoundation\Request; @@ -22,12 +22,12 @@ interface AuthenticationSuccessHandlerInterface * is called by authentication listeners inheriting from * AbstractAuthenticationListener. * - * @param RequestEventArgs $eventArgs the "onCoreSecurity" event, this event always + * @param GetResponseEventArgs $eventArgs the "onCoreSecurity" event, this event always * has the kernel as target * @param Request $request * @param TokenInterface $token * * @return Response the response to return */ - function onAuthenticationSuccess(RequestEventArgs $eventArgs, Request $request, TokenInterface $token); + function onAuthenticationSuccess(GetResponseEventArgs $eventArgs, Request $request, TokenInterface $token); }
\ No newline at end of file diff --git a/Http/EntryPoint/AuthenticationEntryPointInterface.php b/Http/EntryPoint/AuthenticationEntryPointInterface.php index 8f49971..7d75cbc 100644 --- a/Http/EntryPoint/AuthenticationEntryPointInterface.php +++ b/Http/EntryPoint/AuthenticationEntryPointInterface.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Security\Http\EntryPoint; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpFoundation\Request; @@ -26,9 +26,9 @@ interface AuthenticationEntryPointInterface /** * Starts the authentication scheme. * - * @param RequestEventArgs $eventArgs The "onCoreSecurity" event + * @param GetResponseEventArgs $eventArgs The "onCoreSecurity" event * @param object $request The request that resulted in an AuthenticationException * @param AuthenticationException $authException The exception that started the authentication process */ - function start(RequestEventArgs $eventArgs, Request $request, AuthenticationException $authException = null); + function start(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $authException = null); } diff --git a/Http/EntryPoint/BasicAuthenticationEntryPoint.php b/Http/EntryPoint/BasicAuthenticationEntryPoint.php index 95a2147..968986c 100644 --- a/Http/EntryPoint/BasicAuthenticationEntryPoint.php +++ b/Http/EntryPoint/BasicAuthenticationEntryPoint.php @@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; /** * BasicAuthenticationEntryPoint starts an HTTP Basic authentication. @@ -31,7 +31,7 @@ class BasicAuthenticationEntryPoint implements AuthenticationEntryPointInterface $this->realmName = $realmName; } - public function start(RequestEventArgs $event, Request $request, AuthenticationException $authException = null) + public function start(GetResponseEventArgs $event, Request $request, AuthenticationException $authException = null) { $response = new Response(); $response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName)); diff --git a/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/Http/EntryPoint/DigestAuthenticationEntryPoint.php index d779bc8..06799bc 100644 --- a/Http/EntryPoint/DigestAuthenticationEntryPoint.php +++ b/Http/EntryPoint/DigestAuthenticationEntryPoint.php @@ -17,7 +17,7 @@ use Symfony\Component\Security\Core\Exception\NonceExpiredException; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; /** * DigestAuthenticationEntryPoint starts an HTTP Digest authentication. @@ -39,7 +39,7 @@ class DigestAuthenticationEntryPoint implements AuthenticationEntryPointInterfac $this->logger = $logger; } - public function start(RequestEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) + public function start(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) { $expiryTime = microtime(true) + $this->nonceValiditySeconds * 1000; $signatureValue = md5($expiryTime.':'.$this->key); diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php index 96b233c..ddd9bb7 100644 --- a/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; /** * FormAuthenticationEntryPoint starts an authentication via a login form. @@ -44,7 +44,7 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface /** * {@inheritdoc} */ - public function start(RequestEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) + public function start(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) { if ($this->useForward) { return $event->getKernel()->handle(Request::create($this->loginPath), HttpKernelInterface::SUB_REQUEST); diff --git a/Http/EntryPoint/RetryAuthenticationEntryPoint.php b/Http/EntryPoint/RetryAuthenticationEntryPoint.php index 643e944..c624c54 100644 --- a/Http/EntryPoint/RetryAuthenticationEntryPoint.php +++ b/Http/EntryPoint/RetryAuthenticationEntryPoint.php @@ -16,7 +16,7 @@ use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; /** * RetryAuthenticationEntryPoint redirects URL based on the configured scheme. @@ -36,7 +36,7 @@ class RetryAuthenticationEntryPoint implements AuthenticationEntryPointInterface $this->httpsPort = $httpsPort; } - public function start(RequestEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) + public function start(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $authException = null) { $scheme = $request->isSecure() ? 'http' : 'https'; if ('http' === $scheme && 80 != $this->httpPort) { diff --git a/Http/Firewall.php b/Http/Firewall.php index 25d6b48..8fe2bcb 100644 --- a/Http/Firewall.php +++ b/Http/Firewall.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Security\Http; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Events; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpFoundation\Request; use Doctrine\Common\EventManager; @@ -48,9 +48,9 @@ class Firewall /** * Handles security. * - * @param RequestEventArgs $eventArgs An RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs An GetResponseEventArgs instance */ - public function onCoreRequest(RequestEventArgs $eventArgs) + public function onCoreRequest(GetResponseEventArgs $eventArgs) { if (HttpKernelInterface::MASTER_REQUEST !== $eventArgs->getRequestType()) { return; @@ -83,7 +83,7 @@ class Firewall } // initiate the listener chain - $securityEventArgs = new RequestEventArgs($eventArgs->getKernel(), $request, $eventArgs->getRequestType()); + $securityEventArgs = new GetResponseEventArgs($eventArgs->getKernel(), $request, $eventArgs->getRequestType()); $this->evm->dispatchEvent($securityEventArgs); if ($securityEventArgs->hasResponse()) { diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php index 63b7b7e..9af2a1c 100644 --- a/Http/Firewall/AbstractAuthenticationListener.php +++ b/Http/Firewall/AbstractAuthenticationListener.php @@ -21,7 +21,7 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Events as KernelEvents; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -125,7 +125,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface * * @param Event $event An Event instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); @@ -170,7 +170,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface return $this->options['check_path'] === $request->getPathInfo(); } - protected function onFailure(RequestEventArgs $eventArgs, Request $request, AuthenticationException $failed) + protected function onFailure(GetResponseEventArgs $eventArgs, Request $request, AuthenticationException $failed) { if (null !== $this->logger) { $this->logger->debug(sprintf('Authentication request failed: %s', $failed->getMessage())); @@ -206,7 +206,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface return new RedirectResponse(0 !== strpos($this->options['failure_path'], 'http') ? $request->getUriForPath($this->options['failure_path']) : $this->options['failure_path'], 302); } - protected function onSuccess(RequestEventArgs $eventArgs, Request $request, TokenInterface $token) + protected function onSuccess(GetResponseEventArgs $eventArgs, Request $request, TokenInterface $token) { if (null !== $this->logger) { $this->logger->debug('User has been authenticated successfully'); diff --git a/Http/Firewall/AbstractPreAuthenticatedListener.php b/Http/Firewall/AbstractPreAuthenticatedListener.php index 8299383..1ed7d86 100644 --- a/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -17,7 +17,7 @@ use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\Event\InteractiveLoginEventArgs; use Symfony\Component\Security\Http\Events; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events as KernelEvents; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Request; @@ -70,7 +70,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface * * @param EventInterface $event An EventInterface instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); diff --git a/Http/Firewall/AccessListener.php b/Http/Firewall/AccessListener.php index 7464747..7a0c926 100644 --- a/Http/Firewall/AccessListener.php +++ b/Http/Firewall/AccessListener.php @@ -16,7 +16,7 @@ use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface use Symfony\Component\Security\Http\AccessMap; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException; use Symfony\Component\Security\Core\Exception\AccessDeniedException; @@ -64,9 +64,9 @@ class AccessListener implements ListenerInterface /** * Handles access authorization. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { if (null === $token = $this->context->getToken()) { throw new AuthenticationCredentialsNotFoundException('A Token was not found in the SecurityContext.'); diff --git a/Http/Firewall/AnonymousAuthenticationListener.php b/Http/Firewall/AnonymousAuthenticationListener.php index 285cf0b..9d23c58 100644 --- a/Http/Firewall/AnonymousAuthenticationListener.php +++ b/Http/Firewall/AnonymousAuthenticationListener.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Security\Http\Firewall; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Doctrine\Common\EventManager; @@ -58,9 +58,9 @@ class AnonymousAuthenticationListener implements ListenerInterface /** * Handles anonymous authentication. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { if (null !== $this->context->getToken()) { return; diff --git a/Http/Firewall/BasicAuthenticationListener.php b/Http/Firewall/BasicAuthenticationListener.php index e61b896..7a4a17a 100644 --- a/Http/Firewall/BasicAuthenticationListener.php +++ b/Http/Firewall/BasicAuthenticationListener.php @@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\Exception\AuthenticationException; @@ -69,11 +69,11 @@ class BasicAuthenticationListener implements ListenerInterface /** * Handles basic authentication. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { - $request = $event->get('request'); + $request = $eventArgs->getRequest(); if (false === $username = $request->server->get('PHP_AUTH_USER', false)) { return; diff --git a/Http/Firewall/ChannelListener.php b/Http/Firewall/ChannelListener.php index 40e6829..b9416dd 100644 --- a/Http/Firewall/ChannelListener.php +++ b/Http/Firewall/ChannelListener.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Http\Firewall; use Symfony\Component\Security\Http\AccessMap; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Doctrine\Common\EventManager; @@ -57,9 +57,9 @@ class ChannelListener implements ListenerInterface /** * Handles channel management. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php index 172f84a..f19d2bc 100644 --- a/Http/Firewall/ContextListener.php +++ b/Http/Firewall/ContextListener.php @@ -14,7 +14,8 @@ namespace Symfony\Component\Security\Http\Firewall; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; +use Symfony\Component\HttpKernel\Event\FilterResponseEventArgs; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; @@ -73,9 +74,9 @@ class ContextListener implements ListenerInterface /** * Reads the SecurityContext from the session. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); @@ -103,7 +104,7 @@ class ContextListener implements ListenerInterface * * @param EventInterface $event An EventInterface instance */ - public function filterCoreResponse(RequestEventArgs $eventArgs) + public function filterCoreResponse(FilterResponseEventArgs $eventArgs) { if (HttpKernelInterface::MASTER_REQUEST !== $eventArgs->getRequestType()) { return; diff --git a/Http/Firewall/DigestAuthenticationListener.php b/Http/Firewall/DigestAuthenticationListener.php index b626386..6426fa1 100644 --- a/Http/Firewall/DigestAuthenticationListener.php +++ b/Http/Firewall/DigestAuthenticationListener.php @@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\Exception\BadCredentialsException; @@ -72,9 +72,9 @@ class DigestAuthenticationListener implements ListenerInterface /** * Handles digest authentication. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php index 81a2601..8885ea7 100644 --- a/Http/Firewall/ExceptionListener.php +++ b/Http/Firewall/ExceptionListener.php @@ -142,7 +142,6 @@ class ExceptionListener implements ListenerInterface return; } - $eventArgs->setHandled(true); $eventArgs->setResponse($response); } diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php index c0b2e1f..a4b6991 100644 --- a/Http/Firewall/LogoutListener.php +++ b/Http/Firewall/LogoutListener.php @@ -17,7 +17,7 @@ use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\Kernel\Event\RequestEventArgs; +use Symfony\Component\Kernel\Event\GetResponseEventArgs; use Symfony\Component\Kernel\Events; use Doctrine\Common\EventManager; @@ -81,9 +81,9 @@ class LogoutListener implements ListenerInterface /** * Performs the logout if requested * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); diff --git a/Http/Firewall/RememberMeListener.php b/Http/Firewall/RememberMeListener.php index 67311bb..73514bc 100644 --- a/Http/Firewall/RememberMeListener.php +++ b/Http/Firewall/RememberMeListener.php @@ -4,7 +4,8 @@ namespace Symfony\Component\Security\Http\Firewall; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; +use Symfony\Component\HttpKernel\Event\FilterResponseEventArgs; use Symfony\Component\HttpKernel\Events as KernelEvents; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; @@ -82,9 +83,9 @@ class RememberMeListener implements ListenerInterface /** * Handles remember-me cookie based authentication. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $this->lastState = null; @@ -143,7 +144,7 @@ class RememberMeListener implements ListenerInterface * Update cookies * @param Event $event */ - public function filterCoreResponse(RequestEventArgs $eventArgs) + public function filterCoreResponse(FilterResponseEventArgs $eventArgs) { if (HttpKernelInterface::MASTER_REQUEST !== $eventArgs->getRequestType()) { return; diff --git a/Http/Firewall/SwitchUserListener.php b/Http/Firewall/SwitchUserListener.php index 690074a..5e352b9 100644 --- a/Http/Firewall/SwitchUserListener.php +++ b/Http/Firewall/SwitchUserListener.php @@ -16,7 +16,7 @@ use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Core\User\AccountCheckerInterface; use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; use Symfony\Component\HttpKernel\Events; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpFoundation\Response; @@ -89,9 +89,9 @@ class SwitchUserListener implements ListenerInterface /** * Handles digest authentication. * - * @param RequestEventArgs $eventArgs A RequestEventArgs instance + * @param GetResponseEventArgs $eventArgs A GetResponseEventArgs instance */ - public function onCoreSecurity(RequestEventArgs $eventArgs) + public function onCoreSecurity(GetResponseEventArgs $eventArgs) { $request = $eventArgs->getRequest(); diff --git a/Http/Logout/LogoutSuccessHandlerInterface.php b/Http/Logout/LogoutSuccessHandlerInterface.php index 87153e7..9338256 100644 --- a/Http/Logout/LogoutSuccessHandlerInterface.php +++ b/Http/Logout/LogoutSuccessHandlerInterface.php @@ -3,7 +3,7 @@ namespace Symfony\Component\Security\Http\Logout; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Event\RequestEventArgs; +use Symfony\Component\HttpKernel\Event\GetResponseEventArgs; /** * LogoutSuccesshandlerInterface. @@ -21,9 +21,9 @@ interface LogoutSuccessHandlerInterface /** * Creates a Response object to send upon a successful logout. * - * @param RequestEventArgs $eventArgs + * @param GetResponseEventArgs $eventArgs * @param Request $request * @return Response never null */ - function onLogoutSuccess(RequestEventArgs $eventArgs, Request $request); + function onLogoutSuccess(GetResponseEventArgs $eventArgs, Request $request); }
\ No newline at end of file |