Commitd18a2d8

committed

Fix KernelTestCase compatibility for PhpUnit 8 (bis)

1 parent9e475b6 commitd18a2d8Copy full SHA for d18a2d8

File tree

+48

-9

lines changed

+48

-9

lines changed

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`abstractclass KernelTestCaseextends TestCase`
`25`	`25`	`{`
	`26`	`+use KernelTestCaseTrait;`
	`27`	`+`
`26`	`28`	`protectedstatic$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`	`protectedstaticfunctionensureKernelShutdown()`
`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`		`-protectedfunctiontearDown()`
`228`		`- {`
`229`		`-static::ensureKernelShutdown();`
`230`		`- }`
`231`	`225`	`}`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,45 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+/*`
	`4`	`+ * This file is part of the Symfony package.`
	`5`	`+ *`
	`6`	`+ * (c) Fabien Potencier <fabien@symfony.com>`
	`7`	`+ *`
	`8`	`+ * For the full copyright and license information, please view the LICENSE`
	`9`	`+ * file that was distributed with this source code.`
	`10`	`+ */`
	`11`	`+`
	`12`	`+namespaceSymfony\Bundle\FrameworkBundle\Test;`
	`13`	`+`
	`14`	`+usePHPUnit\Framework\TestCase;`
	`15`	`+`
	`16`	+// Auto-adapt to PHPUnit 8 who added a `void` return-type to the tearDown method
	`17`	`+`
	`18`	`+if (method_exists(\ReflectionMethod::class,'hasReturnType') && (new \ReflectionMethod(TestCase::class,'tearDown'))->hasReturnType()) {`
	`19`	`+eval('`
	`20`	`+ /**`
	`21`	`+ * @internal`
	`22`	`+ */`
	`23`	`+ trait KernelTestCaseTrait`
	`24`	`+ {`
	`25`	`+ protected function tearDown(): void`
	`26`	`+ {`
	`27`	`+ static::ensureKernelShutdown();`
	`28`	`+ }`
	`29`	`+ }`
	`30`	`+');`
	`31`	`+}else {`
	`32`	`+/**`
	`33`	`+ * @internal`
	`34`	`+ */`
	`35`	`+trait KernelTestCaseTrait`
	`36`	`+ {`
	`37`	`+/**`
	`38`	`+ * @return void`
	`39`	`+ */`
	`40`	`+protectedfunctiontearDown()`
	`41`	`+ {`
	`42`	`+static::ensureKernelShutdown();`
	`43`	`+ }`
	`44`	`+ }`
	`45`	`+}`

Comments

(0)