summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-01-27 06:14:19 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2016-01-27 06:14:19 +0100
commitec26f8ebb56b3819fc8d785a45254703b2f3b330 (patch)
tree3f595fd460949df97d479c3f660fa2bcf9ea1bbc
parent3a87c401e5f4403231e808d334e4c0ca3b033a70 (diff)
parent2419db4a834a7c8a3c7f92cd04f79c04afdc1d9a (diff)
downloadsymfony-security-ec26f8ebb56b3819fc8d785a45254703b2f3b330.zip
symfony-security-ec26f8ebb56b3819fc8d785a45254703b2f3b330.tar.gz
symfony-security-ec26f8ebb56b3819fc8d785a45254703b2f3b330.tar.bz2
Merge branch '2.7' into 2.8
* 2.7: Increase the inlining YAML level for config:debug [Serializer] Minor: fix CS and PHPDoc [Form] fix tests [Serializer] Ensure that groups are strings [Debug] Tell that the extension is for PHP 5 only Static code analysis Update AnnotationDirectoryLoader.php added a test Escape the delimiter in Glob::toRegex [FrameworkBundle] Fix template location for PHP templates [FrameworkBundle] Add path verification to the template parsing test cases
-rw-r--r--Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
index f1fb897..ee8a99e 100644
--- a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
+++ b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -172,9 +172,8 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
{
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
$request = new Request();
- $response = new Response();
- $service->loginFail($request, $response);
+ $service->loginFail($request);
$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
$this->assertTrue($cookie->isCleared());