Doing some fixes as the longest option + a short would cause incorrec…

…t formatting.
cakephp · Oct 14, 2010 · 09adc38 · 09adc38
1 parent 0eb6822
commit 09adc38
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/cake/console/console_option_parser.php b/cake/console/console_option_parser.php
@@ -278,7 +278,7 @@ public function help() {
 			foreach ($this->_options as $description) {
 				$max = (strlen($description['name']) > $max) ? strlen($description['name']) : $max;
 			}
-			$max += 3;
+			$max += 6;
 			$out[] = '<info>Options:</info>';
 			$out[] = '';
 			foreach ($this->_options as $description) {

diff --git a/cake/tests/cases/console/console_option_parser.test.php b/cake/tests/cases/console/console_option_parser.test.php
@@ -230,19 +230,21 @@ function testPositionalArgNotEnough() {
  */
 	function testGetHelpWithOptions() {
 		$parser = new ConsoleOptionParser('mycommand', false);
-		$parser->addOption('test', array('short' => 't', 'help' => 'A test option.'))
-			->addOption('connection', array('help' => 'The connection to use.', 'default' => 'default'));
+		$parser->addOption('test', array('help' => 'A test option.'))
+			->addOption('connection', array(
+				'short' => 'c', 'help' => 'The connection to use.', 'default' => 'default'
+			));
 
 		$result = $parser->help();
 		$expected = <<<TEXT
 <info>Usage:</info>
-cake mycommand [-h] [-t] [--connection default]
+cake mycommand [-h] [--test] [-c default]
 
 <info>Options:</info>
 
---help, -h    Display this help.
---test, -t    A test option.
---connection  The connection to use. <comment>(default: default)</comment>
+--help, -h       Display this help.
+--test           A test option.
+--connection, -c The connection to use. <comment>(default: default)</comment>
 TEXT;
 		$this->assertEquals($expected, $result, 'Help does not match');
 	}