diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-26 08:41:27 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-26 08:41:27 +0100 |
| commit | 8b76e3bd74bf9d80b713cdde567f3341c03080d1 (patch) | |
| tree | c9e9f5cc958232878914e572b769ae91e585bbfe /Core/Tests/Encoder | |
| parent | 533f832af99e32dd74d7e3a7d6a3857c3d149614 (diff) | |
| parent | 33dbf427824a8f01fe7fbc1adae208a12c5b8a87 (diff) | |
| download | symfony-security-8b76e3bd74bf9d80b713cdde567f3341c03080d1.zip symfony-security-8b76e3bd74bf9d80b713cdde567f3341c03080d1.tar.gz symfony-security-8b76e3bd74bf9d80b713cdde567f3341c03080d1.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
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.3.22
updated VERSION for 2.3.21
update CONTRIBUTORS for 2.3.21
updated CHANGELOG for 2.3.21
Conflicts:
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/Finder/Shell/Command.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Validator/Constraints/ImageValidator.php
src/Symfony/Component/Validator/Constraints/TypeValidator.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions