diff options
| -rw-r--r-- | Acl/Dbal/MutableAclProvider.php | 3 | ||||
| -rw-r--r-- | Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php | 6 | ||||
| -rw-r--r-- | Http/Firewall/AccessListener.php | 2 | ||||
| -rw-r--r-- | Http/Firewall/ExceptionListener.php | 4 | ||||
| -rw-r--r-- | Http/RememberMe/PersistentTokenBasedRememberMeServices.php | 2 |
5 files changed, 5 insertions, 12 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index 8e6b536..1a5ea0a 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -931,7 +931,6 @@ QUERY; $sids = new \SplObjectStorage(); $classIds = new \SplObjectStorage(); - $currentIds = array(); for ($i = 0, $c = count($new); $i<$c; $i++) { $ace = $new[$i]; @@ -958,8 +957,6 @@ QUERY; $aceIdProperty = new \ReflectionProperty($ace, 'id'); $aceIdProperty->setAccessible(true); $aceIdProperty->setValue($ace, intval($aceId)); - } else { - $currentIds[$ace->getId()] = true; } } } diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index 11c3cda..4f73254 100644 --- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -59,11 +59,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn if (!$user = $token->getUser()) { throw new BadCredentialsException('No pre-authenticated principal found in request.'); } - /* - if (null === $token->getCredentials()) { - throw new BadCredentialsException('No pre-authenticated credentials found in request.'); - } - */ + $user = $this->userProvider->loadUserByUsername($user); $this->userChecker->checkPostAuth($user); diff --git a/Http/Firewall/AccessListener.php b/Http/Firewall/AccessListener.php index 9349012..ecb6a09 100644 --- a/Http/Firewall/AccessListener.php +++ b/Http/Firewall/AccessListener.php @@ -55,7 +55,7 @@ class AccessListener implements ListenerInterface $request = $event->getRequest(); - list($attributes, $channel) = $this->map->getPatterns($request); + list($attributes) = $this->map->getPatterns($request); if (null === $attributes) { return; diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php index 36b16e7..8f54f8d 100644 --- a/Http/Firewall/ExceptionListener.php +++ b/Http/Firewall/ExceptionListener.php @@ -93,7 +93,7 @@ class ExceptionListener } elseif ($exception instanceof AccessDeniedException) { return $this->handleAccessDeniedException($event, $exception); } elseif ($exception instanceof LogoutException) { - return $this->handleLogoutException($event, $exception); + return $this->handleLogoutException($exception); } } while (null !== $exception = $exception->getPrevious()); } @@ -159,7 +159,7 @@ class ExceptionListener } } - private function handleLogoutException(GetResponseForExceptionEvent $event, LogoutException $exception) + private function handleLogoutException(LogoutException $exception) { if (null !== $this->logger) { $this->logger->info(sprintf('Logout exception occurred; wrapping with AccessDeniedHttpException (%s)', $exception->getMessage())); diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index d0a70b7..f800668 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -73,7 +73,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices if (null !== ($cookie = $request->cookies->get($this->options['name'])) && count($parts = $this->decodeCookie($cookie)) === 2 ) { - list($series, $tokenValue) = $parts; + list($series) = $parts; $this->tokenProvider->deleteTokenBySeries($series); } } |