diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
| commit | ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e (patch) | |
| tree | 5cce7f9ba7469c8ee4577a0b8ca3c8abe940f9ab /Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php | |
| parent | 99d73ecb12dedf5c772aab7f00e7d39b60c5f4ed (diff) | |
| parent | 13818e3015a2a20025ae65b6f57756795eaeda7e (diff) | |
| download | symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.zip symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.gz symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.bz2 | |
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php')
| -rw-r--r-- | Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php index 43aaf92..502d170 100644 --- a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php @@ -313,13 +313,6 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test $userProvider = $this->getProvider(); } - if (!isset($options['secure'])) { - $options['secure'] = false; - } - if (!isset($options['httponly'])) { - $options['httponly'] = true; - } - return new PersistentTokenBasedRememberMeServices(array($userProvider), 'foosecret', 'fookey', $options, $logger, new SecureRandom(sys_get_temp_dir().'/_sf2.seed')); } |