Skip to content

Commit 7835757

Browse files
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
2 parents 712f272 + 573ee51 commit 7835757

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323

2424
class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
2525
{
26+
public static function setUpBeforeClass()
27+
{
28+
try {
29+
random_bytes(1);
30+
} catch (\Exception $e) {
31+
throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
32+
}
33+
}
34+
2635
public function testAutoLoginReturnsNullWhenNoCookie()
2736
{
2837
$service = $this->getService(null, array('name' => 'foo'));

Tests/RememberMe/TokenBasedRememberMeServicesTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,8 @@ public function testLoginFail()
172172
{
173173
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
174174
$request = new Request();
175-
$response = new Response();
176175

177-
$service->loginFail($request, $response);
176+
$service->loginFail($request);
178177

179178
$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
180179
$this->assertTrue($cookie->isCleared());

0 commit comments

Comments
 (0)