Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 645816ebdaf0 · 2019-08-04T00:02:11.000+02:00
* 4.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset
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
      */

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,10 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Bridge\PhpUnit\DnsMock;`
`16`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`17`	`16`
`18`	`17`	`class DnsMockTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ForwardCompatTestTrait;`
`21`		`-`
`22`		`- private function doTearDown()`
	`19`	`+ protected function tearDown()`
`23`	`20`	`{`
`24`	`21`	`DnsMock::withMockedHosts(array());`
`25`	`22`	`}`