Consider KERNEL_DIR setting as relative to the PhpUnit XML file if it does not point to a directory (relative to the current cwd)

mpdude · mpdude · commit 05dc0e17b254 · 2013-11-24T23:56:46.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -124,7 +124,15 @@ private static function getPhpUnitCliConfigArgument()
      */
     protected static function getKernelClass()
     {
-        $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir();
+        $dir = $phpUnitDir = static::getPhpUnitXmlDir();
+
+        if (isset($_SERVER['KERNEL_DIR'])) {
+            $dir = $_SERVER['KERNEL_DIR'];
+
+            if (!is_dir($dir) && is_dir("$phpUnitDir/$dir")) {
+                $dir = "$phpUnitDir/$dir";
+            }
+        }
 
         $finder = new Finder();
         $finder->name('*Kernel.php')->depth(0)->in($dir);
