diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-20 17:07:50 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-20 17:07:50 +0100 |
commit | 6a912e962cb4a5636fb6642a122bd565500ea40b (patch) | |
tree | c12d4257b59f0bc407f14c6686a08e5494d71449 /Http/Session/SessionAuthenticationStrategy.php | |
parent | 6ae95fecd877a2e92dd42654d03245ecf3cfe7c4 (diff) | |
parent | c238807840e5a61a7c7f01cf8db8a80861c3e757 (diff) | |
download | symfony-security-6a912e962cb4a5636fb6642a122bd565500ea40b.zip symfony-security-6a912e962cb4a5636fb6642a122bd565500ea40b.tar.gz symfony-security-6a912e962cb4a5636fb6642a122bd565500ea40b.tar.bz2 |
Merge branch '2.7'
* 2.7: (32 commits)
[Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
[Config] fixes broken unit test on ArrayNode class.
fixed CS
[Security] Delete old session on auth strategy migrate
skip if param "translator.logging" doesn't exist.
[SecurityBundle] fixes SecurityDataCollector::getInheritedRoles() documentation.
update required minimum TwigBridge version
Very minor grammar fix in error message
Added the function providers as container resources
[Tests] Silenced all deprecations in tests for 2.3
BinaryFileResponse - add missing newline
fixed CS
add a limit and a test to FlattenExceptionTest.
[DebugBundle] enable the DumpDataCollectorPass
[FrameworkBundle] Use debug namespace.
[FrameworkBundle] update debug commands references
skip compiler pass if interface doesn't exist
Unify the way to provide expression functions for the DI container
CS: There should be no empty lines following phpdocs
[Security] Added the triggering of the security.interactive_login event after set of token
...
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/Session/SessionAuthenticationStrategy.php')
-rw-r--r-- | Http/Session/SessionAuthenticationStrategy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Session/SessionAuthenticationStrategy.php b/Http/Session/SessionAuthenticationStrategy.php index 0e688c7..dd258a0 100644 --- a/Http/Session/SessionAuthenticationStrategy.php +++ b/Http/Session/SessionAuthenticationStrategy.php @@ -47,7 +47,7 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte return; case self::MIGRATE: - $request->getSession()->migrate(); + $request->getSession()->migrate(true); return; |