Skip to content

Commit eef2882

Browse files
Merge branch '4.4'
* 4.4: [Cache] fix cs Make tests support phpunit 8 Allow Travis CI to build on PHP 7.4 [DI] Allow dumping the container in one file instead of many files
2 parents 190f936 + ef04c12 commit eef2882

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Tests/ClockMockTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\PhpUnit\ClockMock;
16+
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1617

1718
/**
1819
* @author Dominic Tubach <[email protected]>
@@ -21,12 +22,14 @@
2122
*/
2223
class ClockMockTest extends TestCase
2324
{
24-
public static function setUpBeforeClass()
25+
use ForwardCompatTestTrait;
26+
27+
private static function doSetUpBeforeClass()
2528
{
2629
ClockMock::register(__CLASS__);
2730
}
2831

29-
protected function setUp()
32+
private function doSetUp()
3033
{
3134
ClockMock::withClockMock(1234567890.125);
3235
}

Tests/DnsMockTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\PhpUnit\DnsMock;
16+
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1617

1718
class DnsMockTest extends TestCase
1819
{
19-
protected function tearDown()
20+
use ForwardCompatTestTrait;
21+
22+
private function doTearDown()
2023
{
2124
DnsMock::withMockedHosts(array());
2225
}

0 commit comments

Comments
 (0)