diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:09:27 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:12:41 +0200 |
commit | d1087257354aca87ceeea2116cb20326354baa88 (patch) | |
tree | b7dace5670e1641930d0ce874ae5e4ba70344154 /Core/Encoder/EncoderAwareInterface.php | |
parent | 9dcf8c062707f846771f87fd64a9dbc2cb417f49 (diff) | |
parent | 91520c37bd5317989094f5f9305ba0ce1c9a968f (diff) | |
download | symfony-security-d1087257354aca87ceeea2116cb20326354baa88.zip symfony-security-d1087257354aca87ceeea2116cb20326354baa88.tar.gz symfony-security-d1087257354aca87ceeea2116cb20326354baa88.tar.bz2 |
Merge branch '2.8'
* 2.8: (61 commits)
[Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
[2.6][Translator] Extend, refactor and simplify Translator tests.
[VarDumper] Allow preserving a subset of cut arrays
[Console] Bind the closure (code) to the Command if possible
[VarDumper] Added support for SplFileObject
[VarDumper] Added support for SplFileInfo
Update DebugClassLoader.php
inject asset packages in assets helper service
[travis] Do not exclude legacy tests on 2.7
[HttpFoundation] remove getExtension method
[2.6][Translation] fix legacy tests.
[Form] Removed remaining deprecation notices in the test suite
[Form] Moved deprecation notice triggers to file level
[Debug] Map PHP errors to LogLevel::CRITICAL
[FrameworkBundle][Server Command] add address port number option.
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Initialize translator with the default locale.
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[2.7][Translation] remove duplicate code for loading catalogue.
...
Conflicts:
composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Component/Console/Helper/DialogHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
src/Symfony/Component/Locale/composer.json
Diffstat (limited to 'Core/Encoder/EncoderAwareInterface.php')
0 files changed, 0 insertions, 0 deletions