From 9ed2caaeaacfd04093cdc7152adb0be191790de1 Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Tue, 21 Jan 2020 11:05:11 +0000 Subject: [PATCH] =?UTF-8?q?Issue=20#3106075=20by=20Krzysztof=20Doma=C5=84s?= =?UTF-8?q?ki,=20heddn,=20G=C3=A1bor=20Hojtsy,=20xjm,=20catch,=20mondrake,?= =?UTF-8?q?=20larowlan,=20greg.1.anderson:=20Bump=20minimum=20PHP=20for=20?= =?UTF-8?q?Drupal=209=20to=20PHP=207.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 11 +++++++---- composer/Plugin/Scaffold/composer.json | 2 +- composer/Plugin/VendorHardening/composer.json | 2 +- core/INSTALL.txt | 6 +++--- core/composer.json | 2 +- core/includes/bootstrap.inc | 4 ++-- core/install.php | 4 ++-- core/lib/Drupal/Component/Annotation/composer.json | 2 +- core/lib/Drupal/Component/Assertion/composer.json | 2 +- core/lib/Drupal/Component/Bridge/composer.json | 2 +- core/lib/Drupal/Component/ClassFinder/composer.json | 2 +- core/lib/Drupal/Component/Datetime/composer.json | 2 +- .../Component/DependencyInjection/composer.json | 2 +- core/lib/Drupal/Component/Diff/composer.json | 2 +- core/lib/Drupal/Component/Discovery/composer.json | 2 +- .../Drupal/Component/EventDispatcher/composer.json | 2 +- core/lib/Drupal/Component/FileCache/composer.json | 2 +- core/lib/Drupal/Component/FileSecurity/composer.json | 2 +- core/lib/Drupal/Component/FileSystem/composer.json | 2 +- core/lib/Drupal/Component/Gettext/composer.json | 2 +- core/lib/Drupal/Component/Graph/composer.json | 2 +- .../lib/Drupal/Component/HttpFoundation/composer.json | 2 +- core/lib/Drupal/Component/PhpStorage/composer.json | 2 +- core/lib/Drupal/Component/Plugin/composer.json | 2 +- core/lib/Drupal/Component/ProxyBuilder/composer.json | 2 +- core/lib/Drupal/Component/Render/composer.json | 2 +- core/lib/Drupal/Component/Serialization/composer.json | 2 +- core/lib/Drupal/Component/Utility/composer.json | 2 +- core/lib/Drupal/Component/Uuid/composer.json | 2 +- core/lib/Drupal/Component/Version/composer.json | 2 +- .../Tests/Core/Extension/ThemeExtensionListTest.php | 2 +- .../Drupal/Tests/Core/Extension/ThemeHandlerTest.php | 2 +- 32 files changed, 42 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index 6fe36bcbc832..98de0ee7b853 100644 --- a/composer.lock +++ b/composer.lock @@ -456,7 +456,7 @@ "dist": { "type": "path", "url": "core", - "reference": "fb43f60ee811f200a5db702bcfcab309b2e684f4" + "reference": "b092a4793dbb192acafca8b27ce6ab418214fb01" }, "require": { "asm89/stack-cors": "^1.1", @@ -482,7 +482,7 @@ "laminas/laminas-feed": "^2.12", "masterminds/html5": "^2.1", "pear/archive_tar": "^1.4.9", - "php": ">=7.2.3", + "php": ">=7.3", "psr/log": "^1.0", "stack/builder": "^1.0", "symfony-cmf/routing": "^2.1", @@ -717,11 +717,11 @@ "dist": { "type": "path", "url": "composer/Plugin/VendorHardening", - "reference": "d6a4c49651f381791d9667354205c8ecd331ca2d" + "reference": "0b015340af38f90df46923a934d0b22026134f18" }, "require": { "composer-plugin-api": "^1.1", - "php": ">=7.2.3" + "php": ">=7.3.0" }, "type": "composer-plugin", "extra": { @@ -4041,6 +4041,9 @@ "ext-zip": "Enabling the zip extension allows you to unzip archives", "ext-zlib": "Allow gzip compression of HTTP requests" }, + "bin": [ + "bin/composer" + ], "type": "library", "extra": { "branch-alias": { diff --git a/composer/Plugin/Scaffold/composer.json b/composer/Plugin/Scaffold/composer.json index 4916c73650a2..5cbb4ad79b99 100644 --- a/composer/Plugin/Scaffold/composer.json +++ b/composer/Plugin/Scaffold/composer.json @@ -7,7 +7,7 @@ "license": "GPL-2.0-or-later", "require": { "composer-plugin-api": "^1.0.0", - "php": ">=7.2.3" + "php": ">=7.3.0" }, "conflict": { "drupal-composer/drupal-scaffold": "*" diff --git a/composer/Plugin/VendorHardening/composer.json b/composer/Plugin/VendorHardening/composer.json index c6aea39869da..4ed1adedd0d6 100644 --- a/composer/Plugin/VendorHardening/composer.json +++ b/composer/Plugin/VendorHardening/composer.json @@ -14,7 +14,7 @@ "class": "Drupal\\Composer\\Plugin\\VendorHardening\\VendorHardeningPlugin" }, "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "composer-plugin-api": "^1.1" } } diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 3cb23dd4b894..8c399305b75a 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -15,7 +15,7 @@ QUICKSTART ---------------------- Prerequisites: -- PHP 7.2.3 (or greater) (https://php.net). +- PHP 7.3.0 (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,8 +48,8 @@ Drupal requires: - A web server with PHP support, for example: - Apache 2.0 (or greater) (http://httpd.apache.org/). - Nginx 1.1 (or greater) (http://nginx.com/). -- PHP 7.0.8 (or greater) (http://php.net/). For better security support it is - recommended to update to at least 7.2.17. +- PHP 7.3.0 (or greater) (http://php.net/). For better security support it is + recommended to update to at least 7.3.13. - One of the following databases: - MySQL 5.5.3 (or greater) (http://www.mysql.com/). - MariaDB 5.5.20 (or greater) (https://mariadb.org/). MariaDB is a fully diff --git a/core/composer.json b/core/composer.json index 9e39dad2a3af..948685415dcb 100644 --- a/core/composer.json +++ b/core/composer.json @@ -17,7 +17,7 @@ "ext-SPL": "*", "ext-tokenizer": "*", "ext-xml": "*", - "php": ">=7.2.3", + "php": ">=7.3", "symfony/class-loader": "~3.4.0", "symfony/console": "^4.4", "symfony/dependency-injection": "^4.4", diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index ab04ebd55c30..08bee278bdb7 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -27,7 +27,7 @@ * @todo Move this to an appropriate autoloadable class. See * https://www.drupal.org/project/drupal/issues/2908079 */ -const DRUPAL_MINIMUM_PHP = '7.2.3'; +const DRUPAL_MINIMUM_PHP = '7.3.0'; /** * Minimum supported version of PHP. @@ -41,7 +41,7 @@ * @todo Move this to an appropriate autoloadable class. See * https://www.drupal.org/project/drupal/issues/2908079 */ -const DRUPAL_MINIMUM_SUPPORTED_PHP = '7.2.3'; +const DRUPAL_MINIMUM_SUPPORTED_PHP = '7.3.0'; /** * Minimum recommended version of PHP. diff --git a/core/install.php b/core/install.php index 0a7ffb1a1fcd..8fae042ed9e5 100644 --- a/core/install.php +++ b/core/install.php @@ -25,8 +25,8 @@ // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not // yet available. It is defined in bootstrap.inc, but it is not possible to // load that file yet as it would cause a fatal error on older versions of PHP. -if (version_compare(PHP_VERSION, '7.2.3') < 0) { - print 'Your PHP installation is too old. Drupal requires at least PHP 7.2.3. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.'; +if (version_compare(PHP_VERSION, '7.3.0') < 0) { + print 'Your PHP installation is too old. Drupal requires at least PHP 7.3.0. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.'; exit; } diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json index f29ac2a7ef5e..c252a2f97148 100644 --- a/core/lib/Drupal/Component/Annotation/composer.json +++ b/core/lib/Drupal/Component/Annotation/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "doctrine/annotations": "^1.4", "drupal/core-file-cache": "^8.8", "drupal/core-plugin": "^8.8", diff --git a/core/lib/Drupal/Component/Assertion/composer.json b/core/lib/Drupal/Component/Assertion/composer.json index 9b7bda88117c..661654b13362 100644 --- a/core/lib/Drupal/Component/Assertion/composer.json +++ b/core/lib/Drupal/Component/Assertion/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Bridge/composer.json b/core/lib/Drupal/Component/Bridge/composer.json index 043dd0e436e3..5429b4c4cf91 100644 --- a/core/lib/Drupal/Component/Bridge/composer.json +++ b/core/lib/Drupal/Component/Bridge/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "laminas/laminas-feed": "^2.12" }, "autoload": { diff --git a/core/lib/Drupal/Component/ClassFinder/composer.json b/core/lib/Drupal/Component/ClassFinder/composer.json index 7edefc072de9..ac17b5f999b0 100644 --- a/core/lib/Drupal/Component/ClassFinder/composer.json +++ b/core/lib/Drupal/Component/ClassFinder/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "doctrine/reflection": "^1.1" }, "autoload": { diff --git a/core/lib/Drupal/Component/Datetime/composer.json b/core/lib/Drupal/Component/Datetime/composer.json index e05806276232..b06d7433a308 100644 --- a/core/lib/Drupal/Component/Datetime/composer.json +++ b/core/lib/Drupal/Component/Datetime/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-utility": "^8.8" }, "autoload": { diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index f0bc03e856a1..771c5cc9ff0a 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -11,7 +11,7 @@ "source": "https://www.drupal.org/project/drupal/git-instructions" }, "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "symfony/dependency-injection": "^4.4" }, "suggest": { diff --git a/core/lib/Drupal/Component/Diff/composer.json b/core/lib/Drupal/Component/Diff/composer.json index 9963231acb1a..7af1986afd43 100644 --- a/core/lib/Drupal/Component/Diff/composer.json +++ b/core/lib/Drupal/Component/Diff/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Discovery/composer.json b/core/lib/Drupal/Component/Discovery/composer.json index a445df9e9638..59fe78eeceee 100644 --- a/core/lib/Drupal/Component/Discovery/composer.json +++ b/core/lib/Drupal/Component/Discovery/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-file-cache": "^8.8", "drupal/core-serialization": "^8.8" }, diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json index 00acc3981154..c75d3f101457 100644 --- a/core/lib/Drupal/Component/EventDispatcher/composer.json +++ b/core/lib/Drupal/Component/EventDispatcher/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "symfony/dependency-injection": "^4.4", "symfony/event-dispatcher": "^4.4" }, diff --git a/core/lib/Drupal/Component/FileCache/composer.json b/core/lib/Drupal/Component/FileCache/composer.json index 77cff4b95c99..68f202b57a4d 100644 --- a/core/lib/Drupal/Component/FileCache/composer.json +++ b/core/lib/Drupal/Component/FileCache/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/FileSecurity/composer.json b/core/lib/Drupal/Component/FileSecurity/composer.json index 5f0883b8c99f..33a11ae6ef2f 100644 --- a/core/lib/Drupal/Component/FileSecurity/composer.json +++ b/core/lib/Drupal/Component/FileSecurity/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/FileSystem/composer.json b/core/lib/Drupal/Component/FileSystem/composer.json index 7410bb68c26f..41fa20509495 100644 --- a/core/lib/Drupal/Component/FileSystem/composer.json +++ b/core/lib/Drupal/Component/FileSystem/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json index c7bef47a2c3a..4c931f4fdcf2 100644 --- a/core/lib/Drupal/Component/Gettext/composer.json +++ b/core/lib/Drupal/Component/Gettext/composer.json @@ -9,7 +9,7 @@ "source": "https://www.drupal.org/project/drupal/git-instructions" }, "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-utility": "^8.8" }, "autoload": { diff --git a/core/lib/Drupal/Component/Graph/composer.json b/core/lib/Drupal/Component/Graph/composer.json index d0723692dc59..dbcc0eebb15a 100644 --- a/core/lib/Drupal/Component/Graph/composer.json +++ b/core/lib/Drupal/Component/Graph/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json index de3768779cbb..0c481d6011fe 100644 --- a/core/lib/Drupal/Component/HttpFoundation/composer.json +++ b/core/lib/Drupal/Component/HttpFoundation/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "symfony/http-foundation": "^4.4" }, "autoload": { diff --git a/core/lib/Drupal/Component/PhpStorage/composer.json b/core/lib/Drupal/Component/PhpStorage/composer.json index 0e3e57830558..776426ba35b6 100644 --- a/core/lib/Drupal/Component/PhpStorage/composer.json +++ b/core/lib/Drupal/Component/PhpStorage/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-file-security": "^8.8" }, "autoload": { diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json index 407e0fbb80bd..8814a8ef3a9d 100644 --- a/core/lib/Drupal/Component/Plugin/composer.json +++ b/core/lib/Drupal/Component/Plugin/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "symfony/validator": "^4.4" }, "autoload": { diff --git a/core/lib/Drupal/Component/ProxyBuilder/composer.json b/core/lib/Drupal/Component/ProxyBuilder/composer.json index 8cff0ff40940..9b798e9265d1 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/composer.json +++ b/core/lib/Drupal/Component/ProxyBuilder/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Render/composer.json b/core/lib/Drupal/Component/Render/composer.json index 4187a2f11128..5b35fcb2a3fd 100644 --- a/core/lib/Drupal/Component/Render/composer.json +++ b/core/lib/Drupal/Component/Render/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-utility": "^8.8" }, "autoload": { diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json index 3f5eb09eebb4..7b40c55ddc31 100644 --- a/core/lib/Drupal/Component/Serialization/composer.json +++ b/core/lib/Drupal/Component/Serialization/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "symfony/yaml": "^4.4" }, "autoload": { diff --git a/core/lib/Drupal/Component/Utility/composer.json b/core/lib/Drupal/Component/Utility/composer.json index b1e2afbe76c1..763133c4c4e2 100644 --- a/core/lib/Drupal/Component/Utility/composer.json +++ b/core/lib/Drupal/Component/Utility/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3", + "php": ">=7.3.0", "drupal/core-render": "^8.8" }, "autoload": { diff --git a/core/lib/Drupal/Component/Uuid/composer.json b/core/lib/Drupal/Component/Uuid/composer.json index e8a85b956692..0a4681e0eeba 100644 --- a/core/lib/Drupal/Component/Uuid/composer.json +++ b/core/lib/Drupal/Component/Uuid/composer.json @@ -9,7 +9,7 @@ "source": "https://www.drupal.org/project/drupal/git-instructions" }, "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Version/composer.json b/core/lib/Drupal/Component/Version/composer.json index 51975e150aca..02e2814dda42 100644 --- a/core/lib/Drupal/Component/Version/composer.json +++ b/core/lib/Drupal/Component/Version/composer.json @@ -5,7 +5,7 @@ "homepage": "https://www.drupal.org/project/drupal", "license": "GPL-2.0-or-later", "require": { - "php": ">=7.2.3" + "php": ">=7.3.0" }, "autoload": { "psr-4": { diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php index 5573121df70e..a4085b0f8ea7 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php @@ -261,5 +261,5 @@ class TestThemeEngineExtensionList extends ThemeEngineExtensionList { } if (!defined('DRUPAL_MINIMUM_PHP')) { - define('DRUPAL_MINIMUM_PHP', '7.2.3'); + define('DRUPAL_MINIMUM_PHP', '7.3.0'); } diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php index 375b035345ab..5c65f64a9c8f 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php @@ -147,5 +147,5 @@ protected function themeRegistryRebuild() { } if (!defined('DRUPAL_MINIMUM_PHP')) { - define('DRUPAL_MINIMUM_PHP', '7.2.3'); + define('DRUPAL_MINIMUM_PHP', '7.3.0'); } -- GitLab