Fixing issue where choices would not be correctly validated.

cakephp · Oct 14, 2010 · 99407e7 · 99407e7
1 parent 6774e40
commit 99407e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cake/console/console_option_parser.php b/cake/console/console_option_parser.php
@@ -573,8 +573,8 @@ protected function _parseArg($argument, $args) {
 		if (!isset($this->_args[$next])) {
 			throw new InvalidArgumentException(__('Too many arguments.'));
 		}
-		$index = max($next - 1, 0);
-		if ($this->_args[$index]->validChoice($argument)) {
+
+		if ($this->_args[$next]->validChoice($argument)) {
 			array_push($args, $argument);
 			return $args;
 		}

diff --git a/cake/tests/cases/console/console_option_parser.test.php b/cake/tests/cases/console/console_option_parser.test.php
@@ -282,13 +282,15 @@ function testPositionalArgNotEnough() {
  */
 	function testPositionalArgWithChoices() {
 		$parser = new ConsoleOptionParser();
-		$parser->addArgument('name', array('choices' => array('mark', 'jose')));
+		$parser->addArgument('name', array('choices' => array('mark', 'jose')))
+			->addArgument('alias', array('choices' => array('cowboy', 'samurai')))
+			->addArgument('weapon', array('choices' => array('gun', 'sword')));
 
-		$result = $parser->parse(array('mark'));
-		$expected = array('mark');
+		$result = $parser->parse(array('mark', 'samurai', 'sword'));
+		$expected = array('mark', 'samurai', 'sword');
 		$this->assertEquals($expected, $result[1], 'Got the correct value.');
 
-		$result = $parser->parse(array('jimmy'));
+		$result = $parser->parse(array('jose', 'coder'));
 	}
 
 /**