diff --git a/src/Symfony/Component/Security/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index 736493de34..dc75113e71 100644 --- a/src/Symfony/Component/Security/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -18,13 +18,11 @@ use Symfony\Component\Security\Authentication\Token\TokenInterface; */ /** - * Processes a pre-authenticated authentication request. The request will - * typically originate from a {@link org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter} - * subclass. + * Processes a pre-authenticated authentication request. * * This authentication provider will not perform any checks on authentication * requests, as they should already be pre-authenticated. However, the - * AuthenticationUserDetailsService implementation may still throw a UsernameNotFoundException, for example. + * UserProviderInterface implementation may still throw a UsernameNotFoundException, for example. * * @author Fabien Potencier */ diff --git a/src/Symfony/Component/Security/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Authorization/AccessDecisionManager.php index d458b895bb..983ad0395f 100644 --- a/src/Symfony/Component/Security/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Authorization/AccessDecisionManager.php @@ -185,7 +185,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface } if ($grant > $deny) { - return; + return true; } if ($deny > $grant) {