Refactor code.

cakephp · Apr 24, 2014 · 96bd2c6 · 96bd2c6
1 parent 7ab75a9
commit 96bd2c6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/src/Console/Command/CompletionShell.php b/src/Console/Command/CompletionShell.php
@@ -75,7 +75,7 @@ public function options() {
  *
  * @return void
  */
-	public function subCommands() {
+	public function subcommands() {
 		if (!$this->args) {
 			return $this->_output();
 		}
@@ -86,7 +86,7 @@ public function subCommands() {
 
 /**
  * Guess autocomplete from the whole argument string
- * 
+ *
  * @return void
  */
 	public function fuzzy() {
@@ -132,6 +132,8 @@ public function getOptionParser() {
 					]
 				]
 			]
+		])->addSubcommand('fuzzy', [
+			'help' => __d('cake_console', 'Guess autocomplete')
 		])->epilog([
 			__d('cake_console', 'This command is not intended to be called manually'),
 		]);

diff --git a/src/Console/ConsoleOptionParser.php b/src/Console/ConsoleOptionParser.php
@@ -465,6 +465,7 @@ public function subcommands() {
  */
 	public function parse($argv, $command = null) {
 		if (isset($this->_subcommands[$command]) && $this->_subcommands[$command]->parser()) {
+			array_shift($argv);
 			return $this->_subcommands[$command]->parser()->parse($argv);
 		}
 		$params = $args = [];

diff --git a/src/Console/Shell.php b/src/Console/Shell.php
@@ -344,6 +344,7 @@ public function runCommand($command, $argv) {
 		try {
 			list($this->params, $this->args) = $this->OptionParser->parse($argv, $command);
 		} catch (Error\ConsoleException $e) {
+			$this->err('<error>Error: ' . $e->getMessage() . '</error>');
 			$this->out($this->OptionParser->help($command));
 			return false;
 		}
@@ -364,27 +365,22 @@ public function runCommand($command, $argv) {
 		}
 
 		$subcommands = $this->OptionParser->subcommands();
-
-		// Method when there are no subcommands.
 		$isMethod = $this->hasMethod($command);
-		if ($isMethod && count($subcommands) === 0) {
-			array_shift($this->args);
-			$this->startup();
-			return call_user_func_array([$this, $command], $this->args);
-		}
 
-		// Method when there is a subcommand
-		if ($isMethod && isset($subcommands[$command])) {
+		if (
+			$isMethod &&
+			(count($subcommands) === 0 || isset($subcommands[$command]))
+		) {
 			array_shift($this->args);
 			$this->startup();
 			return call_user_func_array([$this, $command], $this->args);
 		}
 
-		// Exposed task.
 		if ($this->hasTask($command) && isset($subcommands[$command])) {
 			array_shift($argv);
 			$this->startup();
 			$command = Inflector::camelize($command);
+			// TODO this is suspicious.
 			return $this->{$command}->runCommand('execute', $argv);
 		}
 

diff --git a/tests/TestCase/Console/Command/CompletionShellTest.php b/tests/TestCase/Console/Command/CompletionShellTest.php
@@ -161,7 +161,7 @@ public function testOptions() {
  * @return void
  */
 	public function testSubCommandsCorePlugin() {
-		$this->Shell->runCommand('subCommands', array('subCommands', 'CORE.bake'));
+		$this->Shell->runCommand('subcommands', array('subcommands', 'CORE.bake'));
 		$output = $this->out->output;
 
 		$expected = "behavior component controller fixture helper model plugin project shell test view widget zerg\n";
@@ -174,7 +174,7 @@ public function testSubCommandsCorePlugin() {
  * @return void
  */
 	public function testSubCommandsAppPlugin() {
-		$this->Shell->runCommand('subCommands', array('subCommands', 'app.sample'));
+		$this->Shell->runCommand('subcommands', array('subcommands', 'app.sample'));
 		$output = $this->out->output;
 
 		$expected = '';
@@ -187,7 +187,7 @@ public function testSubCommandsAppPlugin() {
  * @return void
  */
 	public function testSubCommandsPlugin() {
-		$this->Shell->runCommand('subCommands', array('subCommands', 'TestPluginTwo.welcome'));
+		$this->Shell->runCommand('subcommands', array('subcommands', 'TestPluginTwo.welcome'));
 		$output = $this->out->output;
 
 		$expected = "say_hello\n";
@@ -200,7 +200,7 @@ public function testSubCommandsPlugin() {
  * @return void
  */
 	public function testSubCommandsNoArguments() {
-		$this->Shell->runCommand('subCommands', array());
+		$this->Shell->runCommand('subcommands', array());
 		$output = $this->out->output;
 
 		$expected = '';
@@ -213,7 +213,7 @@ public function testSubCommandsNoArguments() {
  * @return void
  */
 	public function testSubCommandsNonExistingCommand() {
-		$this->Shell->runCommand('subCommands', array('subCommands', 'foo'));
+		$this->Shell->runCommand('subcommands', array('subcommands', 'foo'));
 		$output = $this->out->output;
 
 		$expected = '';
@@ -226,7 +226,7 @@ public function testSubCommandsNonExistingCommand() {
  * @return void
  */
 	public function testSubCommands() {
-		$this->Shell->runCommand('subCommands', array('subCommands', 'bake'));
+		$this->Shell->runCommand('subcommands', array('subcommands', 'bake'));
 		$output = $this->out->output;
 
 		$expected = "behavior component controller fixture helper model plugin project shell test view widget zerg\n";