Skip to content

Commit 0ca2778

Browse files
terabytesoftwterabytesoftw
authored
Remove config yii-web, move aliases to app level (#61)
1 parent 20caf08 commit 0ca2778

7 files changed

Lines changed: 27 additions & 86 deletions

File tree

‎config/packages/merge_plan.php‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
'yiisoft/request-model' => [
1818
'common.php',
1919
],
20+
'yiisoft/router-fastroute' => [
21+
'common.php',
22+
],
2023
'yiisoft/yii-cycle' => [
2124
'common.php',
2225
],
@@ -35,16 +38,13 @@
3538
'yiisoft/yii-filesystem' => [
3639
'common.php',
3740
],
38-
'yiisoft/aliases' => [
39-
'common.php',
40-
],
4141
'yiisoft/validator' => [
4242
'common.php',
4343
],
4444
'yiisoft/router' => [
4545
'common.php',
4646
],
47-
'yiisoft/router-fastroute' => [
47+
'yiisoft/aliases' => [
4848
'common.php',
4949
],
5050
'yiisoft/view' => [
@@ -123,6 +123,9 @@
123123
'yiisoft/log-target-file' => [
124124
'params.php',
125125
],
126+
'yiisoft/router-fastroute' => [
127+
'params.php',
128+
],
126129
'yiisoft/user' => [
127130
'params.php',
128131
],
@@ -141,19 +144,13 @@
141144
'yiisoft/profiler' => [
142145
'params.php',
143146
],
144-
'yiisoft/yii-web' => [
145-
'params.php',
146-
],
147147
'yiisoft/yii-view' => [
148148
'params.php',
149149
],
150-
'yiisoft/aliases' => [
151-
'params.php',
152-
],
153-
'yiisoft/router-fastroute' => [
150+
'yiisoft/session' => [
154151
'params.php',
155152
],
156-
'yiisoft/session' => [
153+
'yiisoft/aliases' => [
157154
'params.php',
158155
],
159156
'yiisoft/view' => [
@@ -201,9 +198,6 @@
201198
'yiisoft/yii-debug' => [
202199
'tests.php',
203200
],
204-
'yiisoft/yii-web' => [
205-
'$web',
206-
],
207201
],
208202
'web' => [
209203
'/' => [
@@ -213,6 +207,9 @@
213207
'yiisoft/error-handler' => [
214208
'web.php',
215209
],
210+
'yiisoft/router-fastroute' => [
211+
'web.php',
212+
],
216213
'yiisoft/user' => [
217214
'web.php',
218215
],
@@ -225,9 +222,6 @@
225222
'yiisoft/assets' => [
226223
'web.php',
227224
],
228-
'yiisoft/yii-web' => [
229-
'web.php',
230-
],
231225
'yiisoft/yii-view' => [
232226
'web.php',
233227
],
@@ -237,9 +231,6 @@
237231
'yiisoft/middleware-dispatcher' => [
238232
'web.php',
239233
],
240-
'yiisoft/router-fastroute' => [
241-
'web.php',
242-
],
243234
'yiisoft/session' => [
244235
'web.php',
245236
],

‎config/packages/yiisoft/aliases/params.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44

55
return [
66
'yiisoft/aliases' => [
7-
'aliases' => [
8-
'@root' => dirname(__DIR__, 4),
9-
'@resources' => '@root/resources',
10-
'@src' => '@root/src',
11-
'@data' => '@root/data',
12-
'@tests' => '@root/tests',
13-
'@views' => '@root/views',
14-
'@assets' => '@public/assets',
15-
'@assetsUrl' => '@baseUrl/assets',
16-
],
7+
'aliases' => [],
178
],
189
];

‎config/packages/yiisoft/yii-web/dist/params.php‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎config/packages/yiisoft/yii-web/dist/web.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎config/packages/yiisoft/yii-web/params.php‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎config/packages/yiisoft/yii-web/web.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎config/params.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,18 @@
44

55
return [
66
'supportEmail' => 'support@example.com',
7+
8+
'yiisoft/aliases' => [
9+
'aliases' => [
10+
'@root' => dirname(__DIR__),
11+
'@assets' => '@public/assets',
12+
'@assetsUrl' => '@baseUrl/assets',
13+
'@data' => '@root/data',
14+
'@resources' => '@root/resources',
15+
'@runtime' => '@root/runrime',
16+
'@src' => '@root/src',
17+
'@tests' => '@root/tests',
18+
'@views' => '@root/views',
19+
],
20+
],
721
];

0 commit comments

Comments
 (0)