Skip to content

Commit 89cfcbf

Browse files
author
David Alger
committed
Moved setup of mock into php7 conditional as it's unused when php ver is 7
1 parent 703dcd2 commit 89cfcbf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ public function testCheckPhpSettings()
193193
50
194194
);
195195

196-
$this->setUpNoPrettyVersionParser();
197196
$rawPostMessage = sprintf(
198197
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
199198
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -212,6 +211,7 @@ public function testCheckPhpSettings()
212211
]
213212
];
214213
if (!$this->isPhp7OrHackLang()) {
214+
$this->setUpNoPrettyVersionParser();
215215
$expected['data']['always_populate_raw_post_data'] = [
216216
'message' => $rawPostMessage,
217217
'helpUrl' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data',
@@ -233,7 +233,6 @@ public function testCheckPhpSettingsFailed()
233233
200
234234
);
235235

236-
$this->setUpNoPrettyVersionParser();
237236
$rawPostMessage = sprintf(
238237
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
239238
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -252,6 +251,7 @@ public function testCheckPhpSettingsFailed()
252251
]
253252
];
254253
if (!$this->isPhp7OrHackLang()) {
254+
$this->setUpNoPrettyVersionParser();
255255
$expected['data']['always_populate_raw_post_data'] = [
256256
'message' => $rawPostMessage,
257257
'helpUrl' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data',
@@ -265,7 +265,6 @@ public function testCheckPhpSettingsNoXDebug()
265265
{
266266
$this->phpInfo->expects($this->once())->method('getCurrent')->willReturn([]);
267267

268-
$this->setUpNoPrettyVersionParser();
269268
$rawPostMessage = sprintf(
270269
'Your PHP Version is %s, but always_populate_raw_post_data = -1.
271270
$HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will be removed in PHP 7.0.
@@ -279,6 +278,7 @@ public function testCheckPhpSettingsNoXDebug()
279278
'data' => []
280279
];
281280
if (!$this->isPhp7OrHackLang()) {
281+
$this->setUpNoPrettyVersionParser();
282282
$expected['data'] = [
283283
'always_populate_raw_post_data' => [
284284
'message' => $rawPostMessage,

0 commit comments

Comments
 (0)