Making shells return help if a ConsoleException is catched, like when…

… passing bad parameters
cakephp · Apr 22, 2011 · fa1d7da · fa1d7da
1 parent 495611b
commit fa1d7da
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
@@ -171,25 +171,30 @@ public function dispatch() {
 			$command = $this->args[0];
 		}
 
-		if ($Shell instanceof Shell) {
-			$Shell->initialize();
-			$Shell->loadTasks();
-			return $Shell->runCommand($command, $this->args);
-		}
-		$methods = array_diff(get_class_methods($Shell), get_class_methods('Shell'));
-		$added = in_array($command, $methods);
-		$private = $command[0] == '_' && method_exists($Shell, $command);
-
-		if (!$private) {
-			if ($added) {
-				$this->shiftArgs();
-				$Shell->startup();
-				return $Shell->{$command}();
+		try {
+			if ($Shell instanceof Shell) {
+				$Shell->initialize();
+				$Shell->loadTasks();
+				return $Shell->runCommand($command, $this->args);
 			}
-			if (method_exists($Shell, 'main')) {
-				$Shell->startup();
-				return $Shell->main();
+			$methods = array_diff(get_class_methods($Shell), get_class_methods('Shell'));
+			$added = in_array($command, $methods);
+			$private = $command[0] == '_' && method_exists($Shell, $command);
+
+			if (!$private) {
+				if ($added) {
+					$this->shiftArgs();
+					$Shell->startup();
+					return $Shell->{$command}();
+				}
+				if (method_exists($Shell, 'main')) {
+					$Shell->startup();
+					return $Shell->main();
+				}
 			}
+		} catch(ConsoleException $e) {
+			$this->help();
+			$this->_stop(1);
 		}
 		throw new MissingShellMethodException(array('shell' => $shell, 'method' => $arg));
 	}