Skip to content

Commit dca071a

Browse files
samdarksamdark
authored
Update configs
1 parent 3df1427 commit dca071a

9 files changed

Lines changed: 202 additions & 167 deletions

File tree

‎config/packages/merge_plan.php‎

Lines changed: 137 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -4,158 +4,93 @@
44

55
// Do not edit. Content will be replaced.
66
return [
7-
'params' => [
8-
'/' => [
9-
'config/params.php',
10-
'?config/params-local.php',
11-
],
12-
'yiisoft/yii-debug' => [
13-
'config/params.php',
14-
],
15-
'yiisoft/assets' => [
16-
'config/params.php',
17-
],
18-
'yiisoft/profiler' => [
19-
'config/params.php',
20-
],
21-
'yiisoft/view' => [
22-
'config/params.php',
23-
],
24-
'yiisoft/yii-cycle' => [
25-
'config/params.php',
26-
],
27-
'yiisoft/yii-console' => [
28-
'config/params.php',
29-
],
30-
'yiisoft/user' => [
31-
'config/params.php',
32-
],
33-
'yiisoft/yii-web' => [
34-
'config/params.php',
35-
],
36-
'yiisoft/router-fastroute' => [
37-
'config/params.php',
38-
],
39-
'yiisoft/log-target-file' => [
40-
'config/params.php',
41-
],
42-
'yiisoft/cache-file' => [
43-
'config/params.php',
44-
],
45-
'yiisoft/yii-view' => [
46-
'config/params.php',
47-
],
48-
'yiisoft/session' => [
49-
'config/params.php',
50-
],
51-
'yiisoft/csrf' => [
52-
'config/params.php',
53-
],
54-
'yiisoft/aliases' => [
55-
'config/params.php',
56-
],
57-
],
587
'common' => [
598
'/' => [
609
'config/common/*.php',
6110
],
62-
'yiisoft/cache' => [
11+
'yiisoft/cache-file' => [
6312
'config/common.php',
6413
],
65-
'yiisoft/yii-debug' => [
14+
'yiisoft/log-target-file' => [
6615
'config/common.php',
6716
],
68-
'yiisoft/profiler' => [
17+
'yiisoft/request-model' => [
6918
'config/common.php',
7019
],
71-
'yiisoft/view' => [
20+
'yiisoft/yii-cycle' => [
7221
'config/common.php',
7322
],
74-
'yiisoft/yii-cycle' => [
23+
'yiisoft/yii-debug' => [
7524
'config/common.php',
7625
],
77-
'yiisoft/yii-event' => [
26+
'yiisoft/cache' => [
7827
'config/common.php',
7928
],
80-
'yiisoft/request-model' => [
29+
'yiisoft/yii-event' => [
8130
'config/common.php',
8231
],
83-
'yiisoft/router-fastroute' => [
32+
'yiisoft/profiler' => [
8433
'config/common.php',
8534
],
86-
'yiisoft/router' => [
35+
'yiisoft/yii-filesystem' => [
8736
'config/common.php',
8837
],
89-
'yiisoft/validator' => [
38+
'yiisoft/aliases' => [
9039
'config/common.php',
9140
],
92-
'yiisoft/log-target-file' => [
41+
'yiisoft/validator' => [
9342
'config/common.php',
9443
],
95-
'yiisoft/cache-file' => [
44+
'yiisoft/router' => [
9645
'config/common.php',
9746
],
98-
'yiisoft/yii-filesystem' => [
47+
'yiisoft/router-fastroute' => [
9948
'config/common.php',
10049
],
101-
'yiisoft/aliases' => [
50+
'yiisoft/view' => [
10251
'config/common.php',
10352
],
10453
],
105-
'web' => [
54+
'console' => [
10655
'/' => [
10756
'$common',
108-
'config/web/*.php',
57+
'config/console/*.php',
10958
],
110-
'yiisoft/data-response' => [
111-
'config/web.php',
59+
'yiisoft/yii-cycle' => [
60+
'config/console.php',
11261
],
11362
'yiisoft/yii-debug' => [
114-
'config/web.php',
115-
],
116-
'yiisoft/assets' => [
117-
'config/web.php',
63+
'config/console.php',
11864
],
119-
'yiisoft/view' => [
120-
'config/web.php',
65+
'yiisoft/yii-console' => [
66+
'config/console.php',
12167
],
12268
'yiisoft/yii-event' => [
123-
'config/web.php',
124-
],
125-
'yiisoft/user' => [
126-
'config/web.php',
127-
],
128-
'yiisoft/yii-web' => [
129-
'config/web.php',
130-
],
131-
'yiisoft/middleware-dispatcher' => [
132-
'config/web.php',
133-
],
134-
'yiisoft/router-fastroute' => [
135-
'config/web.php',
136-
],
137-
'yiisoft/yii-view' => [
138-
'config/web.php',
139-
],
140-
'yiisoft/session' => [
141-
'config/web.php',
69+
'config/console.php',
14270
],
143-
'yiisoft/error-handler' => [
144-
'config/web.php',
71+
],
72+
'events' => [
73+
'/' => [
74+
'config/events.php',
14575
],
146-
'yiisoft/csrf' => [
147-
'config/web.php',
76+
'yiisoft/yii-event' => [
77+
'config/events.php',
14878
],
14979
],
150-
'providers' => [
80+
'events-console' => [
15181
'/' => [
152-
'config/providers.php',
82+
'$events',
83+
'config/events-console.php',
84+
],
85+
'yiisoft/yii-cycle' => [
86+
'config/events-console.php',
15387
],
15488
'yiisoft/yii-debug' => [
155-
'config/providers.php',
89+
'config/events-console.php',
15690
],
157-
'yiisoft/yii-filesystem' => [
158-
'config/providers.php',
91+
'yiisoft/yii-event' => [
92+
'$events',
93+
'config/events-console.php',
15994
],
16095
],
16196
'events-web' => [
@@ -166,65 +101,77 @@
166101
'yiisoft/yii-debug' => [
167102
'config/events-web.php',
168103
],
169-
'yiisoft/profiler' => [
104+
'yiisoft/log' => [
170105
'config/events-web.php',
171106
],
172107
'yiisoft/yii-event' => [
173108
'$events',
174109
'config/events-web.php',
175110
],
176-
'yiisoft/log' => [
111+
'yiisoft/profiler' => [
177112
'config/events-web.php',
178113
],
179114
],
180-
'tests' => [
181-
'yiisoft/yii-debug' => [
182-
'config/tests.php',
115+
'params' => [
116+
'/' => [
117+
'config/params.php',
118+
'?config/params-local.php',
183119
],
184-
'yiisoft/yii-web' => [
185-
'$web',
120+
'yiisoft/cache-file' => [
121+
'config/params.php',
186122
],
187-
],
188-
'console' => [
189-
'/' => [
190-
'$common',
191-
'config/console/*.php',
123+
'yiisoft/log-target-file' => [
124+
'config/params.php',
192125
],
193-
'yiisoft/yii-debug' => [
194-
'config/console.php',
126+
'yiisoft/user' => [
127+
'config/params.php',
195128
],
196129
'yiisoft/yii-cycle' => [
197-
'config/console.php',
130+
'config/params.php',
131+
],
132+
'yiisoft/yii-debug' => [
133+
'config/params.php',
198134
],
199135
'yiisoft/yii-console' => [
200-
'config/console.php',
136+
'config/params.php',
201137
],
202-
'yiisoft/yii-event' => [
203-
'config/console.php',
138+
'yiisoft/assets' => [
139+
'config/params.php',
204140
],
205-
],
206-
'events' => [
207-
'/' => [
208-
'config/events.php',
141+
'yiisoft/profiler' => [
142+
'config/params.php',
209143
],
210-
'yiisoft/yii-event' => [
211-
'config/events.php',
144+
'yiisoft/yii-web' => [
145+
'config/params.php',
146+
],
147+
'yiisoft/yii-view' => [
148+
'config/params.php',
149+
],
150+
'yiisoft/aliases' => [
151+
'config/params.php',
152+
],
153+
'yiisoft/router-fastroute' => [
154+
'config/params.php',
155+
],
156+
'yiisoft/session' => [
157+
'config/params.php',
158+
],
159+
'yiisoft/view' => [
160+
'config/params.php',
161+
],
162+
'yiisoft/csrf' => [
163+
'config/params.php',
212164
],
213165
],
214-
'events-console' => [
166+
'providers' => [
215167
'/' => [
216-
'$events',
217-
'config/events-console.php',
168+
'config/providers.php',
218169
],
219170
'yiisoft/yii-debug' => [
220-
'config/events-console.php',
221-
],
222-
'yiisoft/yii-cycle' => [
223-
'config/events-console.php',
171+
'config/providers.php',
224172
],
225-
'yiisoft/yii-event' => [
226-
'$events',
227-
'config/events-console.php',
173+
'yiisoft/yii-filesystem' => [
174+
'config/providers.php',
228175
],
229176
],
230177
'providers-console' => [
@@ -250,4 +197,57 @@
250197
'config/routes.php',
251198
],
252199
],
200+
'tests' => [
201+
'yiisoft/yii-debug' => [
202+
'config/tests.php',
203+
],
204+
'yiisoft/yii-web' => [
205+
'$web',
206+
],
207+
],
208+
'web' => [
209+
'/' => [
210+
'$common',
211+
'config/web/*.php',
212+
],
213+
'yiisoft/error-handler' => [
214+
'config/web.php',
215+
],
216+
'yiisoft/user' => [
217+
'config/web.php',
218+
],
219+
'yiisoft/yii-debug' => [
220+
'config/web.php',
221+
],
222+
'yiisoft/yii-event' => [
223+
'config/web.php',
224+
],
225+
'yiisoft/assets' => [
226+
'config/web.php',
227+
],
228+
'yiisoft/yii-web' => [
229+
'config/web.php',
230+
],
231+
'yiisoft/yii-view' => [
232+
'config/web.php',
233+
],
234+
'yiisoft/data-response' => [
235+
'config/web.php',
236+
],
237+
'yiisoft/middleware-dispatcher' => [
238+
'config/web.php',
239+
],
240+
'yiisoft/router-fastroute' => [
241+
'config/web.php',
242+
],
243+
'yiisoft/session' => [
244+
'config/web.php',
245+
],
246+
'yiisoft/view' => [
247+
'config/web.php',
248+
],
249+
'yiisoft/csrf' => [
250+
'config/web.php',
251+
],
252+
],
253253
];

‎config/packages/yiisoft/assets/config/dist/web.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
AssetManager::class => [
3636
'__class' => AssetManager::class,
3737
'setConverter()' => [Reference::to(AssetConverterInterface::class)],
38-
'setPublisher()' => [Reference::to(AssetPublisherInterface::class)],
3938
'setBundles()' => [$params['yiisoft/assets']['assetManager']['bundles']],
4039
'register()' => [$params['yiisoft/assets']['assetManager']['register']],
4140
],

‎config/packages/yiisoft/assets/config/web.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
AssetManager::class => [
3636
'__class' => AssetManager::class,
3737
'setConverter()' => [Reference::to(AssetConverterInterface::class)],
38-
'setPublisher()' => [Reference::to(AssetPublisherInterface::class)],
3938
'setBundles()' => [$params['yiisoft/assets']['assetManager']['bundles']],
4039
'register()' => [$params['yiisoft/assets']['assetManager']['register']],
4140
],

0 commit comments

Comments
 (0)