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

- fixed incorrect version check

Author: eddielau

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

@@ -65,12 +65,7 @@ public function checkPhpVersion()
             ];
         }
         $multipleConstraints = $this->versionParser->parseConstraints($requiredVersion);
-        try {
-            $normalizedPhpVersion = $this->versionParser->normalize(PHP_VERSION);
-        } catch (\UnexpectedValueException $e) {
-            $prettyVersion = preg_replace('#^([^~+-]+).*$#', '$1', PHP_VERSION);
-            $normalizedPhpVersion = $this->versionParser->normalize($prettyVersion);
-        }
+        $normalizedPhpVersion = $this->normalizePhpVersion(PHP_VERSION);
         $currentPhpVersion = $this->versionParser->parseConstraints($normalizedPhpVersion);
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
         if (!$multipleConstraints->matches($currentPhpVersion)) {
@@ -200,8 +195,10 @@ private function checkPopulateRawPostSetting()
         $error = false;
         $iniSetting = intVal(ini_get('always_populate_raw_post_data'));
 
-        if (version_compare(PHP_VERSION, '5.6.0') >= 0
-            && version_compare(PHP_VERSION, '7.0.0') < 0
+        $checkVersionConstraint = $this->versionParser->parseConstraints('~5.6.0');
+        $normalizedPhpVersion = $this->normalizePhpVersion(PHP_VERSION);
+        $currentVersion = $this->versionParser->parseConstraints($normalizedPhpVersion);
+        if ($checkVersionConstraint->matches($currentVersion)
             && $iniSetting !== -1
         ) {
             $error = true;
@@ -225,4 +222,22 @@ private function checkPopulateRawPostSetting()
 
         return $data;
     }
+
+
+    /**
+     * Normalize PHP Version
+     *
+     * @param string $version
+     * @return string
+     */
+    private function normalizePhpVersion($version)
+    {
+        try {
+            $normalizedPhpVersion = $this->versionParser->normalize($version);
+        } catch (\UnexpectedValueException $e) {
+            $prettyVersion = preg_replace('#^([^~+-]+).*$#', '$1', $version);
+            $normalizedPhpVersion = $this->versionParser->normalize($prettyVersion);
+        }
+        return $normalizedPhpVersion;
+    }
 }

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

@@ -117,9 +117,8 @@ public function testCheckPhpVersionPrettyVersionFailed()
         $this->assertEquals($expected, $this->phpReadinessCheck->checkPhpVersion());
     }
 
-    public function testCheckPhpVersion()
+    private function setUpNoPrettyVersionParser()
     {
-        $this->composerInfo->expects($this->once())->method('getRequiredPhpVersion')->willReturn('1.0');
         $multipleConstraints = $this->getMockForAbstractClass(
             'Composer\Package\LinkConstraint\LinkConstraintInterface',
             [],
@@ -136,6 +135,13 @@ public function testCheckPhpVersion()
         );
         $this->versionParser->expects($this->at(2))->method('parseConstraints')->willReturn($currentPhpVersion);
         $multipleConstraints->expects($this->once())->method('matches')->willReturn(true);
+    }
+
+    public function testCheckPhpVersion()
+    {
+        $this->composerInfo->expects($this->once())->method('getRequiredPhpVersion')->willReturn('1.0');
+
+        $this->setUpNoPrettyVersionParser();
         $expected = [
             'responseType' => ResponseTypeInterface::RESPONSE_TYPE_SUCCESS,
             'data' => [
@@ -186,6 +192,8 @@ public function testCheckPhpSettings()
             100,
             50
         );
+
+        $this->setUpNoPrettyVersionParser();
         $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 be removed in PHP 7.0.
@@ -222,6 +230,8 @@ public function testCheckPhpSettingsFailed()
             100,
             200
         );
+
+        $this->setUpNoPrettyVersionParser();
         $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 be removed in PHP 7.0.
@@ -250,6 +260,8 @@ public function testCheckPhpSettingsFailed()
     public function testCheckPhpSettingsNoXDebug()
     {
         $this->phpInfo->expects($this->once())->method('getCurrent')->willReturn([]);
+
+        $this->setUpNoPrettyVersionParser();
         $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 be removed in PHP 7.0.