From f3cc74398f0be530d0b459a893666b64e1b6a4a1 Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Thu, 23 Dec 2021 10:16:31 -0500 Subject: [PATCH 1/2] [skip ci] Update documentation of supported php versions https://www.php.net/supported-versions.php --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd1ed6f4792cb..2ad375b4ee94e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ If you are fixing a bug, then please submit your PR against the lowest actively supported branch of PHP that the bug affects (only green branches on [the supported version page](https://www.php.net/supported-versions.php) are supported). For example, at the time of writing, the lowest supported version is -PHP 7.3, which corresponds to the `PHP-7.3` branch in Git. Please also make sure +PHP 7.4, which corresponds to the `PHP-7.4` branch in Git. Please also make sure you add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/). Pull requests implementing RFCs should be submitted against `master`. @@ -332,9 +332,9 @@ Currently we have the following branches in use: | master | Active development branch for PHP 8.2, which is open for backwards incompatible changes and major internal API changes. | | PHP-8.1 | Is used to release the PHP 8.1.x series. This is a current stable version and is open for bugfixes only. | | PHP-8.0 | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. | -| PHP-7.4 | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. | -| PHP-7.3 | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. | -| PHP-7.2 | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. | +| PHP-7.4 | Is used to release the PHP 7.4.x series. This is an old stable version and is open for security fixes only. | +| PHP-7.3 | This branch is closed. | +| PHP-7.2 | This branch is closed. | | PHP-7.1 | This branch is closed. | | PHP-7.0 | This branch is closed. | | PHP-5.6 | This branch is closed. | @@ -349,8 +349,8 @@ Currently we have the following branches in use: The next few rules are more of a technical nature: 1. All non-security bugfix changes should first go to the lowest bugfix branch - (i.e. 7.3) and then get merged up to all other branches. All security fixes - should go to the lowest security fixes branch (i.e 7.2). If a change is not + (i.e. 8.0) and then get merged up to all other branches. All security fixes + should go to the lowest security fixes branch (i.e 7.4). If a change is not needed for later branches (i.e. fixes for features which were dropped from later branches) an empty merge should be done. From 224446a228c1803c26d22233f73a7b42228cf7f8 Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Tue, 28 Dec 2021 11:35:23 -0500 Subject: [PATCH 2/2] Update CONTRIBUTING.md Co-authored-by: Christoph M. Becker --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ad375b4ee94e..a77eec1e01fb9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ If you are fixing a bug, then please submit your PR against the lowest actively supported branch of PHP that the bug affects (only green branches on [the supported version page](https://www.php.net/supported-versions.php) are supported). For example, at the time of writing, the lowest supported version is -PHP 7.4, which corresponds to the `PHP-7.4` branch in Git. Please also make sure +PHP 8.0, which corresponds to the `PHP-8.0` branch in Git. Please also make sure you add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/). Pull requests implementing RFCs should be submitted against `master`.