fixes

taylorotwell · taylorotwell · commit fc2e168eadd3 · 2015-06-06T17:11:58.000-05:00
diff --git a/src/Illuminate/Console/Parser.php b/src/Illuminate/Console/Parser.php
@@ -20,7 +20,7 @@ public static function parse($expression)
             throw new InvalidArgumentException('Console command definition is empty.');
         }
 
-        preg_match('/.*?\s/', $expression, $matches);
+        preg_match('/[^\s]+/', $expression, $matches);
 
         if (isset($matches[0])) {
             $name = trim($matches[0]);
diff --git a/tests/Console/ConsoleParserTest.php b/tests/Console/ConsoleParserTest.php
@@ -6,6 +6,10 @@ class ConsoleParserTest extends PHPUnit_Framework_TestCase
 {
 	public function testBasicParameterParsing()
 	{
+		$results = Parser::parse('command:name');
+
+		$this->assertEquals('command:name', $results[0]);
+
 		$results = Parser::parse('command:name {argument} {--option}');
 
 		$this->assertEquals('command:name', $results[0]);
@@ -32,6 +36,18 @@ public function testBasicParameterParsing()
 		$this->assertTrue($results[2][0]->acceptValue());
 		$this->assertTrue($results[2][0]->isArray());
 
+		$results = Parser::parse('command:name {argument?* : The argument description.}	{--option=* : The option description.}');
+
+		$this->assertEquals('command:name', $results[0]);
+		$this->assertEquals('argument', $results[1][0]->getName());
+		$this->assertEquals('The argument description.', $results[1][0]->getDescription());
+		$this->assertTrue($results[1][0]->isArray());
+		$this->assertFalse($results[1][0]->isRequired());
+		$this->assertEquals('option', $results[2][0]->getName());
+		$this->assertEquals('The option description.', $results[2][0]->getDescription());
+		$this->assertTrue($results[2][0]->acceptValue());
+		$this->assertTrue($results[2][0]->isArray());
+
 		$results = Parser::parse('command:name
 			{argument?* : The argument description.}
 			{--option=* : The option description.}');

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static function parse($expression)`
`20`	`20`	`throw new InvalidArgumentException('Console command definition is empty.');`
`21`	`21`	`}`
`22`	`22`
`23`		`- preg_match('/.*?\s/', $expression, $matches);`
	`23`	`+ preg_match('/[^\s]+/', $expression, $matches);`
`24`	`24`
`25`	`25`	`if (isset($matches[0])) {`
`26`	`26`	`$name = trim($matches[0]);`