Deprecate trait

jderusse · jderusse · commit 73f7929f5ee1 · 2020-12-14T09:23:51.000+01:00
diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md
@@ -18,6 +18,11 @@ HttpKernel
 
  * Marked the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal
 
+PhpunitBridge
+-------------
+
+ * Deprecated the `SetUpTearDownTrait` trait, use original methods with "void" return typehint.
+
 Security
 --------
 
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -129,6 +129,7 @@ PhpUnitBridge
 -------------
 
  * Removed support for `@expectedDeprecation` annotations, use the `ExpectDeprecationTrait::expectDeprecation()` method instead.
+ * Removed the `SetUpTearDownTrait` trait, use original methods with "void" return typehint.
 
 PropertyAccess
 --------------
diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * bumped the minimum PHP version to 7.1.3
  * bumped the minimum PHPUnit version to 7.5
+ * deprecated the `SetUpTearDownTrait` trait, use original methods with "void" return typehint.
 
 5.1.0
 -----
diff --git a/src/Symfony/Bridge/PhpUnit/SetUpTearDownTrait.php b/src/Symfony/Bridge/PhpUnit/SetUpTearDownTrait.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 
+trigger_deprecation('symfony/phpunit-bridge', '5.3', 'The "%s" trait is deprecated, use original methods with "void" return typehint.', SetUpTearDownTrait::class);
+
 // A trait to provide forward compatibility with newest PHPUnit versions
 $r = new \ReflectionClass(TestCase::class);
 if (!$r->getMethod('setUp')->hasReturnType()) {
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\SymfonyTestsListenerForV7;
-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\SymfonyTestsListenerForV7;`
`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);`