console app cleanup.

framework/console/Controller.php

@@ -32,6 +32,12 @@ use yii\base\InvalidRouteException;
 class Controller extends \yii\base\Controller
 {
 	/**
+	 * @var boolean whether the call of [[confirm()]] requires a user input.
+	 * If false, [[confirm()]] will always return true no matter what user enters or not.
+	 */
+	public $interactive = true;
+
+	/**
 	 * Runs an action with the specified action ID and parameters.
 	 * If the action ID is empty, the method will use [[defaultAction]].
 	 * @param string $id the ID of the action to be executed.
@@ -80,43 +86,6 @@ class Controller extends \yii\base\Controller
 	}
 
 	/**
-	 * Reads input via the readline PHP extension if that's available, or fgets() if readline is not installed.
-	 *
-	 * @param string $message to echo out before waiting for user input
-	 * @param string $default the default string to be returned when user does not write anything.
-	 * Defaults to null, means that default string is disabled.
-	 * @return mixed line read as a string, or false if input has been closed
-	 */
-	public function prompt($message, $default = null)
-	{
-		if($default !== null) {
-			$message .= " [$default] ";
-		}
-		else {
-			$message .= ' ';
-		}
-
-		if(extension_loaded('readline')) {
-			$input = readline($message);
-			if($input !== false) {
-				readline_add_history($input);
-			}
-		}
-		else {
-			echo $message;
-			$input = fgets(STDIN);
-		}
-
-		if($input === false) {
-			return false;
-		}
-		else {
-			$input = trim($input);
-			return ($input === '' && $default !== null) ? $default : $input;
-		}
-	}
-
-	/**
 	 * Asks user to confirm by typing y or n.
 	 *
 	 * @param string $message to echo out before waiting for user input
@@ -125,9 +94,23 @@ class Controller extends \yii\base\Controller
 	 */
 	public function confirm($message, $default = false)
 	{
+		if ($this->interactive) {
 			echo $message . ' (yes|no) [' . ($default ? 'yes' : 'no') . ']:';
-
 			$input = trim(fgets(STDIN));
 			return empty($input) ? $default : !strncasecmp($input, 'y', 1);
+		} else {
+			return true;
+		}
+	}
+
+	public function error($message)
+	{
+		echo "\nError: $message\n";
+		Yii::$application->end(1);
+	}
+
+	public function globalOptions()
+	{
+		return array();
 	}
 }
\ No newline at end of file

framework/console/controllers/ShellController.php

-<?php
-/**
- * ShellController class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use yii\console\Controller;
-
-/**
- * This command executes the specified Web application and provides a shell for interaction.
- *
- * @property string $help The help information for the shell command.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ShellController extends Controller
-{
-	/**
-	 * @return string the help information for the shell command
-	 */
-	public function getHelp()
-	{
-		return <<<EOD
-USAGE
-  yiic shell [entry-script | config-file]
-
-DESCRIPTION
-  This command allows you to interact with a Web application
-  on the command line. It also provides tools to automatically
-  generate new controllers, views and data models.
-
-  It is recommended that you execute this command under
-  the directory that contains the entry script file of
-  the Web application.
-
-PARAMETERS
- * entry-script | config-file: optional, the path to
-   the entry script file or the configuration file for
-   the Web application. If not given, it is assumed to be
-   the 'index.php' file under the current directory.
-
-EOD;
-	}
-
-	/**
-	 * Execute the action.
-	 * @param array $args command line parameters specific for this command
-	 */
-	public function run($args)
-	{
-		if(!isset($args[0]))
-			$args[0]='index.php';
-		$entryScript=isset($args[0]) ? $args[0] : 'index.php';
-		if(($entryScript=realpath($args[0]))===false || !is_file($entryScript))
-			$this->usageError("{$args[0]} does not exist or is not an entry script file.");
-
-		// fake the web server setting
-		$cwd=getcwd();
-		chdir(dirname($entryScript));
-		$_SERVER['SCRIPT_NAME']='/'.basename($entryScript);
-		$_SERVER['REQUEST_URI']=$_SERVER['SCRIPT_NAME'];
-		$_SERVER['SCRIPT_FILENAME']=$entryScript;
-		$_SERVER['HTTP_HOST']='localhost';
-		$_SERVER['SERVER_NAME']='localhost';
-		$_SERVER['SERVER_PORT']=80;
-
-		// reset context to run the web application
-		restore_error_handler();
-		restore_exception_handler();
-		Yii::setApplication(null);
-		Yii::setPathOfAlias('application',null);
-
-		ob_start();
-		$config=require($entryScript);
-		ob_end_clean();
-
-		// oops, the entry script turns out to be a config file
-		if(is_array($config))
-		{
-			chdir($cwd);
-			$_SERVER['SCRIPT_NAME']='/index.php';
-			$_SERVER['REQUEST_URI']=$_SERVER['SCRIPT_NAME'];
-			$_SERVER['SCRIPT_FILENAME']=$cwd.DIRECTORY_SEPARATOR.'index.php';
-			Yii::createWebApplication($config);
-		}
-
-		restore_error_handler();
-		restore_exception_handler();
-
-		$yiiVersion=Yii::getVersion();
-		echo <<<EOD
-Yii Interactive Tool v1.1 (based on Yii v{$yiiVersion})
-Please type 'help' for help. Type 'exit' to quit.
-EOD;
-		$this->runShell();
-	}
-
-	protected function runShell()
-	{
-		// disable E_NOTICE so that the shell is more friendly
-		error_reporting(E_ALL ^ E_NOTICE);
-
-		$_runner_=new CConsoleCommandRunner;
-		$_runner_->addCommands(dirname(__FILE__).'/shell');
-		$_runner_->addCommands(Yii::getPathOfAlias('application.commands.shell'));
-		if(($_path_=@getenv('YIIC_SHELL_COMMAND_PATH'))!==false)
-			$_runner_->addCommands($_path_);
-		$_commands_=$_runner_->commands;
-		$log=\Yii::$application->log;
-
-		while(($_line_=$this->prompt("\n>>"))!==false)
-		{
-			$_line_=trim($_line_);
-			if($_line_==='exit')
-				return;
-			try
-			{
-				$_args_=preg_split('/[\s,]+/',rtrim($_line_,';'),-1,PREG_SPLIT_NO_EMPTY);
-				if(isset($_args_[0]) && isset($_commands_[$_args_[0]]))
-				{
-					$_command_=$_runner_->createCommand($_args_[0]);
-					array_shift($_args_);
-					$_command_->init();
-					$_command_->run($_args_);
-				}
-				else
-					echo eval($_line_.';');
-			}
-			catch(Exception $e)
-			{
-				if($e instanceof ShellException)
-					echo $e->getMessage();
-				else
-					echo $e;
-			}
-		}
-	}
-}
-
-class ShellException extends CException
-{
-}
\ No newline at end of file