From 75ae028c6c6e491285b3400b6f1d7c57f0926df6 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Sat, 18 Apr 2026 18:22:47 +0800 Subject: [PATCH 1/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f2635e7d4f2..ac49512cc25d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -363,9 +363,9 @@ Currently, we have the following branches in use: | master | Active development branch for PHP 8.6, which is open for backwards incompatible changes and major internal API changes. | | PHP-8.5 | Is used to release the PHP 8.5.x series. This is a current stable version and is open for bugfixes only. | | PHP-8.4 | Is used to release the PHP 8.4.x series. This is a current stable version and is open for bugfixes only. | -| PHP-8.3 | Is used to release the PHP 8.3.x series. This is a current stable version and is open for bugfixes only. | +| PHP-8.3 | Is used to release the PHP 8.3.x series. This is an old stable version and is open for security fixes only. | | PHP-8.2 | Is used to release the PHP 8.2.x series. This is an old stable version and is open for security fixes only. | -| PHP-8.1 | Is used to release the PHP 8.1.x series. This is an old stable version and is open for security fixes only. | +| PHP-8.1 | This branch is closed. | | PHP-8.0 | This branch is closed. | | PHP-7.4 | This branch is closed. | | PHP-7.3 | This branch is closed. | From 55a5f5ebd51c1a8800a0baa58ffec215da4ec4d2 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Sat, 18 Apr 2026 18:41:32 +0800 Subject: [PATCH 2/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ac49512cc25d..2e6b7e6f15af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -356,30 +356,11 @@ Having said that, here are the organizational rules: `--enable-zts` switch to ensure your code handles TSRM correctly and doesn't break for those who need that. -Currently, we have the following branches in use: - -| Branch | | -| --------- | --------- | -| master | Active development branch for PHP 8.6, which is open for backwards incompatible changes and major internal API changes. | -| PHP-8.5 | Is used to release the PHP 8.5.x series. This is a current stable version and is open for bugfixes only. | -| PHP-8.4 | Is used to release the PHP 8.4.x series. This is a current stable version and is open for bugfixes only. | -| PHP-8.3 | Is used to release the PHP 8.3.x series. This is an old stable version and is open for security fixes only. | -| PHP-8.2 | Is used to release the PHP 8.2.x series. This is an old stable version and is open for security fixes only. | -| PHP-8.1 | This branch is closed. | -| PHP-8.0 | This branch is closed. | -| PHP-7.4 | This branch is closed. | -| 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. | -| PHP-5.5 | This branch is closed. | -| PHP-5.4 | This branch is closed. | -| PHP-5.3 | This branch is closed. | -| PHP-5.2 | This branch is closed. | -| PHP-5.1 | This branch is closed. | -| PHP-4.4 | This branch is closed. | -| PHP-X.Y.Z | These branches are used for the release managers for tagging the releases, hence they are closed to the general public. | +For an up-to-date list of branches and their purposes, please see the +[supported versions page](https://www.php.net/supported-versions.php). + +Note that PHP-X.Y.Z branches are used for the release managers for tagging the +releases, hence they are closed to the general public The next few rules are more of a technical nature: From 8e3dbcf6cbfeaf0ee9347a923d008e9713a67934 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Sat, 18 Apr 2026 18:51:08 +0800 Subject: [PATCH 3/5] update detailed description --- CONTRIBUTING.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e6b7e6f15af..c05a44acd917 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -356,8 +356,18 @@ Having said that, here are the organizational rules: `--enable-zts` switch to ensure your code handles TSRM correctly and doesn't break for those who need that. -For an up-to-date list of branches and their purposes, please see the -[supported versions page](https://www.php.net/supported-versions.php). +The master branch is an active development branch for PHP 8.6, which is open for +backwards incompatible changes and major internal API changes. + +For PHP-X.Y branches, they are used to release the PHP X.Y.x series. Please see +the [supported versions page](https://www.php.net/supported-versions.php) to get +the status of each version. + +If a version is described as "Active support" it, the corresponding branch is a +current stable version and is open for bugfixes only. If a version is described +as "Security fixes only" it, the corresponding branch is an old stable version +and is open for security fixes only. If a version is described as "End of life" +it, the corresponding branch is closed. Note that PHP-X.Y.Z branches are used for the release managers for tagging the releases, hence they are closed to the general public From 8375d510866ea3438a18e82e5d558c468663fe4f Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Sat, 18 Apr 2026 18:52:50 +0800 Subject: [PATCH 4/5] [skip ci] the newest version of PHP isn't always 8.6 --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c05a44acd917..8eaab2e2d02d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -356,18 +356,18 @@ Having said that, here are the organizational rules: `--enable-zts` switch to ensure your code handles TSRM correctly and doesn't break for those who need that. -The master branch is an active development branch for PHP 8.6, which is open for -backwards incompatible changes and major internal API changes. +The master branch is an active development branch for the newest version of PHP, +which is open for backwards incompatible changes and major internal API changes. -For PHP-X.Y branches, they are used to release the PHP X.Y.x series. Please see +For PHP-X.Y branches, they are used to release the PHP X.Y.z series. Please see the [supported versions page](https://www.php.net/supported-versions.php) to get the status of each version. -If a version is described as "Active support" it, the corresponding branch is a +If a version is described as "Active support", the corresponding branch is a current stable version and is open for bugfixes only. If a version is described -as "Security fixes only" it, the corresponding branch is an old stable version -and is open for security fixes only. If a version is described as "End of life" -it, the corresponding branch is closed. +as "Security fixes only", the corresponding branch is an old stable version +and is open for security fixes only. If a version is described as "End of life", +the corresponding branch is closed. Note that PHP-X.Y.Z branches are used for the release managers for tagging the releases, hence they are closed to the general public From 347ffb27a5239d9a2542791768492392e7ea3434 Mon Sep 17 00:00:00 2001 From: Nora Dossche <7771979+ndossche@users.noreply.github.com> Date: Sat, 18 Apr 2026 16:52:45 +0200 Subject: [PATCH 5/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8eaab2e2d02d..0e13285dd735 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -370,7 +370,7 @@ and is open for security fixes only. If a version is described as "End of life", the corresponding branch is closed. Note that PHP-X.Y.Z branches are used for the release managers for tagging the -releases, hence they are closed to the general public +releases, hence they are closed to the general public. The next few rules are more of a technical nature: