fix that argument with 0 as value will stop parsing args, tests added

cakephp · Jan 17, 2012 · 8281175 · 8281175
1 parent c81fe62
commit 8281175
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
@@ -467,7 +467,7 @@ public function parse($argv, $command = null) {
 		}
 		$params = $args = array();
 		$this->_tokens = $argv;
-		while ($token = array_shift($this->_tokens)) {
+		while (($token = array_shift($this->_tokens)) !== null) {
 			if (substr($token, 0, 2) == '--') {
 				$params = $this->_parseLongOption($token, $params);
 			} elseif (substr($token, 0, 1) == '-') {

diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -350,6 +350,19 @@ public function testParseArgumentTooMany() {
 		$result = $parser->parse(array('one', 'two', 'three'));
 	}
 
+/**
+ * test parsing arguments with 0 value.
+ *
+ * @return void
+ */
+	public function testParseArgumentZero() {
+		$parser = new ConsoleOptionParser('test', false);
+
+		$expected = array('one', 'two', 0, 'after', 'zero');
+		$result = $parser->parse($expected);
+		$this->assertEquals($expected, $result[1], 'Arguments are not as expected');
+	}
+
 /**
  * test that when there are not enough arguments an exception is raised
  *