Skip to content

Y
yii2
Commit 5391b209 by Yakir Sitbon
Options

Merge pull request #1 from yiisoft/master

Sync..
parents dfb38954 c3ba7f6b
Showing with 42 additions and 42 deletions
apps/basic/config/AppAsset.php
......@@ -17,13 +17,13 @@ class AppAsset extends AssetBundle
{
public $basePath = '@webroot';
public $baseUrl = '@web';
public $css = array(
public $css = [
'css/site.css',
);
public $js = array(
);
public $depends = array(
];
public $js = [
];
public $depends = [
'yii\web\YiiAsset',
'yii\bootstrap\BootstrapAsset',
);
];
}
apps/basic/config/console.php
<?php
$params = require(__DIR__ . '/params.php');
return array(
return [
'id' => 'bootstrap-console',
'basePath' => dirname(__DIR__),
'preload' => array('log'),
'controllerPath' => dirname(__DIR__) . '/commands',
'controllerNamespace' => 'app\commands',
'modules' => array(
),
'components' => array(
'cache' => array(
'modules' => [
],
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
),
'log' => array(
'targets' => array(
array(
],
'log' => [
'targets' => [
[
'class' => 'yii\log\FileTarget',
'levels' => array('error', 'warning'),
),
),
),
),
'levels' => ['error', 'warning'],
],
],
],
],
'params' => $params,
);
];
apps/basic/config/params.php
<?php
return array(
return [
'adminEmail' => 'admin@example.com',
);
];
apps/basic/config/web.php
<?php
$params = require(__DIR__ . '/params.php');
$config = array(
$config = [
'id' => 'bootstrap',
'basePath' => dirname(__DIR__),
'components' => array(
'request' => array(
'components' => [
'request' => [
'enableCsrfValidation' => true,
),
'cache' => array(
],
'cache' => [
'class' => 'yii\caching\FileCache',
),
'user' => array(
],
'user' => [
'identityClass' => 'app\models\User',
),
'errorHandler' => array(
],
'errorHandler' => [
'errorAction' => 'site/error',
),
'log' => array(
],
'log' => [
'traceLevel' => YII_DEBUG ? 3 : 0,
'targets' => array(
array(
'targets' => [
[
'class' => 'yii\log\FileTarget',
'levels' => array('error', 'warning'),
),
),
),
),
'levels' => ['error', 'warning'],
],
],
],
],
'params' => $params,
);
];
if (YII_ENV_DEV) {
$config['preload'][] = 'debug';
......
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