Skip to content

Y
yii2
Commit 53f43ddd by Simone
Options

Merge pull request #3 from yiisoft/master

Merge from yiisoft/yii
parents 6a3e9e15 d2f35f20
Showing with 5 additions and 87 deletions
app/index.php → apps/bootstrap/index.php
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
require(__DIR__ . '/../framework/yii.php'); require(__DIR__ . '/../../framework/yii.php');
$config = require(__DIR__ . '/protected/config/main.php'); $config = require(__DIR__ . '/protected/config/main.php');
$application = new yii\web\Application($config); $application = new yii\web\Application($config);
......
docs/guide/bootstrap.md
...@@ -7,7 +7,7 @@ If you have installed Yii under a Web-accessible folder, you should be able to ...@@ -7,7 +7,7 @@ If you have installed Yii under a Web-accessible folder, you should be able to
access this application through the following URL: access this application through the following URL:
~~~ ~~~
http://localhost/yii/app/index.php http://localhost/yii/apps/bootstrap/index.php
~~~ ~~~
......
framework/console/webapp/config.php deleted 100644 → 0
<?php
/** @var $controller \yii\console\controllers\AppController */
$controller = $this;
return array(
'default' => array(
'index.php' => array(
'handler' => function($source) use ($controller) {
return $controller->replaceRelativePath($source, realpath(YII_PATH.'/yii.php'), 'yii');
},
'permissions' => 0777,
),
'protected/runtime' => array(
'permissions' => 0755,
),
),
);
framework/console/webapp/default/index.php deleted 100644 → 0
<?php
define('YII_DEBUG', true);
require __DIR__.'/../framework/yii.php';
$config = require dirname(__DIR__).'/protected/config/main.php';
$config['basePath'] = dirname(__DIR__).'/protected';
$app = new \yii\web\Application($config);
$app->run();
framework/console/webapp/default/protected/config/main.php deleted 100644 → 0
<?php
return array(
'id' => 'webapp',
'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' => '',
),
*/
'cache' => array(
'class' => 'yii\caching\DummyCache',
),
),
);
framework/console/webapp/default/protected/controllers/SiteController.php deleted 100644 → 0
<?php
use \yii\web\Controller;
/**
* SiteController
*/
class SiteController extends Controller
{
public function actionIndex()
{
echo $this->render('index', array(
'name' => 'Qiang',
));
}
}
framework/console/webapp/default/protected/views/layouts/main.php deleted 100644 → 0
<?php use yii\helpers\Html as Html; ?>
<!doctype html>
<html lang="<?php \Yii::$app->language?>">
<head>
<meta charset="utf-8" />
<title><?php echo Html::encode($this->title)?></title>
</head>
<body>
<h1><?php echo Html::encode($this->title)?></h1>
<div class="content">
<?php echo $content?>
</div>
<div class="footer">
<?php echo \Yii::powered()?>
</div>
</body>
</html>
framework/web/AccessRule.php
...@@ -9,9 +9,6 @@ namespace yii\web; ...@@ -9,9 +9,6 @@ namespace yii\web;
use yii\base\Component; use yii\base\Component;
use yii\base\Action; use yii\base\Action;
use yii\base\Controller;
use yii\web\User;
use yii\web\Request;
/** /**
* *
......
framework/web/User.php
...@@ -461,7 +461,7 @@ class User extends Component ...@@ -461,7 +461,7 @@ class User extends Component
if ($auth !== null) { if ($auth !== null) {
return $auth->checkAccess($this->getId(), $operation, $params); return $auth->checkAccess($this->getId(), $operation, $params);
} else { } else {
return true; return false;
} }
} }
} }
readme.md
...@@ -13,7 +13,8 @@ without prior notices. **Yii 2.0 is not ready for production use yet.** ...@@ -13,7 +13,8 @@ without prior notices. **Yii 2.0 is not ready for production use yet.**
DIRECTORY STRUCTURE DIRECTORY STRUCTURE
------------------- -------------------
app/ a ready-to-use application built on Yii 2 apps/ ready-to-use Web apps built on Yii 2
bootstrap/ a simple app supporting user login and contact page
build/ internally used build tools build/ internally used build tools
docs/ documentation docs/ documentation
framework/ framework source files framework/ framework source files
......
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