From 5d0319f64eaf72c4fc0d4fdb510dba7b7a147eac Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:52:11 +0200
Subject: [PATCH 01/24] Issue template: mention PHPCSExtra

Noticed this while having a quick look through the release PR. As this is not a file which is included in the release (`export-ignore`d via `.gitattributes`), I'm pulling this to `develop`.
---
 .github/ISSUE_TEMPLATE/bug_report.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c089b1d2..f24d6921 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -47,6 +47,7 @@ Use `php -v` and `composer show` to get versions.
 | PHPCSUtils version       | x.y.z
 | VIPCS version            | x.y.z
 | WordPressCS version      | x.y.z
+| PHPCSExtra version       | x.y.z
 | VariableAnalysis version | x.y.z
 
 ## Additional Context (optional)

From d6fe1d4020ed3c1ef8392fd72e622839cfd5b74b Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Wed, 6 Sep 2023 12:07:24 +0100
Subject: [PATCH 02/24] Contributing: add notes for how to checkout the files

Quick note on how best to install the dependencies so that `commit check` is ready to go.
---
 .github/CONTRIBUTING.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 6bc4d107..766f7149 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -29,6 +29,34 @@ Sniff name starts with | Report to
 
 ----
 
+## Getting the source files
+
+```sh
+git clone git@github.com:Automattic/VIP-Coding-Standards.git vipcs
+```
+
+...or:
+
+```sh
+gh repo clone Automattic/VIP-Coding-Standards vipcs
+```
+
+Now `cd vipcs` and run:
+
+```sh
+composer install --ignore-platform-req=php+
+```
+
+The platform requirements for higher versions of PHP are ignored so that the correct version of PHPUnit (7.x needed by PHPCS) is installed.
+
+You can now run:
+
+```
+composer check
+```
+
+... and all checks should pass.
+
 ## tl;dr Composer Scripts
 
 This package contains Composer scripts to quickly run the developer checks which are described (with setups) further below.

From 263d13c7a24f140f4b9f1fb8273613dc87924695 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:05:24 +0200
Subject: [PATCH 03/24] Add dependabot configuration file

This commit adds an initial Dependabot configuration to:
* Submit pull requests for security updates and version updates for GH Action runner dependencies.

At a later point in time, we could consider enabling it for Composer dependencies as well.

The configuration has been set up to:
* Run weekly (for now).
* The commit messages for PRs submitted by Dependabot will be prefixed according the unofficial conventions used in this repo up to now.
* The PRs will automatically be labelled with an appropriate label as already in use in this repo.

Refs:
* https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
* https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#versioning-strategy
---
 .github/dependabot.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..3c13fc31
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+# Dependabot configuration.
+#
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      time: "09:00"
+    commit-message:
+      prefix: "GH Actions:"
+    labels:
+      - "Type: Maintenance"

From 910d24a4d5e5599fdb17705aaa97215c339023ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 06:55:10 +0000
Subject: [PATCH 04/24] GH Actions: Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/basics.yml    | 4 ++--
 .github/workflows/quicktest.yml | 2 +-
 .github/workflows/test.yml      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index 7e616537..35e57232 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -84,7 +84,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index becaac4c..96131998 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc5ed0a6..72dcada6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # With stable PHPCS dependencies, allow for PHP deprecation notices.
       # Unit tests don't need to fail on those for stable releases where those issues won't get fixed anymore.

From ff14488338583cdceff9e08093ebd3c4195f60fa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 19 Sep 2023 06:15:03 +0200
Subject: [PATCH 05/24] Classes/DeclarationCompatibility: sync with WP Core

While looking at this sniff for something unrelated, I started wondering if the signature definitions were still in line with WP Core.

Turned out they were not, though with the current checks being done in the sniff, this wasn't necessarily problematic (though it should have been, but that's for another PR).

Also see the [additional notes I've added to the review ticket](https://github.com/Automattic/VIP-Coding-Standards/issues/507#issuecomment-1724805522).

Refs:
* https://developer.wordpress.org/reference/classes/wp_widget/wp_widget/
* https://developer.wordpress.org/reference/classes/walker/start_el/
* https://developer.wordpress.org/reference/classes/walker/end_el/
* https://developer.wordpress.org/reference/classes/walker/unset_children/
---
 .../Sniffs/Classes/DeclarationCompatibilitySniff.php | 10 +++++-----
 .../Classes/DeclarationCompatibilityUnitTest.inc     | 12 +++++++++---
 .../Classes/DeclarationCompatibilityUnitTest.php     |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php b/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
index 712cacd0..a71b4907 100644
--- a/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
+++ b/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
@@ -40,7 +40,7 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				'widget_options'  => [
 					'default' => 'array()',
 				],
-				'constol_options' => [
+				'control_options' => [
 					'default' => 'array()',
 				],
 			],
@@ -103,7 +103,7 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				'output'            => [
 					'pass_by_reference' => true,
 				],
-				'object',
+				'data_object',
 				'depth'             => [
 					'default' => '0',
 				],
@@ -118,7 +118,7 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				'output' => [
 					'pass_by_reference' => true,
 				],
-				'object',
+				'data_object',
 				'depth'  => [
 					'default' => '0',
 				],
@@ -158,7 +158,7 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				'elements',
 			],
 			'unset_children'              => [
-				'el',
+				'element',
 				'children_elements' => [
 					'pass_by_reference' => true,
 				],
@@ -215,7 +215,7 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		// Meed to define the originalParentClassName since we might override the parentClassName due to signature notations grouping.
+		// Need to define the originalParentClassName since we might override the parentClassName due to signature notations grouping.
 		$originalParentClassName = $parentClassName;
 
 		if ( array_key_exists( $parentClassName, $this->checkClasses ) === false ) {
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc
index a7ecaacf..740a7883 100644
--- a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc
@@ -125,15 +125,21 @@ class MyWalker extends Walker {
 	function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
 	} // Ok.
 
-	function unset_children( $el, $children_elements ) {
+	function unset_children( $element, $children_elements ) {
 	} // Bad. $children_elements should be passed by reference
-	
+
 	function walk( $elements, $max_depth, ...$args ) {
 	} // Ok.
-	
+
 	function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
 	} // Bad. Missing $args.
 
 	function paged_walk( $elements, $max_depth, $page_num, $per_page, $args ) {
 	} // Bad. $args is not variadic.
+
+	function start_el( $output, $data_object, $depth, $args = array(), $current_object_id = 0 ) {
+	} // Bad. $output should be passed by reference, $depth should have a default value.
+
+	function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
+	} // Ok.
 }
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
index 1a6b89a7..817bc324 100644
--- a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
@@ -47,6 +47,7 @@ public function getErrorList() {
 			128 => 1,
 			134 => 1,
 			137 => 1,
+			140 => 1,
 		];
 	}
 

