minor #39497 [PhpUnitBridge] [phpunit] Stop using deprecated trait (jderusse)

nicolas-grekas · nicolas-grekas · commit 698dadccb129 · 2020-12-14T17:15:46.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] [phpunit] Stop using deprecated trait | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - the `SetUpTearDownTrait` trait has been removed in #39487 this PR remove usage of it in branch 4.4 Commits ------- 55ed00c Stop using deprecated trait
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -15,12 +15,9 @@
 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 $prefixDirsPsr4;
 
@@ -261,7 +258,7 @@ private static function removeDir($dir)
         rmdir($dir);
     }
 
-    private static function doSetupBeforeClass()
+    public static function setupBeforeClass(): void
     {
         foreach (get_declared_classes() as $class) {
             if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
@@ -281,7 +278,7 @@ private static function doSetupBeforeClass()
         }
     }
 
-    private static function doTearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         foreach (self::$prefixDirsPsr4 as [$prop, $loader, $prefixDirsPsr4]) {
             $prop->setValue($loader, $prefixDirsPsr4);

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,9 @@`
`15`	`15`	`use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;`
`16`	`16`	`use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;`
`17`	`17`	`use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV5;`
`18`		`-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;`
`19`	`18`
`20`	`19`	`class DeprecationTest extends TestCase`
`21`	`20`	`{`
`22`		`- use SetUpTearDownTrait;`
`23`		`-`
`24`	`21`	`private static $vendorDir;`
`25`	`22`	`private static $prefixDirsPsr4;`
`26`	`23`
`@@ -261,7 +258,7 @@ private static function removeDir($dir)`
`261`	`258`	`rmdir($dir);`
`262`	`259`	`}`
`263`	`260`
`264`		`- private static function doSetupBeforeClass()`
	`261`	`+ public static function setupBeforeClass(): void`
`265`	`262`	`{`
`266`	`263`	`foreach (get_declared_classes() as $class) {`
`267`	`264`	`if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
`@@ -281,7 +278,7 @@ private static function doSetupBeforeClass()`
`281`	`278`	`}`
`282`	`279`	`}`
`283`	`280`
`284`		`- private static function doTearDownAfterClass()`
	`281`	`+ public static function tearDownAfterClass(): void`
`285`	`282`	`{`
`286`	`283`	`foreach (self::$prefixDirsPsr4 as [$prop, $loader, $prefixDirsPsr4]) {`
`287`	`284`	`$prop->setValue($loader, $prefixDirsPsr4);`