diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:55:07 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:55:07 +0200 |
| commit | b071a103319fc4d8549e17e575c75b8b3417d8cd (patch) | |
| tree | 3f901a8dc01d8a8af8c32b3dfdd622e6055c121f /Http/Tests | |
| parent | 02b20eccaf64c7c3c138f89e91f0a83c90cebfa2 (diff) | |
| parent | 06dbcd5a5464cccf4c748071f338f34130ecad06 (diff) | |
| download | symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.zip symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.tar.gz symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Validator] Add missing pt_BR translations
Add parsing of hexadecimal strings for PHP 7
[Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
[Validator] Added missing Hungarian translation
[Validator] Fixed grammar in Hungarian translation
CS: Unary operators should be placed adjacent to their operands
CS: Binary operators should be arounded by at least one space
remove useless tests that fail in php 7
[Translator] fix test for php 7 compatibility
Update phpdoc of ProcessBuilder#setPrefix()
Conflicts:
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
Diffstat (limited to 'Http/Tests')
| -rw-r--r-- | Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php index 8c215e2..9801bc8 100644 --- a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php @@ -43,7 +43,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase $userProvider = $this->getProvider(); $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600)); $request = new Request(); - $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass')); + $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass')); $userProvider ->expects($this->once()) @@ -129,7 +129,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase $service = $this->getService($userProvider, array('name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600)); $request = new Request(); - $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass')); + $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass')); $returnedToken = $service->autoLogin($request); |