Commit 58c40818 by Carsten Brandt

Merge pull request #1761 from lucianobaraglia/master

Basic app: DB configuration in separated file
parents 0c288358 13d6c1fd
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
Yii::setAlias('@tests', dirname(__DIR__) . '/tests'); Yii::setAlias('@tests', dirname(__DIR__) . '/tests');
$params = require(__DIR__ . '/params.php'); $params = require(__DIR__ . '/params.php');
$db = require(__DIR__ . '/db.php');
return [ return [
'id' => 'basic-console', 'id' => 'basic-console',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
...@@ -22,13 +24,7 @@ return [ ...@@ -22,13 +24,7 @@ return [
], ],
], ],
], ],
'db' => [ 'db' => $db,
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
],
'fixture' => [ 'fixture' => [
'class' => 'yii\test\DbFixtureManager', 'class' => 'yii\test\DbFixtureManager',
'basePath' => '@tests/unit/fixtures', 'basePath' => '@tests/unit/fixtures',
......
<?php
return [
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
];
<?php <?php
$params = require(__DIR__ . '/params.php'); $params = require(__DIR__ . '/params.php');
$db = require(__DIR__ . '/db.php');
$config = [ $config = [
'id' => 'basic', 'id' => 'basic',
...@@ -29,13 +30,7 @@ $config = [ ...@@ -29,13 +30,7 @@ $config = [
], ],
], ],
], ],
'db' => [ 'db' => $db,
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=yii2basic',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
],
], ],
'params' => $params, 'params' => $params,
]; ];
......
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