diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-26 08:46:28 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-26 08:46:28 +0100 |
| commit | 23a63ab4a89a4f720ee3a5c4acbb12b1538ab9df (patch) | |
| tree | 2adf6e75b55a081b4cef0ed227310dbb02ac301c /Tests/Core | |
| parent | 61ec4fa90a43c300dfc0a6e47ed50f56565820b6 (diff) | |
| parent | 8b76e3bd74bf9d80b713cdde567f3341c03080d1 (diff) | |
| download | symfony-security-23a63ab4a89a4f720ee3a5c4acbb12b1538ab9df.zip symfony-security-23a63ab4a89a4f720ee3a5c4acbb12b1538ab9df.tar.gz symfony-security-23a63ab4a89a4f720ee3a5c4acbb12b1538ab9df.tar.bz2 | |
Merge branch '2.5'
* 2.5:
Remove aligned '=>' and '='
Break infinite loop while resolving aliases
[Security][listener] change priority of switchuser
Improved the phpdoc for security token classes
bumped Symfony version to 2.5.7
updated VERSION for 2.5.6
updated CHANGELOG for 2.5.6
bumped Symfony version to 2.3.22
updated VERSION for 2.3.21
update CONTRIBUTORS for 2.3.21
updated CHANGELOG for 2.3.21
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Security/Core/SecurityContextInterface.php
src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
src/Symfony/Component/Serializer/Serializer.php
src/Symfony/Component/Validator/Constraints/File.php
Diffstat (limited to 'Tests/Core')
| -rw-r--r-- | Tests/Core/User/InMemoryUserProviderTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/Core/User/InMemoryUserProviderTest.php b/Tests/Core/User/InMemoryUserProviderTest.php index 275426c..826e390 100644 --- a/Tests/Core/User/InMemoryUserProviderTest.php +++ b/Tests/Core/User/InMemoryUserProviderTest.php @@ -21,8 +21,8 @@ class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase $provider = new InMemoryUserProvider(array( 'fabien' => array( 'password' => 'foo', - 'enabled' => false, - 'roles' => array('ROLE_USER'), + 'enabled' => false, + 'roles' => array('ROLE_USER'), ), )); |