summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2016-02-04 13:57:09 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2016-02-04 13:57:09 +0100
commitb5c4b14ce46387314b6bd17f13ac151b446c6847 (patch)
treecaedfa28516989d12f53df4aeb5a123169972b59 /Http
parentd7ed0875e79cac58708a75b06966e8c047de036b (diff)
parentc94edb64c5ca7cf92f0dfc3ebd4d60bf7ebbacb7 (diff)
downloadsymfony-security-b5c4b14ce46387314b6bd17f13ac151b446c6847.zip
symfony-security-b5c4b14ce46387314b6bd17f13ac151b446c6847.tar.gz
symfony-security-b5c4b14ce46387314b6bd17f13ac151b446c6847.tar.bz2
Merge branch '3.0'
* 3.0: (105 commits) [Console] remove readline support bumped Symfony version to 3.0.3 updated VERSION for 3.0.2 updated CHANGELOG for 3.0.2 [Routing] added a suggestion to add the HttpFoundation component. [FrameworkBundle] fix assets and templating tests [ClassLoader] fix ApcClassLoader tests on HHVM [travis] Add some comments changed operator from and to && [DependencyInjection] Remove unused parameter [Process] Fix transient tests for incremental outputs [Console] Add missing `@require` annotation in test Fix merge [appveyor] Fix failure reporting [#17634] move DebugBundle license file Limit Ldap component version for the 3.0 branch backport GlobTest from 2.7 branch Move licenses according to new best practices [FrameworkBundle] Remove unused code in test [2.3] Fixed an undefined variable in Glob::toRegex ... Conflicts: .travis.yml composer.json src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets.yml src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig src/Symfony/Component/Console/CHANGELOG.md src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorTest.php src/Symfony/Component/Yaml/Tests/ParserTest.php
Diffstat (limited to 'Http')
-rw-r--r--Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php9
-rw-r--r--Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php3
2 files changed, 10 insertions, 2 deletions
diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index 581bdfa..30cf4a2 100644
--- a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -23,6 +23,15 @@ use Symfony\Component\Security\Core\Exception\CookieTheftException;
class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
{
+ public static function setUpBeforeClass()
+ {
+ try {
+ random_bytes(1);
+ } catch (\Exception $e) {
+ throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
+ }
+ }
+
public function testAutoLoginReturnsNullWhenNoCookie()
{
$service = $this->getService(null, array('name' => 'foo'));
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());