From 2172151c98a904bd72b03d83fa4aafc404f0d7dd Mon Sep 17 00:00:00 2001 From: Marcus Freire Date: Mon, 15 Feb 2016 00:36:44 -0300 Subject: [PATCH] fix - config names fix - require undefined config --- api/config/main.php | 3 +-- api/web/index.php | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api/config/main.php b/api/config/main.php index da34ec6..b60c294 100644 --- a/api/config/main.php +++ b/api/config/main.php @@ -3,8 +3,7 @@ $params = array_merge( require(__DIR__ . '/../../common/config/params.php'), require(__DIR__ . '/../../common/config/params-local.php'), - require(__DIR__ . '/params.php'), - require(__DIR__ . '/params-local.php') + require(__DIR__ . '/params.php') ); return [ diff --git a/api/web/index.php b/api/web/index.php index b4748ba..f75a2b0 100644 --- a/api/web/index.php +++ b/api/web/index.php @@ -4,13 +4,12 @@ require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); -require(__DIR__ . '/../../common/config/aliases.php'); +require(__DIR__ . '/../../common/config/bootstrap.php'); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../../common/config/main.php'), require(__DIR__ . '/../../common/config/main-local.php'), - require(__DIR__ . '/../config/main.php'), - require(__DIR__ . '/../config/main-local.php') + require(__DIR__ . '/../config/main.php') ); $application = new yii\web\Application($config);