merge magento/2.3-develop into magento-pangolin/community-tests-migration-pr

Author: magento-cicd2

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

@@ -326,24 +326,15 @@ private function assertDependsOnFramework(\StdClass $json)
     private function assertPhpVersionInSync($name, $phpVersion)
     {
         if (isset(self::$rootJson['require']['php'])) {
-            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'
-                );
-            }
+            $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'
+            );
         }
     }