[FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)

fabpot · fabpot · commit 375ded4227f5 · 2013-04-05T08:39:48.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -82,19 +82,19 @@ protected static function getPhpUnitXmlDir()
     }
 
     /**
-     * Finds the value of configuration flag from cli
+     * 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
+     * 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()
     {
         $dir = null;
         $reversedArgs = array_reverse($_SERVER['argv']);
         foreach ($reversedArgs as $argIndex => $testArg) {
-            if ($testArg === '-c' || $testArg === '--configuration') {
+            if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
             } elseif (strpos($testArg, '--configuration=') === 0) {

Original file line number	Diff line number	Diff line change
`@@ -82,19 +82,19 @@ protected static function getPhpUnitXmlDir()`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`
`85`		`- * Finds the value of configuration flag from cli`
	`85`	`+ * Finds the value of the CLI configuration option.`
`86`	`86`	`*`
`87`	`87`	`* PHPUnit will use the last configuration argument on the command line, so this only returns`
`88`		`- * the last configuration argument`
	`88`	`+ * the last configuration argument.`
`89`	`89`	`*`
`90`		`- * @return string The value of the phpunit cli configuration option`
	`90`	`+ * @return string The value of the PHPUnit cli configuration option`
`91`	`91`	`*/`
`92`	`92`	`private static function getPhpUnitCliConfigArgument()`
`93`	`93`	`{`
`94`	`94`	`$dir = null;`
`95`	`95`	`$reversedArgs = array_reverse($_SERVER['argv']);`
`96`	`96`	`foreach ($reversedArgs as $argIndex => $testArg) {`
`97`		`- if ($testArg === '-c' \|\| $testArg === '--configuration') {`
	`97`	`+ if (preg_match('/^-[^ \-]*c$/', $testArg) \|\| $testArg === '--configuration') {`
`98`	`98`	`$dir = realpath($reversedArgs[$argIndex - 1]);`
`99`	`99`	`break;`
`100`	`100`	`} elseif (strpos($testArg, '--configuration=') === 0) {`