merged branch jakzal/console-single-dash-argument (PR #9014)

fabpot · fabpot · commit 7d7b583851e9 · 2013-09-13T07:13:53.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [Console] Fixed argument parsing when a single dash is passed. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8986 | License | MIT | Doc PR | Commits ------- 42019f6 [Console] Fixed argument parsing when a single dash is passed.
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -84,7 +84,7 @@ protected function parse()
                 $parseOptions = false;
             } elseif ($parseOptions && 0 === strpos($token, '--')) {
                 $this->parseLongOption($token);
-            } elseif ($parseOptions && '-' === $token[0]) {
+            } elseif ($parseOptions && '-' === $token[0] && '-' !== $token) {
                 $this->parseShortOption($token);
             } else {
                 $this->parseArgument($token);
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -254,4 +254,11 @@ public function provideGetParameterOptionValues()
             array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), '1'),
         );
     }
+
+    public function testParseSingleDashAsArgument()
+    {
+        $input = new ArgvInput(array('cli.php', '-'));
+        $input->bind(new InputDefinition(array(new InputArgument('file'))));
+        $this->assertEquals(array('file' => '-'), $input->getArguments(), '->parse() parses single dash as an argument');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -254,4 +254,11 @@ public function provideGetParameterOptionValues()`
`254`	`254`	`array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), '1'),`
`255`	`255`	`);`
`256`	`256`	`}`
	`257`	`+`
	`258`	`+ public function testParseSingleDashAsArgument()`
	`259`	`+ {`
	`260`	`+ $input = new ArgvInput(array('cli.php', '-'));`
	`261`	`+ $input->bind(new InputDefinition(array(new InputArgument('file'))));`
	`262`	`+ $this->assertEquals(array('file' => '-'), $input->getArguments(), '->parse() parses single dash as an argument');`
	`263`	`+ }`
`257`	`264`	`}`