summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schwenn <alexander.schwenn@gmail.com>2014-12-20 02:25:16 +0100
committerAlexander Schwenn <alexander.schwenn@gmail.com>2014-12-20 02:42:01 +0100
commitb2e6411a6e1d1556b597c94e045719d418cc8cca (patch)
treebec14eb9f9fe9e6bc8bfaf679ee2a9a3dd28d246
parent460c9c40e1f1adb1a9efdeeeeda6fd07517099db (diff)
downloadsymfony-security-b2e6411a6e1d1556b597c94e045719d418cc8cca.zip
symfony-security-b2e6411a6e1d1556b597c94e045719d418cc8cca.tar.gz
symfony-security-b2e6411a6e1d1556b597c94e045719d418cc8cca.tar.bz2
[Security] Delete old session on auth strategy migrate
-rw-r--r--Http/Session/SessionAuthenticationStrategy.php2
-rw-r--r--Tests/Http/Session/SessionAuthenticationStrategyTest.php2
2 files changed, 2 insertions, 2 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;
diff --git a/Tests/Http/Session/SessionAuthenticationStrategyTest.php b/Tests/Http/Session/SessionAuthenticationStrategyTest.php
index 43c52b5..431a002 100644
--- a/Tests/Http/Session/SessionAuthenticationStrategyTest.php
+++ b/Tests/Http/Session/SessionAuthenticationStrategyTest.php
@@ -47,7 +47,7 @@ class SessionAuthenticationStrategyTest extends \PHPUnit_Framework_TestCase
public function testSessionIsMigrated()
{
$session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
- $session->expects($this->once())->method('migrate');
+ $session->expects($this->once())->method('migrate')->with($this->equalTo(true));
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE);
$strategy->onAuthentication($this->getRequest($session), $this->getToken());