diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 15:03:50 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 15:03:50 +0200 |
| commit | 75f6af14e12329fa92918ca9811dcf9d4016dba9 (patch) | |
| tree | a06aae1e5362f8bae4d0d7fb952e2e30fe6f304c /Core/Tests/Encoder | |
| parent | 6c71220d9a0f048d6cd091ea3c8aabfb12f62ff7 (diff) | |
| parent | 8c1c6eff4059a084f7f60a13da604af074badd79 (diff) | |
| download | symfony-security-75f6af14e12329fa92918ca9811dcf9d4016dba9.zip symfony-security-75f6af14e12329fa92918ca9811dcf9d4016dba9.tar.gz symfony-security-75f6af14e12329fa92918ca9811dcf9d4016dba9.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
Add test for HHVM FatalErrors
[2.6][Debug] Fix fatal-errors handling on HHVM
[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/Security/Http/Firewall/BasicAuthenticationListener.php
src/Symfony/Component/Security/Http/Firewall/ContextListener.php
src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions