Fix KernelTestCase compatibility for PhpUnit 8 (bis)

nicolas-grekas · nicolas-grekas · commit d18a2d88ccbc · 2019-02-09T15:35:18.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -23,6 +23,8 @@
  */
 abstract class KernelTestCase extends TestCase
 {
+    use KernelTestCaseTrait;
+
     protected static $class;
 
     /**
@@ -208,7 +210,7 @@ protected static function createKernel(array $options = [])
     }
 
     /**
-     * Shuts the kernel down if it was used in the test.
+     * Shuts the kernel down if it was used in the test - called by the tearDown method by default.
      */
     protected static function ensureKernelShutdown()
     {
@@ -220,12 +222,4 @@ protected static function ensureKernelShutdown()
             }
         }
     }
-
-    /**
-     * Clean up Kernel usage in this test.
-     */
-    protected function tearDown()
-    {
-        static::ensureKernelShutdown();
-    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCaseTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCaseTrait.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Test;
+
+use PHPUnit\Framework\TestCase;
+
+// Auto-adapt to PHPUnit 8 who added a `void` return-type to the tearDown method
+
+if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+eval('
+    /**
+     * @internal
+     */
+    trait KernelTestCaseTrait
+    {
+        protected function tearDown(): void
+        {
+            static::ensureKernelShutdown();
+        }
+    }
+');
+} else {
+    /**
+     * @internal
+     */
+    trait KernelTestCaseTrait
+    {
+        /**
+         * @return void
+         */
+        protected function tearDown()
+        {
+            static::ensureKernelShutdown();
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`abstract class KernelTestCase extends TestCase`
`25`	`25`	`{`
	`26`	`+ use KernelTestCaseTrait;`
	`27`	`+`
`26`	`28`	`protected static $class;`
`27`	`29`
`28`	`30`	`/**`
`@@ -208,7 +210,7 @@ protected static function createKernel(array $options = [])`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`/**`
`211`		`- * Shuts the kernel down if it was used in the test.`
	`213`	`+ * Shuts the kernel down if it was used in the test - called by the tearDown method by default.`
`212`	`214`	`*/`
`213`	`215`	`protected static function ensureKernelShutdown()`
`214`	`216`	`{`
`@@ -220,12 +222,4 @@ protected static function ensureKernelShutdown()`
`220`	`222`	`}`
`221`	`223`	`}`
`222`	`224`	`}`
`223`		`-`
`224`		`- /**`
`225`		`- * Clean up Kernel usage in this test.`
`226`		`- */`
`227`		`- protected function tearDown()`
`228`		`- {`
`229`		`- static::ensureKernelShutdown();`
`230`		`- }`
`231`	`225`	`}`