symfony · nicolas-grekas · Aug 8, 2019 · Aug 8, 2019
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/ForwardCompatTestTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/ForwardCompatTestTrait.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -23,8 +23,6 @@
  */
 abstract class KernelTestCase extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     protected static $class;
 
     /**
@@ -39,7 +37,7 @@ abstract class KernelTestCase extends TestCase
 
     protected static $booted;
 
-    private function doTearDown()
+    protected function tearDown(): void
     {
         static::ensureKernelShutdown();
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -21,11 +21,10 @@
  */
 abstract class WebTestCase extends KernelTestCase
 {
-    use ForwardCompatTestTrait;
     use WebTestAssertionsTrait;
     use MailerAssertionsTrait;
 
-    private function doTearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         self::getClient(null);

diff --git a/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php b/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php
@@ -20,14 +20,12 @@
  */
 abstract class FormIntegrationTestCase extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var FormFactoryInterface
      */
     protected $factory;
 
-    private function doSetUp()
+    protected function setUp(): void
     {
         $this->factory = Forms::createFormFactoryBuilder()
             ->addExtensions($this->getExtensions())

diff --git a/src/Symfony/Component/Form/Test/ForwardCompatTestTrait.php b/src/Symfony/Component/Form/Test/ForwardCompatTestTrait.php
diff --git a/src/Symfony/Component/Form/Test/TypeTestCase.php b/src/Symfony/Component/Form/Test/TypeTestCase.php
@@ -17,8 +17,6 @@
 
 abstract class TypeTestCase extends FormIntegrationTestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var FormBuilder
      */
@@ -29,15 +27,15 @@ abstract class TypeTestCase extends FormIntegrationTestCase
      */
     protected $dispatcher;
 
-    private function doSetUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
         $this->builder = new FormBuilder('', null, $this->dispatcher, $this->factory);
     }
 
-    private function doTearDown()
+    protected function tearDown(): void
     {
         if (\in_array(ValidatorExtensionTrait::class, class_uses($this))) {
             $this->validator = null;

diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -30,8 +30,6 @@
  */
 abstract class ConstraintValidatorTestCase extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var ExecutionContextInterface
      */
@@ -51,7 +49,7 @@ abstract class ConstraintValidatorTestCase extends TestCase
     protected $constraint;
     protected $defaultTimezone;
 
-    private function doSetUp()
+    protected function setUp(): void
     {
         $this->group = 'MyGroup';
         $this->metadata = null;
@@ -73,7 +71,7 @@ private function doSetUp()
         $this->setDefaultTimezone('UTC');
     }
 
-    private function doTearDown()
+    protected function tearDown(): void
     {
         $this->restoreDefaultTimezone();
     }

diff --git a/src/Symfony/Component/Validator/Test/ForwardCompatTestTrait.php b/src/Symfony/Component/Validator/Test/ForwardCompatTestTrait.php