Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 29e52224988e · 2020-02-05T19:46:35.000+01:00
* 4.4:
  [Bridge/PhpUnit] fix compat with recent versions of phpunit
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -16,9 +16,12 @@
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;
 use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV5;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class DeprecationTest extends TestCase
 {
+    use SetUpTearDownTrait;
+
     private static $vendorDir;
 
     private static function getVendorDir()
@@ -275,7 +278,7 @@ private static function removeDir($dir)
         rmdir($dir);
     }
 
-    public static function tearDownAfterClass()
+    private static function doTearDownAfterClass()
     {
         self::removeDir(self::getVendorDir().'/myfakevendor');
     }

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,12 @@`
`16`	`16`	`use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;`
`17`	`17`	`use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;`
`18`	`18`	`use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV5;`
	`19`	`+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;`
`19`	`20`
`20`	`21`	`class DeprecationTest extends TestCase`
`21`	`22`	`{`
	`23`	`+ use SetUpTearDownTrait;`
	`24`	`+`
`22`	`25`	`private static $vendorDir;`
`23`	`26`
`24`	`27`	`private static function getVendorDir()`
`@@ -275,7 +278,7 @@ private static function removeDir($dir)`
`275`	`278`	`rmdir($dir);`
`276`	`279`	`}`
`277`	`280`
`278`		`- public static function tearDownAfterClass()`
	`281`	`+ private static function doTearDownAfterClass()`
`279`	`282`	`{`
`280`	`283`	`self::removeDir(self::getVendorDir().'/myfakevendor');`
`281`	`284`	`}`