Merge pull request #1761 from lucianobaraglia/master

Basic app: DB configuration in separated file
This commit is contained in:
Carsten Brandt 2014-01-03 14:49:27 -08:00
commit d35698afe6
3 changed files with 14 additions and 14 deletions

View File

@ -3,6 +3,8 @@
Yii::setAlias('@tests', dirname(__DIR__) . '/tests');
$params = require(__DIR__ . '/params.php');
$db = require(__DIR__ . '/db.php');
return [
'id' => 'basic-console',
'basePath' => dirname(__DIR__),
@ -22,13 +24,7 @@ return [
],
],
],
'db' => [
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
],
'db' => $db,
'fixture' => [
'class' => 'yii\test\DbFixtureManager',
'basePath' => '@tests/unit/fixtures',

9
config/db.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
];

View File

@ -1,6 +1,7 @@
<?php
$params = require(__DIR__ . '/params.php');
$db = require(__DIR__ . '/db.php');
$config = [
'id' => 'basic',
@ -29,13 +30,7 @@ $config = [
],
],
],
'db' => [
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
],
'db' => $db,
],
'params' => $params,
];