@@ -193,7 +193,6 @@ public function testCheckPhpSettings()
193
193
50
194
194
);
195
195
196
- $ this ->setUpNoPrettyVersionParser ();
197
196
$ rawPostMessage = sprintf (
198
197
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
199
198
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -209,13 +208,16 @@ public function testCheckPhpSettings()
209
208
'message ' => $ xdebugMessage ,
210
209
'error ' => false ,
211
210
],
212
- 'always_populate_raw_post_data ' => [
213
- 'message ' => $ rawPostMessage ,
214
- 'helpUrl ' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data ' ,
215
- 'error ' => false
216
- ]
217
211
]
218
212
];
213
+ if (!$ this ->isPhp7OrHhvm ()) {
214
+ $ this ->setUpNoPrettyVersionParser ();
215
+ $ expected ['data ' ]['always_populate_raw_post_data ' ] = [
216
+ 'message ' => $ rawPostMessage ,
217
+ 'helpUrl ' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data ' ,
218
+ 'error ' => false
219
+ ];
220
+ }
219
221
$ this ->assertEquals ($ expected , $ this ->phpReadinessCheck ->checkPhpSettings ());
220
222
}
221
223
@@ -231,7 +233,6 @@ public function testCheckPhpSettingsFailed()
231
233
200
232
234
);
233
235
234
- $ this ->setUpNoPrettyVersionParser ();
235
236
$ rawPostMessage = sprintf (
236
237
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
237
238
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -246,22 +247,24 @@ public function testCheckPhpSettingsFailed()
246
247
'xdebug_max_nesting_level ' => [
247
248
'message ' => $ xdebugMessage ,
248
249
'error ' => true ,
249
- ],
250
- 'always_populate_raw_post_data ' => [
251
- 'message ' => $ rawPostMessage ,
252
- 'helpUrl ' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data ' ,
253
- 'error ' => false
254
250
]
255
251
]
256
252
];
253
+ if (!$ this ->isPhp7OrHhvm ()) {
254
+ $ this ->setUpNoPrettyVersionParser ();
255
+ $ expected ['data ' ]['always_populate_raw_post_data ' ] = [
256
+ 'message ' => $ rawPostMessage ,
257
+ 'helpUrl ' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data ' ,
258
+ 'error ' => false
259
+ ];
260
+ }
257
261
$ this ->assertEquals ($ expected , $ this ->phpReadinessCheck ->checkPhpSettings ());
258
262
}
259
263
260
264
public function testCheckPhpSettingsNoXDebug ()
261
265
{
262
266
$ this ->phpInfo ->expects ($ this ->once ())->method ('getCurrent ' )->willReturn ([]);
263
267
264
- $ this ->setUpNoPrettyVersionParser ();
265
268
$ rawPostMessage = sprintf (
266
269
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
267
270
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -272,14 +275,18 @@ public function testCheckPhpSettingsNoXDebug()
272
275
);
273
276
$ expected = [
274
277
'responseType ' => ResponseTypeInterface::RESPONSE_TYPE_SUCCESS ,
275
- 'data ' => [
278
+ 'data ' => []
279
+ ];
280
+ if (!$ this ->isPhp7OrHhvm ()) {
281
+ $ this ->setUpNoPrettyVersionParser ();
282
+ $ expected ['data ' ] = [
276
283
'always_populate_raw_post_data ' => [
277
284
'message ' => $ rawPostMessage ,
278
285
'helpUrl ' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data ' ,
279
286
'error ' => false
280
287
]
281
- ]
282
- ];
288
+ ];
289
+ }
283
290
$ this ->assertEquals ($ expected , $ this ->phpReadinessCheck ->checkPhpSettings ());
284
291
}
285
292
@@ -333,6 +340,14 @@ public function testCheckPhpExtensionsFailed()
333
340
];
334
341
$ this ->assertEquals ($ expected , $ this ->phpReadinessCheck ->checkPhpExtensions ());
335
342
}
343
+
344
+ /**
345
+ * @return bool
346
+ */
347
+ protected function isPhp7OrHhvm ()
348
+ {
349
+ return version_compare (PHP_VERSION , '7.0.0-beta ' ) >= 0 || defined ('HHVM_VERSION ' );
350
+ }
336
351
}
337
352
338
353
namespace Magento \Setup \Model ;
0 commit comments