bug #24113 [FrameworkBundle] Get KERNEL_CLASS through $_ENV too for KernelTestCase (yceruto)

nicolas-grekas · nicolas-grekas · commit fda994b1e474 · 2017-09-07T09:25:08.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- [FrameworkBundle] Get KERNEL_CLASS through $_ENV too for KernelTestCase | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | https://github.com/symfony/recipes/pull/170/files#diff-793b024840ee04ebdff5e04c2cd44f8cR12 | License | MIT | Doc PR | - I guess the check could be simplied in `master` with php7+ /cc @nicolas-grekas Commits ------- 73cdb68 Get KERNEL_CLASS through $_ENV too
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -106,8 +106,9 @@ private static function getPhpUnitCliConfigArgument()
      */
     protected static function getKernelClass()
     {
-        if (isset($_SERVER['KERNEL_CLASS'])) {
-            if (!class_exists($class = $_SERVER['KERNEL_CLASS'])) {
+        if (isset($_SERVER['KERNEL_CLASS']) || isset($_ENV['KERNEL_CLASS'])) {
+            $class = isset($_SERVER['KERNEL_CLASS']) ? $_SERVER['KERNEL_CLASS'] : $_ENV['KERNEL_CLASS'];
+            if (!class_exists($class)) {
                 throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the %s::createKernel() method.', $class, static::class));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,9 @@ private static function getPhpUnitCliConfigArgument()`
`106`	`106`	`*/`
`107`	`107`	`protected static function getKernelClass()`
`108`	`108`	`{`
`109`		`- if (isset($_SERVER['KERNEL_CLASS'])) {`
`110`		`- if (!class_exists($class = $_SERVER['KERNEL_CLASS'])) {`
	`109`	`+ if (isset($_SERVER['KERNEL_CLASS']) \|\| isset($_ENV['KERNEL_CLASS'])) {`
	`110`	`+ $class = isset($_SERVER['KERNEL_CLASS']) ? $_SERVER['KERNEL_CLASS'] : $_ENV['KERNEL_CLASS'];`
	`111`	`+ if (!class_exists($class)) {`
`111`	`112`	`throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the %s::createKernel() method.', $class, static::class));`
`112`	`113`	`}`
`113`	`114`