diff options
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Firewall/LogoutListener.php | 1 | ||||
| -rw-r--r-- | Http/HttpUtils.php | 6 | ||||
| -rw-r--r-- | Http/Logout/CookieClearingLogoutHandler.php | 1 | ||||
| -rw-r--r-- | Http/Logout/LogoutHandlerInterface.php | 1 | ||||
| -rw-r--r-- | Http/Logout/SessionLogoutHandler.php | 1 | ||||
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 5 | ||||
| -rw-r--r-- | Http/RememberMe/PersistentTokenBasedRememberMeServices.php | 1 | ||||
| -rw-r--r-- | Http/RememberMe/RememberMeServicesInterface.php | 2 | ||||
| -rw-r--r-- | Http/Session/SessionAuthenticationStrategyInterface.php | 2 |
9 files changed, 1 insertions, 19 deletions
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php index 06454a3..63ad673 100644 --- a/Http/Firewall/LogoutListener.php +++ b/Http/Firewall/LogoutListener.php @@ -57,7 +57,6 @@ class LogoutListener implements ListenerInterface * Adds a logout handler * * @param LogoutHandlerInterface $handler - * @return void */ public function addHandler(LogoutHandlerInterface $handler) { diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php index a26b1bd..c11b283 100644 --- a/Http/HttpUtils.php +++ b/Http/HttpUtils.php @@ -127,11 +127,7 @@ class HttpUtils try { $parameters = $this->router->match($request->getPathInfo()); - if (isset($parameters['_locale'])) { - $context->setParameter('_locale', $parameters['_locale']); - } elseif ($session = $request->getSession()) { - $context->setParameter('_locale', $session->getLocale()); - } + $context->setParameter('_locale', isset($parameters['_locale']) ? $parameters['_locale'] : $request->getLocale()); } catch (\Exception $e) { // let's hope user doesn't use the locale in the path } diff --git a/Http/Logout/CookieClearingLogoutHandler.php b/Http/Logout/CookieClearingLogoutHandler.php index 65b45f2..dd3d293 100644 --- a/Http/Logout/CookieClearingLogoutHandler.php +++ b/Http/Logout/CookieClearingLogoutHandler.php @@ -39,7 +39,6 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/Logout/LogoutHandlerInterface.php b/Http/Logout/LogoutHandlerInterface.php index 6d5c519..71be388 100644 --- a/Http/Logout/LogoutHandlerInterface.php +++ b/Http/Logout/LogoutHandlerInterface.php @@ -30,7 +30,6 @@ interface LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ function logout(Request $request, Response $response, TokenInterface $token); } diff --git a/Http/Logout/SessionLogoutHandler.php b/Http/Logout/SessionLogoutHandler.php index 9fd49d1..e91cf17 100644 --- a/Http/Logout/SessionLogoutHandler.php +++ b/Http/Logout/SessionLogoutHandler.php @@ -28,7 +28,6 @@ class SessionLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 41349ba..e75cf63 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -143,7 +143,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { @@ -155,7 +154,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * an attempted authentication fails. * * @param Request $request - * @return void */ public final function loginFail(Request $request) { @@ -170,7 +168,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token The token that resulted in a successful authentication - * @return void */ public final function loginSuccess(Request $request, Response $response, TokenInterface $token) { @@ -219,7 +216,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ abstract protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token); @@ -260,7 +256,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Deletes the remember-me cookie * * @param Request $request - * @return void */ protected function cancelCookie(Request $request) { diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 91105db..b87c9e4 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -35,7 +35,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices * Sets the token provider * * @param TokenProviderInterface $tokenProvider - * @return void */ public function setTokenProvider(TokenProviderInterface $tokenProvider) { diff --git a/Http/RememberMe/RememberMeServicesInterface.php b/Http/RememberMe/RememberMeServicesInterface.php index c6b0ada..c01b8f6 100644 --- a/Http/RememberMe/RememberMeServicesInterface.php +++ b/Http/RememberMe/RememberMeServicesInterface.php @@ -59,7 +59,6 @@ interface RememberMeServicesInterface * This method needs to take care of invalidating the cookie. * * @param Request $request - * @return void */ function loginFail(Request $request); @@ -77,7 +76,6 @@ interface RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ function loginSuccess(Request $request, Response $response, TokenInterface $token); } diff --git a/Http/Session/SessionAuthenticationStrategyInterface.php b/Http/Session/SessionAuthenticationStrategyInterface.php index 54924ac..5bc6b80 100644 --- a/Http/Session/SessionAuthenticationStrategyInterface.php +++ b/Http/Session/SessionAuthenticationStrategyInterface.php @@ -32,8 +32,6 @@ interface SessionAuthenticationStrategyInterface * * @param Request $request * @param TokenInterface $token - * - * @return void */ function onAuthentication(Request $request, TokenInterface $token); } |