Remove config yii-web, move aliases to app level (#61)

yiisoft · Apr 9, 2021 · 0ca2778 · 0ca2778
1 parent 20caf08
commit 0ca2778
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 86 deletions.
diff --git a/config/packages/merge_plan.php b/config/packages/merge_plan.php
@@ -17,6 +17,9 @@
         'yiisoft/request-model' => [
             'common.php',
         ],
+        'yiisoft/router-fastroute' => [
+            'common.php',
+        ],
         'yiisoft/yii-cycle' => [
             'common.php',
         ],
@@ -35,16 +38,13 @@
         'yiisoft/yii-filesystem' => [
             'common.php',
         ],
-        'yiisoft/aliases' => [
-            'common.php',
-        ],
         'yiisoft/validator' => [
             'common.php',
         ],
         'yiisoft/router' => [
             'common.php',
         ],
-        'yiisoft/router-fastroute' => [
+        'yiisoft/aliases' => [
             'common.php',
         ],
         'yiisoft/view' => [
@@ -123,6 +123,9 @@
         'yiisoft/log-target-file' => [
             'params.php',
         ],
+        'yiisoft/router-fastroute' => [
+            'params.php',
+        ],
         'yiisoft/user' => [
             'params.php',
         ],
@@ -141,19 +144,13 @@
         'yiisoft/profiler' => [
             'params.php',
         ],
-        'yiisoft/yii-web' => [
-            'params.php',
-        ],
         'yiisoft/yii-view' => [
             'params.php',
         ],
-        'yiisoft/aliases' => [
-            'params.php',
-        ],
-        'yiisoft/router-fastroute' => [
+        'yiisoft/session' => [
             'params.php',
         ],
-        'yiisoft/session' => [
+        'yiisoft/aliases' => [
             'params.php',
         ],
         'yiisoft/view' => [
@@ -201,9 +198,6 @@
         'yiisoft/yii-debug' => [
             'tests.php',
         ],
-        'yiisoft/yii-web' => [
-            '$web',
-        ],
     ],
     'web' => [
         '/' => [
@@ -213,6 +207,9 @@
         'yiisoft/error-handler' => [
             'web.php',
         ],
+        'yiisoft/router-fastroute' => [
+            'web.php',
+        ],
         'yiisoft/user' => [
             'web.php',
         ],
@@ -225,9 +222,6 @@
         'yiisoft/assets' => [
             'web.php',
         ],
-        'yiisoft/yii-web' => [
-            'web.php',
-        ],
         'yiisoft/yii-view' => [
             'web.php',
         ],
@@ -237,9 +231,6 @@
         'yiisoft/middleware-dispatcher' => [
             'web.php',
         ],
-        'yiisoft/router-fastroute' => [
-            'web.php',
-        ],
         'yiisoft/session' => [
             'web.php',
         ],

diff --git a/config/packages/yiisoft/aliases/params.php b/config/packages/yiisoft/aliases/params.php
@@ -4,15 +4,6 @@
 
 return [
     'yiisoft/aliases' => [
-        'aliases' => [
-            '@root' => dirname(__DIR__, 4),
-            '@resources' => '@root/resources',
-            '@src' => '@root/src',
-            '@data' => '@root/data',
-            '@tests' => '@root/tests',
-            '@views' => '@root/views',
-            '@assets' => '@public/assets',
-            '@assetsUrl' => '@baseUrl/assets',
-        ],
+        'aliases' => [],
     ],
 ];
diff --git a/config/packages/yiisoft/yii-web/dist/params.php b/config/packages/yiisoft/yii-web/dist/params.php
diff --git a/config/packages/yiisoft/yii-web/dist/web.php b/config/packages/yiisoft/yii-web/dist/web.php
diff --git a/config/packages/yiisoft/yii-web/params.php b/config/packages/yiisoft/yii-web/params.php
diff --git a/config/packages/yiisoft/yii-web/web.php b/config/packages/yiisoft/yii-web/web.php
diff --git a/config/params.php b/config/params.php
@@ -4,4 +4,18 @@
 
 return [
     'supportEmail' => 'support@example.com',
+
+    'yiisoft/aliases' => [
+        'aliases' => [
+            '@root' => dirname(__DIR__),
+            '@assets' => '@public/assets',
+            '@assetsUrl' => '@baseUrl/assets',
+            '@data' => '@root/data',
+            '@resources' => '@root/resources',
+            '@runtime' => '@root/runrime',
+            '@src' => '@root/src',
+            '@tests' => '@root/tests',
+            '@views' => '@root/views',
+        ],
+    ],
 ];