Merge pull request #3000 from magento-borg/MAGETWO-93153-ui-upgrade

[borg] MAGETWO-93153 Fix UI Upgrade builds in S2

Author: pdohogne-magento

dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php

@@ -67,11 +67,13 @@ public function processAssert(SetupWizard $setupWizard)
             $setupWizard->getReadiness()->getDependencyCheck(),
             'Dependency check is incorrect.'
         );
-        \PHPUnit\Framework\Assert::assertContains(
-            self::PHP_VERSION_MESSAGE,
-            $setupWizard->getReadiness()->getPhpVersionCheck(),
-            'PHP version is incorrect.'
-        );
+        if ($setupWizard->getReadiness()->isPhpVersionCheckVisible()) {
+            \PHPUnit\Framework\Assert::assertContains(
+                self::PHP_VERSION_MESSAGE,
+                $setupWizard->getReadiness()->getPhpVersionCheck(),
+                'PHP version is incorrect.'
+            );
+        }
         \PHPUnit\Framework\Assert::assertContains(
             self::PHP_SETTING_REGEXP,
             $setupWizard->getReadiness()->getSettingsCheck(),