|
@@ -3,14 +3,14 @@ |
|
|
block discarded – undo |
|
3
|
3
|
defined('YII_DEBUG') or define('YII_DEBUG', true); |
|
4
|
4
|
defined('YII_ENV') or define('YII_ENV', 'dev'); |
|
5
|
5
|
|
|
6
|
|
-require(__DIR__ . '/../vendor/autoload.php'); |
|
7
|
|
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); |
|
|
6
|
+require(__DIR__.'/../vendor/autoload.php'); |
|
|
7
|
+require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php'); |
|
8
|
8
|
|
|
9
|
9
|
$config = yii\helpers\ArrayHelper::merge( |
|
10
|
|
- require(__DIR__ . '/../config/common.php'), |
|
11
|
|
- require(__DIR__ . '/../config/common.local.php'), |
|
12
|
|
- require(__DIR__ . '/../config/main.php'), |
|
13
|
|
- require(__DIR__ . '/../config/main.local.php') |
|
|
10
|
+ require(__DIR__.'/../config/common.php'), |
|
|
11
|
+ require(__DIR__.'/../config/common.local.php'), |
|
|
12
|
+ require(__DIR__.'/../config/main.php'), |
|
|
13
|
+ require(__DIR__.'/../config/main.local.php') |
|
14
|
14
|
); |
|
15
|
15
|
|
|
16
|
16
|
(new yii\web\Application($config))->run(); |
Please login to merge, or discard this patch.