Create new PHPUnit assertions for the WebTestCase

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -23,7 +23,7 @@
  */
 abstract class KernelTestCase extends TestCase
 {
-    use KernelShutdownOnTearDownTrait;
+    use TestCaseSetUpTearDownTrait;
 
     protected static $class;
 
@@ -37,6 +37,11 @@ abstract class KernelTestCase extends TestCase
      */
     protected static $container;
 
+    protected function doTearDown(): void
+    {
+        static::ensureKernelShutdown();
+    }
+
     /**
      * @return string The Kernel class name
      *

src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php → src/Symfony/Bundle/FrameworkBundle/Test/TestCaseSetUpTearDownTrait.php

@@ -13,31 +13,60 @@
 
 use PHPUnit\Framework\TestCase;
 
-// Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method
+// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods
 
 if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
     /**
      * @internal
      */
-    trait KernelShutdownOnTearDownTrait
+    trait TestCaseSetUpTearDownTrait
     {
+        private function doSetUp(): void
+        {
+        }
+
+        private function doTearDown(): void
+        {
+        }
+
+        protected function setUp(): void
+        {
+            $this->doSetUp();
+        }
+
         protected function tearDown(): void
         {
-            static::ensureKernelShutdown();
+            $this->doTearDown();
         }
     }
 } else {
     /**
      * @internal
      */
-    trait KernelShutdownOnTearDownTrait
+    trait TestCaseSetUpTearDownTrait
     {
+        private function doSetUp(): void
+        {
+        }
+
+        private function doTearDown(): void
+        {
+        }
+
+        /**
+         * @return void
+         */
+        protected function setUp()
+        {
+            $this->doSetUp();
+        }
+
         /**
          * @return void
          */
         protected function tearDown()
         {
-            static::ensureKernelShutdown();
+            $this->doTearDown();
         }
     }
 }