From 3bca95be0f4c245680fdad48691b2c82d40f1ad4 Mon Sep 17 00:00:00 2001 From: xjm <xjm@65776.no-reply.drupal.org> Date: Fri, 24 Dec 2021 07:54:15 -0600 Subject: [PATCH] Issue #3255271 by Spokje, longwave, catch: Increase Drupal::MINIMUM_PHP to 8.0.2 --- composer.json | 2 +- composer.lock | 8 ++++---- core/INSTALL.txt | 4 ++-- core/composer.json | 2 +- core/install.php | 4 ++-- core/lib/Drupal.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 441c77eb4e37..783b1461b89c 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "preferred-install": "dist", "autoloader-suffix": "Drupal9", "platform": { - "php": "8.0.0" + "php": "8.0.2" }, "allow-plugins": { "composer/installers": true, diff --git a/composer.lock b/composer.lock index 4f8937c51fcb..cf7affcdae79 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4da5f467b822f165f9e26ae5faa8ec08", + "content-hash": "c349b824aa23e0ca51171bd05b895db3", "packages": [ { "name": "asm89/stack-cors", @@ -452,7 +452,7 @@ "dist": { "type": "path", "url": "core", - "reference": "50b6d86a6e39c8e94fc540a41e320ee955e6c8f4" + "reference": "3009c9eaa73ac4f9ff0d92a18714a2f9ac7a8877" }, "require": { "asm89/stack-cors": "^1.1", @@ -477,7 +477,7 @@ "laminas/laminas-feed": "^2.12", "masterminds/html5": "^2.1", "pear/archive_tar": "^1.4.14", - "php": ">=8.0.0", + "php": ">=8.0.2", "psr/log": "^1.0", "stack/builder": "^1.0", "symfony/console": "^4.4", @@ -8248,7 +8248,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.0.0" + "php": "8.0.2" }, "plugin-api-version": "2.1.0" } diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 721879d6d255..739c3071170f 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -15,7 +15,7 @@ QUICKSTART ---------------------- Prerequisites: -- PHP 8.0.0 (or greater) (https://php.net). +- PHP 8.0.2 (or greater) (https://php.net). In the instructions below, replace the version x.y.z with the specific version you wish to download. Example: 8.6.0.zip. You can find the latest stable version @@ -48,7 +48,7 @@ Drupal requires: - A web server with PHP support, for example: - Apache 2.4.7 (or greater) (http://httpd.apache.org/). - Nginx 1.1 (or greater) (http://nginx.com/). -- PHP 8.0.0 (or greater) (http://php.net/). +- PHP 8.0.2 (or greater) (http://php.net/). - One of the following databases: - MySQL 5.7.8 (or greater) (http://www.mysql.com/). - MariaDB 10.3.7 (or greater) (https://mariadb.org/). MariaDB is a fully diff --git a/core/composer.json b/core/composer.json index 7e5f69e2f9de..a303372e2d33 100644 --- a/core/composer.json +++ b/core/composer.json @@ -17,7 +17,7 @@ "ext-SPL": "*", "ext-tokenizer": "*", "ext-xml": "*", - "php": ">=8.0.0", + "php": ">=8.0.2", "symfony/console": "^4.4", "symfony/dependency-injection": "^4.4", "symfony/event-dispatcher": "^4.4", diff --git a/core/install.php b/core/install.php index 347f027dac15..6b7996020d9e 100644 --- a/core/install.php +++ b/core/install.php @@ -29,8 +29,8 @@ // hardcoded minimum PHP version below (both in the version_compare() call and // in the printed message to the user) whenever \Drupal::MINIMUM_PHP is // updated. -if (version_compare(PHP_VERSION, '8.0.0') < 0) { - print 'Your PHP installation is too old. Drupal requires at least PHP 8.0.0. See the <a href="https://www.drupal.org/docs/9/how-drupal-9-is-made-and-what-is-included/environment-requirements-of-drupal-9#s-php-version-requirement">Environment requirements of Drupal 9</a> page for more information.'; +if (version_compare(PHP_VERSION, '8.0.2') < 0) { + print 'Your PHP installation is too old. Drupal requires at least PHP 8.0.2. See the <a href="https://www.drupal.org/docs/9/how-drupal-9-is-made-and-what-is-included/environment-requirements-of-drupal-9#s-php-version-requirement">Environment requirements of Drupal 9</a> page for more information.'; exit; } diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index 604fad7e278a..a42a0f956458 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -96,7 +96,7 @@ class Drupal { * that Drupal no longer supports that PHP version. * - An error is shown in the status report that the PHP version is too old. */ - const MINIMUM_SUPPORTED_PHP = '8.0.0'; + const MINIMUM_SUPPORTED_PHP = '8.0.2'; /** * Minimum allowed version of PHP for Drupal to be bootstrapped. @@ -114,7 +114,7 @@ class Drupal { * - Once in the error message printed to the user immediately after. * Remember to update both whenever this constant is updated. */ - const MINIMUM_PHP = '8.0.0'; + const MINIMUM_PHP = '8.0.2'; /** * Minimum recommended value of PHP memory_limit. -- GitLab