diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-27 06:14:46 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-27 06:14:46 +0100 |
commit | df6b5afc3a39e3b772f834e2d19c3a40e37506a7 (patch) | |
tree | d07eb9f15926f19fb03bb226277fbe1cda298ee5 | |
parent | 74dcdf64e3e497a8e3174d0f2d983893aa37c363 (diff) | |
parent | ec26f8ebb56b3819fc8d785a45254703b2f3b330 (diff) | |
download | symfony-security-df6b5afc3a39e3b772f834e2d19c3a40e37506a7.zip symfony-security-df6b5afc3a39e3b772f834e2d19c3a40e37506a7.tar.gz symfony-security-df6b5afc3a39e3b772f834e2d19c3a40e37506a7.tar.bz2 |
Merge branch '2.8' into 3.0
* 2.8:
[WebProfilerBundle] Don't inherit CSS text-transform property for the toolbar.
Remove duplicate cursor property
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.php | 3 |
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()); |