fixed previous merge

fabpot · fabpot · commit e778cf19cd60 · 2014-03-03T19:01:36.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -31,8 +31,8 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase
     /**
      * Finds the directory where the phpunit.xml(.dist) is stored.
      *
-     * If you run tests with the PHPUnit CLI tool, everything will work as
-     * expected. If not, override this method in your test classes.
+     * If you run tests with the PHPUnit CLI tool, everything will work as expected.
+     * If not, override this method in your test classes.
      *
      * @return string The directory where phpunit.xml(.dist) is stored
      *
@@ -41,7 +41,7 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase
     protected static function getPhpUnitXmlDir()
     {
         if (!isset($_SERVER['argv']) || false === strpos($_SERVER['argv'][0], 'phpunit')) {
-            throw new \RuntimeException('You must override the WebTestCase::createKernel() method.');
+            throw new \RuntimeException('You must override the KernelTestCase::createKernel() method.');
         }
 
         $dir = static::getPhpUnitCliConfigArgument();
@@ -66,10 +66,10 @@ protected static function getPhpUnitXmlDir()
     /**
      * Finds the value of the CLI configuration option.
      *
-     * PHPUnit will use the last configuration argument on the command line, so
-     * this only returns the last configuration argument.
+     * PHPUnit will use the last configuration argument on the command line, so this only returns
+     * the last configuration argument.
      *
-     * @return string The value of the PHPUnit cli configuration option
+     * @return string The value of the PHPUnit CLI configuration option
      */
     private static function getPhpUnitCliConfigArgument()
     {
@@ -100,13 +100,21 @@ 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);
         $results = iterator_to_array($finder);
         if (!count($results)) {
-            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
+            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the KernelTestCase::createKernel() method.');
         }
 
         $file = current($results);
@@ -155,7 +163,7 @@ protected static function createKernel(array $options = array())
     }
 
     /**
-     * Shutdown the Kernel.
+     * Shuts the kernel down if it was used in the test.
      */
     protected static function ensureKernelShutdown()
     {

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase`
`31`	`31`	`/**`
`32`	`32`	`* Finds the directory where the phpunit.xml(.dist) is stored.`
`33`	`33`	`*`
`34`		`- * If you run tests with the PHPUnit CLI tool, everything will work as`
`35`		`- * expected. If not, override this method in your test classes.`
	`34`	`+ * If you run tests with the PHPUnit CLI tool, everything will work as expected.`
	`35`	`+ * If not, override this method in your test classes.`
`36`	`36`	`*`
`37`	`37`	`* @return string The directory where phpunit.xml(.dist) is stored`
`38`	`38`	`*`
`@@ -41,7 +41,7 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase`
`41`	`41`	`protected static function getPhpUnitXmlDir()`
`42`	`42`	`{`
`43`	`43`	`if (!isset($_SERVER['argv']) \|\| false === strpos($_SERVER['argv'][0], 'phpunit')) {`
`44`		`- throw new \RuntimeException('You must override the WebTestCase::createKernel() method.');`
	`44`	`+ throw new \RuntimeException('You must override the KernelTestCase::createKernel() method.');`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$dir = static::getPhpUnitCliConfigArgument();`
`@@ -66,10 +66,10 @@ protected static function getPhpUnitXmlDir()`
`66`	`66`	`/**`
`67`	`67`	`* Finds the value of the CLI configuration option.`
`68`	`68`	`*`
`69`		`- * PHPUnit will use the last configuration argument on the command line, so`
`70`		`- * this only returns the last configuration argument.`
	`69`	`+ * PHPUnit will use the last configuration argument on the command line, so this only returns`
	`70`	`+ * the last configuration argument.`
`71`	`71`	`*`
`72`		`- * @return string The value of the PHPUnit cli configuration option`
	`72`	`+ * @return string The value of the PHPUnit CLI configuration option`
`73`	`73`	`*/`
`74`	`74`	`private static function getPhpUnitCliConfigArgument()`
`75`	`75`	`{`
`@@ -100,13 +100,21 @@ private static function getPhpUnitCliConfigArgument()`
`100`	`100`	`*/`
`101`	`101`	`protected static function getKernelClass()`
`102`	`102`	`{`
`103`		`- $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir();`
	`103`	`+ $dir = $phpUnitDir = static::getPhpUnitXmlDir();`
	`104`	`+`
	`105`	`+ if (isset($_SERVER['KERNEL_DIR'])) {`
	`106`	`+ $dir = $_SERVER['KERNEL_DIR'];`
	`107`	`+`
	`108`	`+ if (!is_dir($dir) && is_dir("$phpUnitDir/$dir")) {`
	`109`	`+ $dir = "$phpUnitDir/$dir";`
	`110`	`+ }`
	`111`	`+ }`
`104`	`112`
`105`	`113`	`$finder = new Finder();`
`106`	`114`	`$finder->name('*Kernel.php')->depth(0)->in($dir);`
`107`	`115`	`$results = iterator_to_array($finder);`
`108`	`116`	`if (!count($results)) {`
`109`		`- throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');`
	`117`	`+ throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the KernelTestCase::createKernel() method.');`
`110`	`118`	`}`
`111`	`119`
`112`	`120`	`$file = current($results);`
`@@ -155,7 +163,7 @@ protected static function createKernel(array $options = array())`
`155`	`163`	`}`
`156`	`164`
`157`	`165`	`/**`
`158`		`- * Shutdown the Kernel.`
	`166`	`+ * Shuts the kernel down if it was used in the test.`
`159`	`167`	`*/`
`160`	`168`	`protected static function ensureKernelShutdown()`
`161`	`169`	`{`