summaryrefslogtreecommitdiffstats
path: root/Http/Tests/Session/SessionAuthenticationStrategyTest.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-12-20 17:01:23 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-12-20 17:01:23 +0100
commit6b42215ea1e9d59e8d449b7436ec05e04cb00f5e (patch)
tree5d2d1abbddae7b3f2eb2e2a26a24009f5a71e74b /Http/Tests/Session/SessionAuthenticationStrategyTest.php
parentcf1120d6fa64c92837f3e94c1ed779a2a05296cb (diff)
parent3b1993579d11af545a1effd2cb3367665dd5a5fd (diff)
downloadsymfony-security-6b42215ea1e9d59e8d449b7436ec05e04cb00f5e.zip
symfony-security-6b42215ea1e9d59e8d449b7436ec05e04cb00f5e.tar.gz
symfony-security-6b42215ea1e9d59e8d449b7436ec05e04cb00f5e.tar.bz2
Merge branch '2.3' into 2.5
* 2.3: [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 update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed Conflicts: src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.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());