Fix KernelTestCase compatibility for PhpUnit 8 (bis)

nicolas-grekas · fabpot · commit 1077df60ab35 · 2019-02-12T08:11:06.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.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 that added a `void` return-type to the tearDown method
+
+if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+eval('
+    /**
+     * @internal
+     */
+    trait KernelShutdownOnTearDownTrait
+    {
+        protected function tearDown(): void
+        {
+            static::ensureKernelShutdown();
+        }
+    }
+');
+} else {
+    /**
+     * @internal
+     */
+    trait KernelShutdownOnTearDownTrait
+    {
+        /**
+         * @return void
+         */
+        protected function tearDown()
+        {
+            static::ensureKernelShutdown();
+        }
+    }
+}
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 KernelShutdownOnTearDownTrait;
+
     protected static $class;
 
     /**
@@ -208,9 +210,7 @@ protected static function createKernel(array $options = [])
     }
 
     /**
-     * @after
-     *
-     * 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()
     {

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 KernelShutdownOnTearDownTrait;`
	`27`	`+`
`26`	`28`	`protected static $class;`
`27`	`29`
`28`	`30`	`/**`
`@@ -208,9 +210,7 @@ protected static function createKernel(array $options = [])`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`/**`
`211`		`- * @after`
`212`		`- *`
`213`		`- * 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.`
`214`	`214`	`*/`
`215`	`215`	`protected static function ensureKernelShutdown()`
`216`	`216`	`{`