bug #17278 [2.3][FrameworkBundle] Add case in Kernel directory guess for PHPUnit (tgalopin)

fabpot · fabpot · commit f9bf3f8d5a52 · 2016-01-07T14:27:03.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [2.3][FrameworkBundle] Add case in Kernel directory guess for PHPUnit | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The current automatic guess of the Kernel directory in the context of PHPUnit does work properly using the following commands: - `phpunit -c app` - `phpunit --configuration app` - `phpunit --configuration=app` But it fails with the synthax `phpunit -capp`, even if PHPUnit supports it. This PR fixes this. See #17272. Commits ------- 758fc1d [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -103,10 +103,14 @@ private static function getPhpUnitCliConfigArgument()
             if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
-            } elseif (strpos($testArg, '--configuration=') === 0) {
+            } elseif (0 === strpos($testArg, '--configuration=')) {
                 $argPath = substr($testArg, strlen('--configuration='));
                 $dir = realpath($argPath);
                 break;
+            } elseif (0 === strpos($testArg, '-c')) {
+                $argPath = substr($testArg, strlen('-c'));
+                $dir = realpath($argPath);
+                break;
             }
         }
 
