Commit dfe77a0e4fbd4d5e0e1879010c58d1904f328438
Merge remote-tracking branch 'origin/master'
Showing
5 changed files
with
31 additions
and
0 deletions
Show diff stats
1 | +<?php | |
2 | +return yii\helpers\ArrayHelper::merge( | |
3 | + require(__DIR__ . '/main.php'), | |
4 | + require(__DIR__ . '/main-local.php'), | |
5 | + require(__DIR__ . '/test.php'), | |
6 | + [ | |
7 | + 'components' => [ | |
8 | + 'db' => [ | |
9 | + 'dsn' => 'mysql:host=localhost;dbname=yii2advanced_test', | |
10 | + ] | |
11 | + ], | |
12 | + ] | |
13 | +); | ... | ... |