Skip to content

Y
yii2
Commit a25f8700 by Alexander Makarov
Options

renamed create -> webapp/create, specified global options

parent 63cb47e1
Showing with 80 additions and 7 deletions
framework/console/Application.php
...@@ -126,7 +126,7 @@ class Application extends \yii\base\Application ...@@ -126,7 +126,7 @@ class Application extends \yii\base\Application
'message' => 'yii\console\controllers\MessageController', 'message' => 'yii\console\controllers\MessageController',
'help' => 'yii\console\controllers\HelpController', 'help' => 'yii\console\controllers\HelpController',
'migrate' => 'yii\console\controllers\MigrateController', 'migrate' => 'yii\console\controllers\MigrateController',
'app' => 'yii\console\controllers\CreateController', 'webapp' => 'yii\console\controllers\WebappController',
'cache' => 'yii\console\controllers\CacheController', 'cache' => 'yii\console\controllers\CacheController',
); );
} }
......
framework/console/controllers/CreateController.php → framework/console/controllers/WebappController.php
<?php <?php
/** /**
* CreateController class file. * WebappController class file.
* *
* @link http://www.yiiframework.com/ * @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008 Yii Software LLC * @copyright Copyright &copy; 2008 Yii Software LLC
...@@ -20,14 +20,14 @@ use yii\base\Exception; ...@@ -20,14 +20,14 @@ use yii\base\Exception;
* @author Alexander Makarov <sam@rmcreative.ru> * @author Alexander Makarov <sam@rmcreative.ru>
* @since 2.0 * @since 2.0
*/ */
class CreateController extends Controller class WebappController extends Controller
{ {
private $_rootPath; private $_rootPath;
private $_config; private $_config;
/** /**
* @var string custom template path. If specified, templates will be * @var string custom template path. If specified, templates will be
* searched there additionally to `framework/console/create`. * searched there additionally to `framework/console/webapp`.
*/ */
public $templatesPath; public $templatesPath;
...@@ -46,6 +46,16 @@ class CreateController extends Controller ...@@ -46,6 +46,16 @@ class CreateController extends Controller
} }
} }
public function globalOptions()
{
return array('templatesPath', 'type');
}
public function actionIndex()
{
$this->forward('help/index', array('-args' => array('webapp/create')));
}
/** /**
* Generates Yii application at the path specified via appPath parameter. * Generates Yii application at the path specified via appPath parameter.
* *
...@@ -56,7 +66,7 @@ class CreateController extends Controller ...@@ -56,7 +66,7 @@ class CreateController extends Controller
* @throws \yii\base\Exception if path specified is not valid * @throws \yii\base\Exception if path specified is not valid
* @return integer the exit status * @return integer the exit status
*/ */
public function actionIndex($path) public function actionCreate($path)
{ {
$path = strtr($path, '/\\', DIRECTORY_SEPARATOR); $path = strtr($path, '/\\', DIRECTORY_SEPARATOR);
if(strpos($path, DIRECTORY_SEPARATOR) === false) { if(strpos($path, DIRECTORY_SEPARATOR) === false) {
...@@ -127,7 +137,7 @@ class CreateController extends Controller ...@@ -127,7 +137,7 @@ class CreateController extends Controller
*/ */
protected function getDefaultTemplatesPath() protected function getDefaultTemplatesPath()
{ {
return realpath(__DIR__.'/../create'); return realpath(__DIR__.'/../webapp');
} }
/** /**
......
framework/console/create/config.php → framework/console/webapp/config.php
<?php <?php
/** @var $controller \yii\console\controllers\CreateController */ /** @var $controller \yii\console\controllers\WebappController */
$controller = $this; $controller = $this;
return array( return array(
......
framework/console/webapp/default/index.php 0 → 100644
<?php
define('YII_DEBUG', true);
$yii = __DIR__.'/../framework/yii.php';
require $yii;
$config = require dirname(__DIR__).'/protected/config/main.php';
$basePath = dirname(__DIR__).'/protected';
$app = new \yii\web\Application('webapp', $basePath, $config);
$app->run();
\ No newline at end of file
framework/console/webapp/default/protected/config/main.php 0 → 100644
<?php
return array(
'name' => 'My Web Application',
'components' => array(
// uncomment the following to use a MySQL database
/*
'db' => array(
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=testdrive',
'username' => 'root',
'password' => '',
),
*/
),
);
\ No newline at end of file
framework/console/webapp/default/protected/controllers/SiteController.php 0 → 100644
<?php
use \yii\web\Controller;
/**
* SiteController
*/
class SiteController extends Controller
{
public function actionIndex()
{
echo $this->render('index', array(
'name' => 'Qiang',
));
}
}
\ No newline at end of file
framework/console/webapp/default/protected/views/layouts/main.php 0 → 100644
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title><?php echo $this->context->pageTitle?></title>
</head>
<body>
<h1><?php echo $this->context->pageTitle?></h1>
<div class="content">
<?php echo $content?>
</div>
<div class="footer">
<?php echo \Yii::powered()?>
</div>
</body>
</html>
\ No newline at end of file
framework/console/webapp/default/protected/views/site/index.php 0 → 100644
Hello, <?php echo $name?>!
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment