Revert "bug #30084 Fix KernelTestCase compatibility for PhpUnit 8 (alexander-schranz)"

nicolas-grekas · nicolas-grekas · commit 9e475b62279f · 2019-02-09T08:38:04.000+01:00
This reverts commit a36dc51, reversing changes made to db445c4.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -208,8 +208,6 @@ protected static function createKernel(array $options = [])
     }
 
     /**
-     * @after
-     *
      * Shuts the kernel down if it was used in the test.
      */
     protected static function ensureKernelShutdown()
@@ -222,4 +220,12 @@ protected static function ensureKernelShutdown()
             }
         }
     }
+
+    /**
+     * Clean up Kernel usage in this test.
+     */
+    protected function tearDown()
+    {
+        static::ensureKernelShutdown();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,6 @@ protected static function createKernel(array $options = [])`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
`211`		`- * @after`
`212`		`- *`
`213`	`211`	`* Shuts the kernel down if it was used in the test.`
`214`	`212`	`*/`
`215`	`213`	`protected static function ensureKernelShutdown()`
`@@ -222,4 +220,12 @@ protected static function ensureKernelShutdown()`
`222`	`220`	`}`
`223`	`221`	`}`
`224`	`222`	`}`
	`223`	`+`
	`224`	`+ /**`
	`225`	`+ * Clean up Kernel usage in this test.`
	`226`	`+ */`
	`227`	`+ protected function tearDown()`
	`228`	`+ {`
	`229`	`+ static::ensureKernelShutdown();`
	`230`	`+ }`
`225`	`231`	`}`