Fixing incorrectly inflected shell names in help.

cakephp · Aug 6, 2011 · fb756c5 · fb756c5
1 parent 5f84b48
commit fb756c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
@@ -124,7 +124,7 @@ class ConsoleOptionParser {
  *  this to false will prevent the addition of `--verbose` & `--quiet` options.
  */
 	public function __construct($command = null, $defaultOptions = true) {
-		$this->_command = $command;
+		$this->command($command);
 
 		$this->addOption('help', array(
 			'short' => 'h',
@@ -206,7 +206,7 @@ public static function buildFromArray($spec) {
  */
 	public function command($text = null) {
 		if ($text !== null) {
-			$this->_command = $text;
+			$this->_command = Inflector::underscore($text);
 			return $this;
 		}
 		return $this->_command;

diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -496,6 +496,16 @@ public function testCreateFactory() {
 		$this->assertEquals('factory', $parser->command());
 	}
 
+/**
+ * test that command() inflects the command name.
+ *
+ * @return void
+ */
+	public function testCommandInflection() {
+		$parser = new ConsoleOptionParser('CommandLine');
+		$this->assertEquals('command_line', $parser->command());
+	}
+
 /**
  * test that parse() takes a subcommand argument, and that the subcommand parser
  * is used.
@@ -529,4 +539,4 @@ public function testParsingWithSubParser() {
 		$this->assertEquals($expected, $result, 'Sub parser did not parse request.');
 	}
 
-}
+}