From 6f5867483284d585e4fadec58701bffe97e69b1e Mon Sep 17 00:00:00 2001
From: KUBO Atsuhiro <kubo@iteman.jp>
Date: Fri, 11 Jul 2014 13:00:56 +0900
Subject: [PATCH] [FrameworkBundle] changed KernelTestCase::getKernelClass() to
 check $_SERVER['KERNEL_DIR'] before invoking getPhpUnitXmlDir()

---
 .../Bundle/FrameworkBundle/Test/KernelTestCase.php    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 7ecf46b2ab..31efd3019e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -100,14 +100,17 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase
      */
     protected static function getKernelClass()
     {
-        $dir = $phpUnitDir = static::getPhpUnitXmlDir();
-
         if (isset($_SERVER['KERNEL_DIR'])) {
             $dir = $_SERVER['KERNEL_DIR'];
 
-            if (!is_dir($dir) && is_dir("$phpUnitDir/$dir")) {
-                $dir = "$phpUnitDir/$dir";
+            if (!is_dir($dir)) {
+                $phpUnitDir = static::getPhpUnitXmlDir();
+                if (is_dir("$phpUnitDir/$dir")) {
+                    $dir = "$phpUnitDir/$dir";
+                }
             }
+        } else {
+            $dir = static::getPhpUnitXmlDir();
         }
 
         $finder = new Finder();