Merge remote branch 'Herzult/fixArrayOption'

fabpot · fabpot · commit c6cfd3aeb100 · 2011-06-07T19:55:53.000+02:00
* Herzult/fixArrayOption:
  Simplify conditional block
  [Command] Fix array option parsing
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -229,7 +229,11 @@ private function addLongOption($name, $value)
             $value = $option->isValueOptional() ? $option->getDefault() : true;
         }
 
-        $this->options[$name] = $value;
+        if ($option->isArray()) {
+            $this->options[$name][] = $value;
+        } else {
+            $this->options[$name] = $value;
+        }
     }
 
     /**
diff --git a/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php b/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php
@@ -147,6 +147,10 @@ public function testParser()
         } catch (\RuntimeException $e) {
             $this->assertNotEquals('Too many arguments.', $e->getMessage(), '->parse() parses array arguments');
         }
+
+        $input = new ArgvInput(array('cli.php', '--name=foo', '--name=bar', '--name=baz'));
+        $input->bind(new InputDefinition(array(new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY))));
+        $this->assertEquals(array('name' => array('foo', 'bar', 'baz')), $input->getOptions());
     }
 
     public function testGetFirstArgument()

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,11 @@ private function addLongOption($name, $value)`
`229`	`229`	`$value = $option->isValueOptional() ? $option->getDefault() : true;`
`230`	`230`	`}`
`231`	`231`
`232`		`- $this->options[$name] = $value;`
	`232`	`+ if ($option->isArray()) {`
	`233`	`+ $this->options[$name][] = $value;`
	`234`	`+ } else {`
	`235`	`+ $this->options[$name] = $value;`
	`236`	`+ }`
`233`	`237`	`}`
`234`	`238`
`235`	`239`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,10 @@ public function testParser()`
`147`	`147`	`} catch (\RuntimeException $e) {`
`148`	`148`	`$this->assertNotEquals('Too many arguments.', $e->getMessage(), '->parse() parses array arguments');`
`149`	`149`	`}`
	`150`	`+`
	`151`	`+ $input = new ArgvInput(array('cli.php', '--name=foo', '--name=bar', '--name=baz'));`
	`152`	`+ $input->bind(new InputDefinition(array(new InputOption('name', null, InputOption::VALUE_OPTIONAL \| InputOption::VALUE_IS_ARRAY))));`
	`153`	`+ $this->assertEquals(array('name' => array('foo', 'bar', 'baz')), $input->getOptions());`
`150`	`154`	`}`
`151`	`155`
`152`	`156`	`public function testGetFirstArgument()`