MAGETWO-44547: [php7] "PHP Settings Check" fail in Web Setup Wizard blocks installation via web

- added check for php 7.0

Author: eddielau

setup/src/Magento/Setup/Model/PhpReadinessCheck.php

@@ -198,20 +198,26 @@ private function checkPopulateRawPostSetting()
 
         $data = [];
         $error = false;
-        $iniSetting = intVal(ini_get('always_populate_raw_post_data'));
+        $rawPostData = ini_get('always_populate_raw_post_data');
+        $iniSetting = $rawPostData !== false ? intval($rawPostData) : null;
 
-        if (version_compare(PHP_VERSION, '5.6.0') >= 0 && $iniSetting !== -1) {
+        if (version_compare(PHP_VERSION, '5.6.0') >= 0
+            && version_compare(PHP_VERSION, '7.0.0') < 0
+            && ($iniSetting !== -1 && $iniSetting !== null)
+        ) {
+            $error = true;
+        } elseif (version_compare(PHP_VERSION, '7.0.0') >= 0 && $iniSetting !== null) {
             $error = true;
         }
 
         $message = sprintf(
             'Your PHP Version is %s, but always_populate_raw_post_data = %d.
- 	        $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will stop the installer from running.
-	        Please open your php.ini file and set always_populate_raw_post_data to -1.
- 	        If you need more help please call your hosting provider.
- 	        ',
+            $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and is removed from PHP 7.0 onwards.
+            This will stop the installer from running.
+            Please open your php.ini file and remove always_populate_raw_post_data.
+            If you need more help please call your hosting provider.',
             PHP_VERSION,
-            intVal(ini_get('always_populate_raw_post_data'))
+            $iniSetting
         );
 
         $data['always_populate_raw_post_data'] = [

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

@@ -188,10 +188,10 @@ public function testCheckPhpSettings()
         );
         $rawPostMessage = sprintf(
             'Your PHP Version is %s, but always_populate_raw_post_data = -1.
- 	        $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will stop the installer from running.
-	        Please open your php.ini file and set always_populate_raw_post_data to -1.
- 	        If you need more help please call your hosting provider.
- 	        ',
+            $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and is removed from PHP 7.0 onwards.
+            This will stop the installer from running.
+            Please open your php.ini file and remove always_populate_raw_post_data.
+            If you need more help please call your hosting provider.',
             PHP_VERSION
         );
         $expected = [
@@ -224,10 +224,10 @@ public function testCheckPhpSettingsFailed()
         );
         $rawPostMessage = sprintf(
             'Your PHP Version is %s, but always_populate_raw_post_data = -1.
- 	        $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will stop the installer from running.
-	        Please open your php.ini file and set always_populate_raw_post_data to -1.
- 	        If you need more help please call your hosting provider.
- 	        ',
+            $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and is removed from PHP 7.0 onwards.
+            This will stop the installer from running.
+            Please open your php.ini file and remove always_populate_raw_post_data.
+            If you need more help please call your hosting provider.',
             PHP_VERSION
         );
         $expected = [
@@ -252,10 +252,10 @@ public function testCheckPhpSettingsNoXDebug()
         $this->phpInfo->expects($this->once())->method('getCurrent')->willReturn([]);
         $rawPostMessage = sprintf(
             'Your PHP Version is %s, but always_populate_raw_post_data = -1.
- 	        $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will stop the installer from running.
-	        Please open your php.ini file and set always_populate_raw_post_data to -1.
- 	        If you need more help please call your hosting provider.
- 	        ',
+            $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and is removed from PHP 7.0 onwards.
+            This will stop the installer from running.
+            Please open your php.ini file and remove always_populate_raw_post_data.
+            If you need more help please call your hosting provider.',
             PHP_VERSION
         );
         $expected = [