From 65fdf26a0d423d5aa6496cabd2477e750472595f Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 7 Jul 2025 22:34:42 +0200 Subject: [PATCH 1/2] 4.0 | Wiki/Upgrade guides: remove warning about 4.0 not having been released --- wiki/Version-4.0-Developer-Upgrade-Guide.md | 6 ------ wiki/Version-4.0-User-Upgrade-Guide.md | 6 ------ 2 files changed, 12 deletions(-) diff --git a/wiki/Version-4.0-Developer-Upgrade-Guide.md b/wiki/Version-4.0-Developer-Upgrade-Guide.md index 60d4782..bbf6987 100644 --- a/wiki/Version-4.0-Developer-Upgrade-Guide.md +++ b/wiki/Version-4.0-Developer-Upgrade-Guide.md @@ -1,9 +1,3 @@ -> [!CAUTION] -> PHP_CodeSniffer 4.0.0 is currently in the pre-release phase. The information in this upgrade guide is subject to change until PHP_CodeSniffer 4.0.0 has been released. -> -> If you find errors in this upgrade guide or would like to contribute improvements based on tests you've run with a PHP_CodeSniffer 4.0 pre-release, please [open an issue](https://github.com/PHPCSStandards/PHP_CodeSniffer/issues). - - PHP_CodeSniffer version 4.0.0 contains a number of core changes and breaks backwards compatibility in select situations. The aim of this guide is to help **sniff developers and integrators** to upgrade from PHP_CodeSniffer version 3.x to version 4.x. > [!NOTE] diff --git a/wiki/Version-4.0-User-Upgrade-Guide.md b/wiki/Version-4.0-User-Upgrade-Guide.md index ceb6d8c..4cc772d 100644 --- a/wiki/Version-4.0-User-Upgrade-Guide.md +++ b/wiki/Version-4.0-User-Upgrade-Guide.md @@ -1,9 +1,3 @@ -> [!CAUTION] -> PHP_CodeSniffer 4.0.0 is currently in the pre-release phase. The information in this upgrade guide is subject to change until PHP_CodeSniffer 4.0.0 has been released. -> -> If you find errors in this upgrade guide or would like to contribute improvements based on tests you've run with a PHP_CodeSniffer 4.0 pre-release, please [open an issue](https://github.com/PHPCSStandards/PHP_CodeSniffer/issues). - - PHP_CodeSniffer version 4.0.0 contains a number of core changes and breaks backwards compatibility in select situations. The aim of this guide is to help **ruleset maintainers and end-users** to upgrade from PHP_CodeSniffer version 3.x to version 4.x. There is a separate [Upgrade Guide for Sniff Developers and Integrators](https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Version-4.0-Developer-Upgrade-Guide) available. From 5964ada7a125bebe360bde8ffe4eaf338b3f7dbd Mon Sep 17 00:00:00 2001 From: jrfnl Date: Fri, 16 May 2025 21:40:11 +0200 Subject: [PATCH 2/2] 4.0 | Wiki/User upgrade guide: update information about branch rename --- wiki/Version-4.0-User-Upgrade-Guide.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/Version-4.0-User-Upgrade-Guide.md b/wiki/Version-4.0-User-Upgrade-Guide.md index 4cc772d..6e6ec46 100644 --- a/wiki/Version-4.0-User-Upgrade-Guide.md +++ b/wiki/Version-4.0-User-Upgrade-Guide.md @@ -280,9 +280,9 @@ CI scripts or git pre-commit hooks may be checking explicitly for specific exit

back to top

-### [Upcoming] Branch rename in the PHP_CodeSniffer repository +### Branch rename in the PHP_CodeSniffer repo -Just before the final 4.0.0 release, the PHP_CodeSniffer `master` branch will be renamed to `3.x` and the default branch will change to `4.x`. +The PHP_CodeSniffer `master` branch has been renamed to `3.x` and the default branch is now the `4.x` branch. #### Upgrading @@ -308,7 +308,7 @@ If you reference a development version of PHP_CodeSniffer in your `composer.json What to update these to, depends on your use-case. * If you want to use the latest development version of PHP_CodeSniffer, use the `4.x` branch. For Composer, references to the branch will need to look like this: `4.x-dev`. -* If you want the last development version of the `3.x` branch - previously `master`, use `3.x`. For Composer, references to the branch will need to look like this: `3.x-dev`. +* If you want the last development version of the `3.x` branch - previously `master` -, use `3.x`. For Composer, references to the branch will need to look like this: `3.x-dev`.

back to top