Merge branch 'MAGETWO-88890' into MPI-PR-2.2.5

Author: YevSent

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

@@ -192,14 +192,14 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
     }
 
     /**
-     * Returns true if package vendor is Magento.
+     * Checks if package vendor is Magento.
      *
      * @param string $packageName
      * @return bool
      */
     private function isVendorMagento($packageName)
     {
-        return strpos($packageName, 'magento') === 0;
+        return strpos($packageName, 'magento/') === 0;
     }
 
     /**
@@ -289,12 +289,24 @@ private function assertDependsOnFramework(\StdClass $json)
     private function assertPhpVersionInSync($name, $phpVersion)
     {
         if (isset(self::$rootJson['require']['php'])) {
-            $this->assertEquals(
-                self::$rootJson['require']['php'],
-                $phpVersion,
-                "PHP version {$phpVersion} in component {$name} is inconsistent with version "
-                . self::$rootJson['require']['php'] . ' in root composer.json'
-            );
+            if ($this->isVendorMagento($name)) {
+                $this->assertEquals(
+                    self::$rootJson['require']['php'],
+                    $phpVersion,
+                    "PHP version {$phpVersion} in component {$name} is inconsistent with version "
+                    . self::$rootJson['require']['php'] . ' in root composer.json'
+                );
+            } else {
+                $composerVersionsPattern = '{\s*\|\|?\s*}';
+                $rootPhpVersions = preg_split($composerVersionsPattern, self::$rootJson['require']['php']);
+                $modulePhpVersions = preg_split($composerVersionsPattern, $phpVersion);
+
+                $this->assertEmpty(
+                    array_diff($rootPhpVersions, $modulePhpVersions),
+                    "PHP version {$phpVersion} in component {$name} is inconsistent with version "
+                    . self::$rootJson['require']['php'] . ' in root composer.json'
+                );
+            }
         }
     }