merged branch tiagojsag/console_input_options_fix (PR #8199)

fabpot · fabpot · commit 9a76c4f01725 · 2013-06-13T09:48:34.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8199). Discussion ---------- [Console] Throw exception if value is passed to VALUE_NONE input optin, long syntax | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8135 | License | MIT Input options with InputOption::VALUE_NONE accept values in both short and long syntaxes: - When using the long syntax, no exception is thrown; - When using short, a "The %s option does not exist" exception is thrown. This PR only addresses the long syntax case. The short syntax case would require considerable refactoring of the parse code, which I believe should be discussed. I included a test that illustrates the above mentioned problem for the long syntax scenario. Commits ------- 32ea77f Throw exception if value is passed to VALUE_NONE input, long syntax
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -134,7 +134,7 @@ private function parseShortOptionSet($name)
 
                 break;
             } else {
-                $this->addLongOption($option->getName(), true);
+                $this->addLongOption($option->getName(), null);
             }
         }
     }
@@ -220,6 +220,10 @@ private function addLongOption($name, $value)
             $value = null;
         }
 
+        if (null !== $value && !$option->acceptValue()) {
+            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name, $value));
+        }
+
         if (null === $value && $option->acceptValue() && count($this->parsed)) {
             // if option accepts an optional or mandatory argument
             // let's see if there is one provided
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -105,6 +105,15 @@ public function testParser()
             $this->assertEquals('The "-o" option does not exist.', $e->getMessage(), '->parse() throws a \RuntimeException if a value is passed to an option which does not take one');
         }
 
+        try {
+            $input = new ArgvInput(array('cli.php', '--foo=bar'));
+            $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))));
+            $this->fail('->parse() throws a \RuntimeException if a value is passed to an option which does not take one');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e, '->parse() throws a \RuntimeException if a value is passed to an option which does not take one');
+            $this->assertEquals('The "--foo" option does not accept a value.', $e->getMessage(), '->parse() throws a \RuntimeException if a value is passed to an option which does not take one');
+        }
+
         try {
             $input = new ArgvInput(array('cli.php', 'foo', 'bar'));
             $input->bind(new InputDefinition());

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private function parseShortOptionSet($name)`
`134`	`134`
`135`	`135`	`break;`
`136`	`136`	`} else {`
`137`		`- $this->addLongOption($option->getName(), true);`
	`137`	`+ $this->addLongOption($option->getName(), null);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -220,6 +220,10 @@ private function addLongOption($name, $value)`
`220`	`220`	`$value = null;`
`221`	`221`	`}`
`222`	`222`
	`223`	`+ if (null !== $value && !$option->acceptValue()) {`
	`224`	`+ throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name, $value));`
	`225`	`+ }`
	`226`	`+`
`223`	`227`	`if (null === $value && $option->acceptValue() && count($this->parsed)) {`
`224`	`228`	`// if option accepts an optional or mandatory argument`
`225`	`229`	`// let's see if there is one provided`