Commit 27f18813 by Alexander Makarov

Merge pull request #6885 from wayhood/master

Move backend config to common config after.
parents 4dd4e593 e018525e
...@@ -6,10 +6,10 @@ $_SERVER['SCRIPT_NAME'] = YII_BACKEND_TEST_ENTRY_URL; ...@@ -6,10 +6,10 @@ $_SERVER['SCRIPT_NAME'] = YII_BACKEND_TEST_ENTRY_URL;
* Application configuration for backend functional tests * Application configuration for backend functional tests
*/ */
return yii\helpers\ArrayHelper::merge( return yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/backend/config/main.php'),
require(YII_APP_BASE_PATH . '/backend/config/main-local.php'),
require(YII_APP_BASE_PATH . '/common/config/main.php'), require(YII_APP_BASE_PATH . '/common/config/main.php'),
require(YII_APP_BASE_PATH . '/common/config/main-local.php'), require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
require(YII_APP_BASE_PATH . '/backend/config/main.php'),
require(YII_APP_BASE_PATH . '/backend/config/main-local.php'),
require(dirname(__DIR__) . '/config.php'), require(dirname(__DIR__) . '/config.php'),
require(dirname(__DIR__) . '/functional.php'), require(dirname(__DIR__) . '/functional.php'),
require(__DIR__ . '/config.php'), require(__DIR__ . '/config.php'),
......
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