@@ -106,12 +106,12 @@ public function testCreateDirectoryListException()
106
106
/**
107
107
* @param array $zfAppConfig Data that comes from Laminas Framework Application config
108
108
* @param array $env Config that comes from SetEnv
109
- * @param string $cliParam Parameter string
109
+ * @param array| string|null $argv Argv
110
110
* @param array $expectedArray Expected result array
111
111
*
112
112
* @dataProvider createServiceDataProvider
113
113
*/
114
- public function testCreateService ($ zfAppConfig , $ env , $ cliParam , $ expectedArray )
114
+ public function testCreateService ($ zfAppConfig , $ env , $ argv , $ expectedArray )
115
115
{
116
116
foreach ($ env as $ envKey => $ envValue ) {
117
117
$ _SERVER [$ envKey ] = $ envValue ;
@@ -125,12 +125,10 @@ public function testCreateService($zfAppConfig, $env, $cliParam, $expectedArray)
125
125
->disableOriginalConstructor ()
126
126
->getMock ();
127
127
128
- $ argv = [ ' bin/magento ' , ' setup:install ' ];
129
- if ( $ cliParam ) {
130
- $ argv [ ] = ' --magento-init-params= ' . $ cliParam ;
128
+ if ( $ argv !== null ) {
129
+ $ zfAppConfig [ ' argv ' ] = $ argv ;
130
+ $ expectedArray [ ' argv ' ] = $ argv ;
131
131
}
132
- $ zfAppConfig ['argv ' ] = $ argv ;
133
- $ expectedArray ['argv ' ] = $ argv ;
134
132
135
133
$ mvcApplication ->expects ($ this ->any ())->method ('getConfig ' )->willReturn (
136
134
$ zfAppConfig ? [InitParamListener::BOOTSTRAP_PARAM => $ zfAppConfig ] : []
@@ -148,36 +146,61 @@ public function testCreateService($zfAppConfig, $env, $cliParam, $expectedArray)
148
146
public function createServiceDataProvider ()
149
147
{
150
148
return [
151
- 'none ' => [[], [], '' , []],
152
- 'mage_mode App ' => [['MAGE_MODE ' => 'developer ' ], [], '' , ['MAGE_MODE ' => 'developer ' ]],
153
- 'mage_mode Env ' => [[], ['MAGE_MODE ' => 'developer ' ], '' , ['MAGE_MODE ' => 'developer ' ]],
154
- 'mage_mode CLI ' => [[], [], 'MAGE_MODE=developer ' , ['MAGE_MODE ' => 'developer ' ]],
149
+ 'none ' => [
150
+ [], //zfAppConfig
151
+ [], //env
152
+ null , //argv
153
+ [] //expectedArray
154
+ ],
155
+ 'mage_mode App ' => [
156
+ ['MAGE_MODE ' => 'developer ' ],
157
+ [],
158
+ '' , //test non array value
159
+ ['MAGE_MODE ' => 'developer ' ]
160
+ ],
161
+ 'mage_mode Env ' => [
162
+ [],
163
+ ['MAGE_MODE ' => 'developer ' ],
164
+ null ,
165
+ ['MAGE_MODE ' => 'developer ' ]
166
+ ],
167
+ 'mage_mode CLI ' => [
168
+ [],
169
+ [],
170
+ ['bin/magento ' , 'setup:install ' , '--magento-init-params=MAGE_MODE=developer ' ],
171
+ ['MAGE_MODE ' => 'developer ' ]
172
+ ],
155
173
'one MAGE_DIRS CLI ' => [
156
174
[],
157
175
[],
158
- ' MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2 ' ,
176
+ [ ' bin/magento ' , ' setup:install ' , ' --magento-init-params= MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2 '] ,
159
177
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2 ' ]], 'MAGE_MODE ' => 'developer ' ],
160
178
],
161
179
'two MAGE_DIRS CLI ' => [
162
180
[],
163
181
[],
164
- ' MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache ' ,
182
+ [ ' bin/magento ' , ' setup:install ' , ' --magento-init-params= MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache '] ,
165
183
[
166
184
'MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2 ' ], 'cache ' => ['path ' => '/tmp/cache ' ]],
167
185
'MAGE_MODE ' => 'developer ' ,
168
186
],
169
187
],
170
- 'mage_mode only ' => [[], [], 'MAGE_MODE=developer ' , ['MAGE_MODE ' => 'developer ' ]],
188
+ 'mage_mode only ' => [
189
+ [],
190
+ [],
191
+ ['bin/magento ' , 'setup:install ' , '--magento-init-params=MAGE_MODE=developer ' ],
192
+ ['MAGE_MODE ' => 'developer ' ]
193
+ ],
171
194
'MAGE_DIRS Env ' => [
172
195
[],
173
196
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2 ' ]], 'MAGE_MODE ' => 'developer ' ],
174
- '' ,
197
+ null ,
175
198
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2 ' ]], 'MAGE_MODE ' => 'developer ' ],
176
199
],
177
200
'two MAGE_DIRS ' => [
178
201
[],
179
202
[],
180
- ' MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache ' ,
203
+ [ ' bin/magento ' , ' setup:install ' , ' --magento-init-params= MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache '] ,
181
204
[
182
205
'MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2 ' ], 'cache ' => ['path ' => '/tmp/cache ' ]],
183
206
'MAGE_MODE ' => 'developer ' ,
@@ -186,19 +209,19 @@ public function createServiceDataProvider()
186
209
'Env overwrites App ' => [
187
210
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/App ' ]], 'MAGE_MODE ' => 'developer ' ],
188
211
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/Env ' ]], 'MAGE_MODE ' => 'developer ' ],
189
- '' ,
212
+ [ ' bin/magento ' , ' setup:install ' ] ,
190
213
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/Env ' ]], 'MAGE_MODE ' => 'developer ' ],
191
214
],
192
215
'CLI overwrites Env ' => [
193
216
['MAGE_MODE ' => 'developer ' ],
194
217
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/Env ' ]]],
195
- ' MAGE_DIRS[base][path]=/var/www/magento2/CLI ' ,
218
+ [ ' bin/magento ' , ' setup:install ' , ' --magento-init-params= MAGE_DIRS[base][path]=/var/www/magento2/CLI '] ,
196
219
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/CLI ' ]], 'MAGE_MODE ' => 'developer ' ],
197
220
],
198
221
'CLI overwrites All ' => [
199
222
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/App ' ]], 'MAGE_MODE ' => 'production ' ],
200
223
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/Env ' ]]],
201
- ' MAGE_DIRS[base][path]=/var/www/magento2/CLI ' ,
224
+ [ ' bin/magento ' , ' setup:install ' , ' --magento-init-params= MAGE_DIRS[base][path]=/var/www/magento2/CLI '] ,
202
225
['MAGE_DIRS ' => ['base ' => ['path ' => '/var/www/magento2/CLI ' ]], 'MAGE_MODE ' => 'developer ' ],
203
226
],
204
227
];
0 commit comments