diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-27 11:19:51 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-27 11:19:51 +0100 |
| commit | 94465e02e58f9a17b29dd4afbcac5c02af4bf7e0 (patch) | |
| tree | c1655995142c2ce7edcf8a47f1e3f39f2d1e51dd /Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php | |
| parent | ee7e5319d0a164be841bf1651c51fc2d09b17698 (diff) | |
| parent | 6c8c751f7f5b09dbb608d4f43518dcb3fb214057 (diff) | |
| download | symfony-security-94465e02e58f9a17b29dd4afbcac5c02af4bf7e0.zip symfony-security-94465e02e58f9a17b29dd4afbcac5c02af4bf7e0.tar.gz symfony-security-94465e02e58f9a17b29dd4afbcac5c02af4bf7e0.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
CS: fixes
Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
[travis] Kill tests when a new commit has been pushed
fixed CS
Change behavior to mirror hash_equals() returning early if there is a length mismatch
CS fixing
Prevent modifying secrets as much as possible
Update StringUtils.php
Whitespace
Update StringUtils.php
CS: general fixes
[SecurityBundle] removed a duplicated service definition and simplified others.
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
Diffstat (limited to 'Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php')
0 files changed, 0 insertions, 0 deletions