diff options
author | Bernhard Schussek <bschussek@gmail.com> | 2014-09-25 11:52:29 +0200 |
---|---|---|
committer | Bernhard Schussek <bschussek@gmail.com> | 2014-09-25 11:52:29 +0200 |
commit | 5aa642a5ad4022f377c0eb43115d754dc92c4ae0 (patch) | |
tree | 9f291e6f94c5244679d2aa7cb00c3b37f3223b46 /Core/Authentication | |
parent | 133d64ad84f9e37d681c70db8a05743fa2001e11 (diff) | |
parent | 659aaeaa6f12334c2946acaeca5f530f8caa74bb (diff) | |
download | symfony-security-5aa642a5ad4022f377c0eb43115d754dc92c4ae0.zip symfony-security-5aa642a5ad4022f377c0eb43115d754dc92c4ae0.tar.gz symfony-security-5aa642a5ad4022f377c0eb43115d754dc92c4ae0.tar.bz2 |
Merge branch '2.4' into 2.5
* 2.4:
[Form] Removed constructor argument from FormTypeHttpFoundationExtension for forward compatibility with 2.5
[Validator] Simplified testing of violations
remove obsolete test file
[FrameworkBundle] output failed matched path for clarification
bug #10242 Missing checkPreAuth from RememberMeAuthenticationProvider
[Validator] Fixed StaticMethodLoaderTest to actually test something
[Form] Fixed ValidatorTypeGuesser to guess properties without constraints not to be required
Use request format from request in twig ExceptionController
fixed bug
added the possibility to return null from SimplePreAuthenticationListener
[Form] Moved POST_MAX_SIZE validation from FormValidator to request handler
[Form] Add a form error if post_max_size has been reached.
Response::isNotModified returns true when If-Modified-Since is later than Last-Modified
[WebProfilerBundle] turbolinks compatibility
Conflicts:
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
Diffstat (limited to 'Core/Authentication')
-rw-r--r-- | Core/Authentication/Provider/RememberMeAuthenticationProvider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authentication/Provider/RememberMeAuthenticationProvider.php b/Core/Authentication/Provider/RememberMeAuthenticationProvider.php index 234bddb..82be1d1 100644 --- a/Core/Authentication/Provider/RememberMeAuthenticationProvider.php +++ b/Core/Authentication/Provider/RememberMeAuthenticationProvider.php @@ -50,7 +50,7 @@ class RememberMeAuthenticationProvider implements AuthenticationProviderInterfac } $user = $token->getUser(); - $this->userChecker->checkPostAuth($user); + $this->userChecker->checkPreAuth($user); $authenticatedToken = new RememberMeToken($user, $this->providerKey, $this->key); $authenticatedToken->setAttributes($token->getAttributes()); |