Throw exception if value is passed to VALUE_NONE input, long syntax

tiagojsag · tiagojsag · commit 32ea77ff9cc8 · 2013-06-04T23:56:57.000+02:00
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
@@ -175,6 +175,11 @@ public function provideInvalidInput()
                 new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
                 'The "-o" option does not exist.'
             ),
+            array(
+                array('cli.php', '--foo=bar'),
+                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+                'The "--foo" option does not accept a value.'
+            ),
             array(
                 array('cli.php', 'foo', 'bar'),
                 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`