diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-17 16:02:08 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-17 16:02:08 +0200 |
| commit | 7bd9e9947f8fc1e9b0df21a4bb69e588133316f5 (patch) | |
| tree | 4ac5c1e3ddc53d08083fd9ae8bd7d791f779df9d /Core/Encoder/EncoderFactory.php | |
| parent | d00dcfed191df63f4b41303f81bd46b19fed80fa (diff) | |
| parent | e00948e5ae59fb98477b8b9868aa00646e8d5e23 (diff) | |
| download | symfony-security-7bd9e9947f8fc1e9b0df21a4bb69e588133316f5.zip symfony-security-7bd9e9947f8fc1e9b0df21a4bb69e588133316f5.tar.gz symfony-security-7bd9e9947f8fc1e9b0df21a4bb69e588133316f5.tar.bz2 | |
Merge branch '3.0' into 3.1v3.1.3
* 3.0:
[VarDumper] Fix dumping jsons casted as arrays
PassConfig::getMergePass is not an array
Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)"
Fix the retrieval of the last username when using forwarding
[Yaml] Fix PHPDoc of the Yaml class
[HttpFoundation] Add OPTIONS and TRACE to the list of safe methods
Update getAbsoluteUri() for query string uris
Conflicts:
src/Symfony/Component/Yaml/Yaml.php
Diffstat (limited to 'Core/Encoder/EncoderFactory.php')
0 files changed, 0 insertions, 0 deletions