php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 14:29:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
resurtm
2013-05-23 23:42:16 +06:00
parent d67416ab8b 8f0b64679b
commit ddfd169610
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/bootstrap/commands/HelloController.php
View File

@@ -24,6 +24,6 @@ class HelloController extends Controller
*/
public function actionIndex($message = 'hello world')
{
echo $message;
echo $message."\n";
}
}

44
extensions/composer/yii/composer/InstallHandler.php
View File

@@ -8,11 +8,18 @@
namespace yii\composer;
use Composer\Script\CommandEvent;
use yii\console;
defined('YII_DEBUG') or define('YII_DEBUG', true);
// fcgi doesn't have STDIN defined by default
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
/**
* InstallHandler is called by Composer after it installs/updates the current package.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @author Tobias Munk <schmunk@usrbin.de>
* @since 2.0
*/
class InstallHandler
@@ -50,4 +57,41 @@ class InstallHandler
}
}
}
/**
* Executes a yii command.
* @param CommandEvent $event
*/
public static function run($event)
{
$options = array_merge(array(
'run' => array(),
'config' => null,
), $event->getComposer()->getPackage()->getExtra());
// resolve and include config file
if (($options['config'] === null)) {
throw new console\Exception('Config file not specified in composer.json extra.config');
} else {
if (!is_file(getcwd() . '/' . $options['config'])) {
throw new console\Exception("Config file '{$options['config']}' specified in composer.json extra.config not found");
} else {
$config = require($options['config']);
}
}
// prepare console application
require(__DIR__ . '/../../../yii2/yii/Yii.php');
$application = new \yii\console\Application($config);
$request = $application->getRequest();
// run commands from extra.run
foreach ((array)$options['run'] as $rawCommand) {
$opts = str_getcsv($rawCommand, ' '); // see http://stackoverflow.com/a/6609509/291573
$request->setParams($opts);
list($command, $params) = $request->resolve();
echo "Running command: yiic {$rawCommand}\n";
$application->runAction($command, $params);
}
}
}

9
framework/yii/web/Application.php
View File

@@ -8,6 +8,8 @@
namespace yii\web;
use Yii;
use yii\base\HttpException;
use yii\base\InvalidRouteException;
/**
* Application is the base class for all application classes.
@@ -25,6 +27,7 @@ class Application extends \yii\base\Application
/**
* Processes the request.
* @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
* @throws HttpException if the request cannot be resolved.
*/
public function processRequest()
{
@@ -32,7 +35,11 @@ class Application extends \yii\base\Application
Yii::setAlias('@wwwroot', dirname($request->getScriptFile()));
Yii::setAlias('@www', $request->getBaseUrl());
list ($route, $params) = $request->resolve();
return $this->runAction($route, $params);
try {
return $this->runAction($route, $params);
} catch (InvalidRouteException $e) {
throw new HttpException(404, $e->getMessage(), $e->getCode(), $e);
}
}
private $_homeUrl;