diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-12-17 19:58:46 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-12-17 19:58:46 +0100 |
| commit | 26e1f88011e6e392c8d8518f268f09b6f053fbd7 (patch) | |
| tree | 23454929234b494cbbb7b508f03ecb4ae6e7e5de /CONTRIBUTING.md | |
| parent | 32df9aeda56f5e129b8ab2206e08bbde7a6cdf41 (diff) | |
| parent | 250416ccb1a61374802f6583361c4d4fea3fe69c (diff) | |
| download | php-git-26e1f88011e6e392c8d8518f268f09b6f053fbd7.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Update CONTRIBUTING.md
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba7ac7c8ac..9474272db5 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.2, which corresponds to the `PHP-7.2` branch in Git. Please also make sure +PHP 7.3, which corresponds to the `PHP-7.3` 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`. @@ -333,8 +333,8 @@ Currently we have the following branches in use: | master | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. | | PHP-7.4 | Active development branch for PHP 7.4, which is open for new features and minor internal API changes. | | 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 a current stable version and is open for bugfixes only. | -| PHP-7.1 | Is used to release the PHP 7.1.x series. This is an old stable version and is open for security fixes 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.1 | This branch is closed. | | PHP-7.0 | This branch is closed. | | PHP-5.6 | This branch is closed. | | PHP-5.5 | This branch is closed. | @@ -348,8 +348,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.2) and then get merged up to all other branches. All security fixes - should go to the lowest security fixes branch (i.e 7.1). If a change is not + (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 needed for later branches (i.e. fixes for features which were dropped from later branches) an empty merge should be done. |