Merge branch '3.4' into 4.3

* 3.4: Remove use of ForwardCompatTrait Remove deprecated methods assertArraySubset
symfony · Aug 3, 2019 · f8af6d7 · f8af6d7
2 parents 49a0e8d + 43f1d05
commit f8af6d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Tests/ClockMockTest.php b/Tests/ClockMockTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ClockMock;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 /**
  * @author Dominic Tubach <dominic.tubach@to.com>
@@ -22,14 +21,12 @@
  */
 class ClockMockTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         ClockMock::register(__CLASS__);
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         ClockMock::withClockMock(1234567890.125);
     }

diff --git a/Tests/DnsMockTest.php b/Tests/DnsMockTest.php
@@ -13,13 +13,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\DnsMock;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 class DnsMockTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
-    private function doTearDown()
+    protected function tearDown()
     {
         DnsMock::withMockedHosts(array());
     }

diff --git a/Tests/ProcessIsolationTest.php b/Tests/ProcessIsolationTest.php
@@ -3,7 +3,6 @@
 namespace Symfony\Bridge\PhpUnit\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 /**
  * Don't remove this test case, it tests the legacy group.
@@ -14,8 +13,6 @@
  */
 class ProcessIsolationTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @expectedDeprecation Test abc
      */