8000 Merge branch '2.8' · symfony/symfony@d67feb4 · GitHub
[go: up one dir, main page]

Skip to content

Commit d67feb4

Browse files
Merge branch '2.8'
* 2.8: [HttpKernel] Clean clock-mock injection, replaced by #16455 [Bridge\PhpUnit] Fix clock-mock registration
2 parents bceb2d9 + 7beea17 commit d67feb4

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
5656
}
5757
}
5858
}
59+
foreach ($suite->tests() as $test) {
60+
if ($test instanceof \PHPUnit_Framework_TestSuite && in_array('time-sensitive', \PHPUnit_Util_Test::getGroups($test->getName()), true)) {
61+
ClockMock::register($test->getName());
62+
}
63+
}
5964
} elseif (2 === $this->state) {
6065
$skipped = array();
6166
foreach ($suite->tests() as $test) {

src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
17-
use Symfony\Bridge\PhpUnit\ClockMock;
1817

1918
/**
2019
* @group time-sensitive
@@ -25,9 +24,6 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
2524

2625
protected function setUp()
2726
{
28-
if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
29-
ClockMock::register('Symfony\Component\HttpFoundation\Request');
30-
}
3127
$this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
3228
->disableOriginalConstructor()
3329
->getMock()

src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\HttpKernel\HttpCache\HttpCache;
1717< 9CDD div class="diff-text-inner">use Symfony\Component\HttpKernel\HttpCache\Store;
1818
use Symfony\Component\HttpKernel\HttpKernelInterface;
19-
use Symfony\Bridge\PhpUnit\ClockMock;
2019

2120
class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
2221
{
@@ -33,9 +32,6 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
3332

3433
protected function setUp()
3534
{
36-
if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
37-
ClockMock::register('Symfony\Component\HttpFoundation\Request');
38-
}
3935
$this->kernel = null;
4036

4137
$this->cache = null;

0 commit comments

Comments
 (0)
0