diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index cb69590abf..a7b3699bb2 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -28,7 +28,7 @@ * - If a site managed to bypass all of the above, then an error is shown in * the status report and various fatal errors occur on various pages. * - * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use + * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. Use * \Drupal\Core\Requirements::MINIMUM_PHP instead. * * @see install.php @@ -45,7 +45,7 @@ * that Drupal no longer supports that PHP version. * - An error is shown in the status report that the PHP version is too old. * - * @deprecated in Drupal 8.8.x, will be removed before Drupal 9.0.0. Use + * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. Use * \Drupal\Core\Requirements::MINIMUM_SUPPORTED_PHP instead. * * @see https://www.drupal.org/node/2909361 @@ -59,7 +59,7 @@ * message, but Drupal can still be installed. Used for (e.g.) PHP versions * that have reached their EOL or will in the near future. * - * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use + * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. Use * \Drupal\Core\Requirements::RECOMMENDED_PHP instead. * * @see https://www.drupal.org/node/2909361 @@ -73,7 +73,7 @@ * contributed modules to be installed prior to hitting the limit. However, * 40M is the target for the Standard installation profile. * - * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use + * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. Use * \Drupal\Core\Requirements::MINIMUM_PHP_MEMORY_LIMIT instead. * * @see https://www.drupal.org/node/2909361 diff --git a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php index 830eb0d5ce..1cdf192a19 100644 --- a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php +++ b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\Core\Command; +use Drupal\Core\Requirements; use Drupal\Core\Test\TestDatabase; use Drupal\Tests\BrowserTestBase; use GuzzleHttp\Client; @@ -84,7 +85,7 @@ public function tearDown() { * Tests the quick-start command. */ public function testQuickStartCommand() { - if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) < 0) { + if (version_compare(phpversion(), Requirements::MINIMUM_SUPPORTED_PHP) < 0) { $this->markTestSkipped(); } @@ -140,7 +141,7 @@ public function testQuickStartCommand() { * Tests that the installer throws a requirement error on older PHP versions. */ public function testPhpRequirement() { - if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) >= 0) { + if (version_compare(phpversion(), Requirements::MINIMUM_SUPPORTED_PHP) >= 0) { $this->markTestSkipped(); } @@ -164,7 +165,7 @@ public function testPhpRequirement() { $error_output = $process->getErrorOutput(); $this->assertContains('Your PHP installation is too old.', $error_output); $this->assertContains('Drupal requires at least PHP', $error_output); - $this->assertContains(DRUPAL_MINIMUM_SUPPORTED_PHP, $error_output); + $this->assertContains(Requirements::MINIMUM_SUPPORTED_PHP, $error_output); // Stop the web server. $process->stop(); @@ -174,7 +175,7 @@ public function testPhpRequirement() { * Tests the quick-start commands. */ public function testQuickStartInstallAndServerCommands() { - if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) < 0) { + if (version_compare(phpversion(), Requirements::MINIMUM_SUPPORTED_PHP) < 0) { $this->markTestSkipped(); } diff --git a/core/tests/Drupal/Tests/RequirementsPageTrait.php b/core/tests/Drupal/Tests/RequirementsPageTrait.php index 44f9bb9dc2..4e9ddaac69 100644 --- a/core/tests/Drupal/Tests/RequirementsPageTrait.php +++ b/core/tests/Drupal/Tests/RequirementsPageTrait.php @@ -2,6 +2,8 @@ namespace Drupal\Tests; +use Drupal\Core\Requirements; + /** * Provides helper methods for the requirements page. */ @@ -12,7 +14,7 @@ trait RequirementsPageTrait { */ protected function updateRequirementsProblem() { // Assert a warning is shown on older test environments. - if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) < 0) { + if (version_compare(phpversion(), Requirements::MINIMUM_SUPPORTED_PHP) < 0) { $this->assertNoText('Errors found'); $this->assertWarningSummaries(['PHP']); $this->clickLink('try again');