summaryrefslogtreecommitdiffstats
path: root/Http/Tests/Session/SessionAuthenticationStrategyTest.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-12-20 17:07:50 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-12-20 17:07:50 +0100
commit6a912e962cb4a5636fb6642a122bd565500ea40b (patch)
treec12d4257b59f0bc407f14c6686a08e5494d71449 /Http/Tests/Session/SessionAuthenticationStrategyTest.php
parent6ae95fecd877a2e92dd42654d03245ecf3cfe7c4 (diff)
parentc238807840e5a61a7c7f01cf8db8a80861c3e757 (diff)
downloadsymfony-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/Tests/Session/SessionAuthenticationStrategyTest.php')
-rw-r--r--Http/Tests/Session/SessionAuthenticationStrategyTest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Tests/Session/SessionAuthenticationStrategyTest.php b/Http/Tests/Session/SessionAuthenticationStrategyTest.php
index 7be9054..a1f960f 100644
--- a/Http/Tests/Session/SessionAuthenticationStrategyTest.php
+++ b/Http/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -40,7 +40,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());