Moved config to root dir, removed empty console config

hiqdev · Mar 26, 2019 · 6a37533 · 6a37533
1 parent a147003
commit 6a37533
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -61,16 +61,15 @@
     },
     "extra": {
         "config-plugin": {
-            "defines": "src/config/defines.php",
-            "params": "src/config/params.php",
-            "common": "src/config/common.php",
+            "defines": "config/defines.php",
+            "params": "config/params.php",
+            "common": "config/common.php",
             "console": [
-                "$common",
-                "src/config/console.php"
+                "$common"
             ],
             "web": [
                 "$common",
-                "src/config/web.php"
+                "config/web.php"
             ],
             "hisite": "$web"
         }

diff --git a/src/config/common.php → config/common.php b/src/config/common.php → config/common.php
@@ -18,7 +18,7 @@
         '@vendor/bower' => '@vendor/bower-asset',
         '@vendor/npm' => '@vendor/npm-asset',
     ]),
-    'basePath' => dirname(__DIR__),
+    'basePath' => dirname(__DIR__) . '/src',
     'viewPath' => '@hisite/views',
     'vendorPath' => '@root/vendor',
     'runtimePath' => '@root/runtime',

diff --git a/src/config/defines.php → config/defines.php b/src/config/defines.php → config/defines.php
diff --git a/src/config/i18n.php → config/i18n.php b/src/config/i18n.php → config/i18n.php
@@ -10,8 +10,8 @@
 
 return [
     'languages' => ['ru'],
-    'sourcePath' => dirname(__DIR__),
-    'messagePath' => dirname(__DIR__) . '/messages',
+    'sourcePath' => dirname(__DIR__) . '/src',
+    'messagePath' => dirname(__DIR__) . '/src/messages',
     'sort' => true,
     'removeUnused' => true,
 ];
diff --git a/src/config/params.php → config/params.php b/src/config/params.php → config/params.php
diff --git a/src/config/web.php → config/web.php b/src/config/web.php → config/web.php
diff --git a/src/config/console.php b/src/config/console.php