|
@@ -5,23 +5,23 @@ |
|
|
block discarded – undo |
|
5
|
5
|
use Itstructure\RbacModule\Module as RbacModule; |
|
6
|
6
|
use Itstructure\MFUploader\Module as MFUModule; |
|
7
|
7
|
|
|
8
|
|
-if (file_exists(__DIR__ . '/../config/environment.php')) { |
|
9
|
|
- require __DIR__ . '/../config/environment.php'; |
|
|
8
|
+if (file_exists(__DIR__.'/../config/environment.php')) { |
|
|
9
|
+ require __DIR__.'/../config/environment.php'; |
|
10
|
10
|
} |
|
11
|
11
|
|
|
12
|
12
|
defined('YII_DEBUG') or define('YII_DEBUG', false); |
|
13
|
13
|
defined('YII_ENV') or define('YII_ENV', 'prod'); |
|
14
|
14
|
|
|
15
|
|
-require __DIR__ . '/../vendor/autoload.php'; |
|
16
|
|
-require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php'; |
|
|
15
|
+require __DIR__.'/../vendor/autoload.php'; |
|
|
16
|
+require __DIR__.'/../vendor/yiisoft/yii2/Yii.php'; |
|
17
|
17
|
|
|
18
|
18
|
Yii::setAlias('@app', dirname(__DIR__)); |
|
19
|
19
|
Yii::setAlias('@admin', AdminModule::getBaseDir()); |
|
20
|
20
|
Yii::setAlias('@rbac', RbacModule::getBaseDir()); |
|
21
|
21
|
Yii::setAlias('@mfuploader', MFUModule::getBaseDir()); |
|
22
|
22
|
|
|
23
|
|
-$webConfig = require __DIR__ . '/../config/web.php'; |
|
24
|
|
-$adminConfig = require __DIR__ . '/../config/admin/admin.php'; |
|
|
23
|
+$webConfig = require __DIR__.'/../config/web.php'; |
|
|
24
|
+$adminConfig = require __DIR__.'/../config/admin/admin.php'; |
|
25
|
25
|
|
|
26
|
26
|
$config = ArrayHelper::merge($webConfig, $adminConfig); |
|
27
|
27
|
|
Please login to merge, or discard this patch.