diff --git a/core/install.php b/core/install.php index f859726aab..6d5b3d143e 100644 --- a/core/install.php +++ b/core/install.php @@ -26,7 +26,7 @@ // Exit early if running an incompatible PHP version to avoid fatal errors. if (version_compare(PHP_VERSION, \Drupal::MINIMUM_PHP) < 0) { - print 'Your PHP installation is too old. Drupal requires at least PHP ' . \Drupal::MINIMUM_PHP . '. See the Environment requirements of Drupal 9 page for more information.'; + print 'Your PHP installation is too old. Drupal requires at least PHP ' . \Drupal::MINIMUM_PHP . '. See the Environment requirements of Drupal 9 page for more information.'; exit; } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index db3f910d24..0372ad3d70 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -203,11 +203,11 @@ function system_requirements($phase) { // Check if the PHP version is below what Drupal supports. if (version_compare($phpversion, \Drupal::MINIMUM_SUPPORTED_PHP) < 0) { - $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version. It is recommended to upgrade to PHP version %recommended or higher for the best ongoing support. See PHP\'s version support documentation and the Drupal 8 PHP requirements handbook page for more information.', + $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version. It is recommended to upgrade to PHP version %recommended or higher for the best ongoing support. See PHP\'s version support documentation and the Environment requirements of Drupal 9 page for more information.', [ '%version' => \Drupal::MINIMUM_SUPPORTED_PHP, '%recommended' => \Drupal::RECOMMENDED_PHP, - ':php_requirements' => 'https://www.drupal.org/docs/8/system-requirements/php', + ':php_requirements' => 'https://www.drupal.org/docs/9/how-drupal-9-is-made-and-what-is-included/environment-requirements-of-drupal-9#s-php-version-requirement', ] ); $requirements['php']['severity'] = REQUIREMENT_ERROR; diff --git a/core/tests/Drupal/Tests/RequirementsPageTrait.php b/core/tests/Drupal/Tests/RequirementsPageTrait.php index 16377ea106..0c2cc2a114 100644 --- a/core/tests/Drupal/Tests/RequirementsPageTrait.php +++ b/core/tests/Drupal/Tests/RequirementsPageTrait.php @@ -13,7 +13,7 @@ trait RequirementsPageTrait { protected function updateRequirementsProblem() { // Assert a warning is shown on older test environments. $links = $this->getSession()->getPage()->findAll('named', ['link', 'try again']); - if (version_compare(phpversion(), \Drupal::MINIMUM_SUPPORTED_PHP) < 0) { + if ($links && version_compare(phpversion(), \Drupal::MINIMUM_SUPPORTED_PHP) < 0) { $this->assertNoText('Errors found'); $this->assertWarningSummaries(['PHP']); $this->clickLink('try again');