diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 10:00:47 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 10:00:47 +0200 |
| commit | 6c71220d9a0f048d6cd091ea3c8aabfb12f62ff7 (patch) | |
| tree | 89bfc6f1c6b88e537d4c9ca64040b40151fd9039 /Core/Tests/Encoder | |
| parent | 625a767ea81fa61449d7ca2044c80a186097e7d0 (diff) | |
| parent | 6f969fb6dd0f9d7aecf8e0118563af2aa4796a17 (diff) | |
| download | symfony-security-6c71220d9a0f048d6cd091ea3c8aabfb12f62ff7.zip symfony-security-6c71220d9a0f048d6cd091ea3c8aabfb12f62ff7.tar.gz symfony-security-6c71220d9a0f048d6cd091ea3c8aabfb12f62ff7.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Debug] Fix log level of stacked errors
[VarDumper] Fix uninitialized id in HtmlDumper
Fixed fluent interface
[Debug] fix debug class loader case test on windows
[Debug+VarDumper] Fix handling of PHP7 exception/error model
[2.6][Security][Translation] #14920 update translations
[VarDumper] Cherry-pick code style fixes from 2.7
Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property
Conflicts:
src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
src/Symfony/Component/VarDumper/Caster/DOMCaster.php
src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
src/Symfony/Component/VarDumper/Caster/PdoCaster.php
src/Symfony/Component/VarDumper/Caster/SplCaster.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions