From b966efe525e65856fc6df65d9c147b6c1b96286e Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 6 Nov 2020 20:33:15 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3156651=20by=20alexpott,=20dww,=20pfre?=
 =?UTF-8?q?nssen,=20Kristen=20Pol,=20xjm,=20andypost,=20G=C3=A1bor=20Hojts?=
 =?UTF-8?q?y,=20bradjones1:=20Prevent=20Drupal=208.9=20and=209.0=20from=20?=
 =?UTF-8?q?being=20installed=20on=20PHP=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.lock      | 4 ++--
 core/composer.json | 2 +-
 core/install.php   | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3dab79deada..3aa49ec7f99 100644
--- a/composer.lock
+++ b/composer.lock
@@ -671,7 +671,7 @@
             "dist": {
                 "type": "path",
                 "url": "core",
-                "reference": "00a84fa61ee921f106f7912c3ca0393a2c328e68"
+                "reference": "9e58f98953ff193220b4366d62446dc984f346d4"
             },
             "require": {
                 "asm89/stack-cors": "^1.1",
@@ -698,7 +698,7 @@
                 "laminas/laminas-feed": "^2.12",
                 "masterminds/html5": "^2.1",
                 "pear/archive_tar": "^1.4.9",
-                "php": ">=7.0.8",
+                "php": "^7.0.8",
                 "psr/log": "^1.0",
                 "stack/builder": "^1.0",
                 "symfony-cmf/routing": "^1.4",
diff --git a/core/composer.json b/core/composer.json
index 58841177265..f23174578a8 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -17,7 +17,7 @@
         "ext-SPL": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
-        "php": ">=7.0.8",
+        "php": "^7.0.8",
         "symfony/class-loader": "~3.4.0",
         "symfony/console": "~3.4.0",
         "symfony/dependency-injection": "~3.4.26",
diff --git a/core/install.php b/core/install.php
index 8cc3880c81c..f3d04220d8d 100644
--- a/core/install.php
+++ b/core/install.php
@@ -29,6 +29,10 @@ if (version_compare(PHP_VERSION, '7.0.8') < 0) {
   print 'Your PHP installation is too old. Drupal requires at least PHP 7.0.8. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.';
   exit;
 }
+elseif (version_compare(PHP_VERSION, '8.0', '>=')) {
+  print 'Update to the latest release of Drupal 9 for improved PHP 8 support, or use PHP 7.4. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.';
+  exit;
+}
 
 // Initialize the autoloader.
 $class_loader = require_once $root_path . '/autoload.php';