Commit
dfe77a0e4fbd4d5e0e1879010c58d1904f328438
Authored by
Yarik
Merge remote-tracking branch 'origin/master'
| |
1
| +<?php |
| |
2
| +return yii\helpers\ArrayHelper::merge( |
| |
3
| + require(__DIR__ . '/../../common/config/test-local.php'), |
| |
4
| + require(__DIR__ . '/main.php'), |
| |
5
| + require(__DIR__ . '/main-local.php'), |
| |
6
| + require(__DIR__ . '/test.php'), |
| |
7
| + [ |
| |
8
| + ] |
| |
9
| +); |
| |
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
| +); |
| |
1
| +<?php |
| |
2
| +return yii\helpers\ArrayHelper::merge( |
| |
3
| + require(__DIR__ . '/../../common/config/test-local.php'), |
| |
4
| + require(__DIR__ . '/main.php'), |
| |
5
| + require(__DIR__ . '/main-local.php'), |
| |
6
| + require(__DIR__ . '/test.php'), |
| |
7
| + [ |
| |
8
| + ] |
| |
9
| +); |