From 0ca2778c3ed9795e6e7e394e9308d641445964e2 Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Fri, 9 Apr 2021 12:04:39 -0400
Subject: [PATCH] Remove config yii-web, move aliases to app level (#61)

---
 config/packages/merge_plan.php                | 33 +++++++------------
 config/packages/yiisoft/aliases/params.php    | 11 +------
 .../packages/yiisoft/yii-web/dist/params.php  | 18 ----------
 config/packages/yiisoft/yii-web/dist/web.php  | 10 ------
 config/packages/yiisoft/yii-web/params.php    | 17 ----------
 config/packages/yiisoft/yii-web/web.php       | 10 ------
 config/params.php                             | 14 ++++++++
 7 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 config/packages/yiisoft/yii-web/dist/params.php
 delete mode 100644 config/packages/yiisoft/yii-web/dist/web.php
 delete mode 100644 config/packages/yiisoft/yii-web/params.php
 delete mode 100644 config/packages/yiisoft/yii-web/web.php

diff --git a/config/packages/merge_plan.php b/config/packages/merge_plan.php
index 582a2c7..34dde41 100644
--- 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
index 084cb6d..10b0bf3 100644
--- 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
deleted file mode 100644
index 3574d50..0000000
--- a/config/packages/yiisoft/yii-web/dist/params.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'yiisoft/aliases' => [
-        'aliases' => [
-            // @root needs to be redefined in the application config
-            '@root' => dirname(__DIR__),
-            '@vendor' => '@root/vendor',
-            '@public' => '@root/public',
-            '@runtime' => '@root/runtime',
-            '@bower' => '@vendor/bower-asset',
-            '@npm' => '@root/node_modules',
-            '@baseUrl' => '/',
-        ],
-    ],
-];
diff --git a/config/packages/yiisoft/yii-web/dist/web.php b/config/packages/yiisoft/yii-web/dist/web.php
deleted file mode 100644
index 43548eb..0000000
--- a/config/packages/yiisoft/yii-web/dist/web.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @var array $params
- */
-
-return [
-];
diff --git a/config/packages/yiisoft/yii-web/params.php b/config/packages/yiisoft/yii-web/params.php
deleted file mode 100644
index b3b5315..0000000
--- a/config/packages/yiisoft/yii-web/params.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'yiisoft/aliases' => [
-        'aliases' => [
-            // @root needs to be redefined in the application config
-            '@vendor' => '@root/vendor',
-            '@public' => '@root/public',
-            '@runtime' => '@root/runtime',
-            '@bower' => '@vendor/bower-asset',
-            '@npm' => '@root/node_modules',
-            '@baseUrl' => '/',
-        ],
-    ],
-];
diff --git a/config/packages/yiisoft/yii-web/web.php b/config/packages/yiisoft/yii-web/web.php
deleted file mode 100644
index 43548eb..0000000
--- a/config/packages/yiisoft/yii-web/web.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @var array $params
- */
-
-return [
-];
diff --git a/config/params.php b/config/params.php
index d0203a4..2dc5ba4 100644
--- 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',
+        ],
+    ],
 ];