From f094476d075bc7bec702b706f9db28e714f6f478 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 31 May 2014 20:41:51 +0200 Subject: [PATCH 1/4] updated CHANGELOG for 2.4.6 --- CHANGELOG-2.4.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG-2.4.md b/CHANGELOG-2.4.md index 65902a801e3c7..1e250907be6f4 100644 --- a/CHANGELOG-2.4.md +++ b/CHANGELOG-2.4.md @@ -7,6 +7,15 @@ in 2.4 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.4.0...v2.4.1 +* 2.4.6 (2014-05-31) + + * bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal) + * bug #10983 [DomCrawler] Fixed charset detection in html5 meta charset tag (77web) + * Merge branch '2.3' into 2.4 + * bug #10979 Make rootPath part of regex greedy (artursvonda) + * bug #10995 [TwigBridge][Trans]set %count% only on transChoice from the current context. (aitboudad) + * bug #10987 [DomCrawler] Fixed a forgotten case of complex XPath queries (stof) + * 2.4.5 (2014-05-22) * bug #10849 [WIP][Finder] Fix wrong implementation on sortable callback comparator (ProPheT777) From ebf1be8a9217eb5911102a522eb2bd500923297d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 31 May 2014 20:42:13 +0200 Subject: [PATCH 2/4] updated VERSION for 2.4.6 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 6ac1cebec8ba6..b2de8e20e1dd6 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.4.6-DEV'; + const VERSION = '2.4.6'; const VERSION_ID = '20406'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '4'; const RELEASE_VERSION = '6'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From 1fc8a82f355b32b944097cd5e53562b0270601d3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 1 Jun 2014 17:15:23 +0200 Subject: [PATCH 3/4] bumped Symfony version to 2.4.7 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index b2de8e20e1dd6..a12cf30cbea0e 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.4.6'; - const VERSION_ID = '20406'; + const VERSION = '2.4.7-DEV'; + const VERSION_ID = '20407'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '4'; - const RELEASE_VERSION = '6'; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = '7'; + const EXTRA_VERSION = 'DEV'; /** * Constructor. From d3c95cc0e829e82b808d6210916a38937b499b7f Mon Sep 17 00:00:00 2001 From: Mathieu Morlon Date: Wed, 4 Jun 2014 15:16:04 +0200 Subject: [PATCH 4/4] bug #10242 Missing checkPreAuth from RememberMeAuthenticationProvider --- .../RememberMeAuthenticationProvider.php | 1 + .../RememberMeAuthenticationProviderTest.php | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php index 234bddbc43f93..6570ebfc869a7 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php @@ -50,6 +50,7 @@ public function authenticate(TokenInterface $token) } $user = $token->getUser(); + $this->userChecker->checkPreAuth($user); $this->userChecker->checkPostAuth($user); $authenticatedToken = new RememberMeToken($user, $this->providerKey, $this->key); diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php index 43da274d5b476..f54cba5587d85 100644 --- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Security\Core\Tests\Authentication\Provider; use Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider; -use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; +use Symfony\Component\Security\Core\Exception\DisabledException; use Symfony\Component\Security\Core\Role\Role; class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase @@ -44,6 +44,22 @@ public function testAuthenticateWhenKeysDoNotMatch() $provider->authenticate($token); } + /** + * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException + */ + public function testAuthenticateWhenPreChecksFails() + { + $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface'); + $userChecker->expects($this->once()) + ->method('checkPreAuth') + ->will($this->throwException(new DisabledException())) + ; + + $provider = $this->getProvider($userChecker); + + $provider->authenticate($this->getSupportedToken()); + } + /** * @expectedException \Symfony\Component\Security\Core\Exception\AccountExpiredException */