diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-06-23 09:34:27 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-06-23 09:34:27 +0200 |
| commit | 78724ba5928b63e6c229a38ec057e979610ca2ae (patch) | |
| tree | 6bf4010917a64067b24b74ffbbff33ca4d61fa65 | |
| parent | 7bfcd83fc0284b186cb0b145c4fb42658b9d59c9 (diff) | |
| parent | b0486bfef433b3e62586c6372343783427a58b62 (diff) | |
| download | symfony-security-78724ba5928b63e6c229a38ec057e979610ca2ae.zip symfony-security-78724ba5928b63e6c229a38ec057e979610ca2ae.tar.gz symfony-security-78724ba5928b63e6c229a38ec057e979610ca2ae.tar.bz2 | |
Merge branch '2.4' into 2.5
* 2.4:
[Validator] Add missing ru translations
don't disable constructor calls to mockups of classes that extend internal PHP classes
special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer
Conflicts:
src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
| -rw-r--r-- | Core/Tests/Authentication/AuthenticationProviderManagerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/Core/Tests/Authentication/AuthenticationProviderManagerTest.php index f63ef79..df25874 100644 --- a/Core/Tests/Authentication/AuthenticationProviderManagerTest.php +++ b/Core/Tests/Authentication/AuthenticationProviderManagerTest.php @@ -129,7 +129,7 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase } elseif (null !== $exception) { $provider->expects($this->once()) ->method('authenticate') - ->will($this->throwException($this->getMock($exception, null, array(), '', true))) + ->will($this->throwException($this->getMock($exception, null, array(), ''))) ; } |