diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 14:58:06 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 14:58:06 +0200 |
| commit | 8c1c6eff4059a084f7f60a13da604af074badd79 (patch) | |
| tree | 1fd42cbd273d70be148b9e1c321db5fa85b6df04 /Core/Tests/Encoder | |
| parent | 6f969fb6dd0f9d7aecf8e0118563af2aa4796a17 (diff) | |
| parent | 36cde602d02d84b7a176912a8e01ed8e3c7ab85c (diff) | |
| download | symfony-security-8c1c6eff4059a084f7f60a13da604af074badd79.zip symfony-security-8c1c6eff4059a084f7f60a13da604af074badd79.tar.gz symfony-security-8c1c6eff4059a084f7f60a13da604af074badd79.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
[2.3][Debug] Fix fatal-errors handling on HHVM
Standardize the name of the exception variables
[2.3] Static Code Analysis for Components
Remove duplicated paths
Conflicts:
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions