Changing how arguments are shown in help output.

cakephp · Oct 14, 2010 · 037bc6c · 037bc6c
1 parent 3e1554f
commit 037bc6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cake/console/console_input_argument.php b/cake/console/console_input_argument.php
@@ -90,6 +90,7 @@ public function usage() {
 		if (!empty($this->_choices)) {
 			$name = implode('|', $this->_choices);
 		}
+		$name = '<' . $name . '>';
 		if (!$this->isRequired()) {
 			$name = '[' . $name . ']';
 		}

diff --git a/cake/tests/cases/console/console_option_parser.test.php b/cake/tests/cases/console/console_option_parser.test.php
@@ -407,7 +407,7 @@ function testHelpWithOptionsAndArguments() {
 		$result = $parser->help();
 		$expected = <<<TEXT
 <info>Usage:</info>
-cake mycommand [-h] [--test] model [other_longer]
+cake mycommand [-h] [--test] <model> [<other_longer>]
 
 <info>Options:</info>
 
@@ -455,7 +455,7 @@ function testHelpWithChoices() {
 		$result = $parser->help();
 		$expected = <<<TEXT
 <info>Usage:</info>
-cake mycommand [-h] [--test one|two] aco|aro [other_longer]
+cake mycommand [-h] [--test one|two] <aco|aro> [<other_longer>]
 
 <info>Options:</info>
 
@@ -488,7 +488,7 @@ function testHelpDescriptionAndEpilog() {
 Description text
 
 <info>Usage:</info>
-cake mycommand [-h] [--test] model
+cake mycommand [-h] [--test] <model>
 
 <info>Options:</info>