diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-18 17:02:51 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-18 17:02:51 +0200 |
| commit | 957136819fa019626b0f009152a53d094972bcdf (patch) | |
| tree | 5c0d7a0d6d10055ba46b058410bae10599a82473 /Core/Encoder/EncoderAwareInterface.php | |
| parent | c29987543b13344731ec7169e5f81cdee5b9d7d8 (diff) | |
| parent | 0233adf28c0dc2f502a2d20541934ac9c588bb0b (diff) | |
| download | symfony-security-957136819fa019626b0f009152a53d094972bcdf.zip symfony-security-957136819fa019626b0f009152a53d094972bcdf.tar.gz symfony-security-957136819fa019626b0f009152a53d094972bcdf.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[HttpKernel] Cleanup ExceptionListener
CS fixes
[DependencyInjection] Show better error when the Yaml component is not installed
[2.3] SCA for Components - reference mismatches
[2.3] Static Code Analysis for Components
[Translation][fixed test] refresh cache when resources are no longer fresh.
[Validator] Added missing Simplified Chinese (zh_CN) translations
[FrameworkBundle] Workaround php -S ignoring auto_prepend_file
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
src/Symfony/Component/Console/Descriptor/TextDescriptor.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
Diffstat (limited to 'Core/Encoder/EncoderAwareInterface.php')
0 files changed, 0 insertions, 0 deletions