diff --git a/setup/src/Magento/Setup/Controller/Environment.php b/setup/src/Magento/Setup/Controller/Environment.php index 5e11e2fdb31e3..20c3ea666d906 100644 --- a/setup/src/Magento/Setup/Controller/Environment.php +++ b/setup/src/Magento/Setup/Controller/Environment.php @@ -54,19 +54,19 @@ public function phpVersionAction() { try { $requiredVersion = $this->phpInformation->getRequiredPhpVersion(); + $multipleConstraints = $this->versionParser->parseConstraints($requiredVersion); + $currentPhpVersion = $this->versionParser->parseConstraints(strtok(PHP_VERSION,'-')); } catch (\Exception $e) { return new JsonModel( [ 'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR, 'data' => [ - 'error' => 'phpVersionError', + 'exception' => 'phpVersionException', 'message' => 'Cannot determine required PHP version: ' . $e->getMessage() ], ] ); } - $multipleConstraints = $this->versionParser->parseConstraints($requiredVersion); - $currentPhpVersion = $this->versionParser->parseConstraints(PHP_VERSION); $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS; if (!$multipleConstraints->matches($currentPhpVersion)) { $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR; diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml index 92578438d2679..208707c4d34c7 100644 --- a/setup/view/magento/setup/readiness-check/progress.phtml +++ b/setup/view/magento/setup/readiness-check/progress.phtml @@ -60,26 +60,45 @@
Need Help?
- PHP Documentation + + ++ {{version.data.message}} +
+- Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}. - - Show detail - Hide detail - -
-- Donwload and install PHP version {{version.data.required}} from www.php.net using this PHP Documentation. -
-If you need more help please call your hosting provider.
++ Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}. + + Show detail + Hide detail + +
++ Donwload and install PHP version {{version.data.required}} from www.php.net using this PHP Documentation. +
+If you need more help please call your hosting provider.
+Need Help?
+ PHP Documentation