diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-30 18:10:16 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-30 18:10:16 +0200 |
commit | 385b0a54583ce0fc43a2489855951c6ea4ef9be8 (patch) | |
tree | fbb6d74de901c1818c29a3c5086a4c963a4f1d72 /Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php | |
parent | 6a96b68515bba1ae9e275ff0498e88659d3f5354 (diff) | |
parent | 1738333e52f972aabad7764e53722c9682354beb (diff) | |
download | symfony-security-385b0a54583ce0fc43a2489855951c6ea4ef9be8.zip symfony-security-385b0a54583ce0fc43a2489855951c6ea4ef9be8.tar.gz symfony-security-385b0a54583ce0fc43a2489855951c6ea4ef9be8.tar.bz2 |
Merge branch '2.3' into 2.6
* 2.3:
Minor fixes
Towards 100% HHVM compat
trigger event with right user (add test)
[Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
[Form] Fixed: Data mappers always receive forms indexed by their names
Conflicts:
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
src/Symfony/Component/Filesystem/Filesystem.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Diffstat (limited to 'Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php')
0 files changed, 0 insertions, 0 deletions