From 6c9995e56a262816699de14e626bf291db4e8ab8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Nov 2023 03:09:55 +0100
Subject: [PATCH 06/24] GH Actions: minor tweaks

* Update a URL which is no longer valid.
* Ensure all steps have a name.
---
 .github/workflows/basics.yml    | 7 ++++---
 .github/workflows/quicktest.yml | 2 +-
 .github/workflows/test.yml      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index 35e57232..50c1d832 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -40,7 +40,8 @@ jobs:
 
       # Show XML violations inline in the file diff.
       # @link https://github.com/marketplace/actions/xmllint-problem-matcher
-      - uses: korelstar/xmllint-problem-matcher@v1
+      - name: Enable showing XML issues inline
+        uses: korelstar/xmllint-problem-matcher@v1
 
       # Validate the composer.json file.
       # @link https://getcomposer.org/doc/03-cli.md#validate
@@ -52,7 +53,7 @@ jobs:
         run: composer require --no-update --no-scripts squizlabs/php_codesniffer:"dev-master" --no-interaction
 
       # Install dependencies and handle caching in one go.
-      # @link https://github.com/marketplace/actions/install-composer-dependencies
+      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
         uses: "ramsey/composer-install@v2"
         with:
@@ -95,7 +96,7 @@ jobs:
 
       # Install dependencies and handle caching in one go.
       # Dependencies need to be installed to make sure the PHPCS and PHPUnit classes are recognized.
-      # @link https://github.com/marketplace/actions/install-composer-dependencies
+      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
         uses: "ramsey/composer-install@v2"
         with:
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 96131998..fb001fa6 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -52,7 +52,7 @@ jobs:
           coverage: none
 
       # Install dependencies and handle caching in one go.
-      # @link https://github.com/marketplace/actions/install-composer-dependencies
+      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies - normal
         if: ${{ startsWith( matrix.php, '8' ) == false && matrix.php != 'latest' }}
         uses: "ramsey/composer-install@v2"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 72dcada6..09e0c856 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -123,7 +123,7 @@ jobs:
           wp-coding-standards/wpcs:"dev-develop"
 
       # Install dependencies and handle caching in one go.
-      # @link https://github.com/marketplace/actions/install-composer-dependencies
+      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies - normal
         if: ${{ startsWith( matrix.php, '8' ) == false }}
         uses: "ramsey/composer-install@v2"

From 47909901d72864b1f73d17954fa8d65f414c7ac3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 23 Nov 2023 08:06:22 +0100
Subject: [PATCH 07/24] GH Actions: update for the release of PHP 8.3

... which is expected later today.

* Builds against PHP 8.3 are no longer allowed to fail.
* Add _allowed to fail_ build against PHP 8.4.
---
 .github/workflows/test.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 09e0c856..47f1d4f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,10 +28,10 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.4', 'latest', '8.3']
+        php: ['5.4', 'latest', '8.4']
 
     name: "Lint: PHP ${{ matrix.php }}"
-    continue-on-error: ${{ matrix.php == '8.3' }}
+    continue-on-error: ${{ matrix.php == '8.4' }}
 
     steps:
       - name: Checkout code
@@ -67,8 +67,9 @@ jobs:
       #   - PHPCS will run without errors on PHP 5.4 - 7.4 on any supported version.
       #   - PHP 8.0 needs PHPCS 3.5.7+ to run without errors, and we require a higher minimum version.
       #   - PHP 8.1 needs PHPCS 3.6.1+ to run without errors, but works best with 3.7.1+, and we require at least this minimum version.
+      #   - PHP 8.2 and 8.3 need PHPCS 3.8.0+ to run without errors (though the errors don't affect the tests).
       matrix:
-        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         dependencies: ['lowest', 'stable']
 
         include:
@@ -79,16 +80,16 @@ jobs:
             dependencies: 'dev'
           - php: '7.4'
             dependencies: 'dev'
-          - php: '8.2'
+          - php: '8.3'
             dependencies: 'dev'
 
           # Test against upcoming PHP version.
-          - php: '8.3'
+          - php: '8.4'
             dependencies: 'dev'
 
     name: "Test: PHP ${{ matrix.php }} - PHPCS ${{ matrix.dependencies }}"
 
-    continue-on-error: ${{ matrix.php == '8.3' }}
+    continue-on-error: ${{ matrix.php == '8.4' }}
 
     steps:
       - name: Checkout code

From d11b30453a6e999da4fd09b2b587f465ed2a8c18 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Nov 2023 01:17:18 +0100
Subject: [PATCH 08/24] Switch to PHPCSStandards/PHP_CodeSniffer

The Squizlabs repo has been abandoned. The project continues in a fork in the PHPCSStandards organisation.

Ref:
* squizlabs/PHP_CodeSniffer 3932
---
 .github/CONTRIBUTING.md         | 6 +++---
 .phpcs.xml.dist                 | 2 +-
 LICENSE.md                      | 2 +-
 README.md                       | 4 ++--
 WordPress-VIP-Go/ruleset.xml    | 2 +-
 WordPressVIPMinimum/ruleset.xml | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 766f7149..5d6ff2a5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -19,9 +19,9 @@ To determine where best to report the bug, use the first part of the sniff name:
 
 Sniff name starts with | Report to
 --- | ---
-`Generic` | [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer/issues/)
-`PSR2` | [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer/issues/)
-`Squiz` | [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer/issues/)
+`Generic` | [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/)
+`PSR2` | [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/)
+`Squiz` | [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/)
 `Universal` | [PHPCSExtra](https://github.com/PHPCSStandards/PHPCSExtra/issues/)
 `VariableAnalysis` | [VariableAnalysis](https://github.com/sirbrillig/phpcs-variable-analysis/issues/)
 `WordPress` | [WordPressCS](https://github.com/WordPress/WordPress-Coding-Standards/issues/)
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index a0049b7b..098e5acb 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="VIP Coding Standards" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="VIP Coding Standards" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
 	<description>The custom ruleset for the VIP Coding Standards itself.</description>
 
 	<file>.</file>
diff --git a/LICENSE.md b/LICENSE.md
index b6197d02..5517f00d 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -64,4 +64,4 @@ Included Files
 This project includes:
 
 - [WordPress-Coding-Standards](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards), which is Copyright &copy; 2009 John Godley and contributors. Released under the MIT license https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/blob/develop/LICENSE
-- [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer), Copyright &copy; 2012, Squiz Pty Ltd (ABN 77 084 670 600). Released under the following license: https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt
+- [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer), Copyright &copy; 2012, Squiz Pty Ltd (ABN 77 084 670 600). Released under the following license: https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt
diff --git a/README.md b/README.md
index 1006b175..8e839b00 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # VIP Coding Standards
 
-This project contains [PHP_CodeSniffer (PHPCS) sniffs and rulesets](https://github.com/squizlabs/PHP_CodeSniffer) to validate code developed for [WordPress VIP](https://wpvip.com/).
+This project contains [PHP_CodeSniffer (PHPCS) sniffs and rulesets](https://github.com/PHPCSStandards/PHP_CodeSniffer) to validate code developed for [WordPress VIP](https://wpvip.com/).
 
 This project contains two rulesets:
 
@@ -16,7 +16,7 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
 ## Minimal requirements
 
 * PHP 5.4+
-* [PHPCS 3.7.2+](https://github.com/squizlabs/PHP_CodeSniffer/releases)
+* [PHPCS 3.7.2+](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
 * [PHPCSUtils 1.0.8+](https://github.com/PHPCSStandards/PHPCSUtils)
 * [WPCS 3.0.0+](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/releases)
 * [VariableAnalysis 2.11.17+](https://github.com/sirbrillig/phpcs-variable-analysis/releases)
diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 190bebc8..f8952dcb 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPress-VIP-Go" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPress-VIP-Go" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
 	<description>WordPress VIP Go Coding Standards</description>
 
 	<!-- The rules below are the changes from between the original sniff or parent ruleset, and what should be applied for this Standard. -->
diff --git a/WordPressVIPMinimum/ruleset.xml b/WordPressVIPMinimum/ruleset.xml
index 13670326..6a3f10c1 100644
--- a/WordPressVIPMinimum/ruleset.xml
+++ b/WordPressVIPMinimum/ruleset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPressVIPMinimum" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPressVIPMinimum" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
 	<description>WordPress VIP Minimum Coding Standards</description>
 
 	<!--

From a3d7a2c4d91af8311b9357a2cb2a2d8d8a503122 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Nov 2023 03:14:31 +0100
Subject: [PATCH 09/24] Composer: raise the minimum supported PHPCS version to
 3.8.0

... for improved PHP 8.2 support.
---
 README.md     | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8e839b00..1efb6da7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
 ## Minimal requirements
 
 * PHP 5.4+
-* [PHPCS 3.7.2+](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
+* [PHPCS 3.8.0+](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
 * [PHPCSUtils 1.0.8+](https://github.com/PHPCSStandards/PHPCSUtils)
 * [WPCS 3.0.0+](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/releases)
 * [VariableAnalysis 2.11.17+](https://github.com/sirbrillig/phpcs-variable-analysis/releases)
diff --git a/composer.json b/composer.json
index 7f4db735..7cb78d04 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
 		"phpcsstandards/phpcsextra": "^1.1.0",
 		"phpcsstandards/phpcsutils": "^1.0.8",
 		"sirbrillig/phpcs-variable-analysis": "^2.11.17",
-		"squizlabs/php_codesniffer": "^3.7.2",
+		"squizlabs/php_codesniffer": "^3.8.0",
 		"wp-coding-standards/wpcs": "^3.0"
 	},
 	"require-dev": {

From 873e28ec2d68f098908bd449548d0000ab06d916 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Nov 2023 03:22:41 +0100
Subject: [PATCH 10/24] Composer: update various version constraints

... after the tooling has also updated to the PHPCSStandards version of PHPCS.

Refs:
* https://github.com/PHPCSStandards/PHPCSUtils/releases
* https://github.com/PHPCSStandards/PHPCSExtra/releases
---
 README.md     | 3 ++-
 composer.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1efb6da7..01680ddd 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
 
 * PHP 5.4+
 * [PHPCS 3.8.0+](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
-* [PHPCSUtils 1.0.8+](https://github.com/PHPCSStandards/PHPCSUtils)
+* [PHPCSUtils 1.0.9+](https://github.com/PHPCSStandards/PHPCSUtils)
+* [PHPCSExtra 1.2.1+](https://github.com/PHPCSStandards/PHPCSExtra)
 * [WPCS 3.0.0+](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/releases)
 * [VariableAnalysis 2.11.17+](https://github.com/sirbrillig/phpcs-variable-analysis/releases)
 
diff --git a/composer.json b/composer.json
index 7cb78d04..4f7f0b33 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,8 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"phpcsstandards/phpcsextra": "^1.1.0",
-		"phpcsstandards/phpcsutils": "^1.0.8",
+		"phpcsstandards/phpcsextra": "^1.2.1",
+		"phpcsstandards/phpcsutils": "^1.0.9",
 		"sirbrillig/phpcs-variable-analysis": "^2.11.17",
 		"squizlabs/php_codesniffer": "^3.8.0",
 		"wp-coding-standards/wpcs": "^3.0"

From 185d514977401bc27a9679fab59195cbea8e17f7 Mon Sep 17 00:00:00 2001
From: Terri Ann Swallow <terri.swallow@automattic.com>
Date: Fri, 2 Feb 2024 14:20:29 -0500
Subject: [PATCH 11/24] Update install instructions

*  Include `--dev` in require commands
* Use the full term `global` instead of the shorthand `g`
* Mirror "Installation" section structure to the structure on WordPress/WordPress-Coding-Standards
---
 README.md | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 1006b175..3b7d6d1b 100644
--- a/README.md
+++ b/README.md
@@ -23,23 +23,29 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
 
 ## Installation
 
-To install the VIP Coding Standards, run:
-```bash
-composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
-composer require automattic/vipwpcs
-```
+[Composer](https://getcomposer.org/) will install the latest compatible versions of PHPCS, PHPCSUtils, PHPCSExtra, WPCS and VariableAnalysis and register the external standards with PHP_CodeSniffer.
+
+Please refer to the [installation instructions for installing PHP_CodeSniffer for WordPress.com VIP](https://docs.wpvip.com/how-tos/code-review/php_codesniffer/) for more details.
+
+As of VIPCS version 2.3.0, there is no need to `require` the [PHP_CodeSniffer Standards Composer Installer Plugin](https://github.com/PHPCSStandards/composer-installer) anymore as it is now a requirement of VIPCS itself. Permission to run the plugin will still need to be granted though when using Composer 2.2 or higher.
+
+### Composer Project-based Installation
+
+To install the VIP Coding Standards, run the following from the root of your project:
 
-or if installing globally:
 ```bash
-composer g config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
-composer g require automattic/vipwpcs
+composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+composer require --dev automattic/vipwpcs
 ```
 
-This will install the latest compatible versions of PHPCS, PHPCSUtils, PHPCSExtra, WPCS and VariableAnalysis and register the external standards with PHP_CodeSniffer.
+## Composer Global Installation
 
-Please refer to the [installation instructions for installing PHP_CodeSniffer for WordPress.com VIP](https://docs.wpvip.com/how-tos/code-review/php_codesniffer/) for more details.
+Alternatively, it can be installed standard globally for use across multiple projects:
 
-As of VIPCS version 2.3.0, there is no need to `require` the [PHP_CodeSniffer Standards Composer Installer Plugin](https://github.com/PHPCSStandards/composer-installer) anymore as it is now a requirement of VIPCS itself. Permission to run the plugin will still need to be granted though when using Composer 2.2 or higher.
+```bash
+composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+composer global require --dev automattic/vipwpcs
+```
 
 ## Contribution
 

From aac66cefc2c0ed9357077e40e5d66695e6ecf610 Mon Sep 17 00:00:00 2001
From: Terri Ann Swallow <terri.swallow@automattic.com>
Date: Fri, 2 Feb 2024 14:24:06 -0500
Subject: [PATCH 12/24] Correct use of semantic heading

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3b7d6d1b..6429f1f3 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer tru
 composer require --dev automattic/vipwpcs
 ```
 
-## Composer Global Installation
+### Composer Global Installation
 
 Alternatively, it can be installed standard globally for use across multiple projects:
 

From 83d152e21afc4bc17529d25111c02660174eae31 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:18:56 +0100
Subject: [PATCH 13/24] Tests: allow for PHPUnit 8/9

PHP_CodeSniffer 3.8.0 now allows for running the tests, which are based on the PHPCS native test suite, with PHPUnit 8 and 9.

This commit updates the package to take advantage of that.

Includes:
* Widening the PHPUnit version requirements.
* Adding the PHPUnit 8+ cache file to `.gitignore`.
* Updating the PHPUnit configuration to make sure that PHP deprecations will always show, even when on a high PHPUnit 9.6 version.
* Updating the info in `CONTRIBUTING`.
* Simplifications to the `quicktest` and `test` workflows.
    Also, the code coverage "high" run can now be run against PHP 8.3.
* Running PHPStan against PHP `latest` (couldn't previously be done due to the old PHPUnit version).
* Updating the `unit-tests` script to remove the PHP version based toggle, which is no longer needed.

Ref:
* PHPCSStandards/PHP_CodeSniffer 59
---
 .github/CONTRIBUTING.md         |  6 +++---
 .github/workflows/basics.yml    |  2 +-
 .github/workflows/quicktest.yml | 24 ++----------------------
 .github/workflows/test.yml      | 24 ++----------------------
 .gitignore                      |  1 +
 bin/unit-tests                  |  6 +-----
 composer.json                   |  2 +-
 phpstan.neon.dist               |  2 +-
 phpunit.xml.dist                |  4 ++++
 9 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 5d6ff2a5..76fce724 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -95,7 +95,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 * WordPress-Coding-Standards
 * PHPCSUtils 1.x
 * PHP_CodeSniffer 3.x
-* PHPUnit 4.x, 5.x, 6.x or 7.x
+* PHPUnit 4.x - 9.x
 
 The VIP Coding Standards use the PHP_CodeSniffer native unit test suite for unit testing the sniffs.
 
@@ -106,7 +106,7 @@ N.B.: If you installed VIPCS using Composer, make sure you used `--prefer-source
 If you already have PHPUnit installed on your system: Congrats, you're all set.
 
 If not, you can navigate to the directory where the `PHP_CodeSniffer` repo is checked out and do `composer install` to install the `dev` dependencies.
-Alternatively, you can [install PHPUnit](https://phpunit.readthedocs.io/en/7.5/installation.html) as a PHAR file.
+Alternatively, you can [install PHPUnit](https://phpunit.readthedocs.io/en/9.6/installation.html) as a PHAR file.
 
 ### Before running the unit tests
 
@@ -146,7 +146,7 @@ The easiest way to do this is to add a `phpunit.xml` file to the root of your VI
 
 Expected output:
 ```
-PHPUnit 7.5.20 by Sebastian Bergmann and contributors.
+PHPUnit 9.6.15 by Sebastian Bergmann and contributors.
 
 ........................................                          40 / 40 (100%)
 
diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index 50c1d832..c99454d2 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -90,7 +90,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: 'latest'
           coverage: none
           tools: phpstan
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index fb001fa6..fce8df00 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -53,24 +53,14 @@ jobs:
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
-      - name: Install Composer dependencies - normal
-        if: ${{ startsWith( matrix.php, '8' ) == false && matrix.php != 'latest' }}
+      - name: Install Composer dependencies
         uses: "ramsey/composer-install@v2"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
-      # requirements to get PHPUnit 7.x to install on nightly.
-      - name: Install Composer dependencies - with ignore platform
-        if: ${{ startsWith( matrix.php, '8' ) || matrix.php == 'latest' }}
-        uses: "ramsey/composer-install@v2"
-        with:
-          composer-options: --ignore-platform-req=php+
-          custom-cache-suffix: $(date -u "+%Y-%m")
-
       - name: "Composer: downgrade PHPCS dependencies for tests (lowest)"
-        if: ${{ matrix.php == '5.4' && matrix.dependencies == 'lowest' }}
+        if: ${{ matrix.dependencies == 'lowest' }}
         run: >
           composer update --prefer-lowest --no-scripts --no-interaction
           squizlabs/php_codesniffer
@@ -79,16 +69,6 @@ jobs:
           sirbrillig/phpcs-variable-analysis
           wp-coding-standards/wpcs
 
-      - name: "Composer: downgrade PHPCS dependencies for tests (lowest) - with ignore platform"
-        if: ${{ matrix.php == 'latest' && matrix.dependencies == 'lowest' }}
-        run: >
-          composer update --prefer-lowest --no-scripts --no-interaction --ignore-platform-req=php+
-          squizlabs/php_codesniffer
-          phpcsstandards/phpcsutils
-          phpcsstandards/phpcsextra
-          sirbrillig/phpcs-variable-analysis
-          wp-coding-standards/wpcs
-
       - name: Display PHPCS installed standards
         run: ./vendor/bin/phpcs -i
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 47f1d4f8..c9a9fe90 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -125,24 +125,14 @@ jobs:
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
-      - name: Install Composer dependencies - normal
-        if: ${{ startsWith( matrix.php, '8' ) == false }}
+      - name: Install Composer dependencies
         uses: "ramsey/composer-install@v2"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
-      # requirements to get PHPUnit 7.x to install on nightly.
-      - name: Install Composer dependencies - with ignore platform
-        if: ${{ startsWith( matrix.php, '8' ) }}
-        uses: "ramsey/composer-install@v2"
-        with:
-          composer-options: --ignore-platform-req=php+
-          custom-cache-suffix: $(date -u "+%Y-%m")
-
       - name: "Composer: downgrade PHPCS dependencies for tests (lowest)"
-        if: ${{ ! startsWith( matrix.php, '8' ) && matrix.dependencies == 'lowest' }}
+        if: ${{ matrix.dependencies == 'lowest' }}
         run: >
           composer update --prefer-lowest --no-scripts --no-interaction
           squizlabs/php_codesniffer
@@ -151,16 +141,6 @@ jobs:
           sirbrillig/phpcs-variable-analysis
           wp-coding-standards/wpcs
 
-      - name: "Composer: downgrade PHPCS dependencies for tests (lowest) - with ignore platform"
-        if: ${{ startsWith( matrix.php, '8' ) && matrix.dependencies == 'lowest' }}
-        run: >
-          composer update --prefer-lowest --no-scripts --no-interaction --ignore-platform-req=php+
-          squizlabs/php_codesniffer
-          phpcsstandards/phpcsutils
-          phpcsstandards/phpcsextra
-          sirbrillig/phpcs-variable-analysis
-          wp-coding-standards/wpcs
-
       - name: Run the unit tests
         run: ./bin/unit-tests
 
diff --git a/.gitignore b/.gitignore
index 8c5b8732..843c4b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ phpcs.xml
 phpunit.xml
 phpcs.cache
 phpstan.neon
+.phpunit.result.cache
diff --git a/bin/unit-tests b/bin/unit-tests
index 8ffc5acc..adc03b12 100755
--- a/bin/unit-tests
+++ b/bin/unit-tests
@@ -16,8 +16,4 @@
 #   ./bin/unit-tests --filter SniffName
 #
 
-if [[ $(php -r 'echo PHP_VERSION_ID;') -ge 80100 ]]; then
-	"$(pwd)/vendor/bin/phpunit" --filter=WordPressVIPMinimum "$(pwd)/vendor/squizlabs/php_codesniffer/tests/AllTests.php" --no-coverage --no-configuration --bootstrap=./tests/bootstrap.php --dont-report-useless-tests $@
-else
-	"$(pwd)/vendor/bin/phpunit" --filter=WordPressVIPMinimum "$(pwd)/vendor/squizlabs/php_codesniffer/tests/AllTests.php" --no-coverage $@
-fi
+"$(pwd)/vendor/bin/phpunit" --filter WordPressVIPMinimum "$(pwd)/vendor/squizlabs/php_codesniffer/tests/AllTests.php" --no-coverage $@
diff --git a/composer.json b/composer.json
index 4f7f0b33..799886db 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
 		"php-parallel-lint/php-console-highlighter": "^1.0.0",
 		"phpcompatibility/php-compatibility": "^9",
 		"phpcsstandards/phpcsdevtools": "^1.0",
-		"phpunit/phpunit": "^4 || ^5 || ^6 || ^7"
+		"phpunit/phpunit": "^4 || ^5 || ^6 || ^7 || ^8 || ^9"
 	},
 	"config": {
 		"allow-plugins": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index d6d59ff5..772d91a9 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 parameters:
-    #phpVersion: 50400 # Needs to be 70100 or higher... sigh...
+    phpVersion: 70100 # Needs to be 70100 or higher... sigh...
     level: 5
     paths:
         - WordPressVIPMinimum
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 299e2f35..60e45c7f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,6 +5,10 @@
 	backupGlobals="true"
 	bootstrap="./tests/bootstrap.php"
 	beStrictAboutTestsThatDoNotTestAnything="false"
+	convertErrorsToExceptions="true"
+	convertWarningsToExceptions="true"
+	convertNoticesToExceptions="true"
+	convertDeprecationsToExceptions="true"
 	forceCoversAnnotation="true"
 	colors="true"
 	>

From f34f465a829f516c937e5c8e319619988a3689eb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:18:56 +0100
Subject: [PATCH 14/24] CONTRIBUTING: minor tweak

Follow up to #809 and #796
---
 .github/CONTRIBUTING.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 76fce724..8a17c256 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -44,11 +44,9 @@ gh repo clone Automattic/VIP-Coding-Standards vipcs
 Now `cd vipcs` and run:
 
 ```sh
-composer install --ignore-platform-req=php+
+composer install
 ```
 
-The platform requirements for higher versions of PHP are ignored so that the correct version of PHPUnit (7.x needed by PHPCS) is installed.
-
 You can now run:
 
 ```

From 26312cfa20d894b11b4fcae1f09a83d074302ad0 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 16 Feb 2024 16:05:51 +0000
Subject: [PATCH 15/24] Docs: Fix name of WPVIP

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6429f1f3..834900ec 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
 
 [Composer](https://getcomposer.org/) will install the latest compatible versions of PHPCS, PHPCSUtils, PHPCSExtra, WPCS and VariableAnalysis and register the external standards with PHP_CodeSniffer.
 
-Please refer to the [installation instructions for installing PHP_CodeSniffer for WordPress.com VIP](https://docs.wpvip.com/how-tos/code-review/php_codesniffer/) for more details.
+Please refer to the [installation instructions for installing PHP_CodeSniffer for WordPress VIP](https://docs.wpvip.com/how-tos/code-review/php_codesniffer/) for more details.
 
 As of VIPCS version 2.3.0, there is no need to `require` the [PHP_CodeSniffer Standards Composer Installer Plugin](https://github.com/PHPCSStandards/composer-installer) anymore as it is now a requirement of VIPCS itself. Permission to run the plugin will still need to be granted though when using Composer 2.2 or higher.
 

From cf5dc95b1fb1eb784ff00f2fc1a7d3c3caaae4a3 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 16 Feb 2024 16:08:25 +0000
Subject: [PATCH 16/24] Docs: Fix links

Update some old WPVIP Documentation links.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 01680ddd..86e8efd6 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@ This project contains two rulesets:
  - `WordPressVIPMinimum` - for use with projects on the (older) WordPress.com VIP platform.
  - `WordPress-VIP-Go` - for use with projects on the (newer) VIP Go platform.
 
-These rulesets contain only the rules which are considered to be ["errors"](https://docs.wpvip.com/technical-references/code-review/vip-errors/) and ["warnings"](https://docs.wpvip.com/technical-references/code-review/vip-warnings/) according to the WordPress VIP Go documentation.
+These rulesets contain only the rules which are considered to be [errors](https://docs.wpvip.com/php_codesniffer/errors/) and [warnings](https://docs.wpvip.com/php_codesniffer/warnings/) according to the WordPress VIP documentation.
 
 The rulesets use rules from the [WordPress Coding Standards](https://github.com/WordPress/WordPress-Coding-Standards) (WPCS) project, as well as the [VariableAnalysis](https://github.com/sirbrillig/phpcs-variable-analysis) standard.
 
-Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to learn about why violations are flagged as errors vs warnings and what the levels mean.
+[Learn](https://docs.wpvip.com/vip-code-analysis-bot/phpcs-report/) about why violations are flagged as errors vs warnings and what the levels mean.
 
 ## Minimal requirements
 

From cd82f3e2d36efa687751299e2aabec62ece5d675 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 16 Feb 2024 16:24:41 +0000
Subject: [PATCH 17/24] End restricting usage of term_exists()

Since WP 6.0.0, term_exists() uses get_terms() internally`. See core.trac.wordpress.org/ticket/36949. This means that reporting this function as not being cached is not true anymore.

Fixes #720.
---
 WordPress-VIP-Go/ruleset-test.inc                          | 2 +-
 WordPress-VIP-Go/ruleset-test.php                          | 1 -
 .../Sniffs/Functions/RestrictedFunctionsSniff.php          | 7 -------
 .../Tests/Functions/RestrictedFunctionsUnitTest.inc        | 4 ++--
 .../Tests/Functions/RestrictedFunctionsUnitTest.php        | 1 -
 WordPressVIPMinimum/ruleset-test.inc                       | 2 +-
 WordPressVIPMinimum/ruleset-test.php                       | 1 -
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset-test.inc b/WordPress-VIP-Go/ruleset-test.inc
index 773842b0..4a36e262 100644
--- a/WordPress-VIP-Go/ruleset-test.inc
+++ b/WordPress-VIP-Go/ruleset-test.inc
@@ -358,7 +358,7 @@ wpcom_vip_irc(); // Error.
 flush_rewrite_rules(); // Error.
 $wp_rewrite->flush_rules(); // Error.
 \add_role(); // Error.
-term_exists(); // Error.
+
 count_user_posts(); // Error.
 get_intermediate_image_sizes(); // Error.
 wp_is_mobile(); // Error.
diff --git a/WordPress-VIP-Go/ruleset-test.php b/WordPress-VIP-Go/ruleset-test.php
index 0fde7fbe..053d9a86 100644
--- a/WordPress-VIP-Go/ruleset-test.php
+++ b/WordPress-VIP-Go/ruleset-test.php
@@ -47,7 +47,6 @@
 		358 => 1,
 		359 => 1,
 		360 => 1,
-		361 => 1,
 		362 => 1,
 		363 => 1,
 		364 => 1,
diff --git a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
index 505bc5a0..8f81f4cf 100644
--- a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
@@ -102,13 +102,6 @@ public function getGroups() {
 					'add_role',
 				],
 			],
-			'term_exists' => [
-				'type'      => 'error',
-				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_term_exists() instead.',
-				'functions' => [
-					'term_exists',
-				],
-			],
 			'count_user_posts' => [
 				'type'      => 'error',
 				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_count_user_posts() instead.',
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
index d6dc74ef..b4366c98 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
@@ -84,8 +84,8 @@ add_role( 'test' ); // Error.
 
 
 
-wpcom_vip_term_exists(); // Ok - VIP recommended version of term_exists().
-term_exists(); // Error.
+
+
 
 wpcom_vip_count_user_posts(); // Ok - VIP recommended version of count_user_posts().
 count_user_posts(); // Error.
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
index e089d78e..bb5236cb 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
@@ -39,7 +39,6 @@ public function getErrorList() {
 			62  => 1,
 			75  => 1,
 			76  => 1,
-			88  => 1,
 			91  => 1,
 			94  => 1,
 			97  => 1,
diff --git a/WordPressVIPMinimum/ruleset-test.inc b/WordPressVIPMinimum/ruleset-test.inc
index 0b25bfef..fd0567c6 100644
--- a/WordPressVIPMinimum/ruleset-test.inc
+++ b/WordPressVIPMinimum/ruleset-test.inc
@@ -329,7 +329,7 @@ url_to_postid( $url ); // Error.
 
 
 
-term_exists(); // Error.
+
 count_user_posts(); // Error.
 wp_old_slug_redirect(); // Error.
 get_adjacent_post(); // Error.
diff --git a/WordPressVIPMinimum/ruleset-test.php b/WordPressVIPMinimum/ruleset-test.php
index 05076415..71016e82 100644
--- a/WordPressVIPMinimum/ruleset-test.php
+++ b/WordPressVIPMinimum/ruleset-test.php
@@ -95,7 +95,6 @@
 		325 => 1,
 		326 => 1,
 		327 => 1,
-		332 => 1,
 		333 => 1,
 		334 => 1,
 		335 => 1,

From 7e51538195204c252f2a86d690b930f04537ab51 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 16 Feb 2024 16:25:40 +0000
Subject: [PATCH 18/24] Docs: Fix changelog heading

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1105bddb..a5f8f157 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ The tagged releases branch is now `main` instead of `master`.
 - [#777](https://github.com/Automattic/VIP-Coding-Standards/pull/777): 3.0: start using PHPCSUtils.
 - [#779](https://github.com/Automattic/VIP-Coding-Standards/pull/779): 3.0: support WordPressCS 3.0.
 
-## Changed
+### Changed
 - [#780](https://github.com/Automattic/VIP-Coding-Standards/pull/780): Performance/WPQueryParams: defer to the parent sniff.
   - Two error codes changed:
     - `WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn` is now `WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn_post__not_in`.

From 4c83c0bef449f9c73454c5283b92762e577b0761 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 16 Feb 2024 18:02:08 +0000
Subject: [PATCH 19/24] End restricting usage of get_page_by_title()

In WP 6.1.0, `get_page_by_title()` was changed to use `WP_Query` internally`. See core.trac.wordpress.org/ticket/36905. This means that reporting this function as not being cached is not true anymore.

Note that since WP 6.2.0, the function was reverted from using `WP_Query` but was deprecated in favour of using `WP_Query` directly. WordPress Coding Standards highlights this deprecation already.

See #801.
---
 WordPress-VIP-Go/ruleset-test.inc                          | 6 +++---
 WordPress-VIP-Go/ruleset-test.php                          | 4 ----
 WordPress-VIP-Go/ruleset.xml                               | 4 ----
 .../Sniffs/Functions/RestrictedFunctionsSniff.php          | 7 -------
 .../Tests/Functions/RestrictedFunctionsUnitTest.inc        | 4 ++--
 .../Tests/Functions/RestrictedFunctionsUnitTest.php        | 1 -
 WordPressVIPMinimum/ruleset-test.inc                       | 2 +-
 WordPressVIPMinimum/ruleset-test.php                       | 1 -
 8 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset-test.inc b/WordPress-VIP-Go/ruleset-test.inc
index 4a36e262..bd7e3de6 100644
--- a/WordPress-VIP-Go/ruleset-test.inc
+++ b/WordPress-VIP-Go/ruleset-test.inc
@@ -130,9 +130,9 @@ get_next_post(); // Warning.
 get_previous_post_link(); // Warning.
 get_next_post_link(); // Warning.
 
-// WordPressVIPMinimum.Functions.RestrictedFunctions.get_page_by_title_get_page_by_title
-wpcom_vip_get_page_by_title(); // Ok.
-get_page_by_title( $page_title ); // Warning + Message.
+
+
+
 
 // WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_children
 get_child(); // Ok.
diff --git a/WordPress-VIP-Go/ruleset-test.php b/WordPress-VIP-Go/ruleset-test.php
index 053d9a86..d8701db4 100644
--- a/WordPress-VIP-Go/ruleset-test.php
+++ b/WordPress-VIP-Go/ruleset-test.php
@@ -154,7 +154,6 @@
 		129 => 1,
 		130 => 1,
 		131 => 1,
-		135 => 1,
 		139 => 1,
 		142 => 1,
 		146 => 1,
@@ -304,9 +303,6 @@
 		123 => [
 			'attachment_url_to_postid() is uncached, please use wpcom_vip_attachment_url_to_postid() instead.',
 		],
-		135 => [
-			'get_page_by_title() is uncached, please use wpcom_vip_get_page_by_title() instead.',
-		],
 		139 => [
 			'get_children() is uncached and performs a no limit query. Please use get_posts or WP_Query instead. Please see: https://docs.wpvip.com/technical-references/caching/uncached-functions/',
 		],
diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index f8952dcb..8cd531c3 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -152,10 +152,6 @@
 	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_adjacent_post_get_next_post_link">
 		<type>warning</type>
 	</rule>
-	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_page_by_title_get_page_by_title">
-		<type>warning</type>
-		<message>%s() is uncached, please use wpcom_vip_get_page_by_title() instead.</message>
-	</rule>
 	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_children">
 		<type>warning</type>
 		<severity>3</severity>
diff --git a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
index 8f81f4cf..152f4499 100644
--- a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
@@ -80,13 +80,6 @@ public function getGroups() {
 					'switch_to_blog',
 				],
 			],
-			'get_page_by_title' => [
-				'type'      => 'error',
-				'message'   => '%s() is prohibited, please use wpcom_vip_get_page_by_title() instead.',
-				'functions' => [
-					'get_page_by_title',
-				],
-			],
 			'url_to_postid' => [
 				'type'      => 'error',
 				'message'   => '%s() is prohibited, please use wpcom_vip_url_to_postid() instead.',
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
index b4366c98..10851408 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
@@ -55,8 +55,8 @@ $wp_rewrite->flush_rules(); // Error.
 switch_blog(); // Ok - similarly-named function to switch_to_blog().
 switch_to_blog( $blogid ); // Warning.
 
-wpcom_vip_get_page_by_title(); // Ok - VIP recommended version of get_page_by_title().
-get_page_by_title( $page_title ); // Error.
+
+
 
 wpcom_vip_url_to_postid( $url ); // Ok - VIP recommended version of url_to_postid().
 url_to_postid( $url ); // Error.
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
index bb5236cb..036bd4f7 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList() {
 			43  => 1,
 			46  => 1,
 			50  => 1,
-			59  => 1,
 			62  => 1,
 			75  => 1,
 			76  => 1,
diff --git a/WordPressVIPMinimum/ruleset-test.inc b/WordPressVIPMinimum/ruleset-test.inc
index fd0567c6..a20a8494 100644
--- a/WordPressVIPMinimum/ruleset-test.inc
+++ b/WordPressVIPMinimum/ruleset-test.inc
@@ -322,7 +322,7 @@ $wp_rewrite->flush_rules(); // Error.
 attachment_url_to_postid( $url ); // Error.
 
 switch_to_blog( $blogid ); // Warning.
-get_page_by_title( $page_title ); // Error.
+
 url_to_postid( $url ); // Error.
 \add_role(); // Error.
 
diff --git a/WordPressVIPMinimum/ruleset-test.php b/WordPressVIPMinimum/ruleset-test.php
index 71016e82..e78ae6a7 100644
--- a/WordPressVIPMinimum/ruleset-test.php
+++ b/WordPressVIPMinimum/ruleset-test.php
@@ -92,7 +92,6 @@
 		320 => 1,
 		321 => 1,
 		322 => 1,
-		325 => 1,
 		326 => 1,
 		327 => 1,
 		333 => 1,

From fe947b0a16962bee453dc28ba5ba3d8c0fa30ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:54:24 +0000
Subject: [PATCH 20/24] GH Actions: Bump ramsey/composer-install from 2 to 3

Bumps [ramsey/composer-install](https://github.com/ramsey/composer-install) from 2 to 3.
- [Release notes](https://github.com/ramsey/composer-install/releases)
- [Commits](https://github.com/ramsey/composer-install/compare/v2...v3)

---
updated-dependencies:
- dependency-name: ramsey/composer-install
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/basics.yml    | 4 ++--
 .github/workflows/quicktest.yml | 2 +-
 .github/workflows/test.yml      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index c99454d2..bbaae6cb 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -55,7 +55,7 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
@@ -98,7 +98,7 @@ jobs:
       # Dependencies need to be installed to make sure the PHPCS and PHPUnit classes are recognized.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index fce8df00..fff3cfa4 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -54,7 +54,7 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9a9fe90..ab08a031 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
           tools: cs2pr
 
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
@@ -126,7 +126,7 @@ jobs:
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")

From ab5666274083ffc4a34d4770106b85ab45f0ef3a Mon Sep 17 00:00:00 2001
From: Rebecca Hum <rebecca.hum@automattic.com>
Date: Mon, 8 Apr 2024 16:11:33 -0600
Subject: [PATCH 21/24] Deprecate suggesting using wpcom_vip_get_page_by_path

---
 .../Sniffs/Functions/RestrictedFunctionsSniff.php          | 7 -------
 .../Tests/Functions/RestrictedFunctionsUnitTest.inc        | 4 ++--
 .../Tests/Functions/RestrictedFunctionsUnitTest.php        | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
index 152f4499..4513140c 100644
--- a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
@@ -269,13 +269,6 @@ public function getGroups() {
 					'create_function',
 				],
 			],
-			'get_page_by_path' => [
-				'type'      => 'warning',
-				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_get_page_by_path() instead.',
-				'functions' => [
-					'get_page_by_path',
-				],
-			],
 		];
 
 		$deprecated_vip_helpers = [
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
index 10851408..19cba6b3 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
@@ -222,8 +222,8 @@ $wp_random_testing = create_function3( '$a, $b', 'return ( $b / $a ); '); // Ok.
 
 
 
-wpcom_vip_get_page_by_path(); // Ok - VIP recommended version of get_page_by_path().
-get_page_by_path( $page_path ); // Warning.
+
+
 
 $popular = stats_get_csv( 'postviews', [ 'days'  => 2,   'limit' => 20 ] ); // Error.
 $popular = custom_stats_get_csv( 'postviews', [ 'days'  => 2,   'limit' => 20 ] ); // Ok.
diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
index 036bd4f7..0b4fcc5c 100644
--- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
@@ -121,7 +121,6 @@ public function getWarningList() {
 			138 => 1,
 			139 => 1,
 			208 => 1,
-			226 => 1,
 		];
 	}
 }

From f60ed12ed913928446c1e8dee4d09298ae6afed2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:42:01 +0200
Subject: [PATCH 22/24] GH Actions: work around intermittent apt-get errors

Okay, so apparently, there is a long-standing bug in the Microsoft package deploy process which caused `apt-get update` to fail in the first half hour after Microsoft has deployed a package.

The failure looks like this:
```
E: Failed to fetch https://packages.microsoft.com/ubuntu/22.04/prod/dists/jammy/InRelease  Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?)
```

As this only happens intermittently (after a MS package deploy), the chance of running into this bug are slim, but guess what: today I ran into it.

This change to the workflow is intended to prevent the next person running into this issue from having to waste time on figuring this out.

By splitting the "Install xmllint" step into two steps: one doing the `apt-get update` and one doing the actual install and making the first step one which is allowed to `continue-on-error`, this issue should hopefully not crop up anymore.

Any errors in the `apt-get update` step will now be ignored and as most errors which could potentially come from that step are irrelevant for the rest of the job anyway, this is fine.
If a relevant error would be surfaced, the next step (the xmllint install), will fail the job anyway.

Refs:
* https://github.com/actions/runner-images/issues/3410
* https://github.com/dotnet/core/issues/4167
---
 .github/workflows/basics.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index bbaae6cb..8a6c8fa1 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -33,10 +33,15 @@ jobs:
           coverage: none
           tools: cs2pr
 
+      # Updating the lists can fail intermittently, typically after Microsoft has released a new package.
+      # This should not be blocking for this job, so ignore any errors from this step.
+      # Ref: https://github.com/dotnet/core/issues/4167
+      - name: Update the available packages list
+        continue-on-error: true
+        run: sudo apt-get update
+
       - name: Install xmllint
-        run: |
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends -y libxml2-utils
+        run: sudo apt-get install --no-install-recommends -y libxml2-utils
 
       # Show XML violations inline in the file diff.
       # @link https://github.com/marketplace/actions/xmllint-problem-matcher

From b14551f0ca048f6566102fe1813fa0a5535c68fd Mon Sep 17 00:00:00 2001
From: Rebecca Hum <rebeccahum@gmail.com>
Date: Wed, 8 May 2024 11:55:03 -0600
Subject: [PATCH 23/24] Update dependencies per
 https://github.com/Automattic/VIP-Coding-Standards/pull/819

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 799886db..c65c23bb 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,10 @@
 	"require": {
 		"php": ">=5.4",
 		"phpcsstandards/phpcsextra": "^1.2.1",
-		"phpcsstandards/phpcsutils": "^1.0.9",
-		"sirbrillig/phpcs-variable-analysis": "^2.11.17",
-		"squizlabs/php_codesniffer": "^3.8.0",
-		"wp-coding-standards/wpcs": "^3.0"
+		"phpcsstandards/phpcsutils": "^1.0.11",
+		"sirbrillig/phpcs-variable-analysis": "^2.11.18",
+		"squizlabs/php_codesniffer": "^3.9.2",
+		"wp-coding-standards/wpcs": "^3.1.0"
 	},
 	"require-dev": {
 		"php-parallel-lint/php-parallel-lint": "^1.3.2",

From 65ef15abe06e98a702358d8858a0a6558506bb8d Mon Sep 17 00:00:00 2001
From: Rebecca Hum <rebecca.hum@automattic.com>
Date: Thu, 2 May 2024 12:35:03 -0600
Subject: [PATCH 24/24] Add changelog for 3.0.1 release

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5f8f157..3e04b2ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.1] - 2024-05-14
+
+Props: @GaryJones, @jrnfl, @terriann, @rebeccahum
+
+Increases requirements for PHPCS from 3.7.2 to 3.9.2 for improved PHP 8.2 and PHP 8.3 support. Please ensure you run `composer update automattic/vipwpcs --with-dependencies` to benefit from this.
+
+### Removed
+- Functions/RestrictedFunctions:
+    * [#812](https://github.com/Automattic/VIP-Coding-Standards/pull/812): Remove restricting `term_exists()`.
+    * [#814](https://github.com/Automattic/VIP-Coding-Standards/pull/814): Remove restricting `get_page_by_title()`.
+    * [#817](https://github.com/Automattic/VIP-Coding-Standards/pull/817): Remove restricting `get_page_by_path()`.
+
+### Changed
+- [#799](https://github.com/Automattic/VIP-Coding-Standards/pull/799): Classes/DeclarationCompatibility: Sync signature definitions with WP Core.
+
+### Maintenance
+- [#797](https://github.com/Automattic/VIP-Coding-Standards/pull/797): GH: Add initial dependabot config file.
+- GH Actions:
+    * [#798](https://github.com/Automattic/VIP-Coding-Standards/pull/798): Bump actions/checkout to 4 from 3.
+    * [#802](https://github.com/Automattic/VIP-Coding-Standards/pull/802): Minor tweaks of updating an incorrect URL and adding names to steps.
+    * [#803](https://github.com/Automattic/VIP-Coding-Standards/pull/802): Builds against PHP 8.3 can no longer fail, but 8.4 can.
+    * [#818](https://github.com/Automattic/VIP-Coding-Standards/pull/818): Add workaround for intermittent `apt-get update` issue.
+- Composer:
+    * [#805](https://github.com/Automattic/VIP-Coding-Standards/pull/805): Raise minimum version for better PHP 8.2 support.
+    * [#805](https://github.com/Automattic/VIP-Coding-Standards/pull/805): Up the minimum PHPCSExtra version to 1.2.1.
+    * [#821](https://github.com/Automattic/VIP-Coding-Standards/pull/821): Up the minimum PHPCSUtils version to 1.0.11.
+    * [#821](https://github.com/Automattic/VIP-Coding-Standards/pull/821): Up the minimum PHPCS version to 3.9.2.
+    * [#821](https://github.com/Automattic/VIP-Coding-Standards/pull/821): Up the minimum WPCS version to 3.1.0.
+    * [#821](https://github.com/Automattic/VIP-Coding-Standards/pull/821): Up the minimum PHPCSVariableAnalysis version to 2.11.18.
+- Docs:
+    * [#805](https://github.com/Automattic/VIP-Coding-Standards/pull/805): Update references to PHPCS under PHPCSStandards, as squizlabs version is abandoned.
+    * [#808](https://github.com/Automattic/VIP-Coding-Standards/pull/808): Update Composer installation instructions.
+    * [#811](https://github.com/Automattic/VIP-Coding-Standards/pull/811): Update old URLs.
+- [#809](https://github.com/Automattic/VIP-Coding-Standards/pull/809): Unit tests: Allow for PHPUnit 8 and 9.
+
 ## [3.0.0] - 2023-09-05
 
 Props: @GaryJones, @jrfnl
@@ -674,6 +709,7 @@ Initial release.
 
 Props: david-binda, pkevan.
 
+[3.0.1]: https://github.com/Automattic/VIP-Coding-Standards/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/Automattic/VIP-Coding-Standards/compare/2.3.4...3.0.0
 [2.3.4]: https://github.com/Automattic/VIP-Coding-Standards/compare/2.3.3...2.3.4
 [2.3.3]: https://github.com/Automattic/VIP-Coding-Standards/compare/2.3.2...2.3.3