From 50ff813a25c4e3cf594bb23fde7a8ada273c7d7f Mon Sep 17 00:00:00 2001
From: JDGrimes <jdg@codesymphony.co>
Date: Thu, 21 Dec 2017 11:22:41 -0500
Subject: [PATCH 001/822] WP.AlternativeFunctions: Order filesystem function
 list alphabetically

Will make it easier to see changes.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e96d41a557..095bd6b851 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -72,15 +72,15 @@ public function getGroups() {
 				'type'      => 'warning',
 				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
 				'functions' => array(
-					'readfile',
-					'fopen',
-					'fsockopen',
-					'pfsockopen',
 					'fclose',
+					'file_get_contents',
+					'file_put_contents',
+					'fopen',
 					'fread',
+					'fsockopen',
 					'fwrite',
-					'file_put_contents',
-					'file_get_contents',
+					'pfsockopen',
+					'readfile',
 				),
 			),
 

From d3b358637e896f53522fb23c00fed93adf42e99e Mon Sep 17 00:00:00 2001
From: JDGrimes <jdg@codesymphony.co>
Date: Thu, 21 Dec 2017 11:28:10 -0500
Subject: [PATCH 002/822] WP.AlternativeFunctions: Add more functions to
 filesystem functions list

These functions were in the `VIP.FileSystemWritesDisallowed` sniff, and
it seemed like a good idea to add them here as well.
---
 .../Sniffs/WP/AlternativeFunctionsSniff.php   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 095bd6b851..2366cb83a2 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -72,15 +72,35 @@ public function getGroups() {
 				'type'      => 'warning',
 				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
 				'functions' => array(
+					'chgrp',
+					'chmod',
+					'chown',
+					'delete',
 					'fclose',
 					'file_get_contents',
 					'file_put_contents',
+					'flock',
 					'fopen',
+					'fputcsv',
+					'fputs',
 					'fread',
 					'fsockopen',
+					'ftruncate',
 					'fwrite',
+					'is_writable',
+					'is_writeable',
+					'lchgrp',
+					'lchown',
+					'link',
+					'mkdir',
 					'pfsockopen',
 					'readfile',
+					'rename',
+					'rmdir',
+					'symlink',
+					'tempnam',
+					'touch',
+					'unlink',
 				),
 			),
 

From 6275522d37ea849d5c4fb7a4eb9e763eb17ecf24 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 22:49:26 +0200
Subject: [PATCH 003/822] Composer/Travis: change the minimum PHPCS version

Update the minimum required PHPCS version to `3.5.0`.
---
 .travis.yml   | 10 +++++-----
 composer.json |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4369ad0926..8cd9fc1b4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ php:
     - "nightly"
 
 env:
-  # `master` is now 3.x.
+  # PHPCS `master`.
   - PHPCS_BRANCH="dev-master" LINT=1
   # Lowest supported release in the 3.x series with which WPCS is compatible.
-  - PHPCS_BRANCH="3.3.1"
+  - PHPCS_BRANCH="3.5.0"
 
 # Define the stages used.
 # For non-PRs, only the sniff, ruleset and quicktest stages are run.
@@ -101,7 +101,7 @@ jobs:
 
     - stage: rulesets
       php: 7.4
-      env: PHPCS_BRANCH="3.3.1"
+      env: PHPCS_BRANCH="3.5.0"
       script:
         - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Core
         - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Docs
@@ -115,11 +115,11 @@ jobs:
       php: 7.4
       env: PHPCS_BRANCH="dev-master" LINT=1
     - php: 7.3
-      env: PHPCS_BRANCH="3.3.1"
+      env: PHPCS_BRANCH="3.5.0"
     - php: 5.4
       env: PHPCS_BRANCH="dev-master" LINT=1
     - php: 5.4
-      env: PHPCS_BRANCH="3.3.1"
+      env: PHPCS_BRANCH="3.5.0"
 
     #### TEST STAGE ####
     # Add extra build to test against PHPCS 4.
diff --git a/composer.json b/composer.json
index 7e3c558fb3..d5ee2400d5 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"squizlabs/php_codesniffer": "^3.3.1"
+		"squizlabs/php_codesniffer": "^3.5.0"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6",

From f73d151ddde46cee7b33d3d47a881f0030e024c9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 22:49:26 +0200
Subject: [PATCH 004/822] Composer: add PHPCSUtils and PHPCSExtra as
 dependencies

Composer:
* Add PHPCSUtils and PHPCSExtra as dependencies.
* Remove the DealerDirect plugin from `require-dev` as well as from `suggests` as it comes with PHPCSUtils/PHPCSExtra automatically and not having it here may prevent conflicts with allowed versions in the future.

Travis:
* Alias PHPCS 4.x to `3.9.99` to allow testing with the dependencies before PHPCS 4.x is officially supported by them.
* When testing with PHPCS 4.x, we need `--prefer-source` as otherwise the test files we use from PHPCS itself won't be included.
    The way I've implemented this uses a [new feature](https://github.com/composer/composer/issues/6301) which is available since Composer 1.10.0 to selectively download from source.
    This prevents *all* packages being downloaded from source for the PHPCS `4.x` build, which would slow down the build and negate the Travis caching.

Note: the install/upgrade instructions in the Readme and other documentation will be addressed in a separate PR late in the 3.0 cycle, so as not to confuse people using the latest release, while 3.0.0 development is ongoing.
---
 .travis.yml   | 20 +++++++++++---------
 composer.json | 11 +++++------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8cd9fc1b4f..51f40fe794 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,12 +125,12 @@ jobs:
     # Add extra build to test against PHPCS 4.
     - stage: test
       php: 7.4
-      env: PHPCS_BRANCH="4.0.x-dev"
+      env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
 
   allow_failures:
     # Allow failures for unstable builds.
     - php: "nightly"
-    - env: PHPCS_BRANCH="4.0.x-dev"
+    - env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
 
 before_install:
     # Speed up build time by disabling Xdebug.
@@ -147,21 +147,23 @@ before_install:
 
     - export XMLLINT_INDENT="	"
     - export PHPUNIT_DIR=/tmp/phpunit
+
     - |
-      if [[ $TRAVIS_PHP_VERSION == "nightly" || $PHPCS_BRANCH == "4.0.x-dev" ]]; then
-          # Even though we're not doing a dev install, dev requirements are still checked.
-          # Neither the PHPCS Composer plugin nor PHPCompatibility allows yet for PHPCS 4.x.
-          # The Composer plugin also doesn't allow for installation on PHP 8.x/nightly.
-          composer remove --dev dealerdirect/phpcodesniffer-composer-installer phpcompatibility/php-compatibility --no-update --no-scripts
+      if [[ ${PHPCS_BRANCH:0:2} == "4." ]]; then
+        # Set Composer up to download only PHPCS from source for PHPCS 4.x.
+        # The source is needed to get the base testcase from PHPCS.
+        composer config preferred-install.squizlabs/php_codesniffer source
+      else
+        composer config preferred-install.squizlabs/php_codesniffer auto
       fi
-    - composer require squizlabs/php_codesniffer:${PHPCS_BRANCH} --update-no-dev --no-suggest --no-scripts
+    - composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --update-no-dev --no-suggest --no-scripts
     - |
       if [[ "${TRAVIS_BUILD_STAGE_NAME^}" == "Sniff" ]]; then
           composer install --dev --no-suggest
           # The `dev` required DealerDirect Composer plugin takes care of the installed_paths.
       else
           # The above require already does the install.
-          $(pwd)/vendor/bin/phpcs --config-set installed_paths $(pwd)
+          composer install-codestandards
       fi
     # Download PHPUnit 7.x for builds on PHP >= 7.2 as the PHPCS
     # test suite is currently not compatible with PHPUnit 8.x.
diff --git a/composer.json b/composer.json
index d5ee2400d5..080051f723 100644
--- a/composer.json
+++ b/composer.json
@@ -16,18 +16,17 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"squizlabs/php_codesniffer": "^3.5.0"
+		"squizlabs/php_codesniffer": "^3.5.0",
+		"phpcsstandards/phpcsutils": "^1.0",
+		"phpcsstandards/phpcsextra": "^1.0"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6",
 		"phpcompatibility/php-compatibility": "^9.0",
 		"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
 		"phpcsstandards/phpcsdevtools": "^1.0"
 	},
-	"suggest": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
-	},
-	"minimum-stability": "RC",
+	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"scripts": {
 		"check-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"

From 9d410e22c6cd0cd5bad0a06a9816c089f0c7cff5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 07:06:27 +0200
Subject: [PATCH 005/822] Travis: simplify the script

Current situation:
* The Travis native PHPUnit is used in most cases, though on PHP > 7.1, a PHPUnit phar is downloaded.

New situation:
* Always installed PHPUnit with Composer.
    For PHP 8 (`nightly`) ignore platform requirements to allow PHPUnit 7.x to install.

This makes us less dependent on the Travis images being correct (we've seen problems before aka the current special casing) and as the Travis cache should retain the downloaded Composer packages, this should really have much impact on the build time and gives us more flexibility to add other dev tools.
---
 .travis.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51f40fe794..e677b3a8e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -146,8 +146,8 @@ before_install:
       fi
 
     - export XMLLINT_INDENT="	"
-    - export PHPUNIT_DIR=/tmp/phpunit
 
+install:
     - |
       if [[ ${PHPCS_BRANCH:0:2} == "4." ]]; then
         # Set Composer up to download only PHPCS from source for PHPCS 4.x.
@@ -156,27 +156,20 @@ before_install:
       else
         composer config preferred-install.squizlabs/php_codesniffer auto
       fi
-    - composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --update-no-dev --no-suggest --no-scripts
+    - composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --no-update --no-suggest --no-scripts
     - |
-      if [[ "${TRAVIS_BUILD_STAGE_NAME^}" == "Sniff" ]]; then
-          composer install --dev --no-suggest
-          # The `dev` required DealerDirect Composer plugin takes care of the installed_paths.
+      if [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
+        # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
+        # requirements to get PHPUnit 7.x to install on nightly.
+        composer install --ignore-platform-reqs --no-suggest
       else
-          # The above require already does the install.
-          composer install-codestandards
+        # Do a normal dev install in all other cases.
+        composer install --no-suggest
       fi
-    # Download PHPUnit 7.x for builds on PHP >= 7.2 as the PHPCS
-    # test suite is currently not compatible with PHPUnit 8.x.
-    - if [[ ${TRAVIS_PHP_VERSION:0:3} > "7.1" ]]; then wget -P $PHPUNIT_DIR https://phar.phpunit.de/phpunit-7.phar && chmod +x $PHPUNIT_DIR/phpunit-7.phar; fi
 
 script:
   # Lint the PHP files against parse errors.
   - if [[ "$LINT" == "1" ]]; then if find . -path ./vendor -prune -o -path ./bin -prune -o -name "*.php" -exec php -l {} \; | grep "^[Parse error|Fatal error]"; then exit 1; fi; fi
 
   # Run the unit tests.
-  - |
-    if [[ ${TRAVIS_PHP_VERSION:0:3} > "7.1" ]]; then
-      php $PHPUNIT_DIR/phpunit-7.phar --filter WordPress --bootstrap="$(pwd)/vendor/squizlabs/php_codesniffer/tests/bootstrap.php" $(pwd)/vendor/squizlabs/php_codesniffer/tests/AllTests.php
-    else
-      phpunit --filter WordPress --bootstrap="$(pwd)/vendor/squizlabs/php_codesniffer/tests/bootstrap.php" $(pwd)/vendor/squizlabs/php_codesniffer/tests/AllTests.php
-    fi
+  - composer run-tests

From a9d6ed36511df18bd1b283b103bf3569acc8fa01 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:30:28 +0200
Subject: [PATCH 006/822] Tests: add a bootstrap file

While not strictly necessary, it makes life easier to have this bootstrap in place.

The bootstrap file will:
* Load the PHPCS autoloader (was previously done from the command-line);
* Load the Composer autoload file.
* Will automatically set the `PHPCS_IGNORE_TESTS` environment variable to the correct value to prevent running tests from other standards.
---
 .gitattributes      |  1 +
 Tests/bootstrap.php | 85 +++++++++++++++++++++++++++++++++++++++++++++
 composer.json       |  2 +-
 phpunit.xml.dist    |  7 +---
 4 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 Tests/bootstrap.php

diff --git a/.gitattributes b/.gitattributes
index c12f94cfb3..f4790dee63 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@
 /phpunit.xml.dist export-ignore
 /.github export-ignore
 /bin export-ignore
+/Tests export-ignore
 /WordPress/Tests export-ignore
 
 #
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
new file mode 100644
index 0000000000..fd4c952893
--- /dev/null
+++ b/Tests/bootstrap.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * Bootstrap file for running the tests.
+ *
+ * - Load the PHPCS PHPUnit bootstrap file providing cross-version PHPUnit support.
+ *   {@link https://github.com/squizlabs/PHP_CodeSniffer/pull/1384}
+ * - Load the Composer autoload file.
+ * - Automatically limit the testing to the WordPressCS tests.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+if ( ! defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
+	define( 'PHP_CODESNIFFER_IN_TESTS', true );
+}
+
+$ds = DIRECTORY_SEPARATOR;
+
+/*
+ * Load the necessary PHPCS files.
+ */
+// Get the PHPCS dir from an environment variable.
+$phpcsDir          = getenv( 'PHPCS_DIR' );
+$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer';
+
+if ( false === $phpcsDir && is_dir( $composerPHPCSPath ) ) {
+	// PHPCS installed via Composer.
+	$phpcsDir = $composerPHPCSPath;
+} elseif ( false !== $phpcsDir ) {
+	/*
+	 * PHPCS in a custom directory.
+	 * For this to work, the `PHPCS_DIR` needs to be set in a custom `phpunit.xml` file.
+	 */
+	$phpcsDir = realpath( $phpcsDir );
+}
+
+// Try and load the PHPCS autoloader.
+if ( false !== $phpcsDir
+	&& file_exists( $phpcsDir . $ds . 'autoload.php' )
+	&& file_exists( $phpcsDir . $ds . 'tests' . $ds . 'bootstrap.php' )
+) {
+	require_once $phpcsDir . $ds . 'autoload.php';
+	require_once $phpcsDir . $ds . 'tests' . $ds . 'bootstrap.php'; // PHPUnit 6.x+ support.
+} else {
+	echo 'Uh oh... can\'t find PHPCS.
+
+If you use Composer, please run `composer install`.
+Otherwise, make sure you set a `PHPCS_DIR` environment variable in your phpunit.xml file
+pointing to the PHPCS directory and that PHPCSUtils is included in the `installed_paths`
+for that PHPCS install.
+';
+
+	die( 1 );
+}
+
+/*
+ * Set the PHPCS_IGNORE_TEST environment variable to ignore tests from other standards.
+ */
+$wpcsStandards = array(
+	'WordPress' => true,
+);
+
+$allStandards   = PHP_CodeSniffer\Util\Standards::getInstalledStandards();
+$allStandards[] = 'Generic';
+
+$standardsToIgnore = array();
+foreach ( $allStandards as $standard ) {
+	if ( isset( $wpcsStandards[ $standard ] ) === true ) {
+		continue;
+	}
+
+	$standardsToIgnore[] = $standard;
+}
+
+$standardsToIgnoreString = implode( ',', $standardsToIgnore );
+
+// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration_putenv -- This is not production, but test code.
+putenv( "PHPCS_IGNORE_TESTS={$standardsToIgnoreString}" );
+
+// Clean up.
+unset( $ds, $phpcsDir, $composerPHPCSPath, $allStandards, $standardsToIgnore, $standard, $standardsToIgnoreString );
diff --git a/composer.json b/composer.json
index 080051f723..5aa842317a 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
 			"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
 		],
 		"run-tests": [
-			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress --bootstrap=\"./vendor/squizlabs/php_codesniffer/tests/bootstrap.php\" ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
+			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
 		],
 		"check-complete": [
 			"@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./WordPress"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ccacc14806..4bd81b342a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,6 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
 	backupGlobals="true"
+	bootstrap="./Tests/bootstrap.php"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	colors="true">
 
@@ -12,10 +13,4 @@
 		</testsuite>
 	</testsuites>
 
-	<php>
-		<!-- This line prevents issues with PHPCS trying to load sniff files for
-			 standards which we aren't testing.
-			 Ref: https://github.com/squizlabs/PHP_CodeSniffer/pull/1146 -->
-		<env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,PSR12,Squiz,Zend,PHPCompatibility"/>
-	</php>
 </phpunit>

From 7cae307243a09dac4a5e4b166218976d85f2a1f7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 10:26:08 +0200
Subject: [PATCH 007/822] Remove deprecated `Sniff::has_whitelist_comment()`
 method and all references to it

1. Remove the method which was deprecated in WPCS 2.0.0.
2. Remove all function calls to the method.
    Includes:
    * Removing the `SlowQuerySniff::process_token()` method.
        This will now fall through automatically to the method in the parent class.
    * Removing the `GlobalVariablesOverrideSniff::maybe_add_error() method.
        This method no longer has a function.
3. Adjusting the unit tests.
    * Where tests could be removed without having to renumber a lot, especially when the test was more about testing the whitelist functionality than testing the sniff, I've removed them.
    * In all other cases, I've changed the previous deprecation warning in the lines lists to a "normal" error/warning and annotated the change in behaviour.
    * Note: in the `PrefixAllGlobals` tests, there were two testcases which would previously throw a warning for the whitelist comment, but where the whitelist comment had no function anyway as the sniff had already been adjusted to no longer throw an error for those cases. For those, I've removed the whitelist comments.

Includes:
* Removing an exclusion for a whitelist comment deprecation notice from the WPCS native PHPCS ruleset.
* Updating the instructions regarding the old whitelist comments in the CONTRIBUTING file.
    :question_mark: As an alternative, the reference to the old-style whitelist comments could be removed completely from the CONTRIBUTING file.

Fixes 1583
---
 .github/CONTRIBUTING.md                       |   4 +-
 .phpcs.xml.dist                               |   6 -
 WordPress/Sniff.php                           | 107 ------------------
 .../DB/PreparedSQLPlaceholdersSniff.php       |  11 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php      |   4 -
 WordPress/Sniffs/DB/SlowDBQuerySniff.php      |  21 ----
 .../PrefixAllGlobalsSniff.php                 |  12 --
 .../Sniffs/PHP/StrictComparisonsSniff.php     |   6 +-
 .../Sniffs/Security/EscapeOutputSniff.php     |   5 -
 .../Security/NonceVerificationSniff.php       |   4 -
 .../Security/ValidatedSanitizedInputSniff.php |   4 -
 WordPress/Sniffs/WP/CapitalPDangitSniff.php   |   5 -
 .../WP/GlobalVariablesOverrideSniff.php       |  25 +---
 .../WhiteSpace/PrecisionAlignmentSniff.php    |   2 +-
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    |   4 +-
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |   4 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.inc    |  16 +--
 WordPress/Tests/DB/PreparedSQLUnitTest.php    |   9 +-
 WordPress/Tests/DB/SlowDBQueryUnitTest.inc    |  17 ---
 WordPress/Tests/DB/SlowDBQueryUnitTest.php    |   4 -
 .../PrefixAllGlobalsUnitTest.1.inc            |  10 +-
 .../PrefixAllGlobalsUnitTest.php              |   8 +-
 .../Tests/PHP/StrictComparisonsUnitTest.inc   |  12 +-
 .../Tests/PHP/StrictComparisonsUnitTest.php   |   4 +-
 .../Tests/Security/EscapeOutputUnitTest.inc   |   2 +-
 .../Tests/Security/EscapeOutputUnitTest.php   |  17 +--
 .../Security/NonceVerificationUnitTest.inc    |   2 +-
 .../Security/NonceVerificationUnitTest.php    |   5 +-
 .../ValidatedSanitizedInputUnitTest.inc       |   2 +-
 .../ValidatedSanitizedInputUnitTest.php       |   5 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc |   2 +-
 .../Tests/WP/CapitalPDangitUnitTest.inc.fixed |   4 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.php |   2 +-
 .../WP/GlobalVariablesOverrideUnitTest.1.inc  |   2 +-
 .../WP/GlobalVariablesOverrideUnitTest.php    |  15 +--
 .../PrecisionAlignmentUnitTest.1.inc          |   2 +-
 .../WhiteSpace/PrecisionAlignmentUnitTest.php |   2 +-
 37 files changed, 52 insertions(+), 314 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 34b96be5c7..21453cd37a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -37,9 +37,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 > **Important**:
 > PHPCS 3.2.0 introduced new selective ignore annotations, which can be considered an improved version of the whitelist mechanism which WPCS contains.
 >
-> Support for the WPCS native whitelist comments has been deprecated in WPCS 2.0.0 and will be removed in WPCS 3.0.0.
->
-> With that in mind, (new) sniffs should not introduce new WPCS native whitelist comments.
+> Support for the WPCS native whitelist comments has been deprecated in WPCS 2.0.0 and removed in WPCS 3.0.0.
 
 
 # Unit Testing
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index ef779c2dc3..6a4fba088f 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -47,10 +47,4 @@
 		<exclude name="PHPCompatibility.Constants.NewConstants.t_yield_fromFound"/>
 	</rule>
 
-	<rule ref="WordPress.NamingConventions.PrefixAllGlobals.DeprecatedWhitelistCommentFound">
-		<!-- False positive for whitelist comment recognition, but no use fixing this now
-			 as the WPCS native whitelist comments are deprecated anyhow. -->
-		<exclude-pattern>/WordPress/AbstractClassRestrictionsSniff\.php$</exclude-pattern>
-	</rule>
-
 </ruleset>
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 55ca6e7419..aea262ef23 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1149,113 +1149,6 @@ protected function get_wp_version_from_cl() {
 		}
 	}
 
-	/**
-	 * Find whitelisting comment.
-	 *
-	 * Comment must be at the end of the line or at the end of the statement
-	 * and must use // format.
-	 * It can be prefixed or suffixed with anything e.g. "foobar" will match:
-	 * ... // foobar okay
-	 * ... // WPCS: foobar whitelist.
-	 *
-	 * There is an exception, and that is when PHP is being interspersed with HTML.
-	 * In that case, the comment should always come at the end of the statement (right
-	 * before the closing tag, ?>). For example:
-	 *
-	 * <input type="text" id="<?php echo $id; // XSS OK ?>" />
-	 *
-	 * @since 0.4.0
-	 * @since 0.14.0 Whitelist comments at the end of the statement are now also accepted.
-	 *
-	 * @deprecated 2.0.0 Use the PHPCS native `phpcs:ignore` annotations instead.
-	 *
-	 * @param string  $comment  Comment to find.
-	 * @param integer $stackPtr The position of the current token in the stack passed
-	 *                          in $tokens.
-	 *
-	 * @return boolean True if whitelisting comment was found, false otherwise.
-	 */
-	protected function has_whitelist_comment( $comment, $stackPtr ) {
-
-		// Respect the PHPCS 3.x --ignore-annotations setting.
-		if ( true === PHPCSHelper::ignore_annotations( $this->phpcsFile ) ) {
-			return false;
-		}
-
-		static $thrown_notices = array();
-
-		$deprecation_notice = 'Using the WPCS native whitelist comments is deprecated. Please use the PHPCS native "phpcs:ignore Standard.Category.SniffName.ErrorCode" annotations instead. Found: %s';
-		$deprecation_code   = 'DeprecatedWhitelistCommentFound';
-		$filename           = $this->phpcsFile->getFileName();
-
-		$regex = '#\b' . preg_quote( $comment, '#' ) . '\b#i';
-
-		// There is a findEndOfStatement() method, but it considers more tokens than
-		// we need to consider here.
-		$end_of_statement = $this->phpcsFile->findNext( array( \T_CLOSE_TAG, \T_SEMICOLON ), $stackPtr );
-
-		if ( false !== $end_of_statement ) {
-			// If the statement was ended by a semicolon, check if there is a whitelist comment directly after it.
-			if ( \T_SEMICOLON === $this->tokens[ $end_of_statement ]['code'] ) {
-				$lastPtr = $this->phpcsFile->findNext( \T_WHITESPACE, ( $end_of_statement + 1 ), null, true );
-			} elseif ( \T_CLOSE_TAG === $this->tokens[ $end_of_statement ]['code'] ) {
-				// If the semicolon was left out and it was terminated by an ending tag, we need to look backwards.
-				$lastPtr = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $end_of_statement - 1 ), null, true );
-			}
-
-			if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-					|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-					&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-				&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $end_of_statement ]['line']
-				&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
-			) {
-				if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-					&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
-				) {
-					$this->phpcsFile->addWarning(
-						$deprecation_notice,
-						$lastPtr,
-						$deprecation_code,
-						array( $this->tokens[ $lastPtr ]['content'] )
-					);
-
-					$thrown_notices[ $filename ][ $lastPtr ] = true;
-				}
-
-				return true;
-			}
-		}
-
-		// No whitelist comment found so far. Check at the end of the stackPtr line.
-		// Note: a T_COMMENT includes the new line character, so may be the last token on the line!
-		$end_of_line = $this->get_last_ptr_on_line( $stackPtr );
-		$lastPtr     = $this->phpcsFile->findPrevious( \T_WHITESPACE, $end_of_line, null, true );
-
-		if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-				|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-				&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-			&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $stackPtr ]['line']
-			&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
-		) {
-			if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-				&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
-			) {
-				$this->phpcsFile->addWarning(
-					$deprecation_notice,
-					$lastPtr,
-					$deprecation_code,
-					array( $this->tokens[ $lastPtr ]['content'] )
-				);
-
-				$thrown_notices[ $filename ][ $lastPtr ] = true;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if a token is used within a unit test.
 	 *
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 8f184c6be7..876ebf179c 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -445,11 +445,6 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$count_diff_whitelisted = $this->has_whitelist_comment(
-			'PreparedSQLPlaceholders replacement count',
-			$stackPtr
-		);
-
 		if ( 0 === $total_placeholders ) {
 			if ( 1 === $total_parameters ) {
 				if ( false === $variable_found && false === $sql_wildcard_found ) {
@@ -465,7 +460,7 @@ public function process_token( $stackPtr ) {
 						'UnnecessaryPrepare'
 					);
 				}
-			} elseif ( false === $count_diff_whitelisted && 0 === $valid_in_clauses['uses_in'] ) {
+			} elseif ( 0 === $valid_in_clauses['uses_in'] ) {
 				$this->phpcsFile->addWarning(
 					'Replacement variables found, but no valid placeholders found in the query.',
 					$i,
@@ -486,10 +481,6 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( true === $count_diff_whitelisted ) {
-			return;
-		}
-
 		$replacements = $parameters;
 		array_shift( $replacements ); // Remove the query.
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 1fe2ad96da..57781d61af 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -127,10 +127,6 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->has_whitelist_comment( 'unprepared SQL', $stackPtr ) ) {
-			return;
-		}
-
 		for ( $this->i; $this->i < $this->end; $this->i++ ) {
 
 			if ( isset( $this->ignored_tokens[ $this->tokens[ $this->i ]['code'] ] ) ) {
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index 4feebdcb60..e6157cb020 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -47,27 +47,6 @@ public function getGroups() {
 		);
 	}
 
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @since 0.10.0
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return int|void Integer stack pointer to skip forward or void to continue
-	 *                  normal file processing.
-	 */
-	public function process_token( $stackPtr ) {
-
-		if ( $this->has_whitelist_comment( 'slow query', $stackPtr ) ) {
-			return;
-		} elseif ( $this->has_whitelist_comment( 'tax_query', $stackPtr ) ) {
-			return;
-		}
-
-		return parent::process_token( $stackPtr );
-	}
-
 	/**
 	 * Callback to process each confirmed key, to check value.
 	 * This must be extended to add the logic to check assignment value.
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 8374faf675..13c1437657 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -263,18 +263,6 @@ public function getGroups() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
-		/*
-		 * Allow for whitelisting.
-		 *
-		 * Generally speaking a theme/plugin should *only* execute their own hooks, but there may be a
-		 * good reason to execute a core hook.
-		 *
-		 * Similarly, newer PHP or WP functions or constants may need to be emulated for continued support
-		 * of older PHP and WP versions.
-		 */
-		if ( $this->has_whitelist_comment( 'prefix', $stackPtr ) ) {
-			return;
-		}
 
 		// Allow overruling the prefixes set in a ruleset via the command line.
 		$cl_prefixes = trim( PHPCSHelper::get_config_data( 'prefixes' ) );
diff --git a/WordPress/Sniffs/PHP/StrictComparisonsSniff.php b/WordPress/Sniffs/PHP/StrictComparisonsSniff.php
index 85fe055490..3b2566bfbb 100644
--- a/WordPress/Sniffs/PHP/StrictComparisonsSniff.php
+++ b/WordPress/Sniffs/PHP/StrictComparisonsSniff.php
@@ -47,10 +47,8 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( ! $this->has_whitelist_comment( 'loose comparison', $stackPtr ) ) {
-			$error = 'Found: ' . $this->tokens[ $stackPtr ]['content'] . '. Use strict comparisons (=== or !==).';
-			$this->phpcsFile->addWarning( $error, $stackPtr, 'LooseComparison' );
-		}
+		$error = 'Found: ' . $this->tokens[ $stackPtr ]['content'] . '. Use strict comparisons (=== or !==).';
+		$this->phpcsFile->addWarning( $error, $stackPtr, 'LooseComparison' );
 	}
 
 }
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 48a4766bad..89b1cb3961 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -214,11 +214,6 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		// Checking for the ignore comment, ex: //xss ok.
-		if ( $this->has_whitelist_comment( 'xss', $stackPtr ) ) {
-			return;
-		}
-
 		if ( isset( $this->unsafePrintingFunctions[ $function ] ) ) {
 			$error = $this->phpcsFile->addError(
 				"All output should be run through an escaping function (like %s), found '%s'.",
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 15f4a60408..934ff8004d 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -111,10 +111,6 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->has_whitelist_comment( 'CSRF', $stackPtr ) ) {
-			return;
-		}
-
 		if ( $this->is_assignment( $stackPtr ) ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index a545c58078..54b43184e7 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -171,10 +171,6 @@ function ( $symbol ) {
 			);
 		}
 
-		if ( $this->has_whitelist_comment( 'sanitization', $stackPtr ) ) {
-			return;
-		}
-
 		// If this variable is being tested with one of the `is_..()` functions, sanitization isn't needed.
 		if ( $this->is_in_type_test( $stackPtr ) ) {
 			return;
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index bf98233fb9..f5f9512ef4 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -115,11 +115,6 @@ public function register() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
-
-		if ( $this->has_whitelist_comment( 'spelling', $stackPtr ) ) {
-			return;
-		}
-
 		/*
 		 * Ignore tokens within an array definition as this is a false positive in 80% of all cases.
 		 *
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 37bf68b2a7..b69a5119f1 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -198,10 +198,6 @@ protected function process_list_assignment( $stackPtr ) {
 	 */
 	protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 
-		if ( $this->has_whitelist_comment( 'override', $stackPtr ) === true ) {
-			return;
-		}
-
 		$token    = $this->tokens[ $stackPtr ];
 		$var_name = substr( $token['content'], 1 ); // Strip the dollar sign.
 		$data     = array();
@@ -410,34 +406,17 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			}
 
 			if ( true === $this->is_assignment( $ptr ) ) {
-				$this->maybe_add_error( $ptr );
+				$this->add_error( $ptr );
 				continue;
 			}
 
 			// Check if this is a variable assignment within a `foreach()` declaration.
 			if ( $this->is_foreach_as( $ptr ) === true ) {
-				$this->maybe_add_error( $ptr );
+				$this->add_error( $ptr );
 			}
 		}
 	}
 
-	/**
-	 * Add the error if there is no whitelist comment present.
-	 *
-	 * @since 0.11.0
-	 * @since 1.1.0  - Visibility changed from public to protected.
-	 *               - Check for being in a test class moved to the process_token() method.
-	 *
-	 * @param int $stackPtr The position of the token to throw the error for.
-	 *
-	 * @return void
-	 */
-	protected function maybe_add_error( $stackPtr ) {
-		if ( $this->has_whitelist_comment( 'override', $stackPtr ) === false ) {
-			$this->add_error( $stackPtr );
-		}
-	}
-
 	/**
 	 * Add the error.
 	 *
diff --git a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php b/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
index 010ec9438b..f5e822bdc3 100644
--- a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
@@ -182,7 +182,7 @@ public function process_token( $stackPtr ) {
 					break;
 			}
 
-			if ( $spaces > 0 && ! $this->has_whitelist_comment( 'precision alignment', $i ) ) {
+			if ( $spaces > 0 ) {
 				$this->phpcsFile->addWarning(
 					'Found precision alignment of %s spaces.',
 					$i,
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index d703013123..04548fc74d 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -59,13 +59,13 @@ $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login
 
 $replacements = [1, "admin", $variable];
 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // Bad.
-$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // WPCS: PreparedSQLPlaceholders replacement count OK.
+$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // Bad - old-style whitelist comment. WPCS: PreparedSQLPlaceholders replacement count OK.
 
 // Valid test case as found in WP core /wp-admin/includes/export.php
 $esses = array_fill( 0, count($post_types), '%s' );
 $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // Warning.
 // Testing that whitelist comment work for this mismatch too.
-$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // WPCS: PreparedSQLPlaceholders replacement count OK.
+$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // Bad - old-style whitelist comment. WPCS: PreparedSQLPlaceholders replacement count OK.
 
 /*
  * Test correctly recognizing queries using IN in combination with dynamic placeholder creation.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 1cf42f021f..e8446786cb 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -85,9 +85,9 @@ public function getWarningList() {
 			57  => 1,
 			58  => 1,
 			61  => 1,
-			62  => 1, // Whitelist comment deprecation warning.
+			62  => 1, // Old-style WPCS whitelist comments are no longer supported.
 			66  => 1,
-			68  => 1, // Whitelist comment deprecation warning.
+			68  => 1, // Old-style WPCS whitelist comments are no longer supported.
 			126 => 1,
 			139 => 1,
 			160 => 2,
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 52ef3a0e31..b09bfdb8e5 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -8,8 +8,8 @@ $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '$var';" ) ); // Bad.
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE %s;", $_GET['title'] ) ); // Ok.
 
-$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . $escaped_var . "';" ); // WPCS: unprepared SQL OK.
-$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '{$escaped_var}';" ); // WPCS: unprepared SQL OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . $escaped_var . "';" ); // Bad: old-style whitelist comment. WPCS: unprepared SQL OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '{$escaped_var}';" ); //  Bad: old-style whitelist comment. WPCS: unprepared SQL OK.
 
 $wpdb->query( $wpdb->prepare( "SELECT SUBSTRING( post_name, %d + 1 ) REGEXP '^[0-9]+$'", array( 123 ) ) ); // Ok.
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title = 'The \$_GET var can be evil.' AND ID = %s", array( 123 ) ) ); // Ok.
@@ -90,18 +90,6 @@ $wpdb->query( // Some arbitrary comment.
 		WHERE post_title LIKE '" . $escaped_var . "';"
 ); // Bad x 1.
 
-$wpdb->query(
-	"SELECT *
-		FROM $wpdb->posts
-		WHERE post_title LIKE '" . $escaped_var . "';"
-); // WPCS: unprepared SQL OK.
-
-$wpdb->query( // WPCS: unprepared SQL OK.
-	"SELECT *
-		FROM $wpdb->posts
-		WHERE post_title LIKE '" . $escaped_var . "';"
-);
-
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE ID = " . (int) $foo . ";" ); // Ok.
 
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . (float) $foo . ";" ); // Ok.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 03f7c6d8fa..329baaa3cc 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -36,6 +36,8 @@ public function getErrorList() {
 			5  => 1,
 			7  => 1,
 			8  => 1,
+			11 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			12 => 1, // Old-style WPCS whitelist comments are no longer supported.
 			16 => 1,
 			17 => 1,
 			18 => 1,
@@ -57,12 +59,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array(
-			11 => 1, // Whitelist comment deprecation warning.
-			12 => 1, // Whitelist comment deprecation warning.
-			97 => 1, // Whitelist comment deprecation warning.
-			99 => 1, // Whitelist comment deprecation warning.
-		);
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.inc b/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
index 6c8791aa8b..fea1379591 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
@@ -21,20 +21,3 @@ $query = 'foo=bar&meta_key=foo&meta_value=bar';
 if ( ! isset( $widget['params'][0] ) ) {
 	$widget['params'][0] = array();
 }
-
-
-// Testing whitelisting comments.
-$test = array(
-
-	// Single-line statements.
-	'tax_query' => array(), // Bad.
-	'tax_query' => array(), // WPCS: slow query ok.
-	'tax_query' => array(), // WPCS: tax_query ok.
-
-	// Multi-line statement.
-	'tax_query' => array( // WPCS: slow query ok.
-		array(
-			'taxonomy' => 'foo',
-		),
-	),
-);
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 987e4d412d..1d31c2b930 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -43,10 +43,6 @@ public function getWarningList() {
 			15 => 1,
 			16 => 1,
 			19 => 2,
-			30 => 1,
-			31 => 1, // Whitelist comment deprecation warning.
-			32 => 1, // Whitelist comment deprecation warning.
-			35 => 1, // Whitelist comment deprecation warning.
 		);
 	}
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 12404130e6..6290ff07f2 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -193,22 +193,22 @@ class Test_Class_D extends My_TestClass {
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals custom_test_class_whitelist[]
 
 
-/*
- * OK - whitelisted via whitelist comment.
- */
 if ( ! function_exists( 'intdiv' ) ) {
 	// Fill in for a PHP function which is not available in low PHP versions.
-	function intdiv() { // WPCS: prefix ok.
+	function intdiv() { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
 		// Some code.
     }
 }
 
 if ( ! defined( 'PHP_VERSION_ID' ) ) {
     $acronym_version = explode('.', PHP_VERSION);
-    define('PHP_VERSION_ID', (int) (($acronym_version[0] * 10000) + ($acronym_version[1] * 100) + $acronym_version[2])); // WPCS: prefix ok.
+    define('PHP_VERSION_ID', (int) (($acronym_version[0] * 10000) + ($acronym_version[1] * 100) + $acronym_version[2]));
     unset($acronym_version);
 }
 
+/*
+ * Bad - whitelisted via old-style whitelist comment.
+ */
 $something = 'abc'; // WPCS: prefix ok.
 
 // Executing a WP core action or filter is sometimes ok.
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index eb8e4644b7..85d41bc79b 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -51,6 +51,9 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					39  => 1,
 					40  => 1,
 					90  => 1,
+					212 => 1, // Old-style WPCS whitelist comments are no longer supported.
+					215 => 1, // Old-style WPCS whitelist comments are no longer supported.
+					216 => 1, // Old-style WPCS whitelist comments are no longer supported.
 					// Backfills.
 					225 => ( function_exists( '\mb_strpos' ) ) ? 0 : 1,
 					230 => ( function_exists( '\array_column' ) ) ? 0 : 1,
@@ -108,11 +111,6 @@ public function getWarningList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 			case 'PrefixAllGlobalsUnitTest.1.inc':
 				return array(
 					1   => 3, // 3 x warning for potentially incorrect prefix passed.
-					201 => 1, // Whitelist comment deprecation warning.
-					208 => 1, // Whitelist comment deprecation warning.
-					212 => 1, // Whitelist comment deprecation warning.
-					215 => 1, // Whitelist comment deprecation warning.
-					216 => 1, // Whitelist comment deprecation warning.
 					249 => 1,
 					250 => 1,
 					253 => 1,
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc b/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
index 7c3ce84131..17da61c0d3 100644
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
+++ b/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
@@ -15,17 +15,7 @@ if ( true != $true ) { // Bad.
 	echo 'False';
 }
 
-// Test for whitelisting.
+// Bad - whitelisted via old-style whitelist comment.
 if ( true == $true ) { // Loose comparison, OK.
 	echo 'True';
 }
-
-// Test that whitelisting is not too eager.
-if ( true == $true ) {
-	// The line above has a loose comparison, but no whitelist comment.
-	echo 'True';
-}
-
-if ( true == $true ) { // Loose comparisons FTW!
-	echo 'True';
-}
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php b/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
index b7ada4d896..ec3d970412 100644
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
+++ b/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
@@ -40,9 +40,7 @@ public function getWarningList() {
 			3  => 1,
 			10 => 1,
 			12 => 1,
-			19 => 1, // Whitelist comment deprecation warning.
-			24 => 1,
-			29 => 1,
+			19 => 1, // Old-style WPCS whitelist comments are no longer supported.
 		);
 	}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index bd74d93ac9..1926aad635 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -121,7 +121,7 @@ wp_die( -1 ); // Ok.
 <input type="hidden" name="sync-action" class="sync-action" value="<?php echo esc_attr( $continue_sync ? 'sync_progress' : '' ); ?>" /><!-- OK. -->
 <?php
 
-// Testing whitelisting comments.
+// Bad - whitelisted via old-style whitelist comment.
 echo $html_fragment; // Bad.
 echo $html_fragment; // xss OK.
 echo $html_fragment; // WPCS: XSS whitelist.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index bd81edd244..49f5527e15 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -52,6 +52,9 @@ public function getErrorList() {
 			113 => 1,
 			114 => 1,
 			125 => 1,
+			126 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			127 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			128 => 1, // Old-style WPCS whitelist comments are no longer supported.
 			131 => 1,
 			135 => 1,
 			138 => 1,
@@ -73,11 +76,16 @@ public function getErrorList() {
 			223 => 1,
 			225 => 1,
 			226 => 1,
+			241 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			245 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			249 => 1, // Old-style WPCS whitelist comments are no longer supported.
 			252 => 1,
 			253 => 1,
 			263 => 1,
 			264 => 1,
 			266 => 1,
+			282 => 1,
+			286 => 1,
 			289 => 1,
 			294 => 1,
 			297 => 1,
@@ -90,14 +98,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array(
-			126 => 1, // Whitelist comment deprecation warning.
-			127 => 1, // Whitelist comment deprecation warning.
-			128 => 1, // Whitelist comment deprecation warning.
-			241 => 1, // Whitelist comment deprecation warning.
-			243 => 1, // Whitelist comment deprecation warning.
-			250 => 1, // Whitelist comment deprecation warning.
-		);
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index 41cf566594..cbfe01cbc7 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -83,7 +83,7 @@ function foo_2() {
 	$_POST['settings'][ $setting ] = 'bb'; // OK.
 }
 
-// Particular cases can be whitelisted with a comment.
+// Bad - whitelisted via old-style whitelist comment.
 function foo_3() {
 	bar( $_POST['var'] ); // WPCS: CSRF OK.
 	bar( $_POST['var'] ); // Bad.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index c3fb8a67b0..b53d02997d 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -36,6 +36,7 @@ public function getErrorList() {
 			44  => 1,
 			48  => 1,
 			69  => 1,
+			88  => 1, // Old-style WPCS whitelist comments are no longer supported.
 			89  => 1,
 			113 => 1,
 			114 => 1,
@@ -62,9 +63,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array(
-			88 => 1, // Whitelist comment deprecation warning.
-		);
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
index b70afe7f0a..005c2475f7 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
@@ -73,7 +73,7 @@ function zebra() {
 	}
 }
 
-echo $_GET['test']; // WPCS: sanitization OK.
+echo $_GET['test']; // Bad: old-style whitelist comment. WPCS: sanitization OK.
 
 echo array_map( 'sanitize_text_field', wp_unslash( $_GET['test'] ) ); // Ok.
 echo array_map( 'foo', wp_unslash( $_GET['test'] ) ); // Bad.
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 493465ea3f..f1ba1e7949 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -35,6 +35,7 @@ public function getErrorList() {
 			20  => 1,
 			33  => 3,
 			65  => 1,
+			76  => 2, // Old-style WPCS whitelist comments are no longer supported.
 			79  => 1,
 			80  => 1,
 			81  => 1,
@@ -88,9 +89,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array(
-			76 => 1, // Whitelist comment deprecation warning.
-		);
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index e29ee8942f..1a9fc3b723 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -162,7 +162,7 @@ $installed = self::check_plugin_is_installed( 'wordpress-importer' ); // OK.
 
 
 /*
- * Test whitelisting
+ * Bad - whitelisted via old-style whitelist comment.
  */
 echo 'This is an explanation about wordpress.'; // WPCS: spelling ok.
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 0a00f5ec0d..a711174177 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -162,9 +162,9 @@ $installed = self::check_plugin_is_installed( 'wordpress-importer' ); // OK.
 
 
 /*
- * Test whitelisting
+ * Bad - whitelisted via old-style whitelist comment.
  */
-echo 'This is an explanation about wordpress.'; // WPCS: spelling ok.
+echo 'This is an explanation about WordPress.'; // WPCS: spelling ok.
 
 /*
  * Test fixer with an ignored and a fixable misspelling in the same line.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 0f7454a6ae..fa5f0bd835 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -59,7 +59,7 @@ public function getWarningList() {
 			101 => 1,
 			139 => 1,
 			146 => 0, // False negative.
-			167 => 1, // Whitelist comment deprecation warning.
+			167 => 1, // Old-style WPCS whitelist comments are no longer supported.
 			173 => 1,
 			181 => 1,
 		);
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index f544783056..5725b13c93 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -8,7 +8,7 @@ $wpdb = 'test'; // Bad.
 $post = get_post( 1 ); // Bad.
 
 global $post;
-$post = get_post( 1 ); // Override ok.
+$post = get_post( 1 ); // Bad: old-style whitelist comment. Override ok.
 
 // Bad: Using different types of assignment operators.
 function test_different_assignment_operators() {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index bd611b2830..83fcb3c1da 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -37,6 +37,7 @@ public function getErrorList( $testFile = '' ) {
 					3   => 1,
 					6   => 1,
 					8   => 1,
+					11  => 1, // Old-style WPCS whitelist comments are no longer supported.
 					16  => 1,
 					17  => 1,
 					18  => 1,
@@ -90,20 +91,10 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @param string $testFile The name of the file being tested.
-	 *
 	 * @return array <int line number> => <int number of warnings>
 	 */
-	public function getWarningList( $testFile = '' ) {
-		switch ( $testFile ) {
-			case 'GlobalVariablesOverrideUnitTest.1.inc':
-				return array(
-					11 => 1, // Whitelist comment deprecation warning.
-				);
-
-			default:
-				return array();
-		}
+	public function getWarningList() {
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
index 7bcca1217e..bcf06fe102 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
@@ -31,7 +31,7 @@
 	  function exampleFunctionE() {} // Bad: [tab][space][space].
 	   function exampleFunctionF() {} // Bad: [tab][space][space][space].
 
-	 function exampleFunctionG() {} // WPCS: precision alignment ok.
+	 function exampleFunctionG() {} // Bad old-style whitelist comment: WPCS: precision alignment ok.
 
 ?>
 
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
index a7ed8c5601..32757ee5fb 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
@@ -69,7 +69,7 @@ public function getWarningList( $testFile = '' ) {
 					30 => 1,
 					31 => 1,
 					32 => 1,
-					34 => 1, // Whitelist comment deprecation warning.
+					34 => 1, // Old-style WPCS whitelist comments are no longer supported.
 					39 => 1,
 					65 => 1,
 				);

From 7b1956ebc32a75bf6839e39057d8053697ce9945 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 11:26:34 +0200
Subject: [PATCH 008/822] Remove the WordPress.WP.TimezoneChange sniff

This sniff was deprecated in WPCS 2.2.0 in favour of the `WordPress.DateTime.RestrictedFunctions` sniff (1805/1807).

Fixes 1819
---
 WordPress/Sniffs/WP/TimezoneChangeSniff.php   | 88 -------------------
 WordPress/Tests/WP/TimezoneChangeUnitTest.inc |  8 --
 WordPress/Tests/WP/TimezoneChangeUnitTest.php | 50 -----------
 WordPress/ruleset.xml                         |  6 +-
 4 files changed, 1 insertion(+), 151 deletions(-)
 delete mode 100644 WordPress/Sniffs/WP/TimezoneChangeSniff.php
 delete mode 100644 WordPress/Tests/WP/TimezoneChangeUnitTest.inc
 delete mode 100644 WordPress/Tests/WP/TimezoneChangeUnitTest.php

diff --git a/WordPress/Sniffs/WP/TimezoneChangeSniff.php b/WordPress/Sniffs/WP/TimezoneChangeSniff.php
deleted file mode 100644
index f376c5e3a3..0000000000
--- a/WordPress/Sniffs/WP/TimezoneChangeSniff.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\WP;
-
-use WordPressCS\WordPress\Sniffs\DateTime\RestrictedFunctionsSniff;
-
-/**
- * Disallow the changing of timezone.
- *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#manipulating-the-timezone-server-side
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.11.0 Extends the WordPressCS native `AbstractFunctionRestrictionsSniff`
- *                 class instead of the upstream `Generic.PHP.ForbiddenFunctions` sniff.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
- *
- * @deprecated 2.2.0 Use the `WordPress.DateTime.RestrictedFunctions` sniff instead.
- *                   This `WordPress.WP.TimezoneChange` sniff will be removed in WPCS 3.0.0.
- */
-class TimezoneChangeSniff extends RestrictedFunctionsSniff {
-
-	/**
-	 * Keep track of whether the warnings have been thrown to prevent
-	 * the messages being thrown for every token triggering the sniff.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @var array
-	 */
-	private $thrown = array(
-		'DeprecatedSniff'                 => false,
-		'FoundPropertyForDeprecatedSniff' => false,
-	);
-
-	/**
-	 * Don't use.
-	 *
-	 * @deprecated 2.2.0
-	 *
-	 * @return array
-	 */
-	public function getGroups() {
-		$groups = parent::getGroups();
-		return array( 'timezone_change' => $groups['timezone_change'] );
-	}
-
-	/**
-	 * Don't use.
-	 *
-	 * @since      2.2.0 Added to allow for throwing the deprecation notices.
-	 * @deprecated 2.2.0
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return void|int
-	 */
-	public function process_token( $stackPtr ) {
-		if ( false === $this->thrown['DeprecatedSniff'] ) {
-			$this->thrown['DeprecatedSniff'] = $this->phpcsFile->addWarning(
-				'The "WordPress.WP.TimezoneChange" sniff has been deprecated. Use the "WordPress.DateTime.RestrictedFunctions" sniff instead. Please update your custom ruleset.',
-				0,
-				'DeprecatedSniff'
-			);
-		}
-
-		if ( ! empty( $this->exclude )
-			&& false === $this->thrown['FoundPropertyForDeprecatedSniff']
-		) {
-			$this->thrown['FoundPropertyForDeprecatedSniff'] = $this->phpcsFile->addWarning(
-				'The "WordPress.WP.TimezoneChange" sniff has been deprecated. Use the "WordPress.DateTime.RestrictedFunctions" sniff instead. "exclude" property setting found. Please update your custom ruleset.',
-				0,
-				'FoundPropertyForDeprecatedSniff'
-			);
-		}
-
-		return parent::process_token( $stackPtr );
-	}
-}
diff --git a/WordPress/Tests/WP/TimezoneChangeUnitTest.inc b/WordPress/Tests/WP/TimezoneChangeUnitTest.inc
deleted file mode 100644
index c1a374c306..0000000000
--- a/WordPress/Tests/WP/TimezoneChangeUnitTest.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-date_default_timezone_set( 'Foo/Bar' ); // Bad.
-
-// phpcs:set WordPress.WP.TimezoneChange exclude[] timezone_change
-date_default_timezone_set( 'Foo/Bar' ); // OK.
-
-// phpcs:set WordPress.WP.TimezoneChange exclude[]
diff --git a/WordPress/Tests/WP/TimezoneChangeUnitTest.php b/WordPress/Tests/WP/TimezoneChangeUnitTest.php
deleted file mode 100644
index 906883077b..0000000000
--- a/WordPress/Tests/WP/TimezoneChangeUnitTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\WP;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the TimezoneChange sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
- * @since   2.2.0  The sniff has been deprecated. This unit test file now
- *                 only tests that the deprecation warnings are correctly thrown
- *                 and that the sniff falls through to the parent correctly.
- */
-class TimezoneChangeUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array(
-			3 => 1,
-		);
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array(
-			1 => 2,
-		);
-	}
-
-}
diff --git a/WordPress/ruleset.xml b/WordPress/ruleset.xml
index 20ff9a38cc..fd24ae6318 100644
--- a/WordPress/ruleset.xml
+++ b/WordPress/ruleset.xml
@@ -8,10 +8,6 @@
 	<rule ref="WordPress-Core"/>
 	-->
 	<rule ref="WordPress-Docs"/>
-	<rule ref="WordPress-Extra">
-		<!-- Prevent duplicate messages + deprecation notice from deprecated sniff. -->
-		<exclude name="WordPress.WP.TimezoneChange.timezone_change_date_default_timezone_set"/>
-		<exclude name="WordPress.WP.TimezoneChange.DeprecatedSniff"/>
-	</rule>
+	<rule ref="WordPress-Extra"/>
 
 </ruleset>

From 2f3ac91307f1c6907192ef2c55ba2183d818bf84 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:00:00 +0200
Subject: [PATCH 009/822] Replace the `WordPress.CodeAnalysis.EmptyStatement`
 sniff

... with the same sniff as merged upstream in PHPCS as `Generic.CodeAnalysis.EmptyPHPStatement` in PHPCS 3.4.0.

Fixes 1523
---
 WordPress-Core/ruleset.xml                    |   2 +-
 .../CodeAnalysis/EmptyStatementSniff.php      | 161 ------------------
 .../CodeAnalysis/EmptyStatementUnitTest.1.inc |  52 ------
 .../EmptyStatementUnitTest.1.inc.fixed        |  47 -----
 .../CodeAnalysis/EmptyStatementUnitTest.2.inc |   2 -
 .../CodeAnalysis/EmptyStatementUnitTest.php   |  67 --------
 6 files changed, 1 insertion(+), 330 deletions(-)
 delete mode 100644 WordPress/Sniffs/CodeAnalysis/EmptyStatementSniff.php
 delete mode 100644 WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc
 delete mode 100644 WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc.fixed
 delete mode 100644 WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.2.inc
 delete mode 100644 WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0bff5a0d43..9a8f2712c7 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -479,7 +479,7 @@
 	<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 
 	<!-- There should be no empty statements, i.e. lone semi-colons or open/close tags without content. -->
-	<rule ref="WordPress.CodeAnalysis.EmptyStatement"/>
+	<rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
 
 	<!-- Lowercase PHP constants, like true, false and null. -->
 	<!-- https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions -->
diff --git a/WordPress/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/WordPress/Sniffs/CodeAnalysis/EmptyStatementSniff.php
deleted file mode 100644
index 21e2201469..0000000000
--- a/WordPress/Sniffs/CodeAnalysis/EmptyStatementSniff.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\CodeAnalysis;
-
-use WordPressCS\WordPress\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Checks against empty statements.
- *
- * - Check against two semi-colons with no executable code in between.
- * - Check against an empty PHP open - close tag combination.
- *
- * {@internal This check should at some point in the future be pulled upstream and probably
- *            merged into the upstream `Generic.CodeAnalysis.EmptyStatement` sniff.
- *            This will need to wait until the WPCS minimum requirements have gone up
- *            beyond PHPCS 3.x though as it is not likely that new features will be accepted
- *            still for the PHPCS 2.x branch.}}
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class EmptyStatementSniff extends Sniff {
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return array(
-			\T_SEMICOLON,
-			\T_CLOSE_TAG,
-		);
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return int|void Integer stack pointer to skip forward or void to continue
-	 *                  normal file processing.
-	 */
-	public function process_token( $stackPtr ) {
-
-		switch ( $this->tokens[ $stackPtr ]['type'] ) {
-			/*
-			 * Detect `something();;`.
-			 */
-			case 'T_SEMICOLON':
-				$prevNonEmpty = $this->phpcsFile->findPrevious(
-					Tokens::$emptyTokens,
-					( $stackPtr - 1 ),
-					null,
-					true
-				);
-
-				if ( false === $prevNonEmpty
-					|| ( \T_SEMICOLON !== $this->tokens[ $prevNonEmpty ]['code']
-						&& \T_OPEN_TAG !== $this->tokens[ $prevNonEmpty ]['code']
-						&& \T_OPEN_TAG_WITH_ECHO !== $this->tokens[ $prevNonEmpty ]['code'] )
-				) {
-					return;
-				}
-
-				if ( isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-					$nested      = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-					$last_closer = array_pop( $nested );
-					if ( isset( $this->tokens[ $last_closer ]['parenthesis_owner'] )
-						&& \T_FOR === $this->tokens[ $this->tokens[ $last_closer ]['parenthesis_owner'] ]['code']
-					) {
-						// Empty for() condition.
-						return;
-					}
-				}
-
-				$fix = $this->phpcsFile->addFixableWarning(
-					'Empty PHP statement detected: superfluous semi-colon.',
-					$stackPtr,
-					'SemicolonWithoutCodeDetected'
-				);
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->beginChangeset();
-
-					if ( \T_OPEN_TAG === $this->tokens[ $prevNonEmpty ]['code']
-						|| \T_OPEN_TAG_WITH_ECHO === $this->tokens[ $prevNonEmpty ]['code']
-					) {
-						/*
-						 * Check for superfluous whitespace after the semi-colon which will be
-						 * removed as the `<?php ` open tag token already contains whitespace,
-						 * either a space or a new line and in case of a new line, the indentation
-						 * should be done via tabs, so spaces can be safely removed.
-						 */
-						if ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] ) {
-							$replacement = str_replace( ' ', '', $this->tokens[ ( $stackPtr + 1 ) ]['content'] );
-							$this->phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), $replacement );
-						}
-					}
-
-					for ( $i = $stackPtr; $i > $prevNonEmpty; $i-- ) {
-						if ( \T_SEMICOLON !== $this->tokens[ $i ]['code']
-							&& \T_WHITESPACE !== $this->tokens[ $i ]['code']
-						) {
-							break;
-						}
-						$this->phpcsFile->fixer->replaceToken( $i, '' );
-					}
-
-					$this->phpcsFile->fixer->endChangeset();
-				}
-				break;
-
-			/*
-			 * Detect `<?php ?>`.
-			 */
-			case 'T_CLOSE_TAG':
-				$prevNonEmpty = $this->phpcsFile->findPrevious(
-					\T_WHITESPACE,
-					( $stackPtr - 1 ),
-					null,
-					true
-				);
-
-				if ( false === $prevNonEmpty
-					|| ( \T_OPEN_TAG !== $this->tokens[ $prevNonEmpty ]['code']
-						&& \T_OPEN_TAG_WITH_ECHO !== $this->tokens[ $prevNonEmpty ]['code'] )
-				) {
-					return;
-				}
-
-				$fix = $this->phpcsFile->addFixableWarning(
-					'Empty PHP open/close tag combination detected.',
-					$prevNonEmpty,
-					'EmptyPHPOpenCloseTagsDetected'
-				);
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->beginChangeset();
-					for ( $i = $prevNonEmpty; $i <= $stackPtr; $i++ ) {
-						$this->phpcsFile->fixer->replaceToken( $i, '' );
-					}
-					$this->phpcsFile->fixer->endChangeset();
-				}
-				break;
-
-			default:
-				/* Deliberately left empty. */
-				break;
-		}
-	}
-
-}
diff --git a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc b/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc
deleted file mode 100644
index 5017e7b7aa..0000000000
--- a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * Test empty statement: two consecutive semi-colons without executable code between them.
- */
-function_call(); // OK.
-
-// The below examples are all bad.
-function_call();;
-
-function_call();
-;
-
-function_call();
-/* some comment */;
-
-function_call();
-/* some comment */     ;
-
-?>
-<input name="<?php ; something_else(); ?>" />
-<input name="<?php something_else(); ; ?>" />
-
-/*
- * Test empty statement: no code between PHP open and close tag.
- */
-<input name="<?php something_else() ?>" /> <!-- OK. -->
-<input name="<?php something_else(); ?>" /> <!-- OK. -->
-<input name="<?php /* comment */ ?>" /> <!-- OK. -->
-
-<input name="<?php ?>" /> <!-- Bad. -->
-
-<input name="<?php
-
-
-?>" /> <!-- Bad. -->
-
-<!--
-/*
- * Test detecting & fixing a combination of the two above checks.
- */
--->
-<?php ; ?>
-
-<input name="<?php ; ?>" /> <!-- Bad. -->
-
-<!-- Tests with short open echo tag. -->
-<input name="<?= 'some text' ?>" /> <!-- OK. -->
-
-<?php
-// Guard against false positives for two consecutive semi-colons in a for statement.
-for ( $i = 0; ; $i++ ) {}
diff --git a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc.fixed b/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc.fixed
deleted file mode 100644
index fe6f91d5f8..0000000000
--- a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.1.inc.fixed
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * Test empty statement: two consecutive semi-colons without executable code between them.
- */
-function_call(); // OK.
-
-// The below examples are all bad.
-function_call();
-
-function_call();
-
-function_call();
-/* some comment */
-
-function_call();
-/* some comment */
-
-?>
-<input name="<?php something_else(); ?>" />
-<input name="<?php something_else(); ?>" />
-
-/*
- * Test empty statement: no code between PHP open and close tag.
- */
-<input name="<?php something_else() ?>" /> <!-- OK. -->
-<input name="<?php something_else(); ?>" /> <!-- OK. -->
-<input name="<?php /* comment */ ?>" /> <!-- OK. -->
-
-<input name="" /> <!-- Bad. -->
-
-<input name="" /> <!-- Bad. -->
-
-<!--
-/*
- * Test detecting & fixing a combination of the two above checks.
- */
--->
-
-<input name="" /> <!-- Bad. -->
-
-<!-- Tests with short open echo tag. -->
-<input name="<?= 'some text' ?>" /> <!-- OK. -->
-
-<?php
-// Guard against false positives for two consecutive semi-colons in a for statement.
-for ( $i = 0; ; $i++ ) {}
diff --git a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.2.inc b/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.2.inc
deleted file mode 100644
index 73a039b917..0000000000
--- a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.2.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<input name="<?= ?>" /> <!-- Bad. -->
-<input name="<?= ; ?>" /> <!-- Bad. -->
diff --git a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.php
deleted file mode 100644
index 7c0d72be94..0000000000
--- a/WordPress/Tests/CodeAnalysis/EmptyStatementUnitTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\CodeAnalysis;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the EmptyStatement sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class EmptyStatementUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array();
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @param string $testFile The name of the file being tested.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList( $testFile = '' ) {
-		switch ( $testFile ) {
-			case 'EmptyStatementUnitTest.1.inc':
-				return array(
-					9  => 1,
-					12 => 1,
-					15 => 1,
-					18 => 1,
-					21 => 1,
-					22 => 1,
-					31 => 1,
-					33 => 1,
-					43 => 1,
-					45 => 1,
-				);
-
-			case 'EmptyStatementUnitTest.2.inc':
-				return array(
-					1 => 1, // Internal.NoCode warning when short open tags is off, otherwise EmptyStatement warning.
-					2 => 1,
-				);
-
-			default:
-				return array();
-		}
-	}
-
-}

From 1d6df5f9cde72ca04aab2719994e6735d0f13169 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:19:03 +0200
Subject: [PATCH 010/822] Replace the `WordPress.PHP.DisallowShortTernary`
 sniff

... with the same sniff as merged upstream in PHPCSExtra as `Universal.Operators.DisallowShortTernary`.
---
 WordPress-Core/ruleset.xml                    |  2 +-
 .../Docs/PHP/DisallowShortTernaryStandard.xml | 20 ------
 .../Sniffs/PHP/DisallowShortTernarySniff.php  | 65 -------------------
 .../PHP/DisallowShortTernaryUnitTest.inc      | 12 ----
 .../PHP/DisallowShortTernaryUnitTest.php      | 46 -------------
 5 files changed, 1 insertion(+), 144 deletions(-)
 delete mode 100644 WordPress/Docs/PHP/DisallowShortTernaryStandard.xml
 delete mode 100644 WordPress/Sniffs/PHP/DisallowShortTernarySniff.php
 delete mode 100644 WordPress/Tests/PHP/DisallowShortTernaryUnitTest.inc
 delete mode 100644 WordPress/Tests/PHP/DisallowShortTernaryUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0bff5a0d43..aa10b71f35 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -378,7 +378,7 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/643 -->
 
 	<!-- Rule: The short ternary operator must not be used. -->
-	<rule ref="WordPress.PHP.DisallowShortTernary"/>
+	<rule ref="Universal.Operators.DisallowShortTernary"/>
 
 	<!--
 	#############################################################################
diff --git a/WordPress/Docs/PHP/DisallowShortTernaryStandard.xml b/WordPress/Docs/PHP/DisallowShortTernaryStandard.xml
deleted file mode 100644
index c81b2fd82d..0000000000
--- a/WordPress/Docs/PHP/DisallowShortTernaryStandard.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<documentation title="Disallow Short Ternaries">
-    <standard>
-    <![CDATA[
-    The short ternary operator must not be used.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: long ternary.">
-        <![CDATA[
-$height = ! empty( $data['height'] ) <em>?</em>
-    $data['height'] <em>:</em> 0;
-        ]]>
-        </code>
-        <code title="Invalid: short ternary.">
-        <![CDATA[
-$height = $data['height'] <em>? :</em> 0;
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>
diff --git a/WordPress/Sniffs/PHP/DisallowShortTernarySniff.php b/WordPress/Sniffs/PHP/DisallowShortTernarySniff.php
deleted file mode 100644
index 6c734b8ceb..0000000000
--- a/WordPress/Sniffs/PHP/DisallowShortTernarySniff.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\PHP;
-
-use WordPressCS\WordPress\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Disallow the use of short ternaries.
- *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#ternary-operator
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
- */
-class DisallowShortTernarySniff extends Sniff {
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return array( \T_INLINE_THEN );
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return void
-	 */
-	public function process_token( $stackPtr ) {
-
-		$nextNonEmpty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-		if ( false === $nextNonEmpty ) {
-			// Live coding or parse error.
-			return;
-		}
-
-		if ( \T_INLINE_ELSE !== $this->tokens[ $nextNonEmpty ]['code'] ) {
-			return;
-		}
-
-		$this->phpcsFile->addError(
-			'Using short ternaries is not allowed',
-			$stackPtr,
-			'Found'
-		);
-	}
-
-}
diff --git a/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.inc b/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.inc
deleted file mode 100644
index 419fc19f89..0000000000
--- a/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$long = $compare ? 'a' : 'b';
-
-$short = $compare ? : 0; // Bad.
-$short = $compare ?: 0; // Bad.
-$short = $compare ?
-	: 0; // Bad.
-$short = $compare ? /* intentionally left empty */ : 0; // Bad.
-
-/* Intentional parse error. This should be the last test in the file. */
-$unfinished = $compare ? /* comment */
diff --git a/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.php b/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.php
deleted file mode 100644
index ca4280582c..0000000000
--- a/WordPress/Tests/PHP/DisallowShortTernaryUnitTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\PHP;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the DisallowShortTernary sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
- */
-class DisallowShortTernaryUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array(
-			5 => 1,
-			6 => 1,
-			7 => 1,
-			9 => 1,
-		);
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array();
-	}
-
-}

From 8997d689294fbf880b427873e7fa254237f3b87f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:22:24 +0200
Subject: [PATCH 011/822] Replace the `WordPress.WhiteSpace.DisallowInlineTabs`
 sniff

... with a similar sniff as merged upstream in PHPCSExtra as `Universal.WhiteSpace.DisallowInlineTabs`.

The upstream sniff includes sniffing out inline tabs in `//` and `/* */` style comments which the original sniff did not.
---
 WordPress-Core/ruleset.xml                    |   2 +-
 .../WhiteSpace/DisallowInlineTabsStandard.xml |  25 -----
 .../WhiteSpace/DisallowInlineTabsSniff.php    | 104 ------------------
 .../WhiteSpace/DisallowInlineTabsUnitTest.inc |  39 -------
 .../DisallowInlineTabsUnitTest.inc.fixed      |  39 -------
 .../WhiteSpace/DisallowInlineTabsUnitTest.php |  73 ------------
 6 files changed, 1 insertion(+), 281 deletions(-)
 delete mode 100644 WordPress/Docs/WhiteSpace/DisallowInlineTabsStandard.xml
 delete mode 100644 WordPress/Sniffs/WhiteSpace/DisallowInlineTabsSniff.php
 delete mode 100644 WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc.fixed
 delete mode 100644 WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0bff5a0d43..5d205602e0 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -69,7 +69,7 @@
 	</rule>
 
 	<!-- Covers rule: ... while spaces can be used mid-line for alignment. -->
-	<rule ref="WordPress.WhiteSpace.DisallowInlineTabs"/>
+	<rule ref="Universal.WhiteSpace.DisallowInlineTabs"/>
 
 	<!-- Implied through the examples: align the assignment operator in a block of assignments. -->
 	<rule ref="Generic.Formatting.MultipleStatementAlignment">
diff --git a/WordPress/Docs/WhiteSpace/DisallowInlineTabsStandard.xml b/WordPress/Docs/WhiteSpace/DisallowInlineTabsStandard.xml
deleted file mode 100644
index 16f1da2fb9..0000000000
--- a/WordPress/Docs/WhiteSpace/DisallowInlineTabsStandard.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<documentation title="Disallow Inline Tabs">
-    <standard>
-    <![CDATA[
-    Use spaces for inline alignment.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: spaces used for inline alignment.">
-        <![CDATA[
-$a = array(
-    'abc'<em>[space]</em>=> 'lor',
-    'b'<em>[space][space][space]</em>=> 'em',
-);
-        ]]>
-        </code>
-        <code title="Invalid: tabs used for inline alignment.">
-        <![CDATA[
-$a = array(
-    'abc'<em>[tab]</em>=> 'lor',
-    'b'<em>[tab]</em>=> 'em',
-);
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>
diff --git a/WordPress/Sniffs/WhiteSpace/DisallowInlineTabsSniff.php b/WordPress/Sniffs/WhiteSpace/DisallowInlineTabsSniff.php
deleted file mode 100644
index c20a4d33e6..0000000000
--- a/WordPress/Sniffs/WhiteSpace/DisallowInlineTabsSniff.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
-
-use WordPressCS\WordPress\Sniff;
-use WordPressCS\WordPress\PHPCSHelper;
-
-/**
- * Enforces using spaces for mid-line alignment.
- *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class DisallowInlineTabsSniff extends Sniff {
-
-	/**
-	 * The --tab-width CLI value that is being used.
-	 *
-	 * @var int
-	 */
-	private $tab_width;
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return array(
-			\T_OPEN_TAG,
-		);
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return int Integer stack pointer to skip the rest of the file.
-	 */
-	public function process_token( $stackPtr ) {
-		if ( ! isset( $this->tab_width ) ) {
-			$this->tab_width = PHPCSHelper::get_tab_width( $this->phpcsFile );
-		}
-
-		$check_tokens = array(
-			\T_WHITESPACE             => true,
-			\T_DOC_COMMENT_WHITESPACE => true,
-			\T_DOC_COMMENT_STRING     => true,
-		);
-
-		for ( $i = ( $stackPtr + 1 ); $i < $this->phpcsFile->numTokens; $i++ ) {
-			// Skip all non-whitespace tokens and skip whitespace at the start of a new line.
-			if ( ! isset( $check_tokens[ $this->tokens[ $i ]['code'] ] ) || 1 === $this->tokens[ $i ]['column'] ) {
-				continue;
-			}
-
-			// If tabs are being converted to spaces by the tokenizer, the
-			// original content should be checked instead of the converted content.
-			if ( isset( $this->tokens[ $i ]['orig_content'] ) ) {
-				$content = $this->tokens[ $i ]['orig_content'];
-			} else {
-				$content = $this->tokens[ $i ]['content'];
-			}
-
-			if ( '' === $content || strpos( $content, "\t" ) === false ) {
-				continue;
-			}
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Spaces must be used for mid-line alignment; tabs are not allowed',
-				$i,
-				'NonIndentTabsUsed'
-			);
-			if ( true === $fix ) {
-				if ( isset( $this->tokens[ $i ]['orig_content'] ) ) {
-					// Use the replacement that PHPCS has already done.
-					$this->phpcsFile->fixer->replaceToken( $i, $this->tokens[ $i ]['content'] );
-				} else {
-					// Replace tabs with spaces, using an indent of $tab_width.
-					// Other sniffs can then correct the indent if they need to.
-					$spaces     = str_repeat( ' ', $this->tab_width );
-					$newContent = str_replace( "\t", $spaces, $this->tokens[ $i ]['content'] );
-					$this->phpcsFile->fixer->replaceToken( $i, $newContent );
-				}
-			}
-		}
-
-		// Ignore the rest of the file.
-		return ( $this->phpcsFile->numTokens + 1 );
-	}
-
-}
diff --git a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc b/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc
deleted file mode 100644
index 5d7178c14d..0000000000
--- a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @param int    $var    Description.
- * @param string $string Another description.
- */
-
-			$expected = ( $column - 1 );
-			$found    = ( $this->tokens[ $closer ]['column'] - 1 );
-			$error    = 'Array closer not aligned correctly; expected %s space(s) but found %s';
-			$data     = array(
-				$expected_value => 'data',
-				$found          => 'more_data',
-			);
-
-/**
- * @param int	 $var	 Description - Bad: alignment using tabs.
- * @param string $string Another description.
- */
-
-			$expected = ( $column - 1 );
-			$found	  = ( $this->tokens[ $closer ]['column'] - 1 ); // Bad.
-			$error	  = 'Array closer not aligned correctly; expected %s space(s) but found %s'; // Bad.
-			$data	  = array( // Bad.
-				$expected_value => 'data',
-				$found			=> 'more_data', // Bad.
-			);
-
-/*
- * Test that the tab replacements do not negatively influence the existing mid-line alignments.
- */
-$a		  = true;
-$aa		  = true;
-$aaa	  = true;
-$aaaa	  = true;
-$aaaaa	  = true;
-$aaaaaa	  = true;
-$aaaaaaa  = true;
-$aaaaaaaa = true;
diff --git a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc.fixed
deleted file mode 100644
index 20f2877f69..0000000000
--- a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.inc.fixed
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @param int    $var    Description.
- * @param string $string Another description.
- */
-
-			$expected = ( $column - 1 );
-			$found    = ( $this->tokens[ $closer ]['column'] - 1 );
-			$error    = 'Array closer not aligned correctly; expected %s space(s) but found %s';
-			$data     = array(
-				$expected_value => 'data',
-				$found          => 'more_data',
-			);
-
-/**
- * @param int    $var    Description - Bad: alignment using tabs.
- * @param string $string Another description.
- */
-
-			$expected = ( $column - 1 );
-			$found    = ( $this->tokens[ $closer ]['column'] - 1 ); // Bad.
-			$error    = 'Array closer not aligned correctly; expected %s space(s) but found %s'; // Bad.
-			$data     = array( // Bad.
-				$expected_value => 'data',
-				$found          => 'more_data', // Bad.
-			);
-
-/*
- * Test that the tab replacements do not negatively influence the existing mid-line alignments.
- */
-$a        = true;
-$aa       = true;
-$aaa      = true;
-$aaaa     = true;
-$aaaaa    = true;
-$aaaaaa   = true;
-$aaaaaaa  = true;
-$aaaaaaaa = true;
diff --git a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.php b/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.php
deleted file mode 100644
index edaac2c7ea..0000000000
--- a/WordPress/Tests/WhiteSpace/DisallowInlineTabsUnitTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\WhiteSpace;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the DisallowInlineTabs sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class DisallowInlineTabsUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * The tab width to use during testing.
-	 *
-	 * @var int
-	 */
-	private $tab_width = 4;
-
-	/**
-	 * Set CLI values before the file is tested.
-	 *
-	 * @param string                  $testFile The name of the file being tested.
-	 * @param \PHP_CodeSniffer\Config $config   The config data for the test run.
-	 *
-	 * @return void
-	 */
-	public function setCliValues( $testFile, $config ) {
-		$config->tabWidth = $this->tab_width;
-	}
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array(
-			17 => 1,
-			22 => 1,
-			23 => 1,
-			24 => 1,
-			26 => 1,
-			32 => 1,
-			33 => 1,
-			34 => 1,
-			35 => 1,
-			36 => 1,
-			37 => 1,
-		);
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array();
-	}
-
-}

From 00b895c92f41a49923c37df58b370b801080a204 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 08:14:19 +0200
Subject: [PATCH 012/822] Tests/RestrictedClasses: compatibility with PHPCS 4.x

PHPCS 4.x is set up to use PHPUnit 8+, including using the `void` return type for the `setUp[BeforeClass]()` and `tearDown[AfterClass]()` fixtures.

This commit makes our tests compatible with both PHPCS 3.x as well as 4.x and with PHPUnit < 8 and 8+.

This is done by:
* Renaming the fixtures in use in our test suite to use a different method name (only this class).
* And using the PHPUnit `@before` and `@after` annotations, which translate to `setUp()` and `tearDown()` to get round the `void` return type requirement.
---
 WordPress/Tests/DB/RestrictedClassesUnitTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index b5df274d02..183af9717a 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -19,6 +19,7 @@
  *
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
  */
 class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
 
@@ -28,8 +29,10 @@ class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * Note: as that class extends the abstract FunctionRestrictions class, that's
 	 * where we are passing the parameters to.
+	 *
+	 * @before
 	 */
-	protected function setUp() {
+	protected function enhanceGroups() {
 		parent::setUp();
 
 		AbstractFunctionRestrictionsSniff::$unittest_groups = array(
@@ -46,8 +49,10 @@ protected function setUp() {
 
 	/**
 	 * Reset the $groups property.
+	 *
+	 * @after
 	 */
-	protected function tearDown() {
+	protected function resetGroups() {
 		AbstractFunctionRestrictionsSniff::$unittest_groups = array();
 		parent::tearDown();
 	}

From 8d52417615676068165a9a9bf53cb3fc8110f268 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:06:12 +0200
Subject: [PATCH 013/822] TypeCasts: remove sniffing for `T_STRING_CAST`

That token is no longer needed as the tokenization in PHPCS upstream was fixed in PHPCS 3.4.0.

Fixes 1600
---
 WordPress/Sniffs/PHP/TypeCastsSniff.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 7aded55fec..f41cce5f5d 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -38,7 +38,6 @@ public function register() {
 		return array(
 			\T_DOUBLE_CAST,
 			\T_UNSET_CAST,
-			\T_STRING_CAST,
 			\T_BINARY_CAST,
 		);
 	}
@@ -80,12 +79,7 @@ public function process_token( $stackPtr ) {
 				);
 				break;
 
-			case \T_STRING_CAST:
 			case \T_BINARY_CAST:
-				if ( \T_STRING_CAST === $token_code && '(binary)' !== $typecast_lc ) {
-					break;
-				}
-
 				$this->phpcsFile->addWarning(
 					'Using binary casting is strongly discouraged. Found: "%s"',
 					$stackPtr,

From f092f0dcba9ef48ccb2e24f6ea4afc5585e6d1bc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:35:52 +0200
Subject: [PATCH 014/822] Tests: improve language used in inline comments

... which explain what something is testing and/or what has changed.
---
 .../Tests/DB/PreparedSQLPlaceholdersUnitTest.inc     |  6 +++---
 .../Tests/DB/PreparedSQLPlaceholdersUnitTest.php     |  4 ++--
 WordPress/Tests/DB/PreparedSQLUnitTest.inc           |  4 ++--
 WordPress/Tests/DB/PreparedSQLUnitTest.php           |  4 ++--
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc |  2 +-
 .../NamingConventions/PrefixAllGlobalsUnitTest.php   |  6 +++---
 WordPress/Tests/PHP/StrictComparisonsUnitTest.inc    |  2 +-
 WordPress/Tests/PHP/StrictComparisonsUnitTest.php    |  2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.inc    |  2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.php    | 12 ++++++------
 .../Tests/Security/NonceVerificationUnitTest.inc     |  2 +-
 .../Tests/Security/NonceVerificationUnitTest.php     |  2 +-
 .../Security/ValidatedSanitizedInputUnitTest.inc     |  2 +-
 .../Security/ValidatedSanitizedInputUnitTest.php     |  2 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc        |  2 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed  |  2 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.php        |  2 +-
 .../Tests/WP/GlobalVariablesOverrideUnitTest.1.inc   |  2 +-
 .../Tests/WP/GlobalVariablesOverrideUnitTest.php     |  2 +-
 .../WhiteSpace/PrecisionAlignmentUnitTest.1.inc      |  2 +-
 .../Tests/WhiteSpace/PrecisionAlignmentUnitTest.php  |  2 +-
 21 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 04548fc74d..60cdc8b008 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -59,13 +59,13 @@ $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login
 
 $replacements = [1, "admin", $variable];
 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // Bad.
-$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // Bad - old-style whitelist comment. WPCS: PreparedSQLPlaceholders replacement count OK.
+$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", $replacements ); // Bad - old-style ignore comment. WPCS: PreparedSQLPlaceholders replacement count OK.
 
 // Valid test case as found in WP core /wp-admin/includes/export.php
 $esses = array_fill( 0, count($post_types), '%s' );
 $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // Warning.
-// Testing that whitelist comment work for this mismatch too.
-$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // Bad - old-style whitelist comment. WPCS: PreparedSQLPlaceholders replacement count OK.
+// Testing that ignore comment works for this mismatch too.
+$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types ); // Bad - old-style ignore comment. WPCS: PreparedSQLPlaceholders replacement count OK.
 
 /*
  * Test correctly recognizing queries using IN in combination with dynamic placeholder creation.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index e8446786cb..68c908da66 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -85,9 +85,9 @@ public function getWarningList() {
 			57  => 1,
 			58  => 1,
 			61  => 1,
-			62  => 1, // Old-style WPCS whitelist comments are no longer supported.
+			62  => 1, // Old-style WPCS ignore comments are no longer supported.
 			66  => 1,
-			68  => 1, // Old-style WPCS whitelist comments are no longer supported.
+			68  => 1, // Old-style WPCS ignore comments are no longer supported.
 			126 => 1,
 			139 => 1,
 			160 => 2,
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index b09bfdb8e5..3fa34f89e7 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -8,8 +8,8 @@ $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '$var';" ) ); // Bad.
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE %s;", $_GET['title'] ) ); // Ok.
 
-$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . $escaped_var . "';" ); // Bad: old-style whitelist comment. WPCS: unprepared SQL OK.
-$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '{$escaped_var}';" ); //  Bad: old-style whitelist comment. WPCS: unprepared SQL OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . $escaped_var . "';" ); // Bad: old-style ignore comment. WPCS: unprepared SQL OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '{$escaped_var}';" ); //  Bad: old-style ignore comment. WPCS: unprepared SQL OK.
 
 $wpdb->query( $wpdb->prepare( "SELECT SUBSTRING( post_name, %d + 1 ) REGEXP '^[0-9]+$'", array( 123 ) ) ); // Ok.
 $wpdb->query( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_title = 'The \$_GET var can be evil.' AND ID = %s", array( 123 ) ) ); // Ok.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 329baaa3cc..78e484a076 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -36,8 +36,8 @@ public function getErrorList() {
 			5  => 1,
 			7  => 1,
 			8  => 1,
-			11 => 1, // Old-style WPCS whitelist comments are no longer supported.
-			12 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			11 => 1, // Old-style WPCS ignore comments are no longer supported.
+			12 => 1, // Old-style WPCS ignore comments are no longer supported.
 			16 => 1,
 			17 => 1,
 			18 => 1,
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 6290ff07f2..c5212b1042 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -207,7 +207,7 @@ if ( ! defined( 'PHP_VERSION_ID' ) ) {
 }
 
 /*
- * Bad - whitelisted via old-style whitelist comment.
+ * Bad - ignored via old-style ignore comment.
  */
 $something = 'abc'; // WPCS: prefix ok.
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 85d41bc79b..b6ace2e4e0 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -51,9 +51,9 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					39  => 1,
 					40  => 1,
 					90  => 1,
-					212 => 1, // Old-style WPCS whitelist comments are no longer supported.
-					215 => 1, // Old-style WPCS whitelist comments are no longer supported.
-					216 => 1, // Old-style WPCS whitelist comments are no longer supported.
+					212 => 1, // Old-style WPCS ignore comments are no longer supported.
+					215 => 1, // Old-style WPCS ignore comments are no longer supported.
+					216 => 1, // Old-style WPCS ignore comments are no longer supported.
 					// Backfills.
 					225 => ( function_exists( '\mb_strpos' ) ) ? 0 : 1,
 					230 => ( function_exists( '\array_column' ) ) ? 0 : 1,
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc b/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
index 17da61c0d3..507e7f1277 100644
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
+++ b/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
@@ -15,7 +15,7 @@ if ( true != $true ) { // Bad.
 	echo 'False';
 }
 
-// Bad - whitelisted via old-style whitelist comment.
+// Bad - ignored via old-style ignore comment.
 if ( true == $true ) { // Loose comparison, OK.
 	echo 'True';
 }
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php b/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
index ec3d970412..1648efab9e 100644
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
+++ b/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
@@ -40,7 +40,7 @@ public function getWarningList() {
 			3  => 1,
 			10 => 1,
 			12 => 1,
-			19 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			19 => 1, // Old-style WPCS ignore comments are no longer supported.
 		);
 	}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index 1926aad635..777c72e6dc 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -121,7 +121,7 @@ wp_die( -1 ); // Ok.
 <input type="hidden" name="sync-action" class="sync-action" value="<?php echo esc_attr( $continue_sync ? 'sync_progress' : '' ); ?>" /><!-- OK. -->
 <?php
 
-// Bad - whitelisted via old-style whitelist comment.
+// Bad - ignored via old-style ignore comment.
 echo $html_fragment; // Bad.
 echo $html_fragment; // xss OK.
 echo $html_fragment; // WPCS: XSS whitelist.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 49f5527e15..5ae98881da 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -52,9 +52,9 @@ public function getErrorList() {
 			113 => 1,
 			114 => 1,
 			125 => 1,
-			126 => 1, // Old-style WPCS whitelist comments are no longer supported.
-			127 => 1, // Old-style WPCS whitelist comments are no longer supported.
-			128 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			126 => 1, // Old-style WPCS ignore comments are no longer supported.
+			127 => 1, // Old-style WPCS ignore comments are no longer supported.
+			128 => 1, // Old-style WPCS ignore comments are no longer supported.
 			131 => 1,
 			135 => 1,
 			138 => 1,
@@ -76,9 +76,9 @@ public function getErrorList() {
 			223 => 1,
 			225 => 1,
 			226 => 1,
-			241 => 1, // Old-style WPCS whitelist comments are no longer supported.
-			245 => 1, // Old-style WPCS whitelist comments are no longer supported.
-			249 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			241 => 1, // Old-style WPCS ignore comments are no longer supported.
+			245 => 1, // Old-style WPCS ignore comments are no longer supported.
+			249 => 1, // Old-style WPCS ignore comments are no longer supported.
 			252 => 1,
 			253 => 1,
 			263 => 1,
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index cbfe01cbc7..4f60f45aec 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -83,7 +83,7 @@ function foo_2() {
 	$_POST['settings'][ $setting ] = 'bb'; // OK.
 }
 
-// Bad - whitelisted via old-style whitelist comment.
+// Bad - ignored via old-style ignore comment.
 function foo_3() {
 	bar( $_POST['var'] ); // WPCS: CSRF OK.
 	bar( $_POST['var'] ); // Bad.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index b53d02997d..825c5f289e 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList() {
 			44  => 1,
 			48  => 1,
 			69  => 1,
-			88  => 1, // Old-style WPCS whitelist comments are no longer supported.
+			88  => 1, // Old-style WPCS ignore comments are no longer supported.
 			89  => 1,
 			113 => 1,
 			114 => 1,
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
index 005c2475f7..12f9f65309 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
@@ -73,7 +73,7 @@ function zebra() {
 	}
 }
 
-echo $_GET['test']; // Bad: old-style whitelist comment. WPCS: sanitization OK.
+echo $_GET['test']; // Bad: old-style ignore comment. WPCS: sanitization OK.
 
 echo array_map( 'sanitize_text_field', wp_unslash( $_GET['test'] ) ); // Ok.
 echo array_map( 'foo', wp_unslash( $_GET['test'] ) ); // Bad.
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index f1ba1e7949..8643c2a78d 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList() {
 			20  => 1,
 			33  => 3,
 			65  => 1,
-			76  => 2, // Old-style WPCS whitelist comments are no longer supported.
+			76  => 2, // Old-style WPCS ignore comments are no longer supported.
 			79  => 1,
 			80  => 1,
 			81  => 1,
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 1a9fc3b723..1f197ec6e5 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -162,7 +162,7 @@ $installed = self::check_plugin_is_installed( 'wordpress-importer' ); // OK.
 
 
 /*
- * Bad - whitelisted via old-style whitelist comment.
+ * Bad - ignored via old-style ignore comment.
  */
 echo 'This is an explanation about wordpress.'; // WPCS: spelling ok.
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index a711174177..44d2e489d4 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -162,7 +162,7 @@ $installed = self::check_plugin_is_installed( 'wordpress-importer' ); // OK.
 
 
 /*
- * Bad - whitelisted via old-style whitelist comment.
+ * Bad - ignored via old-style ignore comment.
  */
 echo 'This is an explanation about WordPress.'; // WPCS: spelling ok.
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index fa5f0bd835..0e6d2b268a 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -59,7 +59,7 @@ public function getWarningList() {
 			101 => 1,
 			139 => 1,
 			146 => 0, // False negative.
-			167 => 1, // Old-style WPCS whitelist comments are no longer supported.
+			167 => 1, // Old-style WPCS ignore comments are no longer supported.
 			173 => 1,
 			181 => 1,
 		);
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 5725b13c93..5d1c4ada4d 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -8,7 +8,7 @@ $wpdb = 'test'; // Bad.
 $post = get_post( 1 ); // Bad.
 
 global $post;
-$post = get_post( 1 ); // Bad: old-style whitelist comment. Override ok.
+$post = get_post( 1 ); // Bad: old-style ignore comment. Override ok.
 
 // Bad: Using different types of assignment operators.
 function test_different_assignment_operators() {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index 83fcb3c1da..b7700ed669 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList( $testFile = '' ) {
 					3   => 1,
 					6   => 1,
 					8   => 1,
-					11  => 1, // Old-style WPCS whitelist comments are no longer supported.
+					11  => 1, // Old-style WPCS ignore comments are no longer supported.
 					16  => 1,
 					17  => 1,
 					18  => 1,
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
index bcf06fe102..f7b840b0c4 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
@@ -31,7 +31,7 @@
 	  function exampleFunctionE() {} // Bad: [tab][space][space].
 	   function exampleFunctionF() {} // Bad: [tab][space][space][space].
 
-	 function exampleFunctionG() {} // Bad old-style whitelist comment: WPCS: precision alignment ok.
+	 function exampleFunctionG() {} // Bad old-style ignore comment: WPCS: precision alignment ok.
 
 ?>
 
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
index 32757ee5fb..0b03b8f1fb 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
@@ -69,7 +69,7 @@ public function getWarningList( $testFile = '' ) {
 					30 => 1,
 					31 => 1,
 					32 => 1,
-					34 => 1, // Old-style WPCS whitelist comments are no longer supported.
+					34 => 1, // Old-style WPCS ignore comments are no longer supported.
 					39 => 1,
 					65 => 1,
 				);

From 22b85df02851cb119d9a232932a5be65b9df5c18 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:33:04 +0200
Subject: [PATCH 015/822] CONTRIBUTING: remove section about the WPCS native
 selective ignore comments

... as support for those is now completely removed.
---
 .github/CONTRIBUTING.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 21453cd37a..dc8adf1b22 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -32,14 +32,6 @@ Only make a property `public` if that is the intended behaviour.
 
 When you introduce new `public` sniff properties, or your sniff extends a class from which you inherit a `public` property, please don't forget to update the [public properties wiki page](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties) with the relevant details once your PR has been merged into the `develop` branch.
 
-## Whitelist comments
-
-> **Important**:
-> PHPCS 3.2.0 introduced new selective ignore annotations, which can be considered an improved version of the whitelist mechanism which WPCS contains.
->
-> Support for the WPCS native whitelist comments has been deprecated in WPCS 2.0.0 and removed in WPCS 3.0.0.
-
-
 # Unit Testing
 
 ## Pre-requisites

From d8ed55fb773baf393a039bace3355ed503d48fde Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:41:06 +0200
Subject: [PATCH 016/822] README: fix language of header referring to ignore
 comments

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 42eda804b6..908d032f2c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@
     + [Using PHPCS and WPCS from within your IDE](#using-phpcs-and-wpcs-from-within-your-ide)
 * [Running your code through WPCS automatically using CI tools](#running-your-code-through-wpcs-automatically-using-ci-tools)
     + [Travis CI](#travis-ci)
-* [Fixing errors or whitelisting them](#fixing-errors-or-whitelisting-them)
+* [Fixing errors or ignoring them](#fixing-errors-or-ignoring-them)
     + [Tools shipped with WPCS](#tools-shipped-with-wpcs)
 * [Contributing](#contributing)
 * [License](#license)
@@ -267,7 +267,7 @@ script:
 More examples and advice about integrating PHPCS in your Travis build tests can be found here: https://github.com/jrfnl/make-phpcs-work-for-you/tree/master/travis-examples
 
 
-## Fixing errors or whitelisting them
+## Fixing errors or ignoring them
 
 You can find information on how to deal with some of the more frequent issues in the [wiki](https://github.com/WordPress/WordPress-Coding-Standards/wiki).
 

From 953d7a9f199b66c67a85d3b39bdaeb1898ce7e66 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 08:49:27 +0200
Subject: [PATCH 017/822] Replace the `WordPress.PHP.StrictComparisons` sniff

... with a similar sniff as merged upstream in PHPCSExtra as `Universal.Operators.StrictComparisons`.

Notes:
* The sniff in PHPCSExtra contains a fixer. As this is a risky fixer, this fixer is turned off for WPCS.
* The sniff in PHPCSExtra will provide metrics about loose versus strict comparisons.
---
 WordPress-Core/ruleset.xml                    |  4 +-
 .../Sniffs/PHP/StrictComparisonsSniff.php     | 54 -------------------
 .../Tests/PHP/StrictComparisonsUnitTest.inc   | 21 --------
 .../Tests/PHP/StrictComparisonsUnitTest.php   | 47 ----------------
 bin/class-ruleset-test.php                    |  2 +-
 5 files changed, 4 insertions(+), 124 deletions(-)
 delete mode 100644 WordPress/Sniffs/PHP/StrictComparisonsSniff.php
 delete mode 100644 WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
 delete mode 100644 WordPress/Tests/PHP/StrictComparisonsUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0d0a55c9e0..f1449bcb8a 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -406,7 +406,9 @@
 
 	<!-- Rule: Unless absolutely necessary, loose comparisons should not be used,
 		 as their behaviour can be misleading. -->
-	<rule ref="WordPress.PHP.StrictComparisons"/>
+	<rule phpcs-only="true" ref="Universal.Operators.StrictComparisons">
+		<type>warning</type>
+	</rule>
 	<rule ref="WordPress.PHP.StrictInArray"/>
 
 	<!-- Rule: Assignments must not be placed in placed in conditionals.
diff --git a/WordPress/Sniffs/PHP/StrictComparisonsSniff.php b/WordPress/Sniffs/PHP/StrictComparisonsSniff.php
deleted file mode 100644
index 3b2566bfbb..0000000000
--- a/WordPress/Sniffs/PHP/StrictComparisonsSniff.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\PHP;
-
-use WordPressCS\WordPress\Sniff;
-
-/**
- * Enforces Strict Comparison checks, based upon Squiz code.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.4.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- *
- * Last synced with base class ?[unknown date]? at commit ?[unknown commit]?.
- * It is currently unclear whether this sniff is actually based on Squiz code on whether the above
- * reference to it is a copy/paste oversight.
- * @link    Possibly: https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
- */
-class StrictComparisonsSniff extends Sniff {
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return array(
-			\T_IS_EQUAL,
-			\T_IS_NOT_EQUAL,
-		);
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return void
-	 */
-	public function process_token( $stackPtr ) {
-
-		$error = 'Found: ' . $this->tokens[ $stackPtr ]['content'] . '. Use strict comparisons (=== or !==).';
-		$this->phpcsFile->addWarning( $error, $stackPtr, 'LooseComparison' );
-	}
-
-}
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc b/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
deleted file mode 100644
index 507e7f1277..0000000000
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-// Test for 'equals' conditionals.
-if ( true == $true ) { // Bad.
-	echo 'True';
-} elseif ( false === $true ) { // Ok.
-	echo 'False';
-}
-
-// Test for 'not equals' conditionals.
-if ( true != $true ) { // Bad.
-	echo 'True';
-} elseif ( true <> $true ) { // Bad.
-	echo 'False';
-} elseif ( false !== $true ) { // Ok.
-	echo 'False';
-}
-
-// Bad - ignored via old-style ignore comment.
-if ( true == $true ) { // Loose comparison, OK.
-	echo 'True';
-}
diff --git a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php b/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
deleted file mode 100644
index 1648efab9e..0000000000
--- a/WordPress/Tests/PHP/StrictComparisonsUnitTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\PHP;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the StrictComparisons sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.4.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class StrictComparisonsUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array();
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array(
-			3  => 1,
-			10 => 1,
-			12 => 1,
-			19 => 1, // Old-style WPCS ignore comments are no longer supported.
-		);
-	}
-
-}
diff --git a/bin/class-ruleset-test.php b/bin/class-ruleset-test.php
index e9a85899c4..42af57dd25 100644
--- a/bin/class-ruleset-test.php
+++ b/bin/class-ruleset-test.php
@@ -72,7 +72,7 @@ public function testing( $param_a, ?bool $param_b = false ): void {
 		$d = new self();
 		$e = apply_filter( 'filter_name', $d, $c );
 
-		if ( $a == $b ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		if ( $a == $b ) { // phpcs:ignore Universal.Operators.StrictComparisons
 			$f = isset( $_GET['nonce'] ) ? 1 : 2; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
 

From c70167ab49b6452fb5fe04e0f089aceb4bf8175e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 08:03:50 +0200
Subject: [PATCH 018/822] .gitattributes: minor update

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index c12f94cfb3..60d28f9088 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,8 @@
 # If you develop for WPCS using Composer, use `--prefer-source`.
 # https://blog.madewithlove.be/post/gitattributes/
 #
+/.gitattributes export-ignore
+/.gitignore export-ignore
 /.travis.yml export-ignore
 /.phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore

From fa0e10aae39b5226894ef1e22c7be549b048bc4a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 01:41:42 +0200
Subject: [PATCH 019/822] PHPCSHelper: deprecate the class and all the methods
 in it

As everything here is now contained within PHPCSUtils, including updated and/or improved versions of some of these.
---
 WordPress/PHPCSHelper.php | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/WordPress/PHPCSHelper.php b/WordPress/PHPCSHelper.php
index 1599a97a1b..9260e55df1 100644
--- a/WordPress/PHPCSHelper.php
+++ b/WordPress/PHPCSHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * PHPCSHelper
@@ -22,7 +23,8 @@
  *
  * @package WPCS\WordPressCodingStandards
  *
- * @since   0.13.0
+ * @since      0.13.0
+ * @deprecated 3.0.0  Use {@see PHPCSUtils\BackCompat\Helper} instead.
  */
 class PHPCSHelper {
 
@@ -34,7 +36,7 @@ class PHPCSHelper {
 	 * @return string
 	 */
 	public static function get_version() {
-		return Config::VERSION;
+		return Helper::getVersion();
 	}
 
 	/**
@@ -42,7 +44,8 @@ public static function get_version() {
 	 *
 	 * PHPCS cross-version compatibility helper.
 	 *
-	 * @since 0.13.0
+	 * @since      0.13.0
+	 * @deprecated 3.0.0
 	 *
 	 * @param string      $key   The name of the config value.
 	 * @param string|null $value The value to set. If null, the config entry
@@ -51,59 +54,49 @@ public static function get_version() {
 	 *                           This will not write the config data to the config file.
 	 */
 	public static function set_config_data( $key, $value, $temp = false ) {
-		Config::setConfigData( $key, $value, $temp );
+		Helper::setConfigData( $key, $value, $temp );
 	}
 
 	/**
 	 * Get the value of a single PHPCS config key.
 	 *
-	 * @since 0.13.0
+	 * @since      0.13.0
+	 * @deprecated 3.0.0
 	 *
 	 * @param string $key The name of the config value.
 	 *
 	 * @return string|null
 	 */
 	public static function get_config_data( $key ) {
-		return Config::getConfigData( $key );
+		return Helper::getConfigData( $key );
 	}
 
 	/**
 	 * Get the tab width as passed to PHPCS from the command-line or the ruleset.
 	 *
-	 * @since 0.13.0
+	 * @since      0.13.0
+	 * @deprecated 3.0.0
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
 	 *
 	 * @return int Tab width. Defaults to 4.
 	 */
 	public static function get_tab_width( File $phpcsFile ) {
-		$tab_width = 4;
-
-		if ( isset( $phpcsFile->config->tabWidth ) && $phpcsFile->config->tabWidth > 0 ) {
-			$tab_width = $phpcsFile->config->tabWidth;
-		}
-
-		return $tab_width;
+		return Helper::getTabWidth( $phpcsFile );
 	}
 
 	/**
 	 * Check whether the `--ignore-annotations` option has been used.
 	 *
-	 * @since 0.13.0
+	 * @since      0.13.0
+	 * @deprecated 3.0.0
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile Optional. The current file being processed.
 	 *
 	 * @return bool True if annotations should be ignored, false otherwise.
 	 */
 	public static function ignore_annotations( File $phpcsFile = null ) {
-		if ( isset( $phpcsFile, $phpcsFile->config->annotations ) ) {
-			return ! $phpcsFile->config->annotations;
-		} else {
-			$annotations = Config::getConfigData( 'annotations' );
-			if ( isset( $annotations ) ) {
-				return ! $annotations;
-			}
-		}
+		return Helper::ignoreAnnotations( $phpcsFile );
 	}
 
 }

From b4203e43de97bd657025aa912fd27fdd57b1a7e1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 02:29:58 +0200
Subject: [PATCH 020/822] PHPCSHelper::get_version(): remove call to the
 function

This function call is no longer needed now support for PHPCS < 3.5.0 has been dropped.
---
 WordPress/Tests/PHP/TypeCastsUnitTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index 9349f1b838..72f581446c 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -10,7 +10,6 @@
 namespace WordPressCS\WordPress\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-use WordPressCS\WordPress\PHPCSHelper;
 
 /**
  * Unit test class for the TypeCasts sniff.
@@ -44,7 +43,7 @@ public function getWarningList() {
 		return array(
 			14 => 1,
 			15 => 1,
-			16 => ( version_compare( PHPCSHelper::get_version(), '3.4.0', '<' ) === true ? 0 : 1 ),
+			16 => 1,
 			17 => 1,
 			28 => 1,
 			29 => 1,

From 52c15bd05b6f4feaecd8ea8c06e2b37cf13ac89c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 01:49:16 +0200
Subject: [PATCH 021/822] PHPCSHelper::get_config_data(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniff.php                                          | 4 ++--
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 4 ++--
 WordPress/Sniffs/WP/I18nSniff.php                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index aea262ef23..db1732ba2e 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -12,7 +12,7 @@
 use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use WordPressCS\WordPress\PHPCSHelper;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -1141,7 +1141,7 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 	 * @since 0.14.0
 	 */
 	protected function get_wp_version_from_cl() {
-		$cl_supported_version = trim( PHPCSHelper::get_config_data( 'minimum_supported_wp_version' ) );
+		$cl_supported_version = trim( Helper::getConfigData( 'minimum_supported_wp_version' ) );
 		if ( ! empty( $cl_supported_version )
 			&& filter_var( $cl_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
 		) {
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 13c1437657..46b3bfd582 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -10,8 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
-use WordPressCS\WordPress\PHPCSHelper;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Verify that everything defined in the global namespace is prefixed with a theme/plugin specific prefix.
@@ -265,7 +265,7 @@ public function getGroups() {
 	public function process_token( $stackPtr ) {
 
 		// Allow overruling the prefixes set in a ruleset via the command line.
-		$cl_prefixes = trim( PHPCSHelper::get_config_data( 'prefixes' ) );
+		$cl_prefixes = trim( Helper::getConfigData( 'prefixes' ) );
 		if ( ! empty( $cl_prefixes ) ) {
 			$this->prefixes = array_filter( array_map( 'trim', explode( ',', $cl_prefixes ) ) );
 		}
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index d229cb5e9a..1e4cd9c396 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -10,8 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
-use WordPressCS\WordPress\PHPCSHelper;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -191,7 +191,7 @@ public function process_token( $stack_ptr ) {
 		$this->text_domain_is_default       = false;
 
 		// Allow overruling the text_domain set in a ruleset via the command line.
-		$cl_text_domain = trim( PHPCSHelper::get_config_data( 'text_domain' ) );
+		$cl_text_domain = trim( Helper::getConfigData( 'text_domain' ) );
 		if ( ! empty( $cl_text_domain ) ) {
 			$this->text_domain = array_filter( array_map( 'trim', explode( ',', $cl_text_domain ) ) );
 		}

From 3549ec2bb8428945ece6d9f0ed3a4118f3ac4f75 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 01:51:38 +0200
Subject: [PATCH 022/822] PHPCSHelper::get_tab_width(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php       | 4 ++--
 WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index c0b5dcf573..d388e85321 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -10,8 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
 use WordPressCS\WordPress\Sniff;
-use WordPressCS\WordPress\PHPCSHelper;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Enforces WordPress array indentation for multi-line arrays.
@@ -90,7 +90,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		if ( ! isset( $this->tab_width ) ) {
-			$this->tab_width = PHPCSHelper::get_tab_width( $this->phpcsFile );
+			$this->tab_width = Helper::getTabWidth( $this->phpcsFile );
 		}
 
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
diff --git a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php b/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
index f5e822bdc3..1d2d0e8afd 100644
--- a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
@@ -10,8 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
 
 use WordPressCS\WordPress\Sniff;
-use WordPressCS\WordPress\PHPCSHelper;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Warn on line indentation ending with spaces for precision alignment.
@@ -90,7 +90,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		if ( ! isset( $this->tab_width ) ) {
-			$this->tab_width = PHPCSHelper::get_tab_width( $this->phpcsFile );
+			$this->tab_width = Helper::getTabWidth( $this->phpcsFile );
 		}
 
 		// Handle any custom ignore tokens received from a ruleset.

From b868652e45bf4caea3719ba9b826da264187f424 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 01:54:16 +0200
Subject: [PATCH 023/822] Remove the PHPCSHelper.php file

All of the methods contained herein are now provided via PHPCSUtils and all code has been switched over to use the PHPCSUtils versions of the methods instead.
---
 WordPress/PHPCSHelper.php | 102 --------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 WordPress/PHPCSHelper.php

diff --git a/WordPress/PHPCSHelper.php b/WordPress/PHPCSHelper.php
deleted file mode 100644
index 9260e55df1..0000000000
--- a/WordPress/PHPCSHelper.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * PHPCS cross-version compatibility helper class.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress;
-
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Files\File;
-use PHPCSUtils\BackCompat\Helper;
-
-/**
- * PHPCSHelper
- *
- * PHPCS cross-version compatibility helper class.
- *
- * Deals with files which cannot be aliased 1-on-1 as the original
- * class was split up into several classes.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since      0.13.0
- * @deprecated 3.0.0  Use {@see PHPCSUtils\BackCompat\Helper} instead.
- */
-class PHPCSHelper {
-
-	/**
-	 * Get the PHPCS version number.
-	 *
-	 * @since 0.13.0
-	 *
-	 * @return string
-	 */
-	public static function get_version() {
-		return Helper::getVersion();
-	}
-
-	/**
-	 * Pass config data to PHPCS.
-	 *
-	 * PHPCS cross-version compatibility helper.
-	 *
-	 * @since      0.13.0
-	 * @deprecated 3.0.0
-	 *
-	 * @param string      $key   The name of the config value.
-	 * @param string|null $value The value to set. If null, the config entry
-	 *                           is deleted, reverting it to the default value.
-	 * @param boolean     $temp  Set this config data temporarily for this script run.
-	 *                           This will not write the config data to the config file.
-	 */
-	public static function set_config_data( $key, $value, $temp = false ) {
-		Helper::setConfigData( $key, $value, $temp );
-	}
-
-	/**
-	 * Get the value of a single PHPCS config key.
-	 *
-	 * @since      0.13.0
-	 * @deprecated 3.0.0
-	 *
-	 * @param string $key The name of the config value.
-	 *
-	 * @return string|null
-	 */
-	public static function get_config_data( $key ) {
-		return Helper::getConfigData( $key );
-	}
-
-	/**
-	 * Get the tab width as passed to PHPCS from the command-line or the ruleset.
-	 *
-	 * @since      0.13.0
-	 * @deprecated 3.0.0
-	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
-	 *
-	 * @return int Tab width. Defaults to 4.
-	 */
-	public static function get_tab_width( File $phpcsFile ) {
-		return Helper::getTabWidth( $phpcsFile );
-	}
-
-	/**
-	 * Check whether the `--ignore-annotations` option has been used.
-	 *
-	 * @since      0.13.0
-	 * @deprecated 3.0.0
-	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile Optional. The current file being processed.
-	 *
-	 * @return bool True if annotations should be ignored, false otherwise.
-	 */
-	public static function ignore_annotations( File $phpcsFile = null ) {
-		return Helper::ignoreAnnotations( $phpcsFile );
-	}
-
-}

From 62db197ceae54aeb17d4900977310d285111dfb1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:13:32 +0200
Subject: [PATCH 024/822] Core: replace
 `Generic.Arrays.DisallowShortArraySyntax` with `Universal` version

The `Generic.Arrays.DisallowShortArraySyntax` sniff does not take short lists using square brackets `[]` into account, which leads to incorrect detection and fixing of more modern PHP code.

The `Universal.Arrays.DisallowShortArraySyntax` sniff in PHPCSExtra does take short lists into account and prevents these issues.

Fixes 1838
---
 WordPress-Core/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0d0a55c9e0..ce5b60cde1 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -106,7 +106,7 @@
 	#############################################################################
 	-->
 	<!-- Covers rule: Arrays must be declared using long array syntax. -->
-	<rule ref="Generic.Arrays.DisallowShortArraySyntax"/>
+	<rule ref="Universal.Arrays.DisallowShortArraySyntax"/>
 
 
 	<!--

From d96f26eccc3dcad19ba69b06f42bd65e73d73d87 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:08:24 +0200
Subject: [PATCH 025/822] Extra: replace the
 `Squiz.WhiteSpace.LanguageConstructSpacing` sniff with the `Generic` one

Fixes 1616
---
 WordPress-Extra/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 4a2f95997a..1ab4f3757e 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -50,7 +50,7 @@
 	<!-- Check correct spacing of language constructs. This also ensures that the
 	     above rule for not using brackets with require is fixed correctly.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1153 -->
-	<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+	<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
 
 	<!-- Hook callbacks may not use all params -->
 	<!-- https://github.com/WordPress/WordPress-Coding-Standards/pull/382#discussion_r29981655 -->

From 1914ebf19730e1da74814c64b6fcfc0374faf11e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 08:57:25 +0200
Subject: [PATCH 026/822] Core ruleset: add PHPCSUtils requirement

PHPCSUtils does not contain any sniffs, so adding this rule isn't strictly necessary, but by having the rule in the ruleset anyway, if PHPCSUtils is missing, the user will get a descriptive error message during the loading of the ruleset instead of a fatal "class not found" error once the sniffs start running.

Adding this only in the `Core` ruleset is sufficient.

Both `Extra` as well as `WordPress` include `Core` and `Docs` currently doesn't use any sniffs which use PHPCSUtils, so doesn't need it.
---
 WordPress-Core/ruleset.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 18be74004a..e3b77923c2 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -6,6 +6,15 @@
 	<!-- Default tab width for indentation fixes and such. -->
 	<arg name="tab-width" value="4"/>
 
+	<!--
+		 Trigger error if PHPCSUtils cannot be found.
+		 PHPCSUtils does not contain any sniffs, so this rule isn't strictly necessary, but
+		 by having this here anyway, if PHPCSUtils is missing, the user will get a
+		 descriptive error message during the loading of the ruleset instead of
+		 a fatal "class not found" error once the sniffs start running.
+	-->
+	<rule ref="PHPCSUtils"/>
+
 	<!--
 	#############################################################################
 	Handbook: PHP - Single and Double Quotes.

From 39313979ccb32d6a43600e196cbdea59c1e13119 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 02:28:19 +0200
Subject: [PATCH 027/822] Sniff: deprecate everything which has moved to
 PHPCSUtils

These will be removed in a later commit. Doing this staged will allow for easier testing during the transition.
---
 WordPress/Sniff.php | 492 +++++---------------------------------------
 1 file changed, 54 insertions(+), 438 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index db1732ba2e..2ca2767cab 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -13,6 +13,13 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\Arrays;
+use PHPCSUtils\Utils\Lists;
+use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\PassedParameters;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\TextStrings;
+use PHPCSUtils\Utils\UseStatements;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -942,13 +949,14 @@ protected function init( File $phpcsFile ) {
 	 *
 	 * Intended for use with the contents of a T_CONSTANT_ENCAPSED_STRING / T_DOUBLE_QUOTED_STRING.
 	 *
-	 * @since 0.11.0
+	 * @since      0.11.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\TextStrings::stripQuotes()} instead.
 	 *
 	 * @param string $string The raw string.
 	 * @return string String without quotes around it.
 	 */
 	public function strip_quotes( $string ) {
-		return preg_replace( '`^([\'"])(.*)\1$`Ds', '$2', $string );
+		return TextStrings::stripQuotes( $string );
 	}
 
 	/**
@@ -2308,7 +2316,8 @@ protected function is_in_array_comparison( $stackPtr ) {
 	 * This function will check the token and return 'closure', 'trait', or 'class',
 	 * based on which of these uses the use is being used for.
 	 *
-	 * @since 0.7.0
+	 * @since      0.7.0
+	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\UseStatements::getType()} instead.
 	 *
 	 * @param int $stackPtr The position of the token to check.
 	 *
@@ -2316,25 +2325,12 @@ protected function is_in_array_comparison( $stackPtr ) {
 	 */
 	protected function get_use_type( $stackPtr ) {
 
-		// USE keywords inside closures.
-		$next = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
-
-		if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code'] ) {
-			return 'closure';
+		$type = UseStatements::getType( $this->phpcsFile, $stackPtr );
+		if ( 'import' === $type ) {
+			$type = 'class';
 		}
 
-		// USE keywords for traits.
-		$valid_scopes = array(
-			'T_CLASS'      => true,
-			'T_ANON_CLASS' => true,
-			'T_TRAIT'      => true,
-		);
-		if ( false !== $this->valid_direct_scope( $stackPtr, $valid_scopes ) ) {
-			return 'trait';
-		}
-
-		// USE keywords for classes to import to a namespace.
-		return 'class';
+		return $type;
 	}
 
 	/**
@@ -2391,59 +2387,15 @@ public function strip_interpolated_variables( $string ) {
 	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/120
 	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/152
 	 *
-	 * @since 0.11.0
+	 * @since      0.11.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::hasParameters()} instead.
 	 *
 	 * @param int $stackPtr The position of the function call token.
 	 *
 	 * @return bool
 	 */
 	public function does_function_call_have_parameters( $stackPtr ) {
-
-		// Check for the existence of the token.
-		if ( false === isset( $this->tokens[ $stackPtr ] ) ) {
-			return false;
-		}
-
-		// Is this one of the tokens this function handles ?
-		if ( false === \in_array( $this->tokens[ $stackPtr ]['code'], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY ), true ) ) {
-			return false;
-		}
-
-		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-
-		// Deal with short array syntax.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
-			if ( false === isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
-				return false;
-			}
-
-			if ( $next_non_empty === $this->tokens[ $stackPtr ]['bracket_closer'] ) {
-				// No parameters.
-				return false;
-			} else {
-				return true;
-			}
-		}
-
-		// Deal with function calls & long arrays.
-		// Next non-empty token should be the open parenthesis.
-		if ( false === $next_non_empty && \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
-			return false;
-		}
-
-		if ( false === isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] ) ) {
-			return false;
-		}
-
-		$close_parenthesis   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
-		$next_next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), ( $close_parenthesis + 1 ), true );
-
-		if ( $next_next_non_empty === $close_parenthesis ) {
-			// No parameters.
-			return false;
-		}
-
-		return true;
+		return PassedParameters::hasParameters( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
@@ -2459,18 +2411,15 @@ public function does_function_call_have_parameters( $stackPtr ) {
 	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/114
 	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/151
 	 *
-	 * @since 0.11.0
+	 * @since      0.11.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameterCount()} instead.
 	 *
 	 * @param int $stackPtr The position of the function call token.
 	 *
 	 * @return int
 	 */
 	public function get_function_call_parameter_count( $stackPtr ) {
-		if ( false === $this->does_function_call_have_parameters( $stackPtr ) ) {
-			return 0;
-		}
-
-		return \count( $this->get_function_call_parameters( $stackPtr ) );
+		return PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
@@ -2482,7 +2431,8 @@ public function get_function_call_parameter_count( $stackPtr ) {
 	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
 	 * it will tokenize the values / key/value pairs contained in the array call.
 	 *
-	 * @since 0.11.0
+	 * @since      0.11.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameters()} instead.
 	 *
 	 * @param int $stackPtr The position of the function call token.
 	 *
@@ -2496,94 +2446,7 @@ public function get_function_call_parameter_count( $stackPtr ) {
 	 *               }
 	 */
 	public function get_function_call_parameters( $stackPtr ) {
-		if ( false === $this->does_function_call_have_parameters( $stackPtr ) ) {
-			return array();
-		}
-
-		/*
-		 * Ok, we know we have a T_STRING, T_ARRAY or T_OPEN_SHORT_ARRAY with parameters
-		 * and valid open & close brackets/parenthesis.
-		 */
-
-		// Mark the beginning and end tokens.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
-			$opener = $stackPtr;
-			$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
-
-			$nestedParenthesisCount = 0;
-		} else {
-			$opener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-			$closer = $this->tokens[ $opener ]['parenthesis_closer'];
-
-			$nestedParenthesisCount = 1;
-		}
-
-		// Which nesting level is the one we are interested in ?
-		if ( isset( $this->tokens[ $opener ]['nested_parenthesis'] ) ) {
-			$nestedParenthesisCount += \count( $this->tokens[ $opener ]['nested_parenthesis'] );
-		}
-
-		$parameters  = array();
-		$next_comma  = $opener;
-		$param_start = ( $opener + 1 );
-		$cnt         = 1;
-		while ( $next_comma = $this->phpcsFile->findNext( array( \T_COMMA, $this->tokens[ $closer ]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $next_comma + 1 ), ( $closer + 1 ) ) ) {
-			// Ignore anything within short array definition brackets.
-			if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['bracket_opener'] )
-					&& $this->tokens[ $next_comma ]['bracket_opener'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['bracket_closer'] )
-			) {
-				// Skip forward to the end of the short array definition.
-				$next_comma = $this->tokens[ $next_comma ]['bracket_closer'];
-				continue;
-			}
-
-			// Skip past closures passed as function parameters.
-			if ( 'T_CLOSURE' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['scope_condition'] )
-					&& $this->tokens[ $next_comma ]['scope_condition'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['scope_closer'] )
-			) {
-				// Skip forward to the end of the closure declaration.
-				$next_comma = $this->tokens[ $next_comma ]['scope_closer'];
-				continue;
-			}
-
-			// Ignore comma's at a lower nesting level.
-			if ( \T_COMMA === $this->tokens[ $next_comma ]['code']
-				&& isset( $this->tokens[ $next_comma ]['nested_parenthesis'] )
-				&& \count( $this->tokens[ $next_comma ]['nested_parenthesis'] ) !== $nestedParenthesisCount
-			) {
-				continue;
-			}
-
-			// Ignore closing parenthesis/bracket if not 'ours'.
-			if ( $this->tokens[ $next_comma ]['type'] === $this->tokens[ $closer ]['type'] && $next_comma !== $closer ) {
-				continue;
-			}
-
-			// Ok, we've reached the end of the parameter.
-			$parameters[ $cnt ]['start'] = $param_start;
-			$parameters[ $cnt ]['end']   = ( $next_comma - 1 );
-			$parameters[ $cnt ]['raw']   = trim( $this->phpcsFile->getTokensAsString( $param_start, ( $next_comma - $param_start ) ) );
-
-			/*
-			 * Check if there are more tokens before the closing parenthesis.
-			 * Prevents code like the following from setting a third parameter:
-			 * functionCall( $param1, $param2, );
-			 */
-			$has_next_param = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_comma + 1 ), $closer, true, null, true );
-			if ( false === $has_next_param ) {
-				break;
-			}
-
-			// Prepare for the next parameter.
-			$param_start = ( $next_comma + 1 );
-			$cnt++;
-		}
-
-		return $parameters;
+		return PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
@@ -2596,7 +2459,8 @@ public function get_function_call_parameters( $stackPtr ) {
 	 * of the parameter at a specific offset.
 	 * If the specified parameter is not found, will return false.
 	 *
-	 * @since 0.11.0
+	 * @since      0.11.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameter()} instead.
 	 *
 	 * @param int $stackPtr     The position of the function call token.
 	 * @param int $param_offset The 1-based index position of the parameter to retrieve.
@@ -2604,19 +2468,14 @@ public function get_function_call_parameters( $stackPtr ) {
 	 * @return array|false
 	 */
 	public function get_function_call_parameter( $stackPtr, $param_offset ) {
-		$parameters = $this->get_function_call_parameters( $stackPtr );
-
-		if ( false === isset( $parameters[ $param_offset ] ) ) {
-			return false;
-		}
-
-		return $parameters[ $param_offset ];
+		return PassedParameters::getParameter( $this->phpcsFile, $stackPtr, $param_offset );
 	}
 
 	/**
 	 * Find the array opener & closer based on a T_ARRAY or T_OPEN_SHORT_ARRAY token.
 	 *
-	 * @since 0.12.0
+	 * @since      0.12.0
+	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\Arrays::getOpenClose()} instead.
 	 *
 	 * @param int $stackPtr The stack pointer to the array token.
 	 *
@@ -2624,37 +2483,14 @@ public function get_function_call_parameter( $stackPtr, $param_offset ) {
 	 *                    either or these could not be determined.
 	 */
 	protected function find_array_open_close( $stackPtr ) {
-		/*
-		 * Determine the array opener & closer.
-		 */
-		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] ) {
-			if ( isset( $this->tokens[ $stackPtr ]['parenthesis_opener'] ) ) {
-				$opener = $this->tokens[ $stackPtr ]['parenthesis_opener'];
-
-				if ( isset( $this->tokens[ $opener ]['parenthesis_closer'] ) ) {
-					$closer = $this->tokens[ $opener ]['parenthesis_closer'];
-				}
-			}
-		} else {
-			// Short array syntax.
-			$opener = $stackPtr;
-			$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
-		}
-
-		if ( isset( $opener, $closer ) ) {
-			return array(
-				'opener' => $opener,
-				'closer' => $closer,
-			);
-		}
-
-		return false;
+		return Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
 	 * Find the list opener & closer based on a T_LIST or T_OPEN_SHORT_ARRAY token.
 	 *
-	 * @since 2.2.0
+	 * @since      2.2.0
+	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\Lists::getOpenClose()} instead.
 	 *
 	 * @param int $stackPtr The stack pointer to the array token.
 	 *
@@ -2663,107 +2499,22 @@ protected function find_array_open_close( $stackPtr ) {
 	 *                    could not be determined.
 	 */
 	protected function find_list_open_close( $stackPtr ) {
-		/*
-		 * Determine the list opener & closer.
-		 */
-		if ( \T_LIST === $this->tokens[ $stackPtr ]['code'] ) {
-			// PHPCS 3.5.0.
-			if ( isset( $this->tokens[ $stackPtr ]['parenthesis_opener'] ) ) {
-				$opener = $this->tokens[ $stackPtr ]['parenthesis_opener'];
-
-			} else {
-				// PHPCS < 3.5.0.
-				$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-				if ( false !== $next_non_empty
-					&& \T_OPEN_PARENTHESIS === $this->tokens[ $next_non_empty ]['code']
-				) {
-					$opener = $next_non_empty;
-				}
-			}
-
-			if ( isset( $opener, $this->tokens[ $opener ]['parenthesis_closer'] ) ) {
-				$closer = $this->tokens[ $opener ]['parenthesis_closer'];
-			}
-		}
-
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& $this->is_short_list( $stackPtr ) === true
-		) {
-			$opener = $stackPtr;
-			$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
-		}
-
-		if ( isset( $opener, $closer ) ) {
-			return array(
-				'opener' => $opener,
-				'closer' => $closer,
-			);
-		}
-
-		return false;
+		return Lists::getOpenClose( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
 	 * Determine the namespace name an arbitrary token lives in.
 	 *
-	 * @since 0.10.0
-	 * @since 0.12.0 Moved from the `AbstractClassRestrictionsSniff` to this class.
+	 * @since      0.10.0
+	 * @since      0.12.0 Moved from the `AbstractClassRestrictionsSniff` to this class.
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Namespaces::determineNamespace()} instead.
 	 *
 	 * @param int $stackPtr The token position for which to determine the namespace.
 	 *
 	 * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
 	 */
 	public function determine_namespace( $stackPtr ) {
-
-		// Check for the existence of the token.
-		if ( ! isset( $this->tokens[ $stackPtr ] ) ) {
-			return '';
-		}
-
-		// Check for scoped namespace {}.
-		if ( ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
-			$namespacePtr = $this->phpcsFile->getCondition( $stackPtr, \T_NAMESPACE );
-			if ( false !== $namespacePtr ) {
-				$namespace = $this->get_declared_namespace_name( $namespacePtr );
-				if ( false !== $namespace ) {
-					return $namespace;
-				}
-
-				// We are in a scoped namespace, but couldn't determine the name.
-				// Searching for a global namespace is futile.
-				return '';
-			}
-		}
-
-		/*
-		 * Not in a scoped namespace, so let's see if we can find a non-scoped namespace instead.
-		 * Keeping in mind that:
-		 * - there can be multiple non-scoped namespaces in a file (bad practice, but it happens).
-		 * - the namespace keyword can also be used as part of a function/method call and such.
-		 * - that a non-named namespace resolves to the global namespace.
-		 */
-		$previousNSToken = $stackPtr;
-		$namespace       = false;
-		do {
-			$previousNSToken = $this->phpcsFile->findPrevious( \T_NAMESPACE, ( $previousNSToken - 1 ) );
-
-			// Stop if we encounter a scoped namespace declaration as we already know we're not in one.
-			if ( ! empty( $this->tokens[ $previousNSToken ]['scope_condition'] )
-				&& $this->tokens[ $previousNSToken ]['scope_condition'] === $previousNSToken
-			) {
-				break;
-			}
-
-			$namespace = $this->get_declared_namespace_name( $previousNSToken );
-
-		} while ( false === $namespace && false !== $previousNSToken );
-
-		// If we still haven't got a namespace, return an empty string.
-		if ( false === $namespace ) {
-			return '';
-		}
-
-		return $namespace;
+		return Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
@@ -2772,8 +2523,9 @@ public function determine_namespace( $stackPtr ) {
 	 * For hierarchical namespaces, the name will be composed of several tokens,
 	 * i.e. MyProject\Sub\Level which will be returned together as one string.
 	 *
-	 * @since 0.12.0 A lesser variant of this method previously existed in the
-	 *               `AbstractClassRestrictionsSniff` class.
+	 * @since      0.12.0 A lesser variant of this method previously existed in the
+	 *                    `AbstractClassRestrictionsSniff` class.
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Namespaces::getDeclaredName()} instead.
 	 *
 	 * @param int|bool $stackPtr The position of a T_NAMESPACE token.
 	 *
@@ -2781,109 +2533,35 @@ public function determine_namespace( $stackPtr ) {
 	 *                      Namespace name can be an empty string for global namespace declaration.
 	 */
 	public function get_declared_namespace_name( $stackPtr ) {
-
-		// Check for the existence of the token.
-		if ( false === $stackPtr || ! isset( $this->tokens[ $stackPtr ] ) ) {
-			return false;
-		}
-
-		if ( \T_NAMESPACE !== $this->tokens[ $stackPtr ]['code'] ) {
-			return false;
-		}
-
-		$nextToken = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-		if ( \T_NS_SEPARATOR === $this->tokens[ $nextToken ]['code'] ) {
-			// Not a namespace declaration, but use of, i.e. `namespace\someFunction();`.
-			return false;
-		}
-
-		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $nextToken ]['code'] ) {
-			// Declaration for global namespace when using multiple namespaces in a file.
-			// I.e.: `namespace {}`.
-			return '';
-		}
-
-		// Ok, this should be a namespace declaration, so get all the parts together.
-		$acceptedTokens = array(
-			\T_STRING       => true,
-			\T_NS_SEPARATOR => true,
-		);
-		$validTokens    = $acceptedTokens + Tokens::$emptyTokens;
-
-		$namespaceName = '';
-		while ( isset( $validTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-			if ( isset( $acceptedTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-				$namespaceName .= trim( $this->tokens[ $nextToken ]['content'] );
-			}
-			++$nextToken;
-		}
-
-		return $namespaceName;
+		return Namespaces::getDeclaredName( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
 	 * Check whether a T_CONST token is a class constant declaration.
 	 *
-	 * @since 0.14.0
+	 * @since      0.14.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::isOOConstant()} instead.
 	 *
 	 * @param int $stackPtr The position in the stack of the T_CONST token to verify.
 	 *
 	 * @return bool
 	 */
 	public function is_class_constant( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_CONST !== $this->tokens[ $stackPtr ]['code'] ) {
-			return false;
-		}
-
-		// Note: traits can not declare constants.
-		$valid_scopes = array(
-			'T_CLASS'      => true,
-			'T_ANON_CLASS' => true,
-			'T_INTERFACE'  => true,
-		);
-
-		return is_int( $this->valid_direct_scope( $stackPtr, $valid_scopes ) );
+		return Scopes::isOOConstant( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
 	 * Check whether a T_VARIABLE token is a class property declaration.
 	 *
-	 * @since 0.14.0
+	 * @since      0.14.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::isOOProperty()} instead.
 	 *
 	 * @param int $stackPtr The position in the stack of the T_VARIABLE token to verify.
 	 *
 	 * @return bool
 	 */
 	public function is_class_property( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
-			return false;
-		}
-
-		// Note: interfaces can not declare properties.
-		$valid_scopes = array(
-			'T_CLASS'      => true,
-			'T_ANON_CLASS' => true,
-			'T_TRAIT'      => true,
-		);
-
-		$scopePtr = $this->valid_direct_scope( $stackPtr, $valid_scopes );
-		if ( false !== $scopePtr ) {
-			// Make sure it's not a method parameter.
-			if ( empty( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-				return true;
-			} else {
-				$parenthesis  = array_keys( $this->tokens[ $stackPtr ]['nested_parenthesis'] );
-				$deepest_open = array_pop( $parenthesis );
-				if ( $deepest_open < $scopePtr
-					|| isset( $this->tokens[ $deepest_open ]['parenthesis_owner'] ) === false
-					|| \T_FUNCTION !== $this->tokens[ $this->tokens[ $deepest_open ]['parenthesis_owner'] ]['code']
-				) {
-					return true;
-				}
-			}
-		}
-
-		return false;
+		return Scopes::isOOProperty( $this->phpcsFile, $stackPtr );
 	}
 
 	/**
@@ -2892,7 +2570,8 @@ public function is_class_property( $stackPtr ) {
 	 *
 	 * Used to check, for instance, if a T_CONST is a class constant.
 	 *
-	 * @since 0.14.0
+	 * @since      0.14.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::validDirectScope()} instead.
 	 *
 	 * @param int   $stackPtr     The position in the stack of the token to verify.
 	 * @param array $valid_scopes Array of token types.
@@ -2903,25 +2582,7 @@ public function is_class_property( $stackPtr ) {
 	 * @return int|bool StackPtr to the scope if valid, false otherwise.
 	 */
 	protected function valid_direct_scope( $stackPtr, array $valid_scopes ) {
-		if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
-			return false;
-		}
-
-		/*
-		 * Check only the direct wrapping scope of the token.
-		 */
-		$conditions = array_keys( $this->tokens[ $stackPtr ]['conditions'] );
-		$ptr        = array_pop( $conditions );
-
-		if ( ! isset( $this->tokens[ $ptr ] ) ) {
-			return false;
-		}
-
-		if ( isset( $valid_scopes[ $this->tokens[ $ptr ]['type'] ] ) ) {
-			return $ptr;
-		}
-
-		return false;
+		return Scopes::validDirectScope( $this->phpcsFile, $stackPtr, $valid_scopes );
 	}
 
 	/**
@@ -3155,7 +2816,8 @@ protected function is_foreach_as( $stackPtr ) {
 	 * @internal This function will be introduced in PHPCS upstream in version 3.5.0
 	 * and can be removed from WPCS once WPCS raises the minimum version.
 	 *
-	 * @since 2.2.0
+	 * @since      2.2.0
+	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Lists::isShortList()} instead.
 	 *
 	 * @param int $stackPtr The position of the array bracket token.
 	 *
@@ -3164,53 +2826,7 @@ protected function is_foreach_as( $stackPtr ) {
 	 *              a T_OPEN/CLOSE_SHORT_ARRAY token.
 	 */
 	protected function is_short_list( $stackPtr ) {
-		// Is this one of the tokens this function handles ?
-		if ( \T_OPEN_SHORT_ARRAY !== $this->tokens[ $stackPtr ]['code']
-			&& \T_CLOSE_SHORT_ARRAY !== $this->tokens[ $stackPtr ]['code']
-		) {
-			return false;
-		}
-
-		switch ( $this->tokens[ $stackPtr ]['code'] ) {
-			case \T_OPEN_SHORT_ARRAY:
-				$opener = $stackPtr;
-				$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
-				break;
-
-			case \T_CLOSE_SHORT_ARRAY:
-				$opener = $this->tokens[ $stackPtr ]['bracket_opener'];
-				$closer = $stackPtr;
-				break;
-		}
-
-		$nextNonEmpty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $closer + 1 ), null, true, null, true );
-		if ( false !== $nextNonEmpty && \T_EQUAL === $this->tokens[ $nextNonEmpty ]['code'] ) {
-			return true;
-		}
-
-		// Check for short list in foreach, i.e. `foreach($array as [$a, $b])`.
-		if ( $this->is_foreach_as( $stackPtr ) === true ) {
-			return true;
-		}
-
-		// Maybe this is a short list syntax nested inside another short list syntax ?
-		$parentOpen = $opener;
-		do {
-			$parentOpen = $this->phpcsFile->findPrevious(
-				\T_OPEN_SHORT_ARRAY,
-				( $parentOpen - 1 ),
-				null,
-				false,
-				null,
-				true
-			);
-
-			if ( false === $parentOpen ) {
-				return false;
-			}
-		} while ( $this->tokens[ $parentOpen ]['bracket_closer'] < $opener );
-
-		return $this->is_short_list( $parentOpen );
+		return Lists::isShortList( $this->phpcsFile, $stackPtr );
 	}
 
 	/**

From dda669a3a1841bda1e81f12c198e0b9844a3fc4a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 02:40:54 +0200
Subject: [PATCH 028/822] Sniff::strip_quotes(): switch over to the PHPCSUtils
 version

---
 .../AbstractArrayAssignmentRestrictionsSniff.php     |  7 ++++---
 WordPress/Sniff.php                                  | 12 ++++++------
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php |  5 +++--
 .../Sniffs/DateTime/CurrentTimeTimestampSniff.php    |  3 ++-
 WordPress/Sniffs/Files/FileNameSniff.php             |  5 +++--
 .../NamingConventions/PrefixAllGlobalsSniff.php      |  7 ++++---
 .../Sniffs/NamingConventions/ValidHookNameSniff.php  |  3 ++-
 .../NamingConventions/ValidPostTypeSlugSniff.php     |  3 ++-
 WordPress/Sniffs/PHP/IniSetSniff.php                 |  5 +++--
 WordPress/Sniffs/Security/EscapeOutputSniff.php      |  3 ++-
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php  |  5 +++--
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php    |  3 ++-
 WordPress/Sniffs/WP/CronIntervalSniff.php            |  7 ++++---
 .../Sniffs/WP/DeprecatedParameterValuesSniff.php     |  3 ++-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php    |  3 ++-
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php    |  3 ++-
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php |  5 +++--
 WordPress/Sniffs/WP/I18nSniff.php                    |  5 +++--
 18 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 7c662cd0f5..d235862f89 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -164,16 +165,16 @@ public function process_token( $stackPtr ) {
 
 			$keyIdx = $this->phpcsFile->findPrevious( array( \T_WHITESPACE, \T_CLOSE_SQUARE_BRACKET ), ( $operator - 1 ), null, true );
 			if ( ! is_numeric( $this->tokens[ $keyIdx ]['content'] ) ) {
-				$key            = $this->strip_quotes( $this->tokens[ $keyIdx ]['content'] );
+				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
 				$valStart       = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $operator + 1 ), null, true );
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
 				$val            = $this->phpcsFile->getTokensAsString( $valStart, ( $valEnd - $valStart ) );
-				$val            = $this->strip_quotes( $val );
+				$val            = TextStrings::stripQuotes( $val );
 				$inst[ $key ][] = array( $val, $token['line'] );
 			}
 		} elseif ( \in_array( $token['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
 			// $foo = 'bar=taz&other=thing';
-			if ( preg_match_all( '#(?:^|&)([a-z_]+)=([^&]*)#i', $this->strip_quotes( $token['content'] ), $matches ) <= 0 ) {
+			if ( preg_match_all( '#(?:^|&)([a-z_]+)=([^&]*)#i', TextStrings::stripQuotes( $token['content'] ), $matches ) <= 0 ) {
 				return; // No assignments here, nothing to check.
 			}
 			foreach ( $matches[1] as $i => $_k ) {
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 2ca2767cab..de2d87f14b 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1828,7 +1828,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 				);
 
 				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
-					$functionName = $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] );
+					$functionName = TextStrings::stripQuotes( $this->tokens[ $first_non_empty ]['content'] );
 				}
 			}
 		}
@@ -2035,7 +2035,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 			$array_keys = (array) $array_keys;
 		}
 
-		$bare_array_keys = array_map( array( $this, 'strip_quotes' ), $array_keys );
+		$bare_array_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $array_keys );
 		$targets         = array(
 			\T_ISSET          => 'construct',
 			\T_EMPTY          => 'construct',
@@ -2077,7 +2077,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						// $_POST['hello']), that must match too. Quote-style, however, doesn't matter.
 						if ( ! empty( $bare_array_keys ) ) {
 							$found_keys = $this->get_array_access_keys( $i );
-							$found_keys = array_map( array( $this, 'strip_quotes' ), $found_keys );
+							$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 							$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 							if ( ! empty( $diff ) ) {
 								continue;
@@ -2138,7 +2138,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						 */
 
 						$found_keys = $this->get_array_access_keys( $param2_first_token );
-						$found_keys = array_map( array( $this, 'strip_quotes' ), $found_keys );
+						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 
 						// First try matching the complete set against the second parameter.
 						$diff = array_diff_assoc( $bare_array_keys, $found_keys );
@@ -2148,7 +2148,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 
 						// If that failed, try getting an exact match for the subset against the
 						// second parameter and the last key against the first.
-						if ( $bare_keys === $found_keys && $this->strip_quotes( $params[1]['raw'] ) === $last_key ) {
+						if ( $bare_keys === $found_keys && TextStrings::stripQuotes( $params[1]['raw'] ) === $last_key ) {
 							return true;
 						}
 
@@ -2182,7 +2182,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 
 					if ( ! empty( $bare_array_keys ) ) {
 						$found_keys = $this->get_array_access_keys( $prev );
-						$found_keys = array_map( array( $this, 'strip_quotes' ), $found_keys );
+						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 						$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 						if ( ! empty( $diff ) ) {
 							continue 2;
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 876ebf179c..fd3f178d38 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Check for incorrect use of the $wpdb->prepare method.
@@ -229,7 +230,7 @@ public function process_token( $stackPtr ) {
 							$query['start']
 						);
 
-						$prev_content = $this->strip_quotes( $this->tokens[ $prev ]['content'] );
+						$prev_content = TextStrings::stripQuotes( $this->tokens[ $prev ]['content'] );
 						$regex_quote  = $this->get_regex_quote_snippet( $prev_content, $this->tokens[ $prev ]['content'] );
 
 						// Only examine the implode if preceded by an ` IN (`.
@@ -268,7 +269,7 @@ public function process_token( $stackPtr ) {
 
 			$regex_quote = $this->regex_quote;
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) ) {
-				$content     = $this->strip_quotes( $content );
+				$content     = TextStrings::stripQuotes( $content );
 				$regex_quote = $this->get_regex_quote_snippet( $content, $this->tokens[ $i ]['content'] );
 			}
 
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 180ae240d2..2a7d00f0eb 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Don't use current_time() to get a (timezone corrected) "timestamp".
@@ -79,7 +80,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 
 			if ( isset( Tokens::$textStringTokens[ $this->tokens[ $i ]['code'] ] ) ) {
-				$content_first = trim( $this->strip_quotes( $this->tokens[ $i ]['content'] ) );
+				$content_first = trim( TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) );
 				if ( 'U' !== $content_first && 'timestamp' !== $content_first ) {
 					// Most likely valid use of current_time().
 					return;
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 598bc39bda..99fdab8518 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Files;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -138,8 +139,8 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		// Usage of `strip_quotes` is to ensure `stdin_path` passed by IDEs does not include quotes.
-		$file = $this->strip_quotes( $this->phpcsFile->getFileName() );
+		// Usage of `stripQuotes` is to ensure `stdin_path` passed by IDEs does not include quotes.
+		$file = TextStrings::stripQuotes( $this->phpcsFile->getFileName() );
 		if ( 'STDIN' === $file ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 46b3bfd582..1ae8c27621 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Verify that everything defined in the global namespace is prefixed with a theme/plugin specific prefix.
@@ -641,7 +642,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 			}
 
 			$stackPtr      = $array_key;
-			$variable_name = $this->strip_quotes( $this->tokens[ $array_key ]['content'] );
+			$variable_name = TextStrings::stripQuotes( $this->tokens[ $array_key ]['content'] );
 
 			// Check whether a prefix is needed.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $array_key ]['code'] ] )
@@ -792,7 +793,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		$is_error    = true;
-		$raw_content = $this->strip_quotes( $parameters[1]['raw'] );
+		$raw_content = TextStrings::stripQuotes( $parameters[1]['raw'] );
 
 		if ( ( 'define' !== $matched_content
 			&& isset( $this->whitelisted_core_hooks[ $raw_content ] ) )
@@ -817,7 +818,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				return;
 			}
 
-			$first_non_empty_content = $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] );
+			$first_non_empty_content = TextStrings::stripQuotes( $this->tokens[ $first_non_empty ]['content'] );
 
 			// Try again with just the first token if it's a text string.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ]['code'] ] )
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index da62331d50..f0d3558ca8 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Use lowercase letters in action and filter names. Separate words via underscores.
@@ -136,7 +137,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				continue;
 			}
 
-			$string = $this->strip_quotes( $this->tokens[ $i ]['content'] );
+			$string = TextStrings::stripQuotes( $this->tokens[ $i ]['content'] );
 
 			/*
 			 * Here be dragons - a double quoted string can contain extrapolated variables
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index caedae8b39..9edcff7792 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Validates post type names.
@@ -136,7 +137,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$post_type = $this->strip_quotes( $this->tokens[ $string_pos ]['content'] );
+		$post_type = TextStrings::stripQuotes( $this->tokens[ $string_pos ]['content'] );
 
 		if ( strlen( $post_type ) === 0 ) {
 			// Error for using empty slug.
diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 178386d112..e69f7cfde7 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
@@ -136,8 +137,8 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$option_name  = $this->strip_quotes( $parameters[1]['raw'] );
-		$option_value = $this->strip_quotes( $parameters[2]['raw'] );
+		$option_name  = TextStrings::stripQuotes( $parameters[1]['raw'] );
+		$option_value = TextStrings::stripQuotes( $parameters[2]['raw'] );
 		if ( isset( $this->whitelisted_options[ $option_name ] ) ) {
 			$whitelisted_option = $this->whitelisted_options[ $option_name ];
 			if ( ! isset( $whitelisted_option['valid_values'] ) || in_array( strtolower( $option_value ), $whitelisted_option['valid_values'], true ) ) {
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 89b1cb3961..bf6c730a3d 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Verifies that all outputted strings are escaped.
@@ -400,7 +401,7 @@ public function process_token( $stackPtr ) {
 							if ( false !== $mapped_function
 								&& \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $mapped_function ]['code']
 							) {
-								$functionName = $this->strip_quotes( $this->tokens[ $mapped_function ]['content'] );
+								$functionName = TextStrings::stripQuotes( $this->tokens[ $mapped_function ]['content'] );
 								$ptr          = $mapped_function;
 							}
 						}
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index e7090b481c..a14d4bc360 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Comprehensive I18n text domain fixer tool.
@@ -436,7 +437,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		// If we're still here, this means only one T_CONSTANT_ENCAPSED_STRING was found.
-		$old_domain = $this->strip_quotes( $this->tokens[ $domain_token ]['content'] );
+		$old_domain = TextStrings::stripQuotes( $this->tokens[ $domain_token ]['content'] );
 
 		if ( ! \in_array( $old_domain, $this->old_text_domain, true ) ) {
 			// Not a text domain targetted for replacement, ignore.
@@ -545,7 +546,7 @@ public function process_comments( $stackPtr ) {
 		$type    = 'plugin';
 		$skip_to = $stackPtr;
 
-		$file = $this->strip_quotes( $this->phpcsFile->getFileName() );
+		$file = TextStrings::stripQuotes( $this->phpcsFile->getFileName() );
 		if ( 'STDIN' === $file ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index fc6e8fbbb3..059d1d5ea4 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
@@ -298,7 +299,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 */
 	protected function is_local_data_stream( $raw_param_value ) {
 
-		$raw_stripped = $this->strip_quotes( $raw_param_value );
+		$raw_stripped = TextStrings::stripQuotes( $raw_param_value );
 		if ( isset( $this->allowed_local_streams[ $raw_stripped ] )
 			|| isset( $this->allowed_local_stream_constants[ $raw_param_value ] )
 		) {
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 7cfdddd919..3a69eab52f 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Flag cron schedules less than 15 minutes.
@@ -86,7 +87,7 @@ public function register() {
 	public function process_token( $stackPtr ) {
 		$token = $this->tokens[ $stackPtr ];
 
-		if ( 'cron_schedules' !== $this->strip_quotes( $token['content'] ) ) {
+		if ( 'cron_schedules' !== TextStrings::stripQuotes( $token['content'] ) ) {
 			return;
 		}
 
@@ -135,7 +136,7 @@ public function process_token( $stackPtr ) {
 		if ( \T_CLOSURE === $this->tokens[ $callbackFunctionPtr ]['code'] ) {
 			$functionPtr = $callbackFunctionPtr;
 		} else {
-			$functionName = $this->strip_quotes( $this->tokens[ $callbackFunctionPtr ]['content'] );
+			$functionName = TextStrings::stripQuotes( $this->tokens[ $callbackFunctionPtr ]['content'] );
 
 			for ( $ptr = 0; $ptr < $this->phpcsFile->numTokens; $ptr++ ) {
 				if ( \T_FUNCTION === $this->tokens[ $ptr ]['code'] ) {
@@ -165,7 +166,7 @@ public function process_token( $stackPtr ) {
 		for ( $i = $opening; $i <= $closing; $i++ ) {
 
 			if ( \in_array( $this->tokens[ $i ]['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
-				if ( 'interval' === $this->strip_quotes( $this->tokens[ $i ]['content'] ) ) {
+				if ( 'interval' === TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) ) {
 					$operator = $this->phpcsFile->findNext( \T_DOUBLE_ARROW, $i, null, false, null, true );
 					if ( false === $operator ) {
 						$this->confused( $stackPtr );
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 0758def26b..69a7abf3d5 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Check for usage of deprecated parameter values in WP functions and provide alternative based on the parameter passed.
@@ -187,7 +188,7 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 			return;
 		}
 
-		$matched_parameter = $this->strip_quotes( $this->tokens[ $parameter_position ]['content'] );
+		$matched_parameter = TextStrings::stripQuotes( $this->tokens[ $parameter_position ]['content'] );
 		if ( ! isset( $parameter_args[ $matched_parameter ] ) ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 3d45bafc7f..3e50a587f2 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
@@ -305,7 +306,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 					$matched_parameter = array();
 					break;
 				default:
-					$matched_parameter = $this->strip_quotes( $parameters[ $position ]['raw'] );
+					$matched_parameter = TextStrings::stripQuotes( $parameters[ $position ]['raw'] );
 					break;
 			}
 
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index bcd960c446..8426ad2900 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Warns against usage of discouraged WP CONSTANTS and recommends alternatives.
@@ -199,7 +200,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$raw_content = $this->strip_quotes( $parameters[ $target_param ]['raw'] );
+		$raw_content = TextStrings::stripQuotes( $parameters[ $target_param ]['raw'] );
 
 		if ( isset( $this->discouraged_constants[ $raw_content ] ) ) {
 			$this->phpcsFile->addWarning(
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index b69a5119f1..4adf5d93f6 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Warns about overwriting WordPress native global variables.
@@ -226,7 +227,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 				}
 
 				if ( \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $ptr ]['code'] ) {
-					$var_name .= $this->strip_quotes( $this->tokens[ $ptr ]['content'] );
+					$var_name .= TextStrings::stripQuotes( $this->tokens[ $ptr ]['content'] );
 				}
 			}
 
@@ -378,7 +379,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				foreach ( $var_pointers as $ptr ) {
 					$var_name = $this->tokens[ $ptr ]['content'];
 					if ( '$GLOBALS' === $var_name ) {
-						$var_name = '$' . $this->strip_quotes( $this->get_array_access_key( $ptr ) );
+						$var_name = '$' . TextStrings::stripQuotes( $this->get_array_access_key( $ptr ) );
 					}
 
 					if ( \in_array( $var_name, $search, true ) ) {
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 1e4cd9c396..62ddd6342e 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -477,7 +478,7 @@ protected function check_argument_tokens( $context ) {
 
 		if ( isset( Tokens::$textStringTokens[ $tokens[0]['code'] ] ) ) {
 			if ( 'domain' === $arg_name && ! empty( $this->text_domain ) ) {
-				$stripped_content = $this->strip_quotes( $content );
+				$stripped_content = TextStrings::stripQuotes( $content );
 
 				if ( ! \in_array( $stripped_content, $this->text_domain, true ) ) {
 					$this->addMessage(
@@ -630,7 +631,7 @@ protected function check_text( $context ) {
 		 *
 		 * Strip placeholders and surrounding quotes.
 		 */
-		$content_without_quotes  = trim( $this->strip_quotes( $content ) );
+		$content_without_quotes  = trim( TextStrings::stripQuotes( $content ) );
 		$non_placeholder_content = preg_replace( self::SPRINTF_PLACEHOLDER_REGEX, '', $content_without_quotes );
 
 		if ( '' === $non_placeholder_content ) {

From 5edaf980a070b3b022089edfb4f3c6e8cc663bc2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 02:41:44 +0200
Subject: [PATCH 029/822] Sniff::strip_quotes(): remove the function

---
 WordPress/Sniff.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index de2d87f14b..aeaf796476 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -944,21 +944,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Strip quotes surrounding an arbitrary string.
-	 *
-	 * Intended for use with the contents of a T_CONSTANT_ENCAPSED_STRING / T_DOUBLE_QUOTED_STRING.
-	 *
-	 * @since      0.11.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\TextStrings::stripQuotes()} instead.
-	 *
-	 * @param string $string The raw string.
-	 * @return string String without quotes around it.
-	 */
-	public function strip_quotes( $string ) {
-		return TextStrings::stripQuotes( $string );
-	}
-
 	/**
 	 * Add a PHPCS message to the output stack as either a warning or an error.
 	 *

From 540733ceda37daaf6a75323006d65a8e3afaa3dc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:03:37 +0200
Subject: [PATCH 030/822] Sniff::get_use_type(): switch over to a PHPCSUtils
 alternative

---
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 5f7b9a3ca7..5b7426fc92 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\UseStatements;
 
 /**
  * Enforces spacing around logical operators and assignments, based upon Squiz code.
@@ -113,6 +114,12 @@ public function register() {
 	public function process_token( $stackPtr ) {
 		$this->spaces_before_closure_open_paren = (int) $this->spaces_before_closure_open_paren;
 
+		if ( \T_USE === $this->tokens[ $stackPtr ]['code']
+			&& UseStatements::isClosureUse( $this->phpcsFile, $stackPtr ) === false
+		) {
+			return;
+		}
+
 		if ( isset( $this->tokens[ ( $stackPtr + 1 ) ] ) && \T_WHITESPACE !== $this->tokens[ ( $stackPtr + 1 ) ]['code']
 			&& ! ( \T_ELSE === $this->tokens[ $stackPtr ]['code'] && \T_COLON === $this->tokens[ ( $stackPtr + 1 ) ]['code'] )
 			&& ! ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code']
@@ -128,7 +135,7 @@ public function process_token( $stackPtr ) {
 
 		if ( ! isset( $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
 
-			if ( \T_USE === $this->tokens[ $stackPtr ]['code'] && 'closure' === $this->get_use_type( $stackPtr ) ) {
+			if ( \T_USE === $this->tokens[ $stackPtr ]['code'] ) {
 				$scopeOpener = $this->phpcsFile->findNext( \T_OPEN_CURLY_BRACKET, ( $stackPtr + 1 ) );
 				$scopeCloser = $this->tokens[ $scopeOpener ]['scope_closer'];
 			} elseif ( \T_WHILE !== $this->tokens[ $stackPtr ]['code'] ) {

From 063dd57664df54650304e8f9822e82c84908c2ca Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 18:41:37 +0200
Subject: [PATCH 031/822] Sniff::get_use_type(): remove the function

---
 WordPress/Sniff.php | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index aeaf796476..ce3ccd3399 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -19,7 +19,6 @@
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
-use PHPCSUtils\Utils\UseStatements;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -2289,35 +2288,6 @@ protected function is_in_array_comparison( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check what type of 'use' statement a token is part of.
-	 *
-	 * The T_USE token has multiple different uses:
-	 *
-	 * 1. In a closure: function () use ( $var ) {}
-	 * 2. In a class, to import a trait: use Trait_Name
-	 * 3. In a namespace, to import a class: use Some\Class;
-	 *
-	 * This function will check the token and return 'closure', 'trait', or 'class',
-	 * based on which of these uses the use is being used for.
-	 *
-	 * @since      0.7.0
-	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\UseStatements::getType()} instead.
-	 *
-	 * @param int $stackPtr The position of the token to check.
-	 *
-	 * @return string The type of use.
-	 */
-	protected function get_use_type( $stackPtr ) {
-
-		$type = UseStatements::getType( $this->phpcsFile, $stackPtr );
-		if ( 'import' === $type ) {
-			$type = 'class';
-		}
-
-		return $type;
-	}
-
 	/**
 	 * Get the interpolated variable names from a string.
 	 *

From 60bb821fb7b34fbaa7262752619b777831f890bd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 18:42:37 +0200
Subject: [PATCH 032/822] Sniff::does_function_call_have_parameters(): remove
 the function

All uses of the method were already removed with the switching over of the deprecated utility methods themselves.
---
 WordPress/Sniff.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index ce3ccd3399..e0049648a5 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2330,29 +2330,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Checks if a function call has parameters.
-	 *
-	 * Expects to be passed the T_STRING stack pointer for the function call.
-	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-	 *
-	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer, it
-	 * will detect whether the array has values or is empty.
-	 *
-	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/120
-	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/152
-	 *
-	 * @since      0.11.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::hasParameters()} instead.
-	 *
-	 * @param int $stackPtr The position of the function call token.
-	 *
-	 * @return bool
-	 */
-	public function does_function_call_have_parameters( $stackPtr ) {
-		return PassedParameters::hasParameters( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Count the number of parameters a function call has been passed.
 	 *

From 8d5eafdc02736c0f7d211079ddfc363d0ba14dbd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:31:21 +0200
Subject: [PATCH 033/822] Sniff::get_function_call_parameter_count(): switch
 over to the PHPCSUtils version

---
 WordPress/Sniff.php                               | 2 +-
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e0049648a5..f8072da9eb 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2281,7 +2281,7 @@ protected function is_in_array_comparison( $stackPtr ) {
 			return true;
 		}
 
-		if ( $this->get_function_call_parameter_count( $function_ptr ) >= $this->arrayCompareFunctions[ $function_name ] ) {
+		if ( PassedParameters::getParameterCount( $this->phpcsFile, $function_ptr ) >= $this->arrayCompareFunctions[ $function_name ] ) {
 			return true;
 		}
 
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 059d1d5ea4..fef6f26be2 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
@@ -192,7 +193,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 * The function `wp_strip_all_tags()` is only a valid alternative when
 				 * only the first parameter is passed to `strip_tags()`.
 				 */
-				if ( $this->get_function_call_parameter_count( $stackPtr ) !== 1 ) {
+				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1 ) {
 					return;
 				}
 
@@ -205,7 +206,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 *
 				 * @see https://developer.wordpress.org/reference/functions/wp_parse_url/#changelog
 				 */
-				if ( $this->get_function_call_parameter_count( $stackPtr ) !== 1
+				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1
 					&& version_compare( $this->minimum_supported_version, '4.7.0', '<' )
 				) {
 					return;

From 7199ef159ea7c40a719a2428ff5cb34e54cccbe4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:31:51 +0200
Subject: [PATCH 034/822] Sniff::get_function_call_parameter_count(): remove
 the function

---
 WordPress/Sniff.php | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index f8072da9eb..32565c598e 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2330,30 +2330,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Count the number of parameters a function call has been passed.
-	 *
-	 * Expects to be passed the T_STRING stack pointer for the function call.
-	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-	 *
-	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
-	 * it will return the number of values in the array.
-	 *
-	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/111
-	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/114
-	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/151
-	 *
-	 * @since      0.11.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameterCount()} instead.
-	 *
-	 * @param int $stackPtr The position of the function call token.
-	 *
-	 * @return int
-	 */
-	public function get_function_call_parameter_count( $stackPtr ) {
-		return PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Get information on all parameters passed to a function call.
 	 *

From ecf13b88c328d3e65a9ef9fadecc8de57d1f157d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:38:51 +0200
Subject: [PATCH 035/822] Sniff::get_function_call_parameters(): switch over to
 the PHPCSUtils version

---
 WordPress/AbstractFunctionParameterSniff.php          |  3 ++-
 WordPress/Sniff.php                                   |  2 +-
 .../Sniffs/Arrays/ArrayDeclarationSpacingSniff.php    |  5 +++--
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php     |  3 ++-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php  |  3 ++-
 .../Sniffs/Arrays/MultipleStatementAlignmentSniff.php |  3 ++-
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php  | 11 ++++++-----
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php     |  2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/WordPress/AbstractFunctionParameterSniff.php b/WordPress/AbstractFunctionParameterSniff.php
index ab68a1dcf7..b7cc1b141e 100644
--- a/WordPress/AbstractFunctionParameterSniff.php
+++ b/WordPress/AbstractFunctionParameterSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
@@ -68,7 +69,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$parameters = $this->get_function_call_parameters( $stackPtr );
+		$parameters = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
 		if ( empty( $parameters ) ) {
 			return $this->process_no_parameters( $stackPtr, $group_name, $matched_content );
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 32565c598e..cab94033e3 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2097,7 +2097,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						continue 2;
 					}
 
-					$params = $this->get_function_call_parameters( $i );
+					$params = PassedParameters::getParameters( $this->phpcsFile, $i );
 					if ( count( $params ) < 2 ) {
 						continue 2;
 					}
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 5488bfd3bd..df12c4c385 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 
 /**
  * Enforces WordPress array spacing format.
@@ -193,7 +194,7 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 		$array_has_keys = $this->phpcsFile->findNext( \T_DOUBLE_ARROW, $opener, $closer );
 		if ( false !== $array_has_keys ) {
 
-			$array_items = $this->get_function_call_parameters( $stackPtr );
+			$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
 			if ( ( false === $this->allow_single_item_single_line_associative_arrays
 					&& ! empty( $array_items ) )
@@ -375,7 +376,7 @@ protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
 		/*
 		 * Check that each array item starts on a new line.
 		 */
-		$array_items      = $this->get_function_call_parameters( $stackPtr );
+		$array_items      = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 		$end_of_last_item = $opener;
 
 		foreach ( $array_items as $item ) {
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index d388e85321..67e013bdcd 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\PassedParameters;
 
 /**
  * Enforces WordPress array indentation for multi-line arrays.
@@ -165,7 +166,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Verify & correct the array item indentation.
 		 */
-		$array_items = $this->get_function_call_parameters( $stackPtr );
+		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 		if ( empty( $array_items ) ) {
 			// Strange, no array items found.
 			return;
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index 902bc670b0..6f9b438b07 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 
 /**
  * Enforces a comma after each array item and the spacing around it.
@@ -82,7 +83,7 @@ public function process_token( $stackPtr ) {
 			$single_line = false;
 		}
 
-		$array_items = $this->get_function_call_parameters( $stackPtr );
+		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 		if ( empty( $array_items ) ) {
 			// Strange, no array items found.
 			return;
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index dc68e4f9e4..4deb52decf 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -184,7 +185,7 @@ public function process_token( $stackPtr ) {
 		$opener = $array_open_close['opener'];
 		$closer = $array_open_close['closer'];
 
-		$array_items = $this->get_function_call_parameters( $stackPtr );
+		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 		if ( empty( $array_items ) ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index fd3f178d38..e6c1f664a7 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -175,7 +176,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$parameters = $this->get_function_call_parameters( $this->methodPtr );
+		$parameters = PassedParameters::getParameters( $this->phpcsFile, $this->methodPtr );
 		if ( empty( $parameters ) ) {
 			return;
 		}
@@ -211,7 +212,7 @@ public function process_token( $stackPtr ) {
 				if ( \T_STRING === $this->tokens[ $i ]['code'] ) {
 
 					if ( 'sprintf' === strtolower( $this->tokens[ $i ]['content'] ) ) {
-						$sprintf_parameters = $this->get_function_call_parameters( $i );
+						$sprintf_parameters = PassedParameters::getParameters( $this->phpcsFile, $i );
 
 						if ( ! empty( $sprintf_parameters ) ) {
 							$skip_from  = ( $sprintf_parameters[1]['end'] + 1 );
@@ -498,7 +499,7 @@ public function process_token( $stackPtr ) {
 				&& ( \T_ARRAY === $this->tokens[ $next ]['code']
 					|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $next ]['code'] )
 			) {
-				$replacements = $this->get_function_call_parameters( $next );
+				$replacements = PassedParameters::getParameters( $this->phpcsFile, $next );
 			}
 		}
 
@@ -614,7 +615,7 @@ protected function analyse_sprintf( $sprintf_params ) {
 	 * @return bool True if the pattern is found, false otherwise.
 	 */
 	protected function analyse_implode( $implode_token ) {
-		$implode_params = $this->get_function_call_parameters( $implode_token );
+		$implode_params = PassedParameters::getParameters( $this->phpcsFile, $implode_token );
 
 		if ( empty( $implode_params ) || \count( $implode_params ) !== 2 ) {
 			return false;
@@ -641,7 +642,7 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		$array_fill_params = $this->get_function_call_parameters( $array_fill );
+		$array_fill_params = PassedParameters::getParameters( $this->phpcsFile, $array_fill );
 
 		if ( empty( $array_fill_params ) || \count( $array_fill_params ) !== 3 ) {
 			return false;
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index fef6f26be2..b12a6ec4db 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -219,7 +219,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 * Using `wp_remote_get()` will only work for remote URLs.
 				 * See if we can determine is this function call is for a local file and if so, bow out.
 				 */
-				$params = $this->get_function_call_parameters( $stackPtr );
+				$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
 				if ( isset( $params[2] ) && 'true' === $params[2]['raw'] ) {
 					// Setting `$use_include_path` to `true` is only relevant for local files.

From 9b15a6591317ab5493f99f769eed5860c4e5899b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:39:18 +0200
Subject: [PATCH 036/822] Sniff::get_function_call_parameters(): remove the
 function

---
 WordPress/Sniff.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index cab94033e3..e6343d2467 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2330,33 +2330,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Get information on all parameters passed to a function call.
-	 *
-	 * Expects to be passed the T_STRING stack pointer for the function call.
-	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-	 *
-	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
-	 * it will tokenize the values / key/value pairs contained in the array call.
-	 *
-	 * @since      0.11.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameters()} instead.
-	 *
-	 * @param int $stackPtr The position of the function call token.
-	 *
-	 * @return array Multi-dimentional array with parameter details or
-	 *               empty array if no parameters are found.
-	 *
-	 *               @type int $position 1-based index position of the parameter. {
-	 *                   @type int $start Stack pointer for the start of the parameter.
-	 *                   @type int $end   Stack pointer for the end of parameter.
-	 *                   @type int $raw   Trimmed raw parameter content.
-	 *               }
-	 */
-	public function get_function_call_parameters( $stackPtr ) {
-		return PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Get information on a specific parameter passed to a function call.
 	 *

From e4a7487d0581e9bf8a664a72f50e264025bd2973 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:42:40 +0200
Subject: [PATCH 037/822] Sniff::get_function_call_parameter(): switch over to
 the PHPCSUtils version

---
 WordPress/Sniff.php                               | 4 ++--
 WordPress/Sniffs/Security/EscapeOutputSniff.php   | 8 +++++---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 WordPress/Sniffs/WP/CronIntervalSniff.php         | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e6343d2467..b9acacceaa 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1483,7 +1483,7 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 
 		$functionPtr = $this->is_in_function_call( $stackPtr, $valid_functions );
 		if ( false !== $functionPtr ) {
-			$second_param = $this->get_function_call_parameter( $functionPtr, 2 );
+			$second_param = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2 );
 			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
 				return true;
 			}
@@ -1797,7 +1797,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		if ( isset( $this->arrayWalkingFunctions[ $functionName ] ) ) {
 
 			// Get the callback parameter.
-			$callback = $this->get_function_call_parameter( $functionPtr, $this->arrayWalkingFunctions[ $functionName ] );
+			$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, $this->arrayWalkingFunctions[ $functionName ] );
 
 			if ( ! empty( $callback ) ) {
 				/*
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index bf6c730a3d..82ebccdcb6 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -195,7 +196,7 @@ public function process_token( $stackPtr ) {
 
 			// These functions only need to have the first argument escaped.
 			if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
-				$first_param      = $this->get_function_call_parameter( $stackPtr, 1 );
+				$first_param      = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 				$end_of_statement = ( $first_param['end'] + 1 );
 				unset( $first_param );
 			}
@@ -205,7 +206,7 @@ public function process_token( $stackPtr ) {
 			 * pattern, it doesn't need to be escaped.
 			 */
 			if ( '_deprecated_file' === $function ) {
-				$first_param = $this->get_function_call_parameter( $stackPtr, 1 );
+				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 
 				// Quick check. This disregards comments.
 				if ( preg_match( '`^basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
@@ -381,7 +382,8 @@ public function process_token( $stackPtr ) {
 					if ( isset( $this->arrayWalkingFunctions[ $functionName ] ) ) {
 
 						// Get the callback parameter.
-						$callback = $this->get_function_call_parameter(
+						$callback = PassedParameters::getParameter(
+							$this->phpcsFile,
 							$ptr,
 							$this->arrayWalkingFunctions[ $functionName ]
 						);
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index b12a6ec4db..ae4d95221a 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -263,7 +263,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				/*
 				 * Allow for handling raw data streams from the request body.
 				 */
-				$first_param = $this->get_function_call_parameter( $stackPtr, 1 );
+				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 
 				if ( false === $first_param ) {
 					// If the file to work with is not set, local data streams don't come into play.
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 3a69eab52f..5a3595a925 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -97,7 +98,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$callback = $this->get_function_call_parameter( $functionPtr, 2 );
+		$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2 );
 		if ( false === $callback ) {
 			return;
 		}
@@ -115,7 +116,7 @@ public function process_token( $stackPtr ) {
 			&& ( \T_ARRAY === $this->tokens[ $callbackArrayPtr ]['code']
 				|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $callbackArrayPtr ]['code'] )
 		) {
-			$callback = $this->get_function_call_parameter( $callbackArrayPtr, 2 );
+			$callback = PassedParameters::getParameter( $this->phpcsFile, $callbackArrayPtr, 2 );
 
 			if ( false === $callback ) {
 				$this->confused( $stackPtr );

From 9080e865ef8473883d9812d2fff0512f5ea23650 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:46:51 +0200
Subject: [PATCH 038/822] Sniff::get_function_call_parameter(): remove the
 function

---
 WordPress/Sniff.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index b9acacceaa..ce940f035d 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2330,28 +2330,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Get information on a specific parameter passed to a function call.
-	 *
-	 * Expects to be passed the T_STRING stack pointer for the function call.
-	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-	 *
-	 * Will return a array with the start token pointer, end token pointer and the raw value
-	 * of the parameter at a specific offset.
-	 * If the specified parameter is not found, will return false.
-	 *
-	 * @since      0.11.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\PassedParameters::getParameter()} instead.
-	 *
-	 * @param int $stackPtr     The position of the function call token.
-	 * @param int $param_offset The 1-based index position of the parameter to retrieve.
-	 *
-	 * @return array|false
-	 */
-	public function get_function_call_parameter( $stackPtr, $param_offset ) {
-		return PassedParameters::getParameter( $this->phpcsFile, $stackPtr, $param_offset );
-	}
-
 	/**
 	 * Find the array opener & closer based on a T_ARRAY or T_OPEN_SHORT_ARRAY token.
 	 *

From de407a62f9e7ba71fa8353f2479fe48d65dde7d3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:46:30 +0200
Subject: [PATCH 039/822] Sniff::find_array_open_close(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php    | 5 +++--
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php           | 3 ++-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php        | 3 ++-
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index df12c4c385..1b1a47986d 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 
 /**
@@ -99,7 +100,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Determine the array opener & closer.
 		 */
-		$array_open_close = $this->find_array_open_close( $stackPtr );
+		$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $array_open_close ) {
 			// Array open/close could not be determined.
 			return;
@@ -214,7 +215,7 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 
 						// Skip passed any nested arrays.
 						if ( isset( $this->targets[ $this->tokens[ $ptr ]['code'] ] ) ) {
-							$nested_array_open_close = $this->find_array_open_close( $ptr );
+							$nested_array_open_close = Arrays::getOpenClose( $this->phpcsFile, $ptr );
 							if ( false === $nested_array_open_close ) {
 								// Nested array open/close could not be determined.
 								continue;
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 67e013bdcd..6cffe693a4 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 
 /**
@@ -104,7 +105,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Determine the array opener & closer.
 		 */
-		$array_open_close = $this->find_array_open_close( $stackPtr );
+		$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $array_open_close ) {
 			// Array open/close could not be determined.
 			return;
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index 6f9b438b07..aa7269cc7a 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 
 /**
@@ -63,7 +64,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Determine the array opener & closer.
 		 */
-		$array_open_close = $this->find_array_open_close( $stackPtr );
+		$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $array_open_close ) {
 			// Array open/close could not be determined.
 			return;
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 4deb52decf..f939d72b6c 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\Sniff;
 
@@ -176,7 +177,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Determine the array opener & closer.
 		 */
-		$array_open_close = $this->find_array_open_close( $stackPtr );
+		$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $array_open_close ) {
 			// Array open/close could not be determined.
 			return;

From f4123ed32106176e78efaa0e610b3bf5b13dbf16 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:47:03 +0200
Subject: [PATCH 040/822] Sniff::find_array_open_close(): remove the function

---
 WordPress/Sniff.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index ce940f035d..f4f29d834d 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -13,7 +13,6 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
-use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\PassedParameters;
@@ -2330,21 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Find the array opener & closer based on a T_ARRAY or T_OPEN_SHORT_ARRAY token.
-	 *
-	 * @since      0.12.0
-	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\Arrays::getOpenClose()} instead.
-	 *
-	 * @param int $stackPtr The stack pointer to the array token.
-	 *
-	 * @return array|bool Array with two keys `opener`, `closer` or false if
-	 *                    either or these could not be determined.
-	 */
-	protected function find_array_open_close( $stackPtr ) {
-		return Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Find the list opener & closer based on a T_LIST or T_OPEN_SHORT_ARRAY token.
 	 *

From e874627a56b30081ff06504773a69e961656151a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:10:02 +0200
Subject: [PATCH 041/822] Sniff::find_list_open_close(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniff.php                                          | 2 +-
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 3 ++-
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php         | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index f4f29d834d..10bb284bbf 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2696,7 +2696,7 @@ protected function get_list_variables( $stackPtr, $list_open_close = array() ) {
 		}
 
 		if ( empty( $list_open_close ) ) {
-			$list_open_close = $this->find_list_open_close( $stackPtr );
+			$list_open_close = Lists::getOpenClose( $this->phpcsFile, $stackPtr );
 			if ( false === $list_open_close ) {
 				// Not a (short) list.
 				return array();
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 1ae8c27621..c5a5fde31a 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -758,7 +759,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 	 *                  normal file processing.
 	 */
 	protected function process_list_assignment( $stackPtr ) {
-		$list_open_close = $this->find_list_open_close( $stackPtr );
+		$list_open_close = Lists::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $list_open_close ) {
 			// Short array, not short list.
 			return;
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 4adf5d93f6..2db647851e 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -171,7 +172,7 @@ public function process_token( $stackPtr ) {
 	 *                  normal file processing.
 	 */
 	protected function process_list_assignment( $stackPtr ) {
-		$list_open_close = $this->find_list_open_close( $stackPtr );
+		$list_open_close = Lists::getOpenClose( $this->phpcsFile, $stackPtr );
 		if ( false === $list_open_close ) {
 			// Short array, not short list.
 			return;
@@ -368,7 +369,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			if ( \T_LIST === $this->tokens[ $ptr ]['code']
 				|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $ptr ]['code']
 			) {
-				$list_open_close = $this->find_list_open_close( $ptr );
+				$list_open_close = Lists::getOpenClose( $this->phpcsFile, $ptr );
 
 				if ( false === $list_open_close ) {
 					// Short array, not short list.

From a1e82afef158249f56a80b8716afee0037332528 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:10:12 +0200
Subject: [PATCH 042/822] Sniff::find_list_open_close(): remove the function

---
 WordPress/Sniff.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 10bb284bbf..67403b83ec 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,22 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Find the list opener & closer based on a T_LIST or T_OPEN_SHORT_ARRAY token.
-	 *
-	 * @since      2.2.0
-	 * @deprecated 3.0.0 Use {@see PHPCSUtils\Utils\Lists::getOpenClose()} instead.
-	 *
-	 * @param int $stackPtr The stack pointer to the array token.
-	 *
-	 * @return array|bool Array with two keys `opener`, `closer` or false if
-	 *                    not a (short) list token or if either or these
-	 *                    could not be determined.
-	 */
-	protected function find_list_open_close( $stackPtr ) {
-		return Lists::getOpenClose( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Determine the namespace name an arbitrary token lives in.
 	 *

From 0f6658f5997b6e994ba51c2ade4703d2b4190b77 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:12:43 +0200
Subject: [PATCH 043/822] Sniff::determine_namespace(): switch over to the
 PHPCSUtils version

---
 WordPress/AbstractClassRestrictionsSniff.php                 | 3 ++-
 WordPress/Sniff.php                                          | 2 +-
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 9374622e1f..882587edf8 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHPCSUtils\Utils\Namespaces;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
@@ -229,7 +230,7 @@ protected function get_namespaced_classname( $classname, $search_from ) {
 			// No namespace keyword found at all, so global namespace.
 			$classname = '\\' . $classname;
 		} else {
-			$namespace = $this->determine_namespace( $search_from );
+			$namespace = Namespaces::determineNamespace( $this->phpcsFile, $search_from );
 
 			if ( ! empty( $namespace ) ) {
 				$classname = '\\' . $namespace . '\\' . $classname;
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 67403b83ec..f4fd119d8e 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1216,7 +1216,7 @@ protected function is_test_class( $stackPtr ) {
 		}
 
 		// Is the class/trait one of the whitelisted test classes ?
-		$namespace = $this->determine_namespace( $stackPtr );
+		$namespace = Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
 		$className = $this->phpcsFile->getDeclarationName( $stackPtr );
 		if ( '' !== $namespace ) {
 			if ( isset( $whitelist[ $namespace . '\\' . $className ] ) ) {
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index c5a5fde31a..f5a3109eea 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\Lists;
+use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -362,7 +363,7 @@ public function process_token( $stackPtr ) {
 		} else {
 
 			// Namespaced methods, classes and constants do not need to be prefixed.
-			$namespace = $this->determine_namespace( $stackPtr );
+			$namespace = Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
 			if ( '' !== $namespace && '\\' !== $namespace ) {
 				return;
 			}

From 9efff55d03edbe1214f5a1f86a94f0d124fbdd94 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:12:53 +0200
Subject: [PATCH 044/822] Sniff::determine_namespace(): remove the function

---
 WordPress/Sniff.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index f4fd119d8e..fc6018e6c4 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,21 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Determine the namespace name an arbitrary token lives in.
-	 *
-	 * @since      0.10.0
-	 * @since      0.12.0 Moved from the `AbstractClassRestrictionsSniff` to this class.
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Namespaces::determineNamespace()} instead.
-	 *
-	 * @param int $stackPtr The token position for which to determine the namespace.
-	 *
-	 * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
-	 */
-	public function determine_namespace( $stackPtr ) {
-		return Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Get the complete namespace name for a namespace declaration.
 	 *

From 929628d1733ba75eb772035bd7da0d4e1a17c7b8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:18:19 +0200
Subject: [PATCH 045/822] Sniff::get_declared_namespace_name(): switch over to
 the PHPCSUtils version

---
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index f5a3109eea..ef6e1155f8 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -321,7 +321,7 @@ public function process_token( $stackPtr ) {
 			return $this->process_list_assignment( $stackPtr );
 
 		} elseif ( \T_NAMESPACE === $this->tokens[ $stackPtr ]['code'] ) {
-			$namespace_name = $this->get_declared_namespace_name( $stackPtr );
+			$namespace_name = Namespaces::getDeclaredName( $this->phpcsFile, $stackPtr );
 
 			if ( false === $namespace_name || '' === $namespace_name || '\\' === $namespace_name ) {
 				return;

From f8886b90746b040c6a788cc97b50ee828395afc4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:18:29 +0200
Subject: [PATCH 046/822] Sniff::get_declared_namespace_name(): remove the
 function

---
 WordPress/Sniff.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index fc6018e6c4..cef92907ae 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,25 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Get the complete namespace name for a namespace declaration.
-	 *
-	 * For hierarchical namespaces, the name will be composed of several tokens,
-	 * i.e. MyProject\Sub\Level which will be returned together as one string.
-	 *
-	 * @since      0.12.0 A lesser variant of this method previously existed in the
-	 *                    `AbstractClassRestrictionsSniff` class.
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Namespaces::getDeclaredName()} instead.
-	 *
-	 * @param int|bool $stackPtr The position of a T_NAMESPACE token.
-	 *
-	 * @return string|false Namespace name or false if not a namespace declaration.
-	 *                      Namespace name can be an empty string for global namespace declaration.
-	 */
-	public function get_declared_namespace_name( $stackPtr ) {
-		return Namespaces::getDeclaredName( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Check whether a T_CONST token is a class constant declaration.
 	 *

From 683a3cf987da11a9dbb6ec060a17eaf9aa290339 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:20:12 +0200
Subject: [PATCH 047/822] Sniff::is_class_constant(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniff.php                                          | 2 +-
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 3 ++-
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php            | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index cef92907ae..1604c67ab5 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2531,7 +2531,7 @@ public function is_use_of_global_constant( $stackPtr ) {
 
 		if ( false !== $prev
 			&& \T_CONST === $this->tokens[ $prev ]['code']
-			&& $this->is_class_constant( $prev )
+			&& Scopes::isOOConstant( $this->phpcsFile, $prev )
 		) {
 			// Class constant declaration of the same name.
 			return false;
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ef6e1155f8..52a80f4f1d 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -14,6 +14,7 @@
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -443,7 +444,7 @@ public function process_token( $stackPtr ) {
 
 				case 'T_CONST':
 					// Constants in a class do not need to be prefixed.
-					if ( true === $this->is_class_constant( $stackPtr ) ) {
+					if ( true === Scopes::isOOConstant( $this->phpcsFile, $stackPtr ) ) {
 						return;
 					}
 
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 8426ad2900..9d4137d914 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -132,7 +133,7 @@ public function process_arbitrary_tstring( $stackPtr ) {
 
 		if ( false !== $prev
 			&& \T_CONST === $this->tokens[ $prev ]['code']
-			&& true === $this->is_class_constant( $prev )
+			&& true === Scopes::isOOConstant( $this->phpcsFile, $prev )
 		) {
 			// Class constant of the same name.
 			return;

From a7c740f80b4e203f71cd010f241c9c60ca15b7c8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:20:23 +0200
Subject: [PATCH 048/822] Sniff::is_class_constant(): remove the function

---
 WordPress/Sniff.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 1604c67ab5..1f0a865177 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,20 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Check whether a T_CONST token is a class constant declaration.
-	 *
-	 * @since      0.14.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::isOOConstant()} instead.
-	 *
-	 * @param int $stackPtr The position in the stack of the T_CONST token to verify.
-	 *
-	 * @return bool
-	 */
-	public function is_class_constant( $stackPtr ) {
-		return Scopes::isOOConstant( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Check whether a T_VARIABLE token is a class property declaration.
 	 *

From 635f6d069be73104f6b27712b513807131b15fd6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:22:03 +0200
Subject: [PATCH 049/822] Sniff::is_class_property(): switch over to the
 PHPCSUtils version

---
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 2 +-
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 52a80f4f1d..b8b364c34f 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -686,7 +686,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 			}
 
 			// Properties in a class do not need to be prefixed.
-			if ( false === $in_list && true === $this->is_class_property( $stackPtr ) ) {
+			if ( false === $in_list && true === Scopes::isOOProperty( $this->phpcsFile, $stackPtr ) ) {
 				return;
 			}
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 2db647851e..1e522a962a 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Lists;
+use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 
 /**
@@ -284,7 +285,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		/*
 		 * Class property declarations with the same name as WP global variables are fine.
 		 */
-		if ( false === $in_list && true === $this->is_class_property( $stackPtr ) ) {
+		if ( false === $in_list && true === Scopes::isOOProperty( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 

From c062b6b190280c7ce12b38f9a440f9e791dbf0cb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:22:12 +0200
Subject: [PATCH 050/822] Sniff::is_class_property(): remove the function

---
 WordPress/Sniff.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 1f0a865177..892be1551b 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,20 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Check whether a T_VARIABLE token is a class property declaration.
-	 *
-	 * @since      0.14.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::isOOProperty()} instead.
-	 *
-	 * @param int $stackPtr The position in the stack of the T_VARIABLE token to verify.
-	 *
-	 * @return bool
-	 */
-	public function is_class_property( $stackPtr ) {
-		return Scopes::isOOProperty( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Check whether the direct wrapping scope of a token is within a limited set of
 	 * acceptable tokens.

From 72b21076c72af17661b42a9f269320534ec0db62 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:23:30 +0200
Subject: [PATCH 051/822] Sniff::valid_direct_scope(): remove the function

All uses of the method were already removed with the switching over of the deprecated utility methods themselves.
---
 WordPress/Sniff.php | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 892be1551b..96564b164e 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2329,27 +2329,6 @@ public function strip_interpolated_variables( $string ) {
 		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
 	}
 
-	/**
-	 * Check whether the direct wrapping scope of a token is within a limited set of
-	 * acceptable tokens.
-	 *
-	 * Used to check, for instance, if a T_CONST is a class constant.
-	 *
-	 * @since      0.14.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Scopes::validDirectScope()} instead.
-	 *
-	 * @param int   $stackPtr     The position in the stack of the token to verify.
-	 * @param array $valid_scopes Array of token types.
-	 *                            Keys should be the token types in string format
-	 *                            to allow for newer token types.
-	 *                            Value is irrelevant.
-	 *
-	 * @return int|bool StackPtr to the scope if valid, false otherwise.
-	 */
-	protected function valid_direct_scope( $stackPtr, array $valid_scopes ) {
-		return Scopes::validDirectScope( $this->phpcsFile, $stackPtr, $valid_scopes );
-	}
-
 	/**
 	 * Checks whether this is a call to a $wpdb method that we want to sniff.
 	 *

From 3a486087ec7cc1ede16b2f9696293efd468caa99 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:28:16 +0200
Subject: [PATCH 052/822] Sniff::is_short_list(): switch over to a PHPCSUtils
 alternative

PHPCSUtils contains both a `Lists::isShortList()` as well as an `Arrays::isShortArray()` method. These are not direct opposites as there are tokenizer problems across PHPCS version which sometimes affect one, sometimes the other, so instead of checking that something is "not a short list", in these cases, we should be checking that something **is** a short array.
---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php    | 2 +-
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php           | 2 +-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php        | 2 +-
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 1b1a47986d..8abe4f20b0 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -91,7 +91,7 @@ public function register() {
 	public function process_token( $stackPtr ) {
 
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& $this->is_short_list( $stackPtr )
+			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
 			return;
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 6cffe693a4..5ee911a349 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -96,7 +96,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& $this->is_short_list( $stackPtr )
+			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
 			return;
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index aa7269cc7a..b1b1893fef 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -55,7 +55,7 @@ public function register() {
 	public function process_token( $stackPtr ) {
 
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& $this->is_short_list( $stackPtr )
+			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
 			return;
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index f939d72b6c..7a851507ee 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -168,7 +168,7 @@ public function register() {
 	public function process_token( $stackPtr ) {
 
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& $this->is_short_list( $stackPtr )
+			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
 			return;

From 7ed7c40457f634457840e4e76cf642833e5e51f7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:28:29 +0200
Subject: [PATCH 053/822] Sniff::is_short_list(): remove the function

---
 WordPress/Sniff.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 96564b164e..0ecfcb4e06 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2554,25 +2554,6 @@ protected function is_foreach_as( $stackPtr ) {
 		return ( $stackPtr > $as_ptr );
 	}
 
-	/**
-	 * Determine whether a T_OPEN/CLOSE_SHORT_ARRAY token is a short list() construct.
-	 *
-	 * @internal This function will be introduced in PHPCS upstream in version 3.5.0
-	 * and can be removed from WPCS once WPCS raises the minimum version.
-	 *
-	 * @since      2.2.0
-	 * @deprecated 3.0.0  Use {@see PHPCSUtils\Utils\Lists::isShortList()} instead.
-	 *
-	 * @param int $stackPtr The position of the array bracket token.
-	 *
-	 * @return bool True if the token passed is the open/close bracket of a short list.
-	 *              False if the token is a short array bracket or not
-	 *              a T_OPEN/CLOSE_SHORT_ARRAY token.
-	 */
-	protected function is_short_list( $stackPtr ) {
-		return Lists::isShortList( $this->phpcsFile, $stackPtr );
-	}
-
 	/**
 	 * Get a list of the token pointers to the variables being assigned to in a list statement.
 	 *

From 673b94dd471a4eecdd7ab68d0a7336bb91f72f16 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 01:16:11 +0200
Subject: [PATCH 054/822] PHPCS 4.x compatibility: allow for the JS/CSS
 tokenizer being dropped in PHPCS 4.x

PHPCS 4.x will completely remove the JS/CSS tokenizers and all supporting features for JS/CSS support.

Until support for PHPCS 3.x will be dropped, WPCS will continue to support sniffing JS/CSS files.

This commit addresses the current PHPCS cross-version compatibility issues related to JS/CSS sniffing in WPCS:
* Prevent "Undefined property" notices in PHPCS 4.x for when WPCS tries to access the (removed) `File::$tokenizerType` property.
* Don't expect any errors/warnings in CSS/JS files being sniffed when on PHPCS 4.x.
---
 .../Sniffs/Classes/ClassInstantiationSniff.php   |  7 ++++---
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php    |  4 ++--
 .../Tests/Classes/ClassInstantiationUnitTest.php | 10 +++++++---
 .../Tests/Utils/I18nTextDomainFixerUnitTest.php  | 16 ++++++++++------
 .../WhiteSpace/PrecisionAlignmentUnitTest.php    | 12 ++++++++----
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/WordPress/Sniffs/Classes/ClassInstantiationSniff.php b/WordPress/Sniffs/Classes/ClassInstantiationSniff.php
index 3572fbeed2..d426685c1e 100644
--- a/WordPress/Sniffs/Classes/ClassInstantiationSniff.php
+++ b/WordPress/Sniffs/Classes/ClassInstantiationSniff.php
@@ -91,8 +91,9 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		// Make sure we have the right token, JS vs PHP.
-		if ( ( 'PHP' === $this->phpcsFile->tokenizerType && \T_NEW !== $this->tokens[ $stackPtr ]['code'] )
-			|| ( 'JS' === $this->phpcsFile->tokenizerType
+		if ( ( ( isset( $this->phpcsFile->tokenizerType ) === false || 'PHP' === $this->phpcsFile->tokenizerType )
+				&& \T_NEW !== $this->tokens[ $stackPtr ]['code'] )
+			|| ( ( isset( $this->phpcsFile->tokenizerType ) && 'JS' === $this->phpcsFile->tokenizerType )
 				&& ( \T_STRING !== $this->tokens[ $stackPtr ]['code']
 				|| 'new' !== strtolower( $this->tokens[ $stackPtr ]['content'] ) ) )
 		) {
@@ -102,7 +103,7 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Check for new by reference used in PHP files.
 		 */
-		if ( 'PHP' === $this->phpcsFile->tokenizerType ) {
+		if ( isset( $this->phpcsFile->tokenizerType ) === false || 'PHP' === $this->phpcsFile->tokenizerType ) {
 			$prev_non_empty = $this->phpcsFile->findPrevious(
 				Tokens::$emptyTokens,
 				( $stackPtr - 1 ),
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index e7090b481c..4bd11cb99f 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -341,7 +341,7 @@ public function process_token( $stackPtr ) {
 			// Examine for plugin/theme file header.
 			return $this->process_comments( $stackPtr );
 
-		} elseif ( 'CSS' !== $this->phpcsFile->tokenizerType ) {
+		} elseif ( isset( $this->phpcsFile->tokenizerType ) === false || 'CSS' !== $this->phpcsFile->tokenizerType ) {
 			// Examine a T_STRING token in a PHP file as a function call.
 			return parent::process_token( $stackPtr );
 		}
@@ -551,7 +551,7 @@ public function process_comments( $stackPtr ) {
 		}
 
 		$file_name = basename( $file );
-		if ( 'CSS' === $this->phpcsFile->tokenizerType ) {
+		if ( isset( $this->phpcsFile->tokenizerType ) && 'CSS' === $this->phpcsFile->tokenizerType ) {
 			if ( 'style.css' !== $file_name && ! defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
 				// CSS files only need to be examined for the file header.
 				return ( $this->phpcsFile->numTokens + 1 );
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.php b/WordPress/Tests/Classes/ClassInstantiationUnitTest.php
index 21b74950e7..42253fdbfb 100644
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.php
+++ b/WordPress/Tests/Classes/ClassInstantiationUnitTest.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Unit test class for the ClassInstantiation sniff.
@@ -29,6 +30,9 @@ class ClassInstantiationUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList( $testFile = '' ) {
 
+		$phpcs_version = Helper::getVersion();
+		$is_phpcs_4    = version_compare( $phpcs_version, '3.99.99', '>' );
+
 		switch ( $testFile ) {
 			case 'ClassInstantiationUnitTest.inc':
 				return array(
@@ -61,9 +65,9 @@ public function getErrorList( $testFile = '' ) {
 
 			case 'ClassInstantiationUnitTest.js':
 				return array(
-					2 => 1,
-					3 => 1,
-					4 => 1,
+					2 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					3 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
 				);
 
 			default:
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 88df73124d..48521bc666 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Tests\Utils;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Unit test class for the I18nTextDomainFixer sniff.
@@ -52,15 +53,18 @@ public function setCliValues( $testFile, $config ) {
 	 */
 	public function getErrorList( $testFile = '' ) {
 
+		$phpcs_version = Helper::getVersion();
+		$is_phpcs_4    = version_compare( $phpcs_version, '3.99.99', '>' );
+
 		switch ( $testFile ) {
 			case 'I18nTextDomainFixerUnitTest.css':
 				return array(
-					29  => 1,
-					92  => 1,
-					107 => 1,
-					120 => 1,
-					133 => 1,
-					149 => 1,
+					29  => ( true === $is_phpcs_4 ? 0 : 1 ),
+					92  => ( true === $is_phpcs_4 ? 0 : 1 ),
+					107 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					120 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					133 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					149 => ( true === $is_phpcs_4 ? 0 : 1 ),
 				);
 
 			case 'I18nTextDomainFixerUnitTest.3.inc':
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
index 0b03b8f1fb..2fd310af84 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHPCSUtils\BackCompat\Helper;
 
 /**
  * Unit test class for the PrecisionAlignment sniff.
@@ -61,6 +62,9 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList( $testFile = '' ) {
+		$phpcs_version = Helper::getVersion();
+		$is_phpcs_4    = version_compare( $phpcs_version, '3.99.99', '>' );
+
 		switch ( $testFile ) {
 			case 'PrecisionAlignmentUnitTest.1.inc':
 				return array(
@@ -105,14 +109,14 @@ public function getWarningList( $testFile = '' ) {
 
 			case 'PrecisionAlignmentUnitTest.css':
 				return array(
-					4 => 1,
+					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
 				);
 
 			case 'PrecisionAlignmentUnitTest.js':
 				return array(
-					4 => 1,
-					5 => 1,
-					6 => 1,
+					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					5 => ( true === $is_phpcs_4 ? 0 : 1 ),
+					6 => ( true === $is_phpcs_4 ? 0 : 1 ),
 				);
 
 			case 'PrecisionAlignmentUnitTest.2.inc':

From 439eb9060f167f1d16f107d6a595c98d2e598ec5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:39:19 +0200
Subject: [PATCH 055/822] Tests: move ruleset check file to tests directory

We'll probably need to re-evaluate this file and its function anyway, but for now, let's at least move it to a more logical place now there is a `Tests` directory and rename it to use the `inc` extension to make it clear that it's not an actual test file, but a test *case* file.
---
 .travis.yml                                      | 16 ++++++++--------
 .../RulesetCheck/class-ruleset-test.inc          |  0
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename bin/class-ruleset-test.php => Tests/RulesetCheck/class-ruleset-test.inc (100%)

diff --git a/.travis.yml b/.travis.yml
index e677b3a8e9..87e3420956 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,10 +87,10 @@ jobs:
       php: 7.4
       env: PHPCS_BRANCH="dev-master"
       script:
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Core
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Docs
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Extra
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Docs
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Extra
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
 
         # Test for fixer conflicts by running the auto-fixers of the complete WPCS over the test case files.
         # This is not an exhaustive test, but should give an early indication for typical fixer conflicts.
@@ -103,10 +103,10 @@ jobs:
       php: 7.4
       env: PHPCS_BRANCH="3.5.0"
       script:
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Core
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Docs
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress-Extra
-        - $(pwd)/vendor/bin/phpcs -ps ./bin/class-ruleset-test.php --standard=WordPress
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Docs
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Extra
+        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
 
     #### QUICK TEST STAGE ####
     # This is a much quicker test which only runs the unit tests and linting against the low/high
diff --git a/bin/class-ruleset-test.php b/Tests/RulesetCheck/class-ruleset-test.inc
similarity index 100%
rename from bin/class-ruleset-test.php
rename to Tests/RulesetCheck/class-ruleset-test.inc

From b4080e6eeece9534e39b895effc51784bbf8080a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:56:35 +0200
Subject: [PATCH 056/822] CastStructureSpacing: minor error message improvement

---
 WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index 41494b91f6..496a2bf11f 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -51,7 +51,7 @@ public function process_token( $stackPtr ) {
 		if ( \T_WHITESPACE !== $this->tokens[ ( $stackPtr - 1 ) ]['code']
 			&& \T_ELLIPSIS !== $this->tokens[ ( $stackPtr - 1 ) ]['code']
 		) {
-			$error = 'No space before opening casting parenthesis is prohibited';
+			$error = 'Expected a space before the type cast open parenthesis; none found';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
 			if ( true === $fix ) {
 				$this->phpcsFile->fixer->addContentBefore( $stackPtr, ' ' );

From c3c64f6e8bedee413b14d1c50b597dd759ad47c0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 2 Jul 2020 00:00:51 +0200
Subject: [PATCH 057/822] OperatorSpacing: defer to upstream for "instanceof"

The `T_INSTANCEOF` token was added to the `OperatorSpacing` sniff targets in PR 1598.

In upstream PR squizlabs/PHP_CodeSniffer 2516, the same was done for the upstream sniff. This PR was merged & included in PHPCS 3.5.0.

As the minimum PHPCS version for WPCS has now been changed to PHPCS 3.5.0, the WPCS sniff no longer needs to register the `T_INSTANCEOF` token.

Includes _removing_ the unit tests related to this as the WPCS sniff should only test the differences between the upstream sniff and the WPCS version.

Includes minor code simplification for the remaining code.
---
 WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php  | 11 +++++------
 .../Tests/WhiteSpace/OperatorSpacingUnitTest.inc      |  4 ----
 .../WhiteSpace/OperatorSpacingUnitTest.inc.fixed      |  4 ----
 .../Tests/WhiteSpace/OperatorSpacingUnitTest.php      |  1 -
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index 17e5090c72..f3291222be 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -13,7 +13,8 @@
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
- * Verify operator spacing, uses the Squiz sniff, but additionally also sniffs for the `!` (boolean not) operator.
+ * Verify operator spacing, uses the Squiz sniff, but additionally also sniffs for the
+ * `!` (boolean not) and the boolean and logical and/or operators.
  *
  * "Always put spaces after commas, and on both sides of logical, comparison, string and assignment operators."
  *
@@ -31,7 +32,7 @@
  *                 $ignoreNewlines property.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
- * Last synced with base class June 2017 at commit 41127aa4764536f38f504fb3f7b8831f05919c89.
+ * Last verified with base class July 2020 at commit a957a73e3533353451eb9fd62ee58bd0aba2773c.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
  */
 class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {
@@ -54,11 +55,9 @@ class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {
 	public function register() {
 		$tokens                   = parent::register();
 		$tokens[ \T_BOOLEAN_NOT ] = \T_BOOLEAN_NOT;
-		$tokens[ \T_INSTANCEOF ]  = \T_INSTANCEOF;
-		$logical_operators        = Tokens::$booleanOperators;
+		$tokens                  += Tokens::$booleanOperators;
 
-		// Using array union to auto-dedup.
-		return $tokens + $logical_operators;
+		return $tokens;
 	}
 
 }
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
index 0f3f6d5a9e..bad89cc0af 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -64,7 +64,3 @@ if ( $a === $b
 
 if ( $a === $b or
 	$b === $c ) {}
-
-// Instanceof
-if ( MyClass    instanceof    SomeOtherClass ) {}
-if ( MyClass instanceof SomeOtherClass ) {}
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
index 21854ae661..4a3214f57e 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
@@ -64,7 +64,3 @@ if ( $a === $b
 
 if ( $a === $b or
 	$b === $c ) {}
-
-// Instanceof
-if ( MyClass instanceof SomeOtherClass ) {}
-if ( MyClass instanceof SomeOtherClass ) {}
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index f31f3f4992..9c2c148c24 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList() {
 			49 => 2,
 			50 => 2,
 			51 => 2,
-			69 => 2,
 		);
 	}
 

From 062c261a4016433a7c8edc4e651c2d93f433f4be Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 20:53:22 +0200
Subject: [PATCH 058/822] ValidFunctionName: implement PHPCSUtils

Use the improved PHPCSUtils versions of the PHPCS native methods.
---
 .../NamingConventions/ValidFunctionNameSniff.php     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index d8826ce1cf..c3d2105efe 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -12,6 +12,8 @@
 use PHP_CodeSniffer\Standards\PEAR\Sniffs\NamingConventions\ValidFunctionNameSniff as PHPCS_PEAR_ValidFunctionNameSniff;
 use PHP_CodeSniffer\Files\File;
 use WordPressCS\WordPress\Sniff;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Enforces WordPress function name and method name format, based upon Squiz code.
@@ -54,7 +56,7 @@ protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
-		$functionName = $phpcsFile->getDeclarationName( $stackPtr );
+		$functionName = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
 
 		if ( ! isset( $functionName ) ) {
 			// Ignore closures.
@@ -122,14 +124,14 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		$methodName = $phpcsFile->getDeclarationName( $stackPtr );
+		$methodName = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
 
 		if ( ! isset( $methodName ) ) {
 			// Ignore closures.
 			return;
 		}
 
-		$className = $phpcsFile->getDeclarationName( $currScope );
+		$className = ObjectDeclarations::getName( $phpcsFile, $currScope );
 		if ( isset( $className ) === false ) {
 			$className = '[Anonymous Class]';
 		}
@@ -152,8 +154,8 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		$extended   = $phpcsFile->findExtendedClassName( $currScope );
-		$interfaces = $phpcsFile->findImplementedInterfaceNames( $currScope );
+		$extended   = ObjectDeclarations::findExtendedClassName( $phpcsFile, $currScope );
+		$interfaces = ObjectDeclarations::findImplementedInterfaceNames( $phpcsFile, $currScope );
 
 		// If this is a child class or interface implementation, it may have to use camelCase or double underscores.
 		if ( ! empty( $extended ) || ! empty( $interfaces ) ) {

From 29b9e678696f8cf0c5afc1c137402310fe7261ac Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 20:55:23 +0200
Subject: [PATCH 059/822] ValidFunctionName: use PHPCSUtils
 `isMagicFunctionName()`

The magic function name list in PHPCSUtils is more complete than the one in the PEAR sniff.

Refs:
* [isMagicFunctionName()](https://phpcsutils.com/phpdoc/classes/PHPCSUtils-Utils-FunctionDeclarations.html#method_isMagicFunctionName)
---
 .../NamingConventions/ValidFunctionNameSniff.php  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index c3d2105efe..e9c49d4efd 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -68,22 +68,19 @@ protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
-		$functionNameLc = strtolower( $functionName );
+		// PHP magic functions are exempt from our rules.
+		if ( FunctionDeclarations::isMagicFunctionName( $functionName ) === true ) {
+			return;
+		}
 
-		// Is this a magic function ? I.e., it is prefixed with "__" ?
-		// Outside class scope this basically just means __autoload().
+		// Is the function name prefixed with "__" ?
 		if ( 0 === strpos( $functionName, '__' ) ) {
-			$magicPart = substr( $functionNameLc, 2 );
-			if ( isset( $this->magicFunctions[ $magicPart ] ) ) {
-				return;
-			}
-
 			$error     = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $functionName );
 			$phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
 		}
 
-		if ( $functionNameLc !== $functionName ) {
+		if ( strtolower( $functionName ) !== $functionName ) {
 			$error     = 'Function name "%s" is not in snake case format, try "%s"';
 			$errorData = array(
 				$functionName,

From 3fb5774e19056584fc9ef08861d47cca0538b0e0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 20:59:53 +0200
Subject: [PATCH 060/822] ValidFunctionName: use PHPCSUtils
 `isMagicMethodName()`

The magic method name list in PHPCSUtils is more complete than the one in the PEAR sniff.

Note: As this sniff bows out for methods declared in extended classes anyway, the PHP native double underscore methods from the SOAPClient class do not need to be taken into account, which is why the `isMagicMethodName()` method is used instead of the `isSpecialMethodName()` method.

Refs:
* [isMagicMethodName()](https://phpcsutils.com/phpdoc/classes/PHPCSUtils-Utils-FunctionDeclarations.html#method_isMagicMethodName)
* [isSpecialMethodName()](https://phpcsutils.com/phpdoc/classes/PHPCSUtils-Utils-FunctionDeclarations.html#method_isSpecialMethodName)
---
 .../NamingConventions/ValidFunctionNameSniff.php     | 12 ++++++------
 .../NamingConventions/ValidFunctionNameUnitTest.inc  |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index e9c49d4efd..2be0053937 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -151,6 +151,11 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
+		// PHP magic methods are exempt from our rules.
+		if ( FunctionDeclarations::isMagicMethodName( $methodName ) === true ) {
+			return;
+		}
+
 		$extended   = ObjectDeclarations::findExtendedClassName( $phpcsFile, $currScope );
 		$interfaces = ObjectDeclarations::findImplementedInterfaceNames( $phpcsFile, $currScope );
 
@@ -159,13 +164,8 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		// Is this a magic method ? I.e. is it prefixed with "__" ?
+		// Is the method name prefixed with "__" ?
 		if ( 0 === strpos( $methodName, '__' ) ) {
-			$magicPart = substr( $methodNameLc, 2 );
-			if ( isset( $this->magicMethods[ $magicPart ] ) ) {
-				return;
-			}
-
 			$error     = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $className . '::' . $methodName );
 			$phpcsFile->addError( $error, $stackPtr, 'MethodDoubleUnderscore', $errorData );
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index f0403333ee..87516c4304 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -145,3 +145,8 @@ class Deprecated {
 	 */
 	public static function __deprecatedMethod() {}
 }
+
+class PHP74Magic {
+	function __serialize() {} // OK.
+	function __unserialize() {} // OK.
+}

From f1c87941321358ccdacfff78a1fafb7f99f23eea Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 21:26:47 +0200
Subject: [PATCH 061/822] ValidFunctionName: decouple from the PEAR sniff

This sniff extended the upstream `PEAR.NamingConventions.ValidFunctionName` sniff to allow using the properties related to magic functions/methods.

As handling of the magic functions/methods is now done via the PHPCSUtils `isMagicFunctionName()`/`isMagicMethodName()` methods, these properties are no longer used, so there is no need to extend the upstream PEAR sniff anymore.

In this commit:
* The parent sniff is changed from the upstream PEAR sniff to the WPCS base sniff.
* The `register()` and `process_token()` methods have been added.
* The `processTokenOutsideScope()` method has been renamed to `process_function_declaration()` to make the method name more descriptive.
* The `processTokenWithinScope()` method has been renamed to `process_method_declaration()` to make the method name more descriptive.
* The "method vs global function" determination is now done using the PHPCSUtils `Scopes::validDirectScope()` method which has higher accuracy.
    This fixes a bug where global functions declared nested within a method would not be examined at all.
* As the WPCS base sniff is now used, the `$this->phpcsFile` and `$this->tokens` properties are now available and use of them has been implemented.

Includes unit tests for the bug fix.
---
 .../ValidFunctionNameSniff.php                | 109 +++++++++++-------
 .../ValidFunctionNameUnitTest.inc             |   7 ++
 .../ValidFunctionNameUnitTest.php             |   1 +
 3 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 2be0053937..f5234bbd7b 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -9,11 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use PHP_CodeSniffer\Standards\PEAR\Sniffs\NamingConventions\ValidFunctionNameSniff as PHPCS_PEAR_ValidFunctionNameSniff;
-use PHP_CodeSniffer\Files\File;
 use WordPressCS\WordPress\Sniff;
+use PHPCSUtils\BackCompat\BCTokens;
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
 
 /**
  * Enforces WordPress function name and method name format, based upon Squiz code.
@@ -27,27 +27,57 @@
  * @since   2.0.0  The `get_name_suggestion()` method has been moved to the
  *                 WordPress native `Sniff` base class as `get_snake_case_name_suggestion()`.
  * @since   2.2.0  Will now ignore functions and methods which are marked as @deprecated.
- *
- * Last synced with parent class December 2018 up to commit ee167761d7756273b8ad0ad68bf3db1f2c211bb8.
- * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
- *
- * {@internal While this class extends the PEAR parent, it does not actually use the checks
- * contained in the parent. It only uses the properties and the token registration from the parent.}}
+ * @since   3.0.0  This sniff has been refactored and no longer extends the upstream
+ *                 PEAR.NamingConventions.ValidFunctionName sniff.
  */
-class ValidFunctionNameSniff extends PHPCS_PEAR_ValidFunctionNameSniff {
+class ValidFunctionNameSniff extends Sniff {
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array
+	 */
+	public function register() {
+		return array( \T_FUNCTION );
+	}
 
 	/**
-	 * Processes the tokens outside the scope.
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @since 3.0.0
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
-	 * @param int                         $stackPtr  The position where this token was
-	 *                                               found.
+	 * @param int $stackPtr The position of the current token in the stack.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process_token( $stackPtr ) {
+
+		$ooPtr = Scopes::validDirectScope( $this->phpcsFile, $stackPtr, BCTokens::ooScopeTokens() );
+		if ( false === $ooPtr ) {
+			$this->process_function_declaration( $stackPtr );
+		} else {
+			$this->process_method_declaration( $stackPtr, $ooPtr );
+		}
+	}
+
+	/**
+	 * Processes a function declaration for a function in the global namespace.
+	 *
+	 * @since 0.1.0
+	 * @since 3.0.0 Renamed from `processTokenOutsideScope()` to `process_function_declaration()`.
+	 *              Method signature has been changed as well as this method no longer overloads
+	 *              a method from the PEAR sniff which was previously the sniff parent.
+	 *
+	 * @param int $stackPtr The position where this token was found.
 	 *
 	 * @return void
 	 */
-	protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
+	protected function process_function_declaration( $stackPtr ) {
 
-		if ( Sniff::is_function_deprecated( $phpcsFile, $stackPtr ) === true ) {
+		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
 			/*
 			 * Deprecated functions don't have to comply with the naming conventions,
 			 * otherwise functions deprecated in favour of a function with a compliant
@@ -56,7 +86,7 @@ protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
-		$functionName = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
+		$functionName = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
 
 		if ( ! isset( $functionName ) ) {
 			// Ignore closures.
@@ -77,42 +107,35 @@ protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
 		if ( 0 === strpos( $functionName, '__' ) ) {
 			$error     = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $functionName );
-			$phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
+			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
 		}
 
 		if ( strtolower( $functionName ) !== $functionName ) {
 			$error     = 'Function name "%s" is not in snake case format, try "%s"';
 			$errorData = array(
 				$functionName,
-				Sniff::get_snake_case_name_suggestion( $functionName ),
+				$this->get_snake_case_name_suggestion( $functionName ),
 			);
-			$phpcsFile->addError( $error, $stackPtr, 'FunctionNameInvalid', $errorData );
+			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionNameInvalid', $errorData );
 		}
 	}
 
 	/**
-	 * Processes the tokens within the scope.
+	 * Processes a method declaration.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being processed.
-	 * @param int                         $stackPtr  The position where this token was
-	 *                                               found.
-	 * @param int                         $currScope The position of the current scope.
+	 * @since 0.1.0
+	 * @since 3.0.0 Renamed from `processTokenWithinScope()` to `process_method_declaration()`.
+	 *              Method signature has been changed as well as this method no longer overloads
+	 *              a method from the PEAR sniff which was previously the sniff parent.
+	 *
+	 * @param int $stackPtr  The position where this token was found.
+	 * @param int $currScope The position of the current scope.
 	 *
 	 * @return void
 	 */
-	protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currScope ) {
-
-		$tokens = $phpcsFile->getTokens();
-
-		// Determine if this is a function which needs to be examined.
-		$conditions = $tokens[ $stackPtr ]['conditions'];
-		end( $conditions );
-		$deepestScope = key( $conditions );
-		if ( $deepestScope !== $currScope ) {
-			return;
-		}
+	protected function process_method_declaration( $stackPtr, $currScope ) {
 
-		if ( Sniff::is_function_deprecated( $phpcsFile, $stackPtr ) === true ) {
+		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
 			/*
 			 * Deprecated functions don't have to comply with the naming conventions,
 			 * otherwise functions deprecated in favour of a function with a compliant
@@ -121,14 +144,14 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		$methodName = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
+		$methodName = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
 
 		if ( ! isset( $methodName ) ) {
 			// Ignore closures.
 			return;
 		}
 
-		$className = ObjectDeclarations::getName( $phpcsFile, $currScope );
+		$className = ObjectDeclarations::getName( $this->phpcsFile, $currScope );
 		if ( isset( $className ) === false ) {
 			$className = '[Anonymous Class]';
 		}
@@ -156,8 +179,8 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return;
 		}
 
-		$extended   = ObjectDeclarations::findExtendedClassName( $phpcsFile, $currScope );
-		$interfaces = ObjectDeclarations::findImplementedInterfaceNames( $phpcsFile, $currScope );
+		$extended   = ObjectDeclarations::findExtendedClassName( $this->phpcsFile, $currScope );
+		$interfaces = ObjectDeclarations::findImplementedInterfaceNames( $this->phpcsFile, $currScope );
 
 		// If this is a child class or interface implementation, it may have to use camelCase or double underscores.
 		if ( ! empty( $extended ) || ! empty( $interfaces ) ) {
@@ -168,7 +191,7 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 		if ( 0 === strpos( $methodName, '__' ) ) {
 			$error     = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $className . '::' . $methodName );
-			$phpcsFile->addError( $error, $stackPtr, 'MethodDoubleUnderscore', $errorData );
+			$this->phpcsFile->addError( $error, $stackPtr, 'MethodDoubleUnderscore', $errorData );
 		}
 
 		// Check for all lowercase.
@@ -177,9 +200,9 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			$errorData = array(
 				$methodName,
 				$className,
-				Sniff::get_snake_case_name_suggestion( $methodName ),
+				$this->get_snake_case_name_suggestion( $methodName ),
 			);
-			$phpcsFile->addError( $error, $stackPtr, 'MethodNameInvalid', $errorData );
+			$this->phpcsFile->addError( $error, $stackPtr, 'MethodNameInvalid', $errorData );
 		}
 	}
 
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index 87516c4304..7847b1836d 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -150,3 +150,10 @@ class PHP74Magic {
 	function __serialize() {} // OK.
 	function __unserialize() {} // OK.
 }
+
+class More_Nested {
+	public function method_name() {
+		function __autoload() {} // OK - magic function in global namespace.
+		function __CamelCase() {} // Bad x 2 for *function*, not method.
+	}
+}
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 0c1db47bc7..4c07520c95 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -46,6 +46,7 @@ public function getErrorList() {
 			106 => 2,
 			116 => 1,
 			117 => 1,
+			157 => 2,
 		);
 	}
 

From c6b0bc577a4f3a387ac48b07ab5d07a08dc2c5cf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 21:37:42 +0200
Subject: [PATCH 062/822] ValidFunctionName: (re)move some code duplication

Move some code which was used in both the `process_function_declaration()` as well as the `process_method_declaration()` method to the `process_token()` method to remove some code duplication.
---
 .../ValidFunctionNameSniff.php                | 78 +++++++------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index f5234bbd7b..8aa4fccf3f 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -55,11 +55,31 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
+		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
+			/*
+			 * Deprecated functions don't have to comply with the naming conventions,
+			 * otherwise functions deprecated in favour of a function with a compliant
+			 * name would still trigger an error.
+			 */
+			return;
+		}
+
+		$name = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
+		if ( empty( $name ) === true ) {
+			// Live coding or parse error.
+			return;
+		}
+
+		if ( '' === ltrim( $name, '_' ) ) {
+			// Ignore special functions, like __().
+			return;
+		}
+
 		$ooPtr = Scopes::validDirectScope( $this->phpcsFile, $stackPtr, BCTokens::ooScopeTokens() );
 		if ( false === $ooPtr ) {
-			$this->process_function_declaration( $stackPtr );
+			$this->process_function_declaration( $stackPtr, $name );
 		} else {
-			$this->process_method_declaration( $stackPtr, $ooPtr );
+			$this->process_method_declaration( $stackPtr, $name, $ooPtr );
 		}
 	}
 
@@ -71,32 +91,12 @@ public function process_token( $stackPtr ) {
 	 *              Method signature has been changed as well as this method no longer overloads
 	 *              a method from the PEAR sniff which was previously the sniff parent.
 	 *
-	 * @param int $stackPtr The position where this token was found.
+	 * @param int    $stackPtr     The position where this token was found.
+	 * @param string $functionName The name of the function.
 	 *
 	 * @return void
 	 */
-	protected function process_function_declaration( $stackPtr ) {
-
-		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
-			/*
-			 * Deprecated functions don't have to comply with the naming conventions,
-			 * otherwise functions deprecated in favour of a function with a compliant
-			 * name would still trigger an error.
-			 */
-			return;
-		}
-
-		$functionName = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
-
-		if ( ! isset( $functionName ) ) {
-			// Ignore closures.
-			return;
-		}
-
-		if ( '' === ltrim( $functionName, '_' ) ) {
-			// Ignore special functions, like __().
-			return;
-		}
+	protected function process_function_declaration( $stackPtr, $functionName ) {
 
 		// PHP magic functions are exempt from our rules.
 		if ( FunctionDeclarations::isMagicFunctionName( $functionName ) === true ) {
@@ -128,28 +128,13 @@ protected function process_function_declaration( $stackPtr ) {
 	 *              Method signature has been changed as well as this method no longer overloads
 	 *              a method from the PEAR sniff which was previously the sniff parent.
 	 *
-	 * @param int $stackPtr  The position where this token was found.
-	 * @param int $currScope The position of the current scope.
+	 * @param int    $stackPtr   The position where this token was found.
+	 * @param string $methodName The name of the method.
+	 * @param int    $currScope  The position of the current scope.
 	 *
 	 * @return void
 	 */
-	protected function process_method_declaration( $stackPtr, $currScope ) {
-
-		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
-			/*
-			 * Deprecated functions don't have to comply with the naming conventions,
-			 * otherwise functions deprecated in favour of a function with a compliant
-			 * name would still trigger an error.
-			 */
-			return;
-		}
-
-		$methodName = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
-
-		if ( ! isset( $methodName ) ) {
-			// Ignore closures.
-			return;
-		}
+	protected function process_method_declaration( $stackPtr, $methodName, $currScope ) {
 
 		$className = ObjectDeclarations::getName( $this->phpcsFile, $currScope );
 		if ( isset( $className ) === false ) {
@@ -159,11 +144,6 @@ protected function process_method_declaration( $stackPtr, $currScope ) {
 		$methodNameLc = strtolower( $methodName );
 		$classNameLc  = strtolower( $className );
 
-		// Ignore special functions.
-		if ( '' === ltrim( $methodName, '_' ) ) {
-			return;
-		}
-
 		// PHP4 constructors are allowed to break our rules.
 		if ( $methodNameLc === $classNameLc ) {
 			return;

From feaeacbb0d4ad10ea32766825df060077b180430 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 22:05:12 +0200
Subject: [PATCH 063/822] ValidFunctionName: don't throw "DoubleUnderscore"
 error for triple underscore

This change was made in various upstream sniffs a while back as _triple_ underscore prefixed method names are not reserved by PHP.

Includes unit tests.
---
 .../Sniffs/NamingConventions/ValidFunctionNameSniff.php     | 4 ++--
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.inc   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 8aa4fccf3f..d3091b35e6 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -104,7 +104,7 @@ protected function process_function_declaration( $stackPtr, $functionName ) {
 		}
 
 		// Is the function name prefixed with "__" ?
-		if ( 0 === strpos( $functionName, '__' ) ) {
+		if ( preg_match( '`^__[^_]`', $functionName ) === 1 ) {
 			$error     = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $functionName );
 			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
@@ -168,7 +168,7 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 		}
 
 		// Is the method name prefixed with "__" ?
-		if ( 0 === strpos( $methodName, '__' ) ) {
+		if ( preg_match( '`^__[^_]`', $methodName ) === 1 ) {
 			$error     = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
 			$errorData = array( $className . '::' . $methodName );
 			$this->phpcsFile->addError( $error, $stackPtr, 'MethodDoubleUnderscore', $errorData );
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index 7847b1836d..e40fdde8d6 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -157,3 +157,9 @@ class More_Nested {
 		function __CamelCase() {} // Bad x 2 for *function*, not method.
 	}
 }
+
+function ___triple_underscore() {} // OK.
+
+class Triple {
+	function ___triple_underscore() {} // OK.
+}

From 9860354db69c602960d3a4bf3193e2957cc06f89 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 22:12:29 +0200
Subject: [PATCH 064/822] ValidFunctionName: small efficiency fix

No need to call the `ObjectDeclarations::getName()` method for an anonymous class.
---
 .../Sniffs/NamingConventions/ValidFunctionNameSniff.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index d3091b35e6..84a3267718 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -136,9 +136,10 @@ protected function process_function_declaration( $stackPtr, $functionName ) {
 	 */
 	protected function process_method_declaration( $stackPtr, $methodName, $currScope ) {
 
-		$className = ObjectDeclarations::getName( $this->phpcsFile, $currScope );
-		if ( isset( $className ) === false ) {
+		if ( \T_ANON_CLASS === $this->tokens[ $currScope ]['code'] ) {
 			$className = '[Anonymous Class]';
+		} else {
+			$className = ObjectDeclarations::getName( $this->phpcsFile, $currScope );
 		}
 
 		$methodNameLc = strtolower( $methodName );

From c0b526e6b3d951010f3e148e95dc66a30395ae85 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 19:05:52 +0200
Subject: [PATCH 065/822] CI: use Parallel-Lint

Parallel-Lint, as the name implies, runs PHP lint in parallel, making it faster than native linting.
It also provides more helpful output with a syntax highlighter code snippet showing the context of syntax errors.
And lastly, it allows for easily running PHP linting over the files in a local dev environment.

As we're now doing a full `composer install` on every build anyway, we may as well use this tool.
---
 .travis.yml   | 2 +-
 composer.json | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87e3420956..767851daff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -169,7 +169,7 @@ install:
 
 script:
   # Lint the PHP files against parse errors.
-  - if [[ "$LINT" == "1" ]]; then if find . -path ./vendor -prune -o -path ./bin -prune -o -name "*.php" -exec php -l {} \; | grep "^[Parse error|Fatal error]"; then exit 1; fi; fi
+  - if [[ "$LINT" == "1" ]]; then composer lint; fi
 
   # Run the unit tests.
   - composer run-tests
diff --git a/composer.json b/composer.json
index 5aa842317a..676b3bc203 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,16 @@
 	"require-dev": {
 		"phpcompatibility/php-compatibility": "^9.0",
 		"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-		"phpcsstandards/phpcsdevtools": "^1.0"
+		"phpcsstandards/phpcsdevtools": "^1.0",
+		"php-parallel-lint/php-parallel-lint": "^1.0",
+		"php-parallel-lint/php-console-highlighter": "^0.5"
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"scripts": {
+		"lint": [
+			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git"
+		],
 		"check-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
 		],

From ef0cb4e865b086466274abd68f1a18fc013398d1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 01:00:37 +0200
Subject: [PATCH 066/822] CapitalPDangit: implement PHPCSUtils and other
 improvements

* The `Tokens::$textStringTokens` property was introduced in PHPCS 2.9.0 and is the same as the `$text_string_tokens` property in this sniff.
    Replacing this was missed in an earlier review round after the minimum PHPCS version changed.
* Use the PHPCSUtils [`ObjectDeclarations::getName()`](https://phpcsutils.com/phpdoc/classes/PHPCSUtils-Utils-ObjectDeclarations.html#method_getName) method instead of the PHPCS native `File::getDeclarationName()` method for a slightly more stable result.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index f5f9512ef4..14c5592fd5 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Capital P Dangit!
@@ -51,19 +52,6 @@ class CapitalPDangitSniff extends Sniff {
 	 */
 	const WP_CLASSNAME_REGEX = '`(?:^|_)(Word[_]*Pres+)(?:_|$)`i';
 
-	/**
-	 * String tokens we want to listen for.
-	 *
-	 * @var array
-	 */
-	private $text_string_tokens = array(
-		\T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
-		\T_DOUBLE_QUOTED_STRING     => \T_DOUBLE_QUOTED_STRING,
-		\T_HEREDOC                  => \T_HEREDOC,
-		\T_NOWDOC                   => \T_NOWDOC,
-		\T_INLINE_HTML              => \T_INLINE_HTML,
-	);
-
 	/**
 	 * Comment tokens we want to listen for as they contain text strings.
 	 *
@@ -93,7 +81,7 @@ class CapitalPDangitSniff extends Sniff {
 	 */
 	public function register() {
 		// Union the arrays - keeps the array keys.
-		$this->text_and_comment_tokens = ( $this->text_string_tokens + $this->comment_text_tokens );
+		$this->text_and_comment_tokens = ( Tokens::$textStringTokens + $this->comment_text_tokens );
 
 		$targets = ( $this->text_and_comment_tokens + Tokens::$ooScopeTokens );
 
@@ -132,7 +120,7 @@ public function process_token( $stackPtr ) {
 		 * These are not auto-fixable, but need the attention of a developer.
 		 */
 		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
-			$classname = $this->phpcsFile->getDeclarationName( $stackPtr );
+			$classname = ObjectDeclarations::getName( $this->phpcsFile, $stackPtr );
 			if ( empty( $classname ) ) {
 				return;
 			}

From d0908f90724184361dd2bb8a3dc556e94c547aaa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 00:28:09 +0200
Subject: [PATCH 067/822] CapitalPDangit: check namespace names

Up to now, class names, trait names and interface names were already checked, but namespace names were not checked for the correct spelling of `WordPress`.

This new feature has now been added.

Includes unit tests.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php   | 38 ++++++++++++++++++-
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc | 12 ++++++
 .../Tests/WP/CapitalPDangitUnitTest.inc.fixed | 12 ++++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.php |  3 ++
 4 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 14c5592fd5..e564147afc 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -12,16 +12,18 @@
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Namespaces;
 
 /**
  * Capital P Dangit!
  *
- * Verify the correct spelling of `WordPress` in text strings, comments and class names.
+ * Verify the correct spelling of `WordPress` in text strings, comments and OO and namespace names.
  *
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since   3.0.0  Now also checks namespace names.
  */
 class CapitalPDangitSniff extends Sniff {
 
@@ -83,7 +85,9 @@ public function register() {
 		// Union the arrays - keeps the array keys.
 		$this->text_and_comment_tokens = ( Tokens::$textStringTokens + $this->comment_text_tokens );
 
-		$targets = ( $this->text_and_comment_tokens + Tokens::$ooScopeTokens );
+		$targets   = $this->text_and_comment_tokens;
+		$targets  += Tokens::$ooScopeTokens;
+		$targets[] = \T_NAMESPACE;
 
 		// Also sniff for array tokens to make skipping anything within those more efficient.
 		$targets[ \T_ARRAY ]            = \T_ARRAY;
@@ -115,6 +119,36 @@ public function process_token( $stackPtr ) {
 			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
 		}
 
+		/*
+		 * Deal with misspellings in namespace names.
+		 * These are not auto-fixable, but need the attention of a developer.
+		 */
+		if ( \T_NAMESPACE === $this->tokens[ $stackPtr ]['code'] ) {
+			$ns_name = Namespaces::getDeclaredName( $this->phpcsFile, $stackPtr );
+			if ( empty( $ns_name ) ) {
+				// Namespace operator or declaration without name.
+				return;
+			}
+
+			$levels = explode( '\\', $ns_name );
+			foreach ( $levels as $level ) {
+				if ( preg_match_all( self::WP_CLASSNAME_REGEX, $level, $matches, \PREG_PATTERN_ORDER ) > 0 ) {
+					$mispelled = $this->retrieve_misspellings( $matches[1] );
+
+					if ( ! empty( $mispelled ) ) {
+						$this->phpcsFile->addWarning(
+							'Please spell "WordPress" correctly. Found: "%s" as part of the namespace name.',
+							$stackPtr,
+							'MisspelledNamespaceName',
+							array( implode( ', ', $mispelled ) )
+						);
+					}
+				}
+			}
+
+			return;
+		}
+
 		/*
 		 * Deal with misspellings in class/interface/trait names.
 		 * These are not auto-fixable, but need the attention of a developer.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 1f197ec6e5..06fae87cbc 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -191,3 +191,15 @@ class TestMe {
 
 // Allow "test" domain.
 $value = function_call( 'git.wordpress.test' );
+
+/*
+ * Test recognizing misspelling in namespace names.
+ */
+namespace {} // OK - no name.
+echo namespace\function_name(); // OK - operator.
+namespace Foo\WordPress\Bar; // OK.
+namespace My_WordPress_Plugin; // OK.
+
+namespace Foo\Bar\Wordpress\; // Bad.
+namespace Foo\word_presss\Bar; // Bad.
+namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 44d2e489d4..cfc811bd54 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -191,3 +191,15 @@ class TestMe {
 
 // Allow "test" domain.
 $value = function_call( 'git.wordpress.test' );
+
+/*
+ * Test recognizing misspelling in namespace names.
+ */
+namespace {} // OK - no name.
+echo namespace\function_name(); // OK - operator.
+namespace Foo\WordPress\Bar; // OK.
+namespace My_WordPress_Plugin; // OK.
+
+namespace Foo\Bar\Wordpress\; // Bad.
+namespace Foo\word_presss\Bar; // Bad.
+namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 0e6d2b268a..e22b02fe1b 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -62,6 +62,9 @@ public function getWarningList() {
 			167 => 1, // Old-style WPCS ignore comments are no longer supported.
 			173 => 1,
 			181 => 1,
+			203 => 1,
+			204 => 1,
+			205 => 1,
 		);
 	}
 

From bdbd5e3a3aa3e1db4d50862d8fcdcf0addb308d5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 00:49:45 +0200
Subject: [PATCH 068/822] CapitalPDangit: minor efficiency tweak

No need to call `findPrevious()` twice.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index e564147afc..c85cad7c5c 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -184,13 +184,16 @@ public function process_token( $stackPtr ) {
 			|| \T_DOC_COMMENT === $this->tokens[ $stackPtr ]['code']
 		) {
 
-			$comment_start = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_OPEN_TAG, ( $stackPtr - 1 ) );
-			if ( false !== $comment_start ) {
-				$comment_tag = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_TAG, ( $stackPtr - 1 ), $comment_start );
-				if ( false !== $comment_tag && '@link' === $this->tokens[ $comment_tag ]['content'] ) {
-					// @link tag, so ignore.
-					return;
-				}
+			$comment_tag = $this->phpcsFile->findPrevious(
+				array( \T_DOC_COMMENT_TAG, \T_DOC_COMMENT_OPEN_TAG ),
+				( $stackPtr - 1 )
+			);
+			if ( false !== $comment_tag
+				&& \T_DOC_COMMENT_TAG === $this->tokens[ $comment_tag ]['code']
+				&& '@link' === $this->tokens[ $comment_tag ]['content']
+			) {
+				// @link tag, so ignore.
+				return;
 			}
 		}
 

From 97418e1fd676a0f4c1ba56ea8dd7265a862bd076 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 00:51:12 +0200
Subject: [PATCH 069/822] CapitalPDangit: minor code layout tweak

Minor code readability improvement.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index c85cad7c5c..e18a0e6794 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -113,9 +113,13 @@ public function process_token( $stackPtr ) {
 		 * The return values skip to the end of the array.
 		 * This prevents the sniff "hanging" on very long configuration arrays.
 		 */
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code'] && isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
+		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+			&& isset( $this->tokens[ $stackPtr ]['bracket_closer'] )
+		) {
 			return $this->tokens[ $stackPtr ]['bracket_closer'];
-		} elseif ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] && isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] ) ) {
+		} elseif ( \T_ARRAY === $this->tokens[ $stackPtr ]['code']
+			&& isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] )
+		) {
 			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
 		}
 

From ac0a94c2f831b9adb633e7af5f000d6a0df650f9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 10 Jul 2020 22:30:04 +0200
Subject: [PATCH 070/822] CapitalPDangit: fix misspelling of "misspelled"

---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index e18a0e6794..f241df383e 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -137,14 +137,14 @@ public function process_token( $stackPtr ) {
 			$levels = explode( '\\', $ns_name );
 			foreach ( $levels as $level ) {
 				if ( preg_match_all( self::WP_CLASSNAME_REGEX, $level, $matches, \PREG_PATTERN_ORDER ) > 0 ) {
-					$mispelled = $this->retrieve_misspellings( $matches[1] );
+					$misspelled = $this->retrieve_misspellings( $matches[1] );
 
-					if ( ! empty( $mispelled ) ) {
+					if ( ! empty( $misspelled ) ) {
 						$this->phpcsFile->addWarning(
 							'Please spell "WordPress" correctly. Found: "%s" as part of the namespace name.',
 							$stackPtr,
 							'MisspelledNamespaceName',
-							array( implode( ', ', $mispelled ) )
+							array( implode( ', ', $misspelled ) )
 						);
 					}
 				}
@@ -164,14 +164,14 @@ public function process_token( $stackPtr ) {
 			}
 
 			if ( preg_match_all( self::WP_CLASSNAME_REGEX, $classname, $matches, \PREG_PATTERN_ORDER ) > 0 ) {
-				$mispelled = $this->retrieve_misspellings( $matches[1] );
+				$misspelled = $this->retrieve_misspellings( $matches[1] );
 
-				if ( ! empty( $mispelled ) ) {
+				if ( ! empty( $misspelled ) ) {
 					$this->phpcsFile->addWarning(
 						'Please spell "WordPress" correctly. Found: "%s" as part of the class/interface/trait name.',
 						$stackPtr,
 						'MisspelledClassName',
-						array( implode( ', ', $mispelled ) )
+						array( implode( ', ', $misspelled ) )
 					);
 				}
 			}
@@ -263,9 +263,9 @@ public function process_token( $stackPtr ) {
 				}
 			}
 
-			$mispelled = $this->retrieve_misspellings( $matches[1] );
+			$misspelled = $this->retrieve_misspellings( $matches[1] );
 
-			if ( empty( $mispelled ) ) {
+			if ( empty( $misspelled ) ) {
 				return;
 			}
 
@@ -274,8 +274,8 @@ public function process_token( $stackPtr ) {
 				$stackPtr,
 				'Misspelled',
 				array(
-					\count( $mispelled ),
-					implode( ', ', $mispelled ),
+					\count( $misspelled ),
+					implode( ', ', $misspelled ),
 				)
 			);
 
@@ -298,7 +298,7 @@ public function process_token( $stackPtr ) {
 	 * @return array Array containing only the misspelled variants.
 	 */
 	protected function retrieve_misspellings( $match_stack ) {
-		$mispelled = array();
+		$misspelled = array();
 		foreach ( $match_stack as $match ) {
 			// Deal with multi-dimensional arrays when capturing offset.
 			if ( \is_array( $match ) ) {
@@ -306,11 +306,11 @@ protected function retrieve_misspellings( $match_stack ) {
 			}
 
 			if ( 'WordPress' !== $match ) {
-				$mispelled[] = $match;
+				$misspelled[] = $match;
 			}
 		}
 
-		return $mispelled;
+		return $misspelled;
 	}
 
 }

From 7cd46bed1e6a7a2af3fe24c7f4a044da3076d8f4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:16:43 +0200
Subject: [PATCH 071/822] PHP 8 | ControlStructureSpacing: bug fix - $data
 should be an array

The `$data` parameter of the `$phpcsFile->add[Fixable]Error|Warning()` methods is expected to be an array, not a string.

Without this fix, PHP 8 will throw and (uncaught) `TypeError: vsprintf(): Argument #2 ($args) must be of type array, string given`.
---
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 5b7426fc92..cbca5fe47c 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -209,7 +209,7 @@ public function process_token( $stackPtr ) {
 						$error,
 						$stackPtr,
 						'SpaceBeforeFunctionOpenParenthesis',
-						$this->tokens[ ( $function_name_ptr + 1 ) ]['content']
+						array( $this->tokens[ ( $function_name_ptr + 1 ) ]['content'] )
 					);
 
 					if ( true === $fix ) {
@@ -282,7 +282,7 @@ public function process_token( $stackPtr ) {
 				$error,
 				$stackPtr,
 				'ExtraSpaceBeforeOpenParenthesis',
-				$this->tokens[ ( $stackPtr + 1 ) ]['content']
+				array( $this->tokens[ ( $stackPtr + 1 ) ]['content'] )
 			);
 
 			if ( true === $fix ) {
@@ -310,7 +310,7 @@ public function process_token( $stackPtr ) {
 					$error,
 					$stackPtr,
 					'ExtraSpaceAfterOpenParenthesis',
-					$this->tokens[ ( $parenthesisOpener + 1 ) ]['content']
+					array( $this->tokens[ ( $parenthesisOpener + 1 ) ]['content'] )
 				);
 
 				if ( true === $fix ) {
@@ -341,7 +341,7 @@ public function process_token( $stackPtr ) {
 							$error,
 							$stackPtr,
 							'ExtraSpaceBeforeCloseParenthesis',
-							$this->tokens[ ( $parenthesisCloser - 1 ) ]['content']
+							array( $this->tokens[ ( $parenthesisCloser - 1 ) ]['content'] )
 						);
 
 						if ( true === $fix ) {
@@ -399,7 +399,7 @@ public function process_token( $stackPtr ) {
 					$error,
 					$stackPtr,
 					'ExtraSpaceAfterCloseParenthesis',
-					$this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
+					array( $this->tokens[ ( $parenthesisCloser + 1 ) ]['content'] )
 				);
 
 				if ( true === $fix ) {

From c421409dfdc237a383be2a509f2653b78c01612e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <denis.zoljom@gmail.com>
Date: Sun, 19 Jul 2020 14:45:20 +0200
Subject: [PATCH 072/822] EnqueuedResources: bug fix - handling of multi-line
 text strings

As it was, if the text the sniff is looking for was split over multiple lines, the sniff would incorrectly not throw an error (false negative).

By using the PHPCSUtils `TextStrings::getCompleteTextString()` method, we can get access to the complete content of a multi-line text string and prevent the false negative.

This does create two minor complications though:
1. The complete text string may contain multiple link/script tags, so we need to use `preg_match_all()` instead of `preg_match()` to be able to report on each of the matches.
2. We need to figure out on which line of the multi-line text string the matched content occurred so we can throw the error on the correct line.
    Luckily, as multi-line text strings have only one token per line, that's easy enough to work out, especially if we let `preg_match_all()` remember the offsets at which a match was found, so we also won't confuse one match for another.

Includes unit tests.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Sniffs/WP/EnqueuedResourcesSniff.php      | 74 +++++++++++++++----
 .../Tests/WP/EnqueuedResourcesUnitTest.inc    | 17 +++++
 .../Tests/WP/EnqueuedResourcesUnitTest.php    |  6 ++
 3 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 27572e95d1..e4c34e037a 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -9,8 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\Sniff;
+use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Makes sure scripts and styles are enqueued and not explicitly echo'd.
@@ -22,6 +25,8 @@
  * @since   0.3.0
  * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since   3.0.0  Added a check for a complete text string in the case where it
+ *                 spans two lines.
  */
 class EnqueuedResourcesSniff extends Sniff {
 
@@ -31,7 +36,10 @@ class EnqueuedResourcesSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		return Tokens::$textStringTokens;
+		$targets   = Collections::$textStingStartTokens;
+		$targets[] = \T_INLINE_HTML;
+
+		return $targets;
 	}
 
 	/**
@@ -42,23 +50,59 @@ public function register() {
 	 * @return void
 	 */
 	public function process_token( $stackPtr ) {
-		$token = $this->tokens[ $stackPtr ];
 
-		if ( preg_match( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $token['content'] ) > 0 ) {
-			$this->phpcsFile->addError(
-				'Stylesheets must be registered/enqueued via wp_enqueue_style',
-				$stackPtr,
-				'NonEnqueuedStylesheet'
-			);
+		$content = $this->tokens[ $stackPtr ]['content'];
+		if ( \T_INLINE_HTML !== $this->tokens[ $stackPtr ]['code'] ) {
+			try {
+				$content = TextStrings::getCompleteTextString( $this->phpcsFile, $stackPtr );
+			} catch ( RuntimeException $e ) {
+				// Not the first token in a multi-line text string. Any issues will already have been reported.
+				return;
+			}
+		}
+
+		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, PREG_OFFSET_CAPTURE ) > 0 ) {
+			foreach ( $matches[0] as $match ) {
+				$this->phpcsFile->addError(
+					'Stylesheets must be registered/enqueued via wp_enqueue_style',
+					$this->find_token_in_multiline_string( $stackPtr, $content, $match[1] ),
+					'NonEnqueuedStylesheet'
+				);
+			}
 		}
 
-		if ( preg_match( '#<script[^>]*(?<=src=)#', $token['content'] ) > 0 ) {
-			$this->phpcsFile->addError(
-				'Scripts must be registered/enqueued via wp_enqueue_script',
-				$stackPtr,
-				'NonEnqueuedScript'
-			);
+		if ( preg_match_all( '#<script[^>]*(?<=src=)#', $content, $matches, PREG_OFFSET_CAPTURE ) > 0 ) {
+			foreach ( $matches[0] as $match ) {
+				$this->phpcsFile->addError(
+					'Scripts must be registered/enqueued via wp_enqueue_script',
+					$this->find_token_in_multiline_string( $stackPtr, $content, $match[1] ),
+					'NonEnqueuedScript'
+				);
+			}
 		}
 	}
 
+	/**
+	 * Find the exact token on which the error should be reported for multi-line strings.
+	 *
+	 * @param int    $stackPtr     The position of the current token in the stack.
+	 * @param string $content      The complete, potentially multi-line, text string.
+	 * @param int    $match_offset The offset within the content at which the match was found.
+	 *
+	 * @return int The stack pointer to the token containing the start of the match.
+	 */
+	private function find_token_in_multiline_string( $stackPtr, $content, $match_offset ) {
+		$newline_count = 0;
+		if ( $match_offset > 0 ) {
+			$newline_count = substr_count( $content, "\n", 0, $match_offset );
+		}
+
+		// Account for heredoc/nowdoc text starting at the token *after* the opener.
+		if ( isset( Tokens::$heredocTokens[ $this->tokens[ $stackPtr ]['code'] ] ) === true ) {
+			++$newline_count;
+		}
+
+		return ( $stackPtr + $newline_count );
+	}
+
 }
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
index 3b5ec4f191..f505e43615 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
@@ -36,3 +36,20 @@ EOD;
 jQuery( document ).ready( function() {
 	$('link[rel="stylesheet"]:not([data-inprogress])').forEach(StyleFix.link);
 });
+
+<?php
+// Test multi-line text string.
+echo '<script type="text/javascript"
+	src="' . $script . '"/>';
+
+// Test multi-line text string with multiple issues.
+echo '<script type="text/javascript"
+	src="http://someurl/somefile1.js"/>
+	<script src="http://someurl/somefile2.js"></script>
+	<script type="text/javascript"
+	src="http://someurl/somefile3.js"/>
+	';
+
+// Test multi-line text string with multiple issues.
+echo '<link rel="stylesheet" href="http://someurl/somefile1.css"/>
+	<link rel="stylesheet" href="http://someurl/somefile2.css"/>';
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index 2ca0095815..e1697abeaf 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -44,6 +44,12 @@ public function getErrorList() {
 			26 => 1,
 			30 => 1,
 			31 => 1,
+			42 => 1,
+			46 => 1,
+			48 => 1,
+			49 => 1,
+			54 => 1,
+			55 => 1,
 		);
 	}
 

From 07324e85206d3f8f964cc0b22e36dc6a823290db Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:20:31 +0200
Subject: [PATCH 073/822] ArrayIndentation: bug fix - prevent fixer conflict

If an array item has something else on the same line before it, the indentation should be left alone.

This fixes a potential fixer conflict with the `DisallowInlineTabs` sniff which could occur when the sniffs are being run in a unconventional order.

Discovered when making a change to the Travis file and not reproducible locally, but consistently reproducible with the alternative running order of sniffs on select platforms, as per the Travis build on Xenial.
---
 .../Sniffs/Arrays/ArrayIndentationSniff.php     | 17 +++++++++++++----
 .../Tests/Arrays/ArrayIndentationUnitTest.1.inc |  6 ++++++
 .../Arrays/ArrayIndentationUnitTest.1.inc.fixed |  6 ++++++
 .../Tests/Arrays/ArrayIndentationUnitTest.2.inc |  8 +++++++-
 .../Arrays/ArrayIndentationUnitTest.2.inc.fixed |  8 +++++++-
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 5ee911a349..d9ba594588 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -208,13 +208,22 @@ public function process_token( $stackPtr ) {
 
 			// Bow out from reporting and fixing mixed multi-line/single-line arrays.
 			// That is handled by the ArrayDeclarationSpacingSniff.
-			if ( $this->tokens[ $first_content ]['line'] === $this->tokens[ $end_of_previous_item ]['line']
-				|| ( 1 !== $this->tokens[ $first_content ]['column']
-					&& \T_WHITESPACE !== $this->tokens[ ( $first_content - 1 ) ]['code'] )
-			) {
+			if ( $this->tokens[ $first_content ]['line'] === $this->tokens[ $end_of_previous_item ]['line'] ) {
 				return $closer;
 			}
 
+			// Ignore this item if there is anything but whitespace before the start of the next item.
+			if ( 1 !== $this->tokens[ $first_content ]['column'] ) {
+				// Go to the start of the line.
+				$i = $first_content;
+				while ( 1 !== $this->tokens[ --$i ]['column'] );
+
+				if ( \T_WHITESPACE !== $this->tokens[ $i ]['code'] ) {
+					$end_of_previous_item = $end_of_this_item;
+					continue;
+				}
+			}
+
 			$found_spaces = ( $this->tokens[ $first_content ]['column'] - 1 );
 
 			if ( $found_spaces !== $expected_spaces ) {
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
index d306dc6c44..43dd3d5e1f 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
@@ -436,3 +436,9 @@ $my_array = [
 'prop1' => $prop1,
 			'prop2' => $prop2,
 ] = $some_var;
+
+// Fixer conflict prevention.
+$bad = array(
+	'key1' => 'value1', /* comment
+	end */ 'key2' => 'value2',
+);
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
index c8baf86bd9..b9c9097827 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
@@ -436,3 +436,9 @@ $my_array = [
 'prop1' => $prop1,
 			'prop2' => $prop2,
 ] = $some_var;
+
+// Fixer conflict prevention.
+$bad = array(
+	'key1' => 'value1', /* comment
+	end */ 'key2' => 'value2',
+);
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
index 49f1d13984..2556e7938e 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
@@ -434,7 +434,13 @@ $my_array = [
  */
 [
 'prop1' => $prop1,
-			'prop2' => $prop2,
+            'prop2' => $prop2,
 ] = $some_var;
 
+// Fixer conflict prevention.
+$bad = array(
+    'key1' => 'value1', /* comment
+    end */ 'key2' => 'value2',
+);
+
 // phpcs:set WordPress.Arrays.ArrayIndentation tabIndent true
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
index efc31384a5..b6b6647ee8 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
@@ -434,7 +434,13 @@ $my_array = [
  */
 [
 'prop1' => $prop1,
-			'prop2' => $prop2,
+            'prop2' => $prop2,
 ] = $some_var;
 
+// Fixer conflict prevention.
+$bad = array(
+    'key1' => 'value1', /* comment
+    end */ 'key2' => 'value2',
+);
+
 // phpcs:set WordPress.Arrays.ArrayIndentation tabIndent true

From 12d3ebfe31c8b33c64248edb2df0ed47da9457a7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 22 Jul 2020 01:54:06 +0200
Subject: [PATCH 074/822] EscapeOutput: defensive coding

The `PassedParameters::getParameter()` method (and the `Sniff::get_function_call_parameter()` method before it), either returns an array with information on the parameter or `false` if the parameter does not exist.

A call to `trigger_error()` and the likes, without passing parameters is a little useless and will throw a warning in PHP 4/5/7 and a fatal `ArgumentCountError` in PHP 8.

However, those types of errors are not the concern of this sniff, so if a call to these functions is encountered without arguments, the sniff should conclude that there is nothing which needs escaping and bow out.

Fix now, including unit tests to safeguard against it in the future.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php   | 11 ++++++++++-
 WordPress/Tests/Security/EscapeOutputUnitTest.inc |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 82ebccdcb6..d70d7fe898 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -196,7 +196,12 @@ public function process_token( $stackPtr ) {
 
 			// These functions only need to have the first argument escaped.
 			if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
-				$first_param      = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
+				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
+				if ( false === $first_param ) {
+					// First parameter doesn't exist. Nothing to do.
+					return;
+				}
+
 				$end_of_statement = ( $first_param['end'] + 1 );
 				unset( $first_param );
 			}
@@ -207,6 +212,10 @@ public function process_token( $stackPtr ) {
 			 */
 			if ( '_deprecated_file' === $function ) {
 				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
+				if ( false === $first_param ) {
+					// First parameter doesn't exist. Nothing to do.
+					return;
+				}
 
 				// Quick check. This disregards comments.
 				if ( preg_match( '`^basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index 777c72e6dc..e9fb752ce7 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -295,3 +295,6 @@ echo implode( '<br>', map_deep( $items, 'foo' ) ); // Bad.
 
 _deprecated_file( basename( __FILE__ ), '1.3.0' ); // Ok.
 _deprecated_file( $file, '1.3.0' ); // Error.
+
+trigger_error(); // Ignore.
+_deprecated_file(); // Ignore.

From 0265236e7c7eab16ec7b93ff99c56f4e27809b08 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 21 Jul 2020 02:08:24 +0200
Subject: [PATCH 075/822] Travis: change from "trusty" to "xenial"

As the "trusty" environment is no longer officially supported by Travis, they decided in their wisdom to silently stop updating the PHP "nightly" image, which makes it next to useless as the last image apparently is from January....

This updates the Travis config to:
* Use the `xenial` distro, which at this time is the default.
* Sets the distro for low PHP versions explicitly to `trusty`.
* Makes the expected OS explicit (linux).
---
 .travis.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 767851daff..997e804e62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
-dist: trusty
+os: linux
+dist: xenial
 
 cache:
   apt: true
@@ -11,8 +12,6 @@ cache:
 language: php
 
 php:
-    - 5.4
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
@@ -117,8 +116,10 @@ jobs:
     - php: 7.3
       env: PHPCS_BRANCH="3.5.0"
     - php: 5.4
+      dist: trusty
       env: PHPCS_BRANCH="dev-master" LINT=1
     - php: 5.4
+      dist: trusty
       env: PHPCS_BRANCH="3.5.0"
 
     #### TEST STAGE ####
@@ -127,6 +128,20 @@ jobs:
       php: 7.4
       env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
 
+    # Builds which need a different distro.
+    - php: 5.5
+      dist: trusty
+      env: PHPCS_BRANCH="dev-master" LINT=1
+    - php: 5.5
+      dist: trusty
+      env: PHPCS_BRANCH="3.5.0"
+    - php: 5.4
+      dist: trusty
+      env: PHPCS_BRANCH="dev-master" LINT=1
+    - php: 5.4
+      dist: trusty
+      env: PHPCS_BRANCH="3.5.0"
+
   allow_failures:
     # Allow failures for unstable builds.
     - php: "nightly"

From 545a0028be43f52b580e1cd0b94b3e1f01a52eab Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:38:58 +0200
Subject: [PATCH 076/822] Move "minimum WP version" related utilities to
 dedicated `MinimumWPVersionTrait`

The "minimum WP version" related utilities are only used by a small set of sniffs, so are better placed in a dedicated trait.

This moves the `$minimum_supported_version` property and the `get_wp_version_from_cl()` method to a new `WordPressCS\WordPress\Helpers\MinimumWPVersionTrait` and starts using that trait in the relevant sniffs.

Related to 1465
---
 WordPress/Helpers/MinimumWPVersionTrait.php   | 95 +++++++++++++++++++
 WordPress/Sniff.php                           | 60 ------------
 .../Sniffs/WP/AlternativeFunctionsSniff.php   |  5 +-
 .../Sniffs/WP/DeprecatedClassesSniff.php      |  5 +-
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    |  5 +-
 .../WP/DeprecatedParameterValuesSniff.php     |  7 +-
 .../Sniffs/WP/DeprecatedParametersSniff.php   |  5 +-
 7 files changed, 116 insertions(+), 66 deletions(-)
 create mode 100644 WordPress/Helpers/MinimumWPVersionTrait.php

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
new file mode 100644
index 0000000000..ca16ae0e44
--- /dev/null
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\BackCompat\Helper;
+
+/**
+ * Helper utilities for sniffs which take the minimum supported WP version of the
+ * code under examination into account.
+ *
+ * Usage instructions:
+ * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
+ * - Call the `MinimumWPVersionTrait::get_wp_version_from_cl()` method in the `process()`/`process_token()`
+ *   method.
+ * - After that, the `MinimumWPVersionTrait::$minimum_supported_version` property can be freely used
+ *   in the sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property and method in this trait were previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ */
+trait MinimumWPVersionTrait {
+
+	/**
+	 * Minimum supported WordPress version.
+	 *
+	 * Currently used by the `WordPress.WP.AlternativeFunctions`,
+	 * `WordPress.WP.DeprecatedClasses`, `WordPress.WP.DeprecatedFunctions`,
+	 * `WordPress.WP.DeprecatedParameter` and the `WordPress.WP.DeprecatedParameterValues` sniff.
+	 *
+	 * These sniffs will throw an error when usage of a deprecated class/function/parameter
+	 * is detected if the class/function/parameter was deprecated before the minimum
+	 * supported WP version; a warning otherwise.
+	 * By default, it is set to presume that a project will support the current
+	 * WP version and up to three releases before.
+	 *
+	 * This property allows changing the minimum supported WP version used by
+	 * these sniffs by setting a property in a custom phpcs.xml ruleset.
+	 * This property will need to be set for each sniff which uses it.
+	 *
+	 * Example usage:
+	 * <rule ref="WordPress.WP.DeprecatedClasses">
+	 *  <properties>
+	 *   <property name="minimum_supported_version" value="4.3"/>
+	 *  </properties>
+	 * </rule>
+	 *
+	 * Alternatively, the value can be passed in one go for all sniff using it via
+	 * the command line or by setting a `<config>` value in a custom phpcs.xml ruleset.
+	 * Note: the `_wp_` in the command line property name!
+	 *
+	 * CL: `phpcs --runtime-set minimum_supported_wp_version 4.5`
+	 * Ruleset: `<config name="minimum_supported_wp_version" value="4.5"/>`
+	 *
+	 * @since 0.14.0 Previously the individual sniffs each contained this property.
+	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *
+	 * @internal When the value of this property is changed, it will also need
+	 *           to be changed in the `WP/AlternativeFunctionsUnitTest.inc` file.
+	 *
+	 * @var string WordPress version.
+	 */
+	public $minimum_supported_version = '5.1';
+
+	/**
+	 * Overrule the minimum supported WordPress version with a command-line/config value.
+	 *
+	 * Handle setting the minimum supported WP version in one go for all sniffs which
+	 * expect it via the command line or via a `<config>` variable in a ruleset.
+	 * The config variable overrules the default `$minimum_supported_version` and/or a
+	 * `$minimum_supported_version` set for individual sniffs through the ruleset.
+	 *
+	 * @since 0.14.0
+	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 */
+	protected function get_wp_version_from_cl() {
+		$cl_supported_version = trim( Helper::getConfigData( 'minimum_supported_wp_version' ) );
+		if ( ! empty( $cl_supported_version )
+			&& filter_var( $cl_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
+		) {
+			$this->minimum_supported_version = $cl_supported_version;
+		}
+	}
+
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 0ecfcb4e06..113eeac8cf 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -12,7 +12,6 @@
 use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\PassedParameters;
@@ -49,46 +48,6 @@ abstract class Sniff implements PHPCS_Sniff {
 	 */
 	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
 
-	/**
-	 * Minimum supported WordPress version.
-	 *
-	 * Currently used by the `WordPress.WP.AlternativeFunctions`,
-	 * `WordPress.WP.DeprecatedClasses`, `WordPress.WP.DeprecatedFunctions`
-	 * and the `WordPress.WP.DeprecatedParameter` sniff.
-	 *
-	 * These sniffs will throw an error when usage of a deprecated class/function/parameter
-	 * is detected if the class/function/parameter was deprecated before the minimum
-	 * supported WP version; a warning otherwise.
-	 * By default, it is set to presume that a project will support the current
-	 * WP version and up to three releases before.
-	 *
-	 * This property allows changing the minimum supported WP version used by
-	 * these sniffs by setting a property in a custom phpcs.xml ruleset.
-	 * This property will need to be set for each sniff which uses it.
-	 *
-	 * Example usage:
-	 * <rule ref="WordPress.WP.DeprecatedClasses">
-	 *  <properties>
-	 *   <property name="minimum_supported_version" value="4.3"/>
-	 *  </properties>
-	 * </rule>
-	 *
-	 * Alternatively, the value can be passed in one go for all sniff using it via
-	 * the command line or by setting a `<config>` value in a custom phpcs.xml ruleset.
-	 * Note: the `_wp_` in the command line property name!
-	 *
-	 * CL: `phpcs --runtime-set minimum_supported_wp_version 4.5`
-	 * Ruleset: `<config name="minimum_supported_wp_version" value="4.5"/>`
-	 *
-	 * @since 0.14.0 Previously the individual sniffs each contained this property.
-	 *
-	 * @internal When the value of this property is changed, it will also need
-	 *           to be changed in the `WP/AlternativeFunctionsUnitTest.inc` file.
-	 *
-	 * @var string WordPress version.
-	 */
-	public $minimum_supported_version = '5.1';
-
 	/**
 	 * Custom list of classes which test classes can extend.
 	 *
@@ -1121,25 +1080,6 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 		return $lastPtr;
 	}
 
-	/**
-	 * Overrule the minimum supported WordPress version with a command-line/config value.
-	 *
-	 * Handle setting the minimum supported WP version in one go for all sniffs which
-	 * expect it via the command line or via a `<config>` variable in a ruleset.
-	 * The config variable overrules the default `$minimum_supported_version` and/or a
-	 * `$minimum_supported_version` set for individual sniffs through the ruleset.
-	 *
-	 * @since 0.14.0
-	 */
-	protected function get_wp_version_from_cl() {
-		$cl_supported_version = trim( Helper::getConfigData( 'minimum_supported_wp_version' ) );
-		if ( ! empty( $cl_supported_version )
-			&& filter_var( $cl_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
-		) {
-			$this->minimum_supported_version = $cl_supported_version;
-		}
-	}
-
 	/**
 	 * Check if a token is used within a unit test.
 	 *
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index ae4d95221a..078e02dc94 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -12,6 +12,7 @@
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
 /**
  * Discourages the use of various functions and suggests (WordPress) alternatives.
@@ -23,10 +24,12 @@
  * @since   1.0.0  - Takes the minimum supported WP version into account.
  *                 - Takes exceptions based on passed parameters into account.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
  */
 class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
+	use MinimumWPVersionTrait;
+
 	/**
 	 * Local input streams which should not be flagged for the file system function checks.
 	 *
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 9d1f95bff4..f203c46531 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use WordPressCS\WordPress\AbstractClassRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
 /**
  * Restricts the use of deprecated WordPress classes and suggests alternatives.
@@ -28,10 +29,12 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
  */
 class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 
+	use MinimumWPVersionTrait;
+
 	/**
 	 * List of deprecated classes with alternative when available.
 	 *
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index df7a4b5525..283734ed1d 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
 /**
  * Restricts the use of various deprecated WordPress functions and suggests alternatives.
@@ -28,10 +29,12 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
  */
 class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
+	use MinimumWPVersionTrait;
+
 	/**
 	 * List of deprecated functions with alternative when available.
 	 *
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 69a7abf3d5..a1e1fd432b 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
 /**
  * Check for usage of deprecated parameter values in WP functions and provide alternative based on the parameter passed.
@@ -20,10 +21,12 @@
  *
  * @since   1.0.0
  *
- * @uses    \WordPressCS\WordPress\Sniff::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
  */
 class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 
+	use MinimumWPVersionTrait;
+
 	/**
 	 * The group name for this group of functions.
 	 *
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 3e50a587f2..d38e50ad8b 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
 /**
  * Check for usage of deprecated parameters in WP functions and suggest alternative based on the parameter passed.
@@ -29,10 +30,12 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
  */
 class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 
+	use MinimumWPVersionTrait;
+
 	/**
 	 * The group name for this group of functions.
 	 *

From e44953e58b44c9836f0b0581b27480782c5bbaa3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:38:58 +0200
Subject: [PATCH 077/822] MinimumWPVersionTrait: use PHPCSUtils
 Helper::getCommandLineData()

The `get_wp_version_from_cl()` method now uses the PHPCSUtils `Helper::getCommandLineData()` method instead of the `Helper::getConfigData()` for more reliable results.

Because of this change, the `$phpcsFile` object is now a required parameter for the `get_wp_version_from_cl()` method.
All calls to the method have been adjusted for this change.
---
 WordPress/Helpers/MinimumWPVersionTrait.php            | 6 ++++--
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php      | 2 +-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php         | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php       | 2 +-
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php | 2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php      | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index ca16ae0e44..f01a9834f3 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -80,11 +80,13 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @since 0.14.0
 	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *               Now requires the $phpcsFile object to be passed in.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 */
-	protected function get_wp_version_from_cl() {
-		$cl_supported_version = trim( Helper::getConfigData( 'minimum_supported_wp_version' ) );
+	protected function get_wp_version_from_cl( File $phpcsFile ) {
+		$cl_supported_version = trim( Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' ) );
+
 		if ( ! empty( $cl_supported_version )
 			&& filter_var( $cl_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
 		) {
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 078e02dc94..c5baab2399 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -185,7 +185,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl();
+		$this->get_wp_version_from_cl( $this->phpcsFile );
 
 		/*
 		 * Deal with exceptions.
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index f203c46531..4ec3e9eb84 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -96,7 +96,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl();
+		$this->get_wp_version_from_cl( $this->phpcsFile );
 
 		$class_name = ltrim( strtolower( $matched_content ), '\\' );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 283734ed1d..433b477d61 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1398,7 +1398,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl();
+		$this->get_wp_version_from_cl( $this->phpcsFile );
 
 		$function_name = strtolower( $matched_content );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index a1e1fd432b..ad77143158 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -154,7 +154,7 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$this->get_wp_version_from_cl();
+		$this->get_wp_version_from_cl( $this->phpcsFile );
 		$param_count = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index d38e50ad8b..de8f387bee 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -283,7 +283,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 
-		$this->get_wp_version_from_cl();
+		$this->get_wp_version_from_cl( $this->phpcsFile );
 
 		$paramCount = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {

From 2a6b0049fbae2fc71e95e80e6c55bd1b51231b70 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 22 Jul 2020 00:07:20 +0200
Subject: [PATCH 078/822] MinimumWPVersionTrait: rename the
 `get_wp_version_from_cl()` method

... to `get_wp_version_from_cli()` as per the review suggestion.

Includes adjusting all relevant call to the method.
---
 WordPress/Helpers/MinimumWPVersionTrait.php            | 9 +++++----
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php      | 2 +-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php         | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php       | 2 +-
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php | 2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php      | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index f01a9834f3..b425ea6896 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -18,7 +18,7 @@
  *
  * Usage instructions:
  * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
- * - Call the `MinimumWPVersionTrait::get_wp_version_from_cl()` method in the `process()`/`process_token()`
+ * - Call the `MinimumWPVersionTrait::get_wp_version_from_cli()` method in the `process()`/`process_token()`
  *   method.
  * - After that, the `MinimumWPVersionTrait::$minimum_supported_version` property can be freely used
  *   in the sniff.
@@ -79,12 +79,13 @@ trait MinimumWPVersionTrait {
 	 * `$minimum_supported_version` set for individual sniffs through the ruleset.
 	 *
 	 * @since 0.14.0
-	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
-	 *               Now requires the $phpcsFile object to be passed in.
+	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
+	 *               - Renamed from `get_wp_version_from_cl()` to `get_wp_version_from_cli()`.
+	 *               - Now requires the $phpcsFile object to be passed in.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 */
-	protected function get_wp_version_from_cl( File $phpcsFile ) {
+	protected function get_wp_version_from_cli( File $phpcsFile ) {
 		$cl_supported_version = trim( Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' ) );
 
 		if ( ! empty( $cl_supported_version )
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index c5baab2399..99f66b8cb0 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -185,7 +185,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl( $this->phpcsFile );
+		$this->get_wp_version_from_cli( $this->phpcsFile );
 
 		/*
 		 * Deal with exceptions.
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 4ec3e9eb84..a1b461aba8 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -96,7 +96,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl( $this->phpcsFile );
+		$this->get_wp_version_from_cli( $this->phpcsFile );
 
 		$class_name = ltrim( strtolower( $matched_content ), '\\' );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 433b477d61..c33c512b99 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1398,7 +1398,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cl( $this->phpcsFile );
+		$this->get_wp_version_from_cli( $this->phpcsFile );
 
 		$function_name = strtolower( $matched_content );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index ad77143158..7ad4904fcb 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -154,7 +154,7 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$this->get_wp_version_from_cl( $this->phpcsFile );
+		$this->get_wp_version_from_cli( $this->phpcsFile );
 		$param_count = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index de8f387bee..ca6114526f 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -283,7 +283,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 
-		$this->get_wp_version_from_cl( $this->phpcsFile );
+		$this->get_wp_version_from_cli( $this->phpcsFile );
 
 		$paramCount = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {

From c540836cf42f725d72a18ea7991719b2112573a9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:02:22 +0200
Subject: [PATCH 079/822] MinimumWPVersionTrait: rename the local
 `$cli_supported_version` variable

... for consistency with the new method name.
---
 WordPress/Helpers/MinimumWPVersionTrait.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index b425ea6896..3afcd5208e 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -86,12 +86,12 @@ trait MinimumWPVersionTrait {
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 */
 	protected function get_wp_version_from_cli( File $phpcsFile ) {
-		$cl_supported_version = trim( Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' ) );
+		$cli_supported_version = trim( Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' ) );
 
-		if ( ! empty( $cl_supported_version )
-			&& filter_var( $cl_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
+		if ( ! empty( $cli_supported_version )
+			&& filter_var( $cli_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
 		) {
-			$this->minimum_supported_version = $cl_supported_version;
+			$this->minimum_supported_version = $cli_supported_version;
 		}
 	}
 

From 8169665c432afd53168ddc21ee5c065e3bf743a5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Jul 2020 00:35:07 +0200
Subject: [PATCH 080/822] EscapedNotTranslated: use PHPCSUtils
 `GetTokensAsString`

The PHPCS native `getTokensAsString()` method has two drawbacks:
1. It is fiddly to use as you always need to do some calculation to find the number of tokens you want to method to concatenate.
2. It will concatenate **everything**, i.e. including new lines, comments etc.

The `getTokensAsString()` method is often used to display a "found" string in an error message and the error message would benefit from that "found" string being clean of comments and having whitespace compacted.

In comes PHPCSUtils. PHPCSUtils has dedicated [`GetTokensAsString`](https://phpcsutils.com/phpdoc/classes/PHPCSUtils-Utils-GetTokensAsString.html) class which contains a variety of methods to retrieve a concatenated string of the content of a group of tokens.

So, for the `EscapedNotTranslated` sniff, replacing the function call to the PHPCS native method with one to one of the PHPCSUtils variations, ensures that the "found" string in the error message is clean and easy to read.

Tested by adjusting one of the existing unit tests.

The current unit test setup does not allow for testing the actual error message, but you can see the difference if you just run the sniff (with and without the change) over the adjusted unit test case file.
---
 WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php  | 3 ++-
 .../Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.inc      | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 5a7af8774f..e1ffc20e59 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\GetTokensAsString;
 
 /**
  * Flag calls to escaping functions which look like they may have been intended
@@ -76,7 +77,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$data = array(
 			$matched_content,
 			$this->target_functions[ $matched_content ],
-			$this->phpcsFile->getTokensAsString( $stackPtr, ( $closer - $stackPtr + 1 ) ),
+			GetTokensAsString::compact( $this->phpcsFile, $stackPtr, $closer, true ),
 		);
 
 		$this->phpcsFile->addWarning(
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.inc b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.inc
index b548525086..c451ccc91b 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.inc
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.inc
@@ -5,4 +5,7 @@ esc_html( $var );
 
 esc_html( 'text', 'domain' ); // Warning.
 esc_html( $foo, $bar ); // Warning.
-esc_attr( 'text', MY_DOMAIN ); // Warning.
+esc_attr(
+	'text', // Some comment.
+	MY_DOMAIN // More comment.
+); // Warning.

From 10f6fdcefc69b7439ec49b25f1e5a5f267db02f1 Mon Sep 17 00:00:00 2001
From: Niels de Blaauw <niels@level-level.com>
Date: Thu, 31 Oct 2019 13:00:01 +0100
Subject: [PATCH 081/822] Adds documentation for the
 WordPress.WP.CapitalPDangit sniff.

Note I used 'Discouraged:' in the second standard code example.
This is because it is not necesserily invalid, but I still want
to mention the opposite of the 'correct'/'valid' use.

Opinions on this?
---
 WordPress/Docs/WP/CapitalPDangitStandard.xml | 41 ++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 WordPress/Docs/WP/CapitalPDangitStandard.xml

diff --git a/WordPress/Docs/WP/CapitalPDangitStandard.xml b/WordPress/Docs/WP/CapitalPDangitStandard.xml
new file mode 100644
index 0000000000..53ea547fa5
--- /dev/null
+++ b/WordPress/Docs/WP/CapitalPDangitStandard.xml
@@ -0,0 +1,41 @@
+<documentation title="Capital P Dangit">
+    <standard>
+    <![CDATA[
+The correct spelling of `WordPress` should be used in text strings, comments and object names.
+
+When part of an identifier or a URL, WordPress does not have to be capitalized.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: WordPress is correctly capitalized.">
+        <![CDATA[
+class <em>WordPress</em>Example {
+
+        /**
+         * This function is about <em>WordPress</em>.
+         */
+        public function explain() {
+                $is_wordpress_awesome = true;
+                echo 'This is an explanation 
+                      about <em>WordPress</em>.';
+        }
+}
+        ]]>
+        </code>
+        <code title="Invalid: WordPress is not correctly capitalized.">
+        <![CDATA[
+class <em>WordpressExample</em> {
+
+        /**
+         * This function is about <em>Wordpress</em>.
+         */
+        public function explain() {
+                $is_wordpress_awesome = true;
+                echo 'This is an explanation 
+                      about <em>wordpress</em>.';
+        }
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 45f673db9483a603e9a3a0988ed36d23ba249320 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 8 Sep 2020 16:32:17 +0200
Subject: [PATCH 082/822] WordPress.WP.CapitalPDangit: next iteration of the
 documentation

---
 WordPress/Docs/WP/CapitalPDangitStandard.xml | 38 ++++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/WordPress/Docs/WP/CapitalPDangitStandard.xml b/WordPress/Docs/WP/CapitalPDangitStandard.xml
index 53ea547fa5..245eb19618 100644
--- a/WordPress/Docs/WP/CapitalPDangitStandard.xml
+++ b/WordPress/Docs/WP/CapitalPDangitStandard.xml
@@ -1,39 +1,37 @@
 <documentation title="Capital P Dangit">
     <standard>
     <![CDATA[
-The correct spelling of `WordPress` should be used in text strings, comments and object names.
+The correct spelling of "WordPress" should be used in text strings, comments and object names.
 
-When part of an identifier or a URL, WordPress does not have to be capitalized.
+In select cases, when part of an identifier or a URL, WordPress does not have to be capitalized.
     ]]>
     </standard>
     <code_comparison>
         <code title="Valid: WordPress is correctly capitalized.">
         <![CDATA[
-class <em>WordPress</em>Example {
+class <em>WordPress</em>_Example {
 
-        /**
-         * This function is about <em>WordPress</em>.
-         */
-        public function explain() {
-                $is_wordpress_awesome = true;
-                echo 'This is an explanation 
-                      about <em>WordPress</em>.';
-        }
+    /**
+     * This function is about <em>WordPress</em>.
+     */
+    public function explain() {
+        echo 'This is an explanation
+            about <em>WordPress</em>.';
+    }
 }
         ]]>
         </code>
         <code title="Invalid: WordPress is not correctly capitalized.">
         <![CDATA[
-class <em>WordpressExample</em> {
+class <em>Wordpress_Example</em> {
 
-        /**
-         * This function is about <em>Wordpress</em>.
-         */
-        public function explain() {
-                $is_wordpress_awesome = true;
-                echo 'This is an explanation 
-                      about <em>wordpress</em>.';
-        }
+    /**
+     * This function is about <em>Wordpress</em>.
+     */
+    public function explain() {
+        echo 'This is an explanation
+            about <em>wordpress</em>.';
+    }
 }
         ]]>
         </code>

From dcd352582f3dc2b0e94d362acb24d1ab5623226c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 8 Sep 2020 18:55:42 +0200
Subject: [PATCH 083/822] Travis: retry composer install on failure

The builds are failing a little too often for my taste on the below error.
```
[Composer\Downloader\TransportException]
Peer fingerprint did not match
```

I'm prefixing the `composer install` commands now with `travis_retry` in an attempt to get round this problem.

Ref:
* https://docs.travis-ci.com/user/common-build-problems/#timeouts-installing-dependencies
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 997e804e62..7973cdaf09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -171,15 +171,15 @@ install:
       else
         composer config preferred-install.squizlabs/php_codesniffer auto
       fi
-    - composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --no-update --no-suggest --no-scripts
+    - travis_retry composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --no-update --no-suggest --no-scripts
     - |
       if [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
         # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
         # requirements to get PHPUnit 7.x to install on nightly.
-        composer install --ignore-platform-reqs --no-suggest
+        travis_retry composer install --ignore-platform-reqs --no-suggest
       else
         # Do a normal dev install in all other cases.
-        composer install --no-suggest
+        travis_retry composer install --no-suggest
       fi
 
 script:

From 600befa57a5d72c78a31cd79f682c213d80560ea Mon Sep 17 00:00:00 2001
From: Niels de Blaauw <niels@level-level.com>
Date: Thu, 10 Sep 2020 15:02:10 +0200
Subject: [PATCH 084/822] Adds documentation for
 WordPress.WP.EnqueueResourceParameters. (#1825)

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
Co-authored-by: Gary Jones <github@garyjones.io>
Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 .../WP/EnqueuedResourceParametersStandard.xml | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml

diff --git a/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml b/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml
new file mode 100644
index 0000000000..ab81c567a7
--- /dev/null
+++ b/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml
@@ -0,0 +1,88 @@
+<documentation title="Enqueued Resource Parameters">
+    <standard>
+    <![CDATA[
+    The resource version must be set, to prevent the browser from using an outdated, cached version after the resource has been updated.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Resource has a version number.">
+        <![CDATA[
+wp_register_style(
+    'someStyle-css',
+    $path_to_local_file,
+    array(),
+    <em>'1.0.0'</em>
+);
+        ]]>
+        </code>
+        <code title="Invalid: Resource has no version number set.">
+        <![CDATA[
+wp_register_style(
+    'someStyle-css',
+    $path_to_local_file,
+    array()
+);
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    The resource version must not be `false`. When this value is set to `false`, the WordPress Core version number will be used, which is incorrect for themes and plugins.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Resource has a version number.">
+        <![CDATA[
+wp_enqueue_script(
+    'someScript-js',
+    $path_to_local_file,
+    array( 'jquery' ),
+    <em>'1.0.0'</em>,
+    true
+);
+        ]]>
+        </code>
+        <code title="Invalid: Resource has version set to false.">
+        <![CDATA[
+wp_enqueue_script(
+    'someScript-js',
+    $path_to_local_file,
+    array( 'jquery' ),
+    <em>false</em>,
+    true
+);
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    You must explicitly set a JavaScript resource to load in either the header or the footer of your page. It is recommended to load these resources in the footer by setting the `$in_footer` parameter to `true`.
+
+    Loading scripts in the header blocks parsing of the page and has a negative impact on load times. However, loading in the footer may break compatibility when other scripts rely on the resource to be available at any time.
+    In that case, you can pass `false` to make it explicit that the script should be loaded in the header of the page.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: The resource is specified to load in the footer.">
+        <![CDATA[
+wp_register_script(
+    'someScript-js',
+    $path_to_local_file,
+    array( 'jquery' ),
+    '1.0.0',
+    <em>true</em>
+);
+        ]]>
+        </code>
+        <code title="Invalid: The location to load this resource is not explicitly set.">
+        <![CDATA[
+wp_register_script(
+    'someScript-js',
+    $path_to_local_file,
+    array( 'jquery' ),
+    '1.0.0'
+);
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 1336d419dbcaa1dcedc1c225d09fa2809ee0c6b3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 20 Nov 2020 02:43:44 +0100
Subject: [PATCH 085/822] TypeCasts: change `(unset)` cast from warning to
 error

The `(unset)` cast has been removed in PHP 8 and should never be used.

Includes updated unit tests.
---
 WordPress/Sniffs/PHP/TypeCastsSniff.php         | 4 ++--
 WordPress/Tests/PHP/TypeCastsUnitTest.inc       | 4 ++--
 WordPress/Tests/PHP/TypeCastsUnitTest.inc.fixed | 4 ++--
 WordPress/Tests/PHP/TypeCastsUnitTest.php       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index f41cce5f5d..9b69b51cb0 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -72,8 +72,8 @@ public function process_token( $stackPtr ) {
 				break;
 
 			case \T_UNSET_CAST:
-				$this->phpcsFile->addWarning(
-					'Using the "(unset)" cast is strongly discouraged. Use the "unset()" language construct or assign "null" as the value to the variable instead.',
+				$this->phpcsFile->addError(
+					'Using the "(unset)" cast is forbidden as the type cast is removed in PHP 8. Use the "unset()" language construct or assign "null" as the value to the variable instead.',
 					$stackPtr,
 					'UnsetFound'
 				);
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.inc b/WordPress/Tests/PHP/TypeCastsUnitTest.inc
index e5b6f78b92..730912fc4b 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.inc
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.inc
@@ -10,8 +10,8 @@ $a = (object) $b;
 $a = (double) $b;
 $a = (real) $b;
 
+$a = (unset) $b; // Error.
 // Warning: Discouraged casts.
-$a = (unset) $b; // Warning.
 $a = (binary) $b; // Warning.
 $a = b"binary string"; // Warning.
 $a = b"binary $string"; // Warning.
@@ -25,5 +25,5 @@ $a = (object      ) $b;
 
 $a = (double ) $b; // Error.
 $a = ( real ) $b; // Error.
-$a = (  unset ) $b; // Warning.
+$a = (  unset ) $b; // Error.
 $a = ( binary ) $b; // Warning.
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.inc.fixed b/WordPress/Tests/PHP/TypeCastsUnitTest.inc.fixed
index 051cb4a459..a45b98de20 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.inc.fixed
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.inc.fixed
@@ -10,8 +10,8 @@ $a = (object) $b;
 $a = (float) $b;
 $a = (float) $b;
 
+$a = (unset) $b; // Error.
 // Warning: Discouraged casts.
-$a = (unset) $b; // Warning.
 $a = (binary) $b; // Warning.
 $a = b"binary string"; // Warning.
 $a = b"binary $string"; // Warning.
@@ -25,5 +25,5 @@ $a = (object      ) $b;
 
 $a = (float) $b; // Error.
 $a = (float) $b; // Error.
-$a = (  unset ) $b; // Warning.
+$a = (  unset ) $b; // Error.
 $a = ( binary ) $b; // Warning.
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index 72f581446c..8644cc8dd3 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -29,8 +29,10 @@ public function getErrorList() {
 		return array(
 			10 => 1,
 			11 => 1,
+			13 => 1,
 			26 => 1,
 			27 => 1,
+			28 => 1,
 		);
 	}
 
@@ -41,11 +43,9 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			14 => 1,
 			15 => 1,
 			16 => 1,
 			17 => 1,
-			28 => 1,
 			29 => 1,
 		);
 	}

From 80f5a2da0b9b34ae0f4bd2d67959234ceabbb9d0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 20 Nov 2020 04:17:13 +0100
Subject: [PATCH 086/822] PHP/RestrictedPHPFunctions: update error message

---
 WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
index 280c94d919..1bb192d8ce 100644
--- a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
@@ -37,7 +37,7 @@ public function getGroups() {
 		return array(
 			'create_function' => array(
 				'type'      => 'error',
-				'message'   => '%s() is deprecated as of PHP 7.2, please use full fledged functions or anonymous functions instead.',
+				'message'   => '%s() is deprecated as of PHP 7.2 and removed in PHP 8.0, please use full fledged functions or anonymous functions instead.',
 				'functions' => array(
 					'create_function',
 				),

From 62866d6fac90f9d48e108035b471e7081bb46d7c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 4 Dec 2020 08:54:41 +0100
Subject: [PATCH 087/822] Travis: add build against PHP 8.0

PHP 8.0 has been branched off two months ago, so `nightly` is now PHP 8.1 and in the mean time PHP 8.0 was released last week.

As of today, there is a PHP 8.0 image available on Travis.

This PR adds two new builds against PHP 8.0 to the matrix and, as PHP 8.0 has been released, these builds are not allowed to fail.
---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7973cdaf09..017f9fdf07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,6 +128,13 @@ jobs:
       php: 7.4
       env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
 
+    # Builds which need a different distro.
+    - php: 8.0
+      env: PHPCS_BRANCH="dev-master" LINT=1
+    - php: 8.0
+      # PHPCS is only compatible with PHP 8.0 as of version 3.5.7.
+      env: PHPCS_BRANCH="3.5.7"
+
     # Builds which need a different distro.
     - php: 5.5
       dist: trusty
@@ -173,7 +180,7 @@ install:
       fi
     - travis_retry composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --no-update --no-suggest --no-scripts
     - |
-      if [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
+      if [[ $TRAVIS_PHP_VERSION == "nightly" || $TRAVIS_PHP_VERSION == "8.0" ]]; then
         # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
         # requirements to get PHPUnit 7.x to install on nightly.
         travis_retry composer install --ignore-platform-reqs --no-suggest

From 862d97036bca392e63813dc602690146cebd941e Mon Sep 17 00:00:00 2001
From: Jon Desrosiers <desrosj@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:32:56 -0500
Subject: [PATCH 088/822] Move from TravisCI to GitHub Actions (#1965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move the "sniffs" stage over to a GitHub Action workflow.

* Update Sniff workflow.

* Load `libxml2-utils`.

* Correct extension syntax.

* Fix typo.

* Manually install xmllint.

* First pass at a Ruleset stage workflow.

* Pass the matrix defined PHP version.

* Correct the ruleset name.

* Set error reporting through the `setup-php` action.

* Correct typo.

* First pass at quick tests.

* Correct casing of environment variable.

* Update the inline documentation for the sniff workflow.

* Cleanup the ruleset workflow.

* Add full test suite file and other changes.

- Update each file with full inline documentation.
- Update each file to use consistent naming and approaches across workflow files.
- Remove travis.yml file.

* Remove TravisCI configuration file from the `.gitattributes` file.

* Update .github/workflows/unit-tests.yml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Update .github/workflows/unit-tests.yml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* `--no-suggest` is now the default behavior.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Clarify the step name for setting the PHPCS version.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* `--no-suggest` is now the default behavior.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Prefix each job name and remove the check for `lint`.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Remove the check for the `lint` key in the matrix.

* Use the `latest` alias to test on PHP 8.0 instead of 7.4.

* Explicitly specify `coverage` as `none` for the `setup-php` action.

* Ignore documentation changes for the quick test workflow.

* Fix syntax error in job name.

* Prefix each ruleset job name.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Don't run the quick tests on `master`, and skip documentation only fixes.

* Use `error_reporting = E_ALL & ~E_DEPRECATED` for both runs in the ruleset workflow.

* Revert to using 7.4 to avoid failures.

* Released versions of PHPCS should not be expected to pass on PHP nightly.

* Don't run the full test suite on `develop`.

The full suite will have just run in the PR context before being merged.

* `$(pwd)` is not necessary here.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>

* Ignore markdown files for the sniff workflow.

* Consolidate PHP installation steps.

* Combine the sniffs and ruleset checks into one workflow.

* Remove `--no-suggest`, which was deprecated in Composer 2.

* List Composer install steps in a more logical order.

* Only run `phpcbf` once.

This updates the `phpcbf` command to interpret a `1` exit code as success, as only fixable errors were discovered. This prevents having to run the command twice.

* Remove duplicate PHP install step.

* Simplify managing Composer dependencies and caches.

* Cleanup some inline docs.

* GH Actions: move `ruleset check` job down

* GH Actions: allow for manually triggering a workflow

Triggering a workflow for a branch manually is not supported by default in GH Actions, but has to be explicitly allowed.

Ref: https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/

* GH Actions: remove the ignores for markdown files

... as it would prevent PRs with only markdown changes from being merged due to required statuses.

* GH actions: move environment variable to job

The environment variable is only used in one job, so make it only available to *that* job.

* GH actions: add "setup ini config" step to Unit Test job

This was already implemented based on feedback for the QuickTest workflow, but not for the UnitTest workflow.

* GH Actions: report PHP lint violations in the PR

The cs2pr tool will allow to display the results from an action run in checkstyle format in-line in the PR code view, which should improve usability of the workflow results.

This means that for the `lint` action an additional parameter `--checkstyle` is needed, which does not give suitable output for when the Composer script is run locally.
The command with the extra parameter could be placed directly in the CI workflow, but this runs the risk of changes made to the local command not being made to the CI version and visa versa.

For that reason, an additional script has been added to the Composer `scripts` section.

Ref: https://github.com/staabm/annotate-pull-request-from-checkstyle

* GH Actions: report PHP code style violations in the PR

The cs2pr tool will allow to display the results from an action run in checkstyle format in-line in the PR code view, which should improve usability of the workflow results.

Ref: https://github.com/staabm/annotate-pull-request-from-checkstyle

* GH Actions: report XML lint violations in the PR

The `korelstar/xmllint-problem-matcher` tool will allow to display the results from an xmllint action directly in the PR.

Ref: https://github.com/staabm/annotate-pull-request-from-checkstyle

* GH Actions: use an action to handle the caching for Composer

This was already implemented based on feedback for the QuickTest workflow, but not for the other workflows/jobs.

* GH Actions: split long line with multiple commands

* GH Actions: fix up various step names

* `Install PHPCS` -> `Set PHPCS version`
    In that particular step, we're not actually _installing_ PHPCS (`--no-update`), just updating the version being required.
* `Check that all sniffs have unit tests` => `Check sniff feature completeness`
    The script run in this step checks feature completeness for PHPCS sniffs. The fact that the documentation check is currently disabled is irrelevant (and runs the risk of when it _does_ get enabled for the step name to become incorrect).
* `Check the ... ruleset` => `Test the ... ruleset`
    This is a _test_ where we are testing that no unexpected errors/warnings are being thrown.
    Also fixes a typo.

* GH Actions: minor inline documentation tweaks

Remove some documentation which isn't relevant (anymore) or which was in the wrong place.
Add some documentation where necessary.

* GH Actions: shorter name for the basic QA workflow

The name of the workflow is used in the badges displayed in the Readme. The name as was would make for an awkwardly long badge name.

* GH Actions: rename `phpcs_branch` to `phpcs_version`

PHPCS doesn't have named branches for the various releases. It has tags and the `master` branch, so `phpcs_version` is more descriptive.

* GH action: miscellaneous tweaks

* Readme: replace the CI status badges

* GH Actions: try slightly different command syntax for  CS check

... as the `ignore_warnings_on_exit` does not seem to get respected when this is split into two commands.

* GH Actions: undo "show CS violations in PR"

... as the cs2pr combined with the `--runtime-set ignore_warnings_on_exit 1` appears to be buggy.

To be revisited later.

* Remove quotes around action name.

Co-authored-by: Denis Žoljom <dingo-d@users.noreply.github.com>

* Remove extra space.

Co-authored-by: Denis Žoljom <dingo-d@users.noreply.github.com>

* Remove quotes around action name.

Co-authored-by: Denis Žoljom <dingo-d@users.noreply.github.com>

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
Co-authored-by: Denis Žoljom <dingo-d@users.noreply.github.com>
---
 .gitattributes                              |   1 -
 .github/workflows/quicktest.yml             |  71 +++++++
 .github/workflows/ruleset-checks-sniffs.yml | 145 ++++++++++++++
 .github/workflows/unit-tests.yml            |  98 ++++++++++
 .travis.yml                                 | 197 --------------------
 README.md                                   |   6 +-
 composer.json                               |   3 +
 7 files changed, 320 insertions(+), 201 deletions(-)
 create mode 100644 .github/workflows/quicktest.yml
 create mode 100644 .github/workflows/ruleset-checks-sniffs.yml
 create mode 100644 .github/workflows/unit-tests.yml
 delete mode 100644 .travis.yml

diff --git a/.gitattributes b/.gitattributes
index e1e9f213ba..e5aefdd938 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,7 +6,6 @@
 #
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
 /.phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore
 /.github export-ignore
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
new file mode 100644
index 0000000000..7085ec8d31
--- /dev/null
+++ b/.github/workflows/quicktest.yml
@@ -0,0 +1,71 @@
+name: Quick Tests
+
+on:
+  push:
+    branches-ignore:
+      - master
+    paths-ignore:
+      - '**.md'
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  # Performs some quick tests.
+  # This is a much quicker test suite which only runs the unit tests and linting
+  # against the low/high supported PHP/PHPCS combinations.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Sets up PHP.
+  # - Installs PHPCS.
+  # - Install Composer dependencies (from cache if available).
+  # - Runs the Composer linting script (if desired).
+  # - Runs Composer run-tests script.
+  quick-tests:
+    name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ '7.4', '5.4' ]
+        phpcs_version: [ 'dev-master' ]
+        include:
+          - php: '7.3'
+            phpcs_version: '3.5.0'
+          - php: '5.4'
+            phpcs_version: '3.5.0'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # On stable PHPCS versions, 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.
+      - name: Setup ini config
+        id: set_ini
+        run: |
+          if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED'
+          else
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL'
+          fi
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
+          coverage: none
+          tools: cs2pr
+
+      - name: Set PHPCS version
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: Lint PHP files against parse errors
+        if: ${{ matrix.phpcs_version == 'dev-master' }}
+        run: composer lint-ci | cs2pr
+
+      - name: Run unit tests
+        run: composer run-tests
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
new file mode 100644
index 0000000000..5462db8384
--- /dev/null
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -0,0 +1,145 @@
+name: Basic QA checks
+
+on:
+  push:
+  pull_request:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  # Performs some code-style related checks.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Configures caching for Composer.
+  # - Sets up PHP.
+  # - Installs libxml2-utils.
+  # - Installs PHPCS.
+  # - Install Composer dependencies.
+  # - Runs PHPCS ignoring warnings.
+  # - Validates the WordPress rulesets.
+  # - Validates the sample ruleset.
+  # - Checks for code-style consistency.
+  # - Validates the composer.json file.
+  # - Checks that sniffs have unit tests.
+  sniffs:
+    name: Run code sniffs
+    runs-on: ubuntu-latest
+
+    env:
+      XMLLINT_INDENT: '	'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+
+      # Using PHPCS `master` as an early detection system for bugs upstream.
+      - name: Set PHPCS version
+        run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: Install xmllint
+        run: sudo apt-get install libxml2-utils
+
+      # Show XML violations inline in the file diff.
+      # @link https://github.com/marketplace/actions/xmllint-problem-matcher
+      - uses: korelstar/xmllint-problem-matcher@v1
+
+      # WordPress Coding Standards.
+      # @link https://github.com/WordPress/WordPress-Coding-Standards
+      # @link http://pear.php.net/package/PHP_CodeSniffer/
+      - name: Run PHPCS ignoring warnings
+        run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
+
+      # Validate the XML files.
+      # @link http://xmlsoft.org/xmllint.html
+      - name: Validate the WordPress rulesets
+        run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./*/ruleset.xml
+
+      - name: Validate the sample ruleset
+        run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample
+
+      - name: Check the code-style consistency of the xml files
+        run: |
+          diff -B --tabsize=4 ./WordPress/ruleset.xml <(xmllint --format "./WordPress/ruleset.xml")
+          diff -B --tabsize=4 ./WordPress-Core/ruleset.xml <(xmllint --format "./WordPress-Core/ruleset.xml")
+          diff -B --tabsize=4 ./WordPress-Docs/ruleset.xml <(xmllint --format "./WordPress-Docs/ruleset.xml")
+          diff -B --tabsize=4 ./WordPress-Extra/ruleset.xml <(xmllint --format "./WordPress-Extra/ruleset.xml")
+          diff -B --tabsize=4 ./phpcs.xml.dist.sample <(xmllint --format "./phpcs.xml.dist.sample")
+
+      # @link https://getcomposer.org/doc/03-cli.md#validate
+      - name: Validate the composer.json file
+        run: composer validate --no-check-all --strict
+
+      # Check that the sniffs available are feature complete.
+      # For now, just check that all sniffs have unit tests.
+      # At a later stage the documentation check can be activated.
+      - name: Check sniff feature completeness
+        run: composer check-complete
+
+  # Makes sure the rulesets don't throw unexpected errors or warnings.
+  # This workflow needs to be run against a high PHP version to prevent triggering the syntax error check.
+  # It also needs to be run against all PHPCS versions WPCS is tested against.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Configures caching for Composer.
+  # - Sets up PHP.
+  # - Installs PHPCS.
+  # - Installs Composer dependencies.
+  # - Checks the WordPress rulesets.
+  ruleset-tests:
+    name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ '7.4' ]
+        phpcs_version: [ 'dev-master', '3.5.0' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          # Allow for PHP deprecation notices.
+          ini-values: error_reporting = E_ALL & ~E_DEPRECATED
+          coverage: none
+
+      - name: Set PHPCS version
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: Test the WordPress-Core ruleset
+        run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
+
+      - name: Test the WordPress-Docs ruleset
+        run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Docs
+
+      - name: Test the WordPress-Extra ruleset
+        run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Extra
+
+      - name: Test the WordPress ruleset
+        run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
+
+      # Test for fixer conflicts by running the auto-fixers of the complete WPCS over the test case files.
+      # This is not an exhaustive test, but should give an early indication for typical fixer conflicts.
+      # If only fixable errors are found, the exit code will be 1, which can be interpreted as success.
+      - name: Test for fixer conflicts (fixes expected)
+        if: ${{ matrix.phpcs_version == 'dev-master' }}
+        continue-on-error: true
+        run: |
+          $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary
+          if [ $? -eq 1 ]; then exit 0; fi
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
new file mode 100644
index 0000000000..d147612118
--- /dev/null
+++ b/.github/workflows/unit-tests.yml
@@ -0,0 +1,98 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  # Runs the test suite against all supported branches and combinations.
+  #
+  # Linting is performed on all jobs run against PHPCS `dev-master`.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Configures caching for Composer.
+  # - Sets up PHP.
+  # - Configures PHPCS to install from source (only when running with 4.0.x-dev).
+  # - Installs PHPCS.
+  # - Install Composer dependencies.
+  # - Runs the Composer linting script.
+  # - Runs Composer run-tests script.
+  test:
+    name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.allowed_failure }}
+    strategy:
+      matrix:
+        php: [ '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
+        phpcs_version: [ 'dev-master', '3.5.0' ]
+        allowed_failure: [ false ]
+        include:
+          - php: '8.0'
+            phpcs_version: 'dev-master'
+            allowed_failure: false
+          # PHPCS is only compatible with PHP 8.0 as of version 3.5.7.
+          - php: '8.0'
+            phpcs_version: '3.5.7'
+            allowed_failure: false
+          # Add extra build to test against PHPCS 4.
+          - php: '7.4'
+            phpcs_version: '4.0.x-dev as 3.9.99'
+            allowed_failure: true
+          - php: '8.1'
+            phpcs_version: 'dev-master'
+            allowed_failure: true
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # On stable PHPCS versions, 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.
+      - name: Setup ini config
+        id: set_ini
+        run: |
+          if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED'
+          else
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL'
+          fi
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
+          coverage: none
+          tools: cs2pr
+
+      # Set Composer up to download only PHPCS from source for PHPCS 4.x.
+      # The source is needed to get the base testcase from PHPCS.
+      # All other jobs can use `auto`, which is Composer's default value.
+      - name: Configure PHPCS
+        if: ${{ startsWith( matrix.phpcs_version, '4' ) }}
+        run: composer config preferred-install.squizlabs/php_codesniffer source
+
+      - name: Set PHPCS version
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+
+      - name: Install Composer dependencies (PHP < 8.0 )
+        if: ${{ matrix.php < 8.0 }}
+        uses: ramsey/composer-install@v1
+
+      - name: Install Composer dependencies (PHP >= 8.0)
+        if: ${{ matrix.php >= 8.0 }}
+        uses: ramsey/composer-install@v1
+        with:
+          composer-options: --ignore-platform-reqs
+
+      - name: Lint PHP files against parse errors
+        if: ${{ matrix.phpcs_version == 'dev-master' }}
+        run: composer lint-ci | cs2pr
+
+      - name: Run unit tests
+        run: composer run-tests
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 017f9fdf07..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,197 +0,0 @@
-os: linux
-dist: xenial
-
-cache:
-  apt: true
-  directories:
-    # Cache directory for older Composer versions.
-    - $HOME/.composer/cache/files
-    # Cache directory for more recent Composer versions.
-    - $HOME/.cache/composer/files
-
-language: php
-
-php:
-    - 5.6
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - "nightly"
-
-env:
-  # PHPCS `master`.
-  - PHPCS_BRANCH="dev-master" LINT=1
-  # Lowest supported release in the 3.x series with which WPCS is compatible.
-  - PHPCS_BRANCH="3.5.0"
-
-# Define the stages used.
-# For non-PRs, only the sniff, ruleset and quicktest stages are run.
-# For pull requests and merges, the full script is run (skipping quicktest).
-# Note: for pull requests, "develop" should be the base branch name.
-# See: https://docs.travis-ci.com/user/conditions-v1
-stages:
-  - name: sniff
-  - name: rulesets
-  - name: quicktest
-    if: type = push AND branch NOT IN (master, develop)
-  - name: test
-    if: branch IN (master, develop)
-
-jobs:
-  fast_finish: true
-  include:
-    #### SNIFF STAGE ####
-    - stage: sniff
-      php: 7.4
-      env: PHPCS_BRANCH="dev-master"
-      addons:
-        apt:
-          packages:
-            - libxml2-utils
-      script:
-        # WordPress Coding Standards.
-        # @link https://github.com/WordPress/WordPress-Coding-Standards
-        # @link http://pear.php.net/package/PHP_CodeSniffer/
-        - $(pwd)/vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
-
-        # Validate the xml files.
-        # @link http://xmlsoft.org/xmllint.html
-        # For the build to properly error when validating against a scheme, these each have to be in their own condition.
-        - xmllint --noout --schema ./vendor/squizlabs/php_codesniffer/phpcs.xsd ./*/ruleset.xml
-        - xmllint --noout --schema ./vendor/squizlabs/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample
-
-        # Check the code-style consistency of the xml files.
-        - diff -B --tabsize=4 ./WordPress/ruleset.xml <(xmllint --format "./WordPress/ruleset.xml")
-        - diff -B --tabsize=4 ./WordPress-Core/ruleset.xml <(xmllint --format "./WordPress-Core/ruleset.xml")
-        - diff -B --tabsize=4 ./WordPress-Docs/ruleset.xml <(xmllint --format "./WordPress-Docs/ruleset.xml")
-        - diff -B --tabsize=4 ./WordPress-Extra/ruleset.xml <(xmllint --format "./WordPress-Extra/ruleset.xml")
-        - diff -B --tabsize=4 ./phpcs.xml.dist.sample <(xmllint --format "./phpcs.xml.dist.sample")
-
-        # Validate the composer.json file.
-        # @link https://getcomposer.org/doc/03-cli.md#validate
-        - composer validate --no-check-all --strict
-
-        # Check that the sniffs available are feature complete.
-        # For now, just check that all sniffs have unit tests.
-        # At a later stage the documentation check can be activated.
-        - composer check-complete
-
-    #### RULESET STAGE ####
-    # Make sure the rulesets don't throw unexpected errors or warnings.
-    # This check needs to be run against a high PHP version to prevent triggering the syntax error check.
-    # It also needs to be run against all PHPCS versions WPCS is tested against.
-    - stage: rulesets
-      php: 7.4
-      env: PHPCS_BRANCH="dev-master"
-      script:
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Docs
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Extra
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
-
-        # Test for fixer conflicts by running the auto-fixers of the complete WPCS over the test case files.
-        # This is not an exhaustive test, but should give an early indication for typical fixer conflicts.
-        # For the first run, the exit code will be 1 (= all fixable errors fixed).
-        # `travis_retry` should then kick in to run the fixer again which should now return 0 (= no fixable errors found).
-        # All error codes for the PHPCBF: https://github.com/squizlabs/PHP_CodeSniffer/issues/1270#issuecomment-272768413
-        - travis_retry $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary
-
-    - stage: rulesets
-      php: 7.4
-      env: PHPCS_BRANCH="3.5.0"
-      script:
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Docs
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Extra
-        - $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
-
-    #### QUICK TEST STAGE ####
-    # This is a much quicker test which only runs the unit tests and linting against the low/high
-    # supported PHP/PHPCS combinations.
-    - stage: quicktest
-      php: 7.4
-      env: PHPCS_BRANCH="dev-master" LINT=1
-    - php: 7.3
-      env: PHPCS_BRANCH="3.5.0"
-    - php: 5.4
-      dist: trusty
-      env: PHPCS_BRANCH="dev-master" LINT=1
-    - php: 5.4
-      dist: trusty
-      env: PHPCS_BRANCH="3.5.0"
-
-    #### TEST STAGE ####
-    # Add extra build to test against PHPCS 4.
-    - stage: test
-      php: 7.4
-      env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
-
-    # Builds which need a different distro.
-    - php: 8.0
-      env: PHPCS_BRANCH="dev-master" LINT=1
-    - php: 8.0
-      # PHPCS is only compatible with PHP 8.0 as of version 3.5.7.
-      env: PHPCS_BRANCH="3.5.7"
-
-    # Builds which need a different distro.
-    - php: 5.5
-      dist: trusty
-      env: PHPCS_BRANCH="dev-master" LINT=1
-    - php: 5.5
-      dist: trusty
-      env: PHPCS_BRANCH="3.5.0"
-    - php: 5.4
-      dist: trusty
-      env: PHPCS_BRANCH="dev-master" LINT=1
-    - php: 5.4
-      dist: trusty
-      env: PHPCS_BRANCH="3.5.0"
-
-  allow_failures:
-    # Allow failures for unstable builds.
-    - php: "nightly"
-    - env: PHPCS_BRANCH="4.0.x-dev as 3.9.99"
-
-before_install:
-    # Speed up build time by disabling Xdebug.
-    # https://johnblackbourn.com/reducing-travis-ci-build-times-for-wordpress-projects/
-    # https://twitter.com/kelunik/status/954242454676475904
-    - phpenv config-rm xdebug.ini || echo 'No xdebug config.'
-
-    # On stable PHPCS versions, 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.
-    - |
-      if [[ "${TRAVIS_BUILD_STAGE_NAME^}" != "Sniff" && $PHPCS_BRANCH != "dev-master" ]]; then
-        echo 'error_reporting = E_ALL & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-      fi
-
-    - export XMLLINT_INDENT="	"
-
-install:
-    - |
-      if [[ ${PHPCS_BRANCH:0:2} == "4." ]]; then
-        # Set Composer up to download only PHPCS from source for PHPCS 4.x.
-        # The source is needed to get the base testcase from PHPCS.
-        composer config preferred-install.squizlabs/php_codesniffer source
-      else
-        composer config preferred-install.squizlabs/php_codesniffer auto
-      fi
-    - travis_retry composer require squizlabs/php_codesniffer:"${PHPCS_BRANCH}" --no-update --no-suggest --no-scripts
-    - |
-      if [[ $TRAVIS_PHP_VERSION == "nightly" || $TRAVIS_PHP_VERSION == "8.0" ]]; then
-        # PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
-        # requirements to get PHPUnit 7.x to install on nightly.
-        travis_retry composer install --ignore-platform-reqs --no-suggest
-      else
-        # Do a normal dev install in all other cases.
-        travis_retry composer install --no-suggest
-      fi
-
-script:
-  # Lint the PHP files against parse errors.
-  - if [[ "$LINT" == "1" ]]; then composer lint; fi
-
-  # Run the unit tests.
-  - composer run-tests
diff --git a/README.md b/README.md
index 908d032f2c..bcacabee25 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 <div aria-hidden="true">
 
 [![Latest Stable Version](https://poser.pugx.org/wp-coding-standards/wpcs/v/stable)](https://packagist.org/packages/wp-coding-standards/wpcs)
-[![Travis Build Status](https://travis-ci.com/WordPress/WordPress-Coding-Standards.svg?branch=master)](https://travis-ci.com/WordPress/WordPress-Coding-Standards)
 [![Release Date of the Latest Version](https://img.shields.io/github/release-date/WordPress/WordPress-Coding-Standards.svg?maxAge=1800)](https://github.com/WordPress/WordPress-Coding-Standards/releases)
 :construction:
 [![Latest Unstable Version](https://img.shields.io/badge/unstable-dev--develop-e68718.svg?maxAge=2419200)](https://packagist.org/packages/wp-coding-standards/wpcs#dev-develop)
-[![Travis Build Status](https://travis-ci.com/WordPress/WordPress-Coding-Standards.svg?branch=develop)](https://travis-ci.com/WordPress/WordPress-Coding-Standards)
 [![Last Commit to Unstable](https://img.shields.io/github/last-commit/WordPress/WordPress-Coding-Standards/develop.svg)](https://github.com/WordPress/WordPress-Coding-Standards/commits/develop)
 
 [![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
-[![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://travis-ci.com/WordPress/WordPress-Coding-Standards)
+[![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
+[![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/ruleset-checks-sniffs.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/ruleset-checks-sniffs.yml)
+[![Unit Tests](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 
 [![License: MIT](https://poser.pugx.org/wp-coding-standards/wpcs/license)](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/LICENSE)
 [![Total Downloads](https://poser.pugx.org/wp-coding-standards/wpcs/downloads)](https://packagist.org/packages/wp-coding-standards/wpcs/stats)
diff --git a/composer.json b/composer.json
index 676b3bc203..addfdf45e6 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,9 @@
 		"lint": [
 			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git"
 		],
+		"lint-ci": [
+			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git --checkstyle"
+		],
 		"check-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
 		],

From 8f39d40d0fa3adeb5bb84eb6b443594f48589d91 Mon Sep 17 00:00:00 2001
From: Juliette <663378+jrfnl@users.noreply.github.com>
Date: Sat, 20 Feb 2021 11:31:34 +0100
Subject: [PATCH 089/822] 3.0: Move "is unit test" utility functions to
 dedicated trait (#1960)

* Sniff: remove the `is_token_in_test_method()` method

This method is currently unused in WPCS and it is not 100% clear what the method _should_ do, so removing the method for now.

If needs be it can be brought back later if/when there is more clarity on what the method is supposed to solve.

* Move "is this test code" related utilities to dedicated `IsUnitTestTrait`

The "is this test code" related utilities are only used by a small set of sniffs, so are better placed in a dedicated trait.

This moves the (`public`) `$custom_test_class_whitelist` and the `$custom_test_class_whitelist` properties as well as the `is_test_class` method to a new `WordPressCS\WordPress\Helpers\IsUnitTestTrait` and starts using that trait in the relevant sniffs.

The trait has been made stand-alone, i.e. it does not presume that a sniff implementing it extends the `WordPressCS\WordPress\Sniff` class.
This makes it easier to (re-)use the traits, even when a sniff extends an abstract sniff class from PHPCS itself or from PHPCSUtils.

Related to 1465

* IsUnitTestTrait::is_test_class(): use PHPCSUtils

This implements PHPCSUtils alternatives for PHPCS native methods and other PHPCSUtils utilities in the `IsUnitTestTrait::is_test_class()` code.

The functionality is unchanged (just less buggy).

* IsUnitTestTrait: rename protected property

The protected property `$test_class_whitelist` has been renamed to `$known_test_classes` as a step towards removing whitelist/blacklist terminology.

* IsUnitTestTrait: rename public property

The public property `$custom_test_class_whitelist` has been renamed to `$custom_test_classes` as a step towards removing whitelist/blacklist terminology.

Includes adjusting the property name in all tests which included the property.

To do before release:
* Annotate this change in the wiki custom properties list

* IsUnitTestTrait: rename local variable

The function local variable `$whitelist` has been renamed to `$known_test_classes` as a step towards removing whitelist/blacklist terminology.

* IsUnitTestTrait: add missing WP Core test case classes

Add two more test cases which were added to `/tests/phpunit/includes/`.

Note: WP Core contains more test cases, but those are in the `tests/phpunit/tests` directory, while the test cases in  `/tests/phpunit/includes/` are supposed to be the "public test API", which is why those are the only ones in this list.

* IsUnitTestTrait: improve documentation

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 WordPress/Helpers/IsUnitTestTrait.php         | 177 ++++++++++++++++++
 WordPress/Sniff.php                           | 162 ----------------
 WordPress/Sniffs/Files/FileNameSniff.php      |   7 +-
 .../PrefixAllGlobalsSniff.php                 |   9 +-
 .../WP/GlobalVariablesOverrideSniff.php       |   9 +-
 .../TestFiles/test-sample-custom-unit.inc     |   4 +-
 ...test-sample-global-namespace-extends.1.inc |   4 +-
 ...test-sample-global-namespace-extends.2.inc |   4 +-
 .../test-sample-namespaced-declaration.1.inc  |   4 +-
 .../test-sample-namespaced-declaration.2.inc  |   4 +-
 .../test-sample-namespaced-declaration.3.inc  |   4 +-
 .../test-sample-namespaced-declaration.4.inc  |   4 +-
 .../test-sample-namespaced-extends.1.inc      |   4 +-
 .../test-sample-namespaced-extends.2.inc      |   4 +-
 .../test-sample-namespaced-extends.3.inc      |   4 +-
 .../test-sample-namespaced-extends.4.inc      |   4 +-
 .../test-sample-namespaced-extends.5.inc      |   4 +-
 .../PrefixAllGlobalsUnitTest.1.inc            |   4 +-
 .../WP/GlobalVariablesOverrideUnitTest.1.inc  |   4 +-
 .../WP/GlobalVariablesOverrideUnitTest.4.inc  |   4 +-
 20 files changed, 224 insertions(+), 200 deletions(-)
 create mode 100644 WordPress/Helpers/IsUnitTestTrait.php

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
new file mode 100644
index 0000000000..801c1e5a5b
--- /dev/null
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use WordPressCS\WordPress\Sniff as WPCS_Sniff;
+
+/**
+ * Helper utilities for sniffs which need to take into account whether the
+ * code under examination is unit test code or not.
+ *
+ * Usage instructions:
+ * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
+ * - Now the sniff will automatically support the public `custom_test_classes` property which
+ *   users can set in their custom ruleset. Do not add the property to the sniff!
+ * - The sniff can call the methods in this trait to verify if certain code was found within
+ *   a test method or is a test class and will take the custom property into account.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The properties and method in this trait were previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ */
+trait IsUnitTestTrait {
+
+	/**
+	 * Custom list of classes which test classes can extend.
+	 *
+	 * This property allows end-users to add to the build-in `$known_test_classes`
+	 * via their custom PHPCS ruleset.
+	 * This property will need to be set for each sniff which uses this trait.
+	 *
+	 * Currently this property is used by the `WordPress.WP.GlobalVariablesOverride`,
+	 * `WordPress.NamingConventions.PrefixAllGlobals` and the `WordPress.Files.Filename` sniffs.
+	 *
+	 * Example usage:
+	 * ```xml
+	 * <rule ref="WordPress.[Subset].[Sniffname]">
+	 *  <properties>
+	 *   <property name="custom_test_classes" type="array">
+	 *     <element value="My_Plugin_First_Test_Class"/>
+	 *     <element value="My_Plugin_Second_Test_Class"/>
+	 *   </property>
+	 *  </properties>
+	 * </rule>
+	 * ```
+	 *
+	 * Note: it is strongly _recommended_ to exclude your test directories for
+	 * select error codes of those particular sniffs instead of relying on this
+	 * property/trait.
+	 *
+	 * @since 0.11.0
+	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *               Renamed from `$custom_test_class_whitelist` to `$custom_test_classes`.
+	 *
+	 * @var string|string[]
+	 */
+	public $custom_test_classes = array();
+
+	/**
+	 * List of PHPUnit and WP native classes which test classes can extend.
+	 *
+	 * {internal These are the test cases provided in the `/tests/phpunit/includes/`
+	 *           directory of WP Core.}
+	 *
+	 * @since 0.11.0
+	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *               Renamed from `$test_class_whitelist` to `$known_test_classes`.
+	 *
+	 * @var string[]
+	 */
+	protected $known_test_classes = array(
+		'WP_UnitTestCase_Base'                       => true,
+		'WP_UnitTestCase'                            => true,
+		'WP_Ajax_UnitTestCase'                       => true,
+		'Block_Supported_Styles_Test'                => true,
+		'WP_Canonical_UnitTestCase'                  => true,
+		'WP_Test_REST_TestCase'                      => true,
+		'WP_Test_REST_Controller_Testcase'           => true,
+		'WP_Test_REST_Post_Type_Controller_Testcase' => true,
+		'WP_Test_XML_TestCase'                       => true,
+		'WP_XMLRPC_UnitTestCase'                     => true,
+		'PHPUnit_Framework_TestCase'                 => true,
+		'PHPUnit\Framework\TestCase'                 => true,
+		// PHPUnit native TestCase class when imported via use statement.
+		'TestCase'                                   => true,
+	);
+
+	/**
+	 * Check if a class token is part of a unit test suite.
+	 *
+	 * Unit test classes are identified as such:
+	 * - Class which either extends one of the known test cases, such as `WP_UnitTestCase`
+	 *   or `PHPUnit_Framework_TestCase` or extends a custom unit test class as listed in the
+	 *   `custom_test_classes` property.
+	 *
+	 * @since 0.12.0 Split off from the `is_token_in_test_method()` method.
+	 * @since 1.0.0  Improved recognition of namespaced class names.
+	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the token to be examined.
+	 *                                               This should be a class, anonymous class or trait token.
+	 *
+	 * @return bool True if the class is a unit test class, false otherwise.
+	 */
+	protected function is_test_class( File $phpcsFile, $stackPtr ) {
+
+		$tokens = $phpcsFile->getTokens();
+
+		if ( isset( $tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $tokens[ $stackPtr ]['code'] ] ) === false ) {
+			return false;
+		}
+
+		// Add any potentially extra custom test classes to the known test classes list.
+		$known_test_classes = WPCS_Sniff::merge_custom_array(
+			$this->custom_test_classes,
+			$this->known_test_classes
+		);
+
+		/*
+		 * Show some tolerance for user input.
+		 * The custom test class names should be passed as FQN without a prefixing `\`.
+		 */
+		foreach ( $known_test_classes as $k => $v ) {
+			$known_test_classes[ $k ] = ltrim( $v, '\\' );
+		}
+
+		// Is the class/trait one of the whitelisted test classes ?
+		$namespace = Namespaces::determineNamespace( $phpcsFile, $stackPtr );
+		$className = ObjectDeclarations::getName( $phpcsFile, $stackPtr );
+		if ( '' !== $namespace ) {
+			if ( isset( $known_test_classes[ $namespace . '\\' . $className ] ) ) {
+				return true;
+			}
+		} elseif ( isset( $known_test_classes[ $className ] ) ) {
+			return true;
+		}
+
+		// Does the class/trait extend one of the whitelisted test classes ?
+		$extendedClassName = ObjectDeclarations::findExtendedClassName( $phpcsFile, $stackPtr );
+		if ( false === $extendedClassName ) {
+			return false;
+		}
+
+		if ( '\\' === $extendedClassName[0] ) {
+			if ( isset( $known_test_classes[ substr( $extendedClassName, 1 ) ] ) ) {
+				return true;
+			}
+		} elseif ( '' !== $namespace ) {
+			if ( isset( $known_test_classes[ $namespace . '\\' . $extendedClassName ] ) ) {
+				return true;
+			}
+		} elseif ( isset( $known_test_classes[ $extendedClassName ] ) ) {
+			return true;
+		}
+
+		/*
+		 * Not examining imported classes via `use` statements as with the variety of syntaxes,
+		 * this would get very complicated.
+		 * After all, users can add an `<exclude-pattern>` for a particular sniff to their
+		 * custom ruleset to selectively exclude the test directory.
+		 */
+
+		return false;
+	}
+
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 113eeac8cf..9413b0fbf9 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -13,7 +13,6 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Lists;
-use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
@@ -48,31 +47,6 @@ abstract class Sniff implements PHPCS_Sniff {
 	 */
 	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
 
-	/**
-	 * Custom list of classes which test classes can extend.
-	 *
-	 * This property allows end-users to add to the $test_class_whitelist via their ruleset.
-	 * This property will need to be set for each sniff which uses the
-	 * `is_test_class()` method.
-	 * Currently the method is used by the `WordPress.WP.GlobalVariablesOverride`,
-	 * `WordPress.NamingConventions.PrefixAllGlobals` and the `WordPress.Files.Filename` sniffs.
-	 *
-	 * Example usage:
-	 * <rule ref="WordPress.[Subset].[Sniffname]">
-	 *  <properties>
-	 *   <property name="custom_test_class_whitelist" type="array">
-	 *     <element value="My_Plugin_First_Test_Class"/>
-	 *     <element value="My_Plugin_Second_Test_Class"/>
-	 *   </property>
-	 *  </properties>
-	 * </rule>
-	 *
-	 * @since 0.11.0
-	 *
-	 * @var string|string[]
-	 */
-	public $custom_test_class_whitelist = array();
-
 	/**
 	 * List of the functions which verify nonces.
 	 *
@@ -817,28 +791,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'$_SERVER',
 	);
 
-	/**
-	 * Whitelist of classes which test classes can extend.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @var string[]
-	 */
-	protected $test_class_whitelist = array(
-		'WP_UnitTestCase_Base'                       => true,
-		'WP_UnitTestCase'                            => true,
-		'WP_Ajax_UnitTestCase'                       => true,
-		'WP_Canonical_UnitTestCase'                  => true,
-		'WP_Test_REST_TestCase'                      => true,
-		'WP_Test_REST_Controller_Testcase'           => true,
-		'WP_Test_REST_Post_Type_Controller_Testcase' => true,
-		'WP_XMLRPC_UnitTestCase'                     => true,
-		'PHPUnit_Framework_TestCase'                 => true,
-		'PHPUnit\Framework\TestCase'                 => true,
-		// PHPUnit native TestCase class when imported via use statement.
-		'TestCase'                                   => true,
-	);
-
 	/**
 	 * The current file being sniffed.
 	 *
@@ -1080,120 +1032,6 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 		return $lastPtr;
 	}
 
-	/**
-	 * Check if a token is used within a unit test.
-	 *
-	 * Unit test methods are identified as such:
-	 * - Method is within a known unit test class;
-	 * - or Method is within a class/trait which extends a known unit test class.
-	 *
-	 * @since 0.11.0
-	 * @since 1.1.0  Supports anonymous test classes and improved handling of nested scopes.
-	 *
-	 * @param int $stackPtr The position of the token to be examined.
-	 *
-	 * @return bool True if the token is within a unit test, false otherwise.
-	 */
-	protected function is_token_in_test_method( $stackPtr ) {
-		// Is the token inside of a function definition ?
-		$functionToken = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
-		if ( false === $functionToken ) {
-			// No conditions or no function condition.
-			return false;
-		}
-
-		$conditions = $this->tokens[ $stackPtr ]['conditions'];
-		foreach ( $conditions as $token => $condition ) {
-			if ( $token === $functionToken ) {
-				// Only examine the conditions the function is nested in, not those nested within the function.
-				break;
-			}
-
-			if ( isset( Tokens::$ooScopeTokens[ $condition ] ) ) {
-				$is_test_class = $this->is_test_class( $token );
-				if ( true === $is_test_class ) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if a class token is part of a unit test suite.
-	 *
-	 * Unit test classes are identified as such:
-	 * - Class which either extends WP_UnitTestCase or PHPUnit_Framework_TestCase
-	 *   or a custom whitelisted unit test class.
-	 *
-	 * @since 0.12.0 Split off from the `is_token_in_test_method()` method.
-	 * @since 1.0.0  Improved recognition of namespaced class names.
-	 *
-	 * @param int $stackPtr The position of the token to be examined.
-	 *                      This should be a class, anonymous class or trait token.
-	 *
-	 * @return bool True if the class is a unit test class, false otherwise.
-	 */
-	protected function is_test_class( $stackPtr ) {
-
-		if ( isset( $this->tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) === false ) {
-			return false;
-		}
-
-		// Add any potentially whitelisted custom test classes to the whitelist.
-		$whitelist = $this->merge_custom_array(
-			$this->custom_test_class_whitelist,
-			$this->test_class_whitelist
-		);
-
-		/*
-		 * Show some tolerance for user input.
-		 * The custom test class names should be passed as FQN without a prefixing `\`.
-		 */
-		foreach ( $whitelist as $k => $v ) {
-			$whitelist[ $k ] = ltrim( $v, '\\' );
-		}
-
-		// Is the class/trait one of the whitelisted test classes ?
-		$namespace = Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
-		$className = $this->phpcsFile->getDeclarationName( $stackPtr );
-		if ( '' !== $namespace ) {
-			if ( isset( $whitelist[ $namespace . '\\' . $className ] ) ) {
-				return true;
-			}
-		} elseif ( isset( $whitelist[ $className ] ) ) {
-			return true;
-		}
-
-		// Does the class/trait extend one of the whitelisted test classes ?
-		$extendedClassName = $this->phpcsFile->findExtendedClassName( $stackPtr );
-		if ( false === $extendedClassName ) {
-			return false;
-		}
-
-		if ( '\\' === $extendedClassName[0] ) {
-			if ( isset( $whitelist[ substr( $extendedClassName, 1 ) ] ) ) {
-				return true;
-			}
-		} elseif ( '' !== $namespace ) {
-			if ( isset( $whitelist[ $namespace . '\\' . $extendedClassName ] ) ) {
-				return true;
-			}
-		} elseif ( isset( $whitelist[ $extendedClassName ] ) ) {
-			return true;
-		}
-
-		/*
-		 * Not examining imported classes via `use` statements as with the variety of syntaxes,
-		 * this would get very complicated.
-		 * After all, users can add an `<exclude-pattern>` for a particular sniff to their
-		 * custom ruleset to selectively exclude the test directory.
-		 */
-
-		return false;
-	}
-
 	/**
 	 * Check if this variable is being assigned a value.
 	 *
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 99fdab8518..cba85fd4c1 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
+use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 
 /**
  * Ensures filenames do not contain underscores.
@@ -29,10 +30,12 @@
  * @since   0.12.0 Now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$custom_test_class_whitelist
+ * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 class FileNameSniff extends Sniff {
 
+	use IsUnitTestTrait;
+
 	/**
 	 * Regex for the theme specific exceptions.
 	 *
@@ -192,7 +195,7 @@ public function process_token( $stackPtr ) {
 		 */
 		if ( true === $this->strict_class_file_names ) {
 			$has_class = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
-			if ( false !== $has_class && false === $this->is_test_class( $has_class ) ) {
+			if ( false !== $has_class && false === $this->is_test_class( $this->phpcsFile, $has_class ) ) {
 				$class_name = $this->phpcsFile->getDeclarationName( $has_class );
 				$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
 
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index b8b364c34f..60bab3d5b1 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -9,13 +9,14 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 
 /**
  * Verify that everything defined in the global namespace is prefixed with a theme/plugin specific prefix.
@@ -28,10 +29,12 @@
  * @since   2.2.0  - Now also checks variables assigned via the list() construct.
  *                 - Now also ignores global functions which are marked as @deprecated.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$custom_test_class_whitelist
+ * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 
+	use IsUnitTestTrait;
+
 	/**
 	 * Error message template.
 	 *
@@ -288,7 +291,7 @@ public function process_token( $stackPtr ) {
 
 		// Ignore test classes.
 		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] )
-			&& true === $this->is_test_class( $stackPtr )
+			&& true === $this->is_test_class( $this->phpcsFile, $stackPtr )
 		) {
 			if ( $this->tokens[ $stackPtr ]['scope_condition'] === $stackPtr && isset( $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
 				// Skip forward to end of test class.
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 1e522a962a..d07064c489 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -9,11 +9,12 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Sniff;
+use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 
 /**
  * Warns about overwriting WordPress native global variables.
@@ -29,10 +30,12 @@
  * @since   1.1.0  The sniff now also detects variables being overriden in the global namespace.
  * @since   2.2.0  The sniff now also detects variable assignments via the list() construct.
  *
- * @uses    \WordPressCS\WordPress\Sniff::$custom_test_class_whitelist
+ * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 class GlobalVariablesOverrideSniff extends Sniff {
 
+	use IsUnitTestTrait;
+
 	/**
 	 * Whether to treat all files as if they were included from
 	 * within a function.
@@ -120,7 +123,7 @@ public function process_token( $stackPtr ) {
 		// Ignore variable overrides in test classes.
 		if ( isset( Tokens::$ooScopeTokens[ $token['code'] ] ) ) {
 
-			if ( true === $this->is_test_class( $stackPtr )
+			if ( true === $this->is_test_class( $this->phpcsFile, $stackPtr )
 				&& $token['scope_condition'] === $stackPtr
 				&& isset( $token['scope_closer'] )
 			) {
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc
index 2fea556ed7..8164b795ec 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc
@@ -1,6 +1,6 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] My_TestClass
+phpcs:set WordPress.Files.FileName custom_test_classes[] My_TestClass
 <?php
 
 class TestSample extends My_TestClass {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc
index 81d072b78d..2de3afc1fe 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] TestSample
 <?php
 
 namespace Some\Name;
 
 class TestCase extends \TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc
index fd3bea2f71..a0edda7dc4 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 namespace Some\Name;
 
 class TestCase extends \TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc
index 228e3f9ba4..05d445a084 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 namespace Some\Name;
 
 class TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc
index 2fb45d28af..9c80d450dd 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] TestSample
 <?php
 
 namespace Some\Name;
 
 class TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc
index 54702f13b1..cdcd282812 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 namespace Some\Other;
 
 class TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc
index c13d52cc98..adaa9d4454 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc
@@ -1,6 +1,6 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 class TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc
index b8d8223014..54f41f2e8a 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 namespace Some\Name;
 
 class TestCase extends TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc
index 3bd881c972..01025e14d1 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 namespace Some\OtherName;
 
 class TestCase extends TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc
index 43abedf627..2bf92d5403 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc
@@ -1,8 +1,8 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] TestSample
 <?php
 
 namespace Some\Name;
 
 class TestCase extends TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc
index 7d17da83b9..7e812600e3 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc
@@ -1,6 +1,6 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 class MyUnitTest extends TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc
index 943e555a67..23089d3f2a 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc
@@ -1,6 +1,6 @@
 <!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
-phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] Some\Name\TestSample
+phpcs:set WordPress.Files.FileName custom_test_classes[] Some\Name\TestSample
 <?php
 
 class TestCase extends \Some\Name\TestSample {}
-/* phpcs:set WordPress.Files.FileName custom_test_class_whitelist[] */
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index c5212b1042..d2bbe40147 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -181,7 +181,7 @@ class Example extends WP_UnitTestCase {
 	function do_something() {}
 }
 
-// phpcs:set WordPress.NamingConventions.PrefixAllGlobals custom_test_class_whitelist[] My_TestClass
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals custom_test_classes[] My_TestClass
 class Test_Class_D extends My_TestClass {
 
 	const SOME_CONSTANT = 'value';
@@ -190,7 +190,7 @@ class Test_Class_D extends My_TestClass {
 
 	function do_something() {}
 }
-// phpcs:set WordPress.NamingConventions.PrefixAllGlobals custom_test_class_whitelist[]
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals custom_test_classes[]
 
 
 if ( ! function_exists( 'intdiv' ) ) {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 5d1c4ada4d..b916db85ff 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -108,7 +108,7 @@ trait My_Class {
 }
 
 // Test adding additional test classes to the whitelist.
-// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_class_whitelist[] My_TestClass
+// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_classes[] My_TestClass
 class Test_Class_D extends My_TestClass {
 
 	public function test_something() {
@@ -116,7 +116,7 @@ class Test_Class_D extends My_TestClass {
 		$tabs = 50; // Ok.
 	}
 }
-// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_class_whitelist[]
+// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_classes[]
 
 // Test detecting within and skipping over anonymous classes.
 global $year;
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.4.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.4.inc
index fb6281061d..28e4185c3c 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.4.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.4.inc
@@ -1,6 +1,6 @@
 <?php
 
-// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_class_whitelist[] My\NameSp\TestClass
+// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_classes[] My\NameSp\TestClass
 
 namespace My \ /* comment */ NameSp;
 
@@ -11,4 +11,4 @@ class Test_Class_D extends TestClass {
 		$tabs = 50; // Ok.
 	}
 }
-// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_class_whitelist[]
+// phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_classes[]

From f1a07acf5a3ca8b7e23e320dd55d413b9de9f9ed Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 25 Feb 2021 21:28:37 +0100
Subject: [PATCH 090/822] Security/EscapeOutput: bug fix - allow for basename()
 being fully qualified

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php   | 2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.inc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index d70d7fe898..09cd206ff3 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -218,7 +218,7 @@ public function process_token( $stackPtr ) {
 				}
 
 				// Quick check. This disregards comments.
-				if ( preg_match( '`^basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
+				if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
 					$stackPtr = ( $first_param['end'] + 2 );
 				}
 				unset( $first_param );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index e9fb752ce7..e5a3422869 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -298,3 +298,5 @@ _deprecated_file( $file, '1.3.0' ); // Error.
 
 trigger_error(); // Ignore.
 _deprecated_file(); // Ignore.
+
+\_deprecated_file( \basename( __FILE__ ), '1.3.0' ); // Ok.

From 7c3f949c7af768d42a5b60bee7e1afa878ca4e38 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 6 Apr 2021 15:58:58 +0200
Subject: [PATCH 091/822] GH Actions: don't test against PHPCS 4.x (yet)

As it looks like PHPCS 4.x is still quite a while away (2022 at the earliest), let's stop testing against PHPCS 4.x for the time being.

This should allow build failure reporting to be more accurate, as currently every PR has a failure on PHPCS 4.x due to a bug in some of the new code in 4.x (fix for this was pulled six months ago and still not merged).

The build against PHPCS 4.x should be re-enabled closer to the PHPCS 4.x release.

Note: PHPCSUtils will continue to test against PHPCS 4.x and will update the provided utilities ahead of time, so with a bit of luck, by the time the build against PHPCS 4.x is re-enabled, the build should largely pass thanks to the compatibility layers in PHPCSUtils.
---
 .github/workflows/unit-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index d147612118..9526b9c4b9 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -40,9 +40,9 @@ jobs:
             phpcs_version: '3.5.7'
             allowed_failure: false
           # Add extra build to test against PHPCS 4.
-          - php: '7.4'
-            phpcs_version: '4.0.x-dev as 3.9.99'
-            allowed_failure: true
+          #- php: '7.4'
+          #  phpcs_version: '4.0.x-dev as 3.9.99'
+          #  allowed_failure: true
           - php: '8.1'
             phpcs_version: 'dev-master'
             allowed_failure: true

From 880af82fd499d462f59904d3b3e64318addbb1de Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:44:29 +0200
Subject: [PATCH 092/822] PHP 8.1 compatibility: fix deprecation notice [1]

PHP 8.1 deprecates passing `null` to PHP native functions where the parameter(s) is not explicitly nullable.

While in PHP 8.1 this is only a deprecation, it should, of course, still be fixed.

This commit contains a fix for the one of the two issues in WordPressCS found related to this so far (based on the unit tests).

Passing `null` to `trim()` is now deprecated, so more defensive coding or explicit type casting is needed.
This comes into play for the `MinimumWPVersionTrait::get_wp_version_from_cli()` method where the `Helper::getCommandLineData()` method can return either string or `null`.

Ref: https://phpcsutils.com/phpdoc/classes/PHPCSUtils-BackCompat-Helper.html#method_getCommandLineData
---
 WordPress/Helpers/MinimumWPVersionTrait.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 3afcd5208e..bf5c65f1f9 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -86,8 +86,13 @@ trait MinimumWPVersionTrait {
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 */
 	protected function get_wp_version_from_cli( File $phpcsFile ) {
-		$cli_supported_version = trim( Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' ) );
+		$cli_supported_version = Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' );
 
+		if ( empty( $cli_supported_version ) ) {
+			return;
+		}
+
+		$cli_supported_version = trim( $cli_supported_version );
 		if ( ! empty( $cli_supported_version )
 			&& filter_var( $cli_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
 		) {

From e9c4858f46775e1477639d471894891f64ac92f6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:54:52 +0200
Subject: [PATCH 093/822] PHP 8.1 compatibility: fix deprecation notice [2]

PHP 8.1 deprecates passing `null` to PHP native functions where the parameter(s) is not explicitly nullable.

While in PHP 8.1 this is only a deprecation, it should, of course, still be fixed.

This commit contains a fix for the second of the two issues in WordPressCS found related to this so far (based on the unit tests).

Passing `null` to `trim()` is now deprecated, so more defensive coding or explicit type casting is needed.
This comes into play for the `I18nSniff::process_token()` and the `PrefixAllGlobalsSniff::process_token()` methods where the `Helper::getConfigData()` method can return either string or `null`.

Ref: https://phpcsutils.com/phpdoc/classes/PHPCSUtils-BackCompat-Helper.html#method_getConfigData
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php     | 7 +++++--
 WordPress/Sniffs/WP/I18nSniff.php                          | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 60bab3d5b1..1d0eceb444 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -272,9 +272,12 @@ public function getGroups() {
 	public function process_token( $stackPtr ) {
 
 		// Allow overruling the prefixes set in a ruleset via the command line.
-		$cl_prefixes = trim( Helper::getConfigData( 'prefixes' ) );
+		$cl_prefixes = Helper::getConfigData( 'prefixes' );
 		if ( ! empty( $cl_prefixes ) ) {
-			$this->prefixes = array_filter( array_map( 'trim', explode( ',', $cl_prefixes ) ) );
+			$cl_prefixes = trim( $cl_prefixes );
+			if ( '' !== $cl_prefixes ) {
+				$this->prefixes = array_filter( array_map( 'trim', explode( ',', $cl_prefixes ) ) );
+			}
 		}
 
 		$this->prefixes = $this->merge_custom_array( $this->prefixes, array(), false );
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 62ddd6342e..41f02661d8 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -192,9 +192,12 @@ public function process_token( $stack_ptr ) {
 		$this->text_domain_is_default       = false;
 
 		// Allow overruling the text_domain set in a ruleset via the command line.
-		$cl_text_domain = trim( Helper::getConfigData( 'text_domain' ) );
+		$cl_text_domain = Helper::getConfigData( 'text_domain' );
 		if ( ! empty( $cl_text_domain ) ) {
-			$this->text_domain = array_filter( array_map( 'trim', explode( ',', $cl_text_domain ) ) );
+			$cl_text_domain = trim( $cl_text_domain );
+			if ( '' !== $cl_text_domain ) {
+				$this->text_domain = array_filter( array_map( 'trim', explode( ',', $cl_text_domain ) ) );
+			}
 		}
 
 		$this->text_domain = $this->merge_custom_array( $this->text_domain, array(), false );

From 96271f6a26973697de4876bfb945df24988daa72 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 28 Feb 2021 07:43:39 +0100
Subject: [PATCH 094/822] GH Actions: get the tests running on PHP 8.1
 (nightly)

Letting PHPUnit read the config file causes an error on PHP 8.1 in combination with PHPUnit 7.

For now, special case the test run on PHP 8.1 and pass the only necessary config from the configuration file on via CLI arguments.
---
 .github/workflows/unit-tests.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 9526b9c4b9..40e7511785 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -94,5 +94,10 @@ jobs:
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint-ci | cs2pr
 
-      - name: Run unit tests
+      - name: Run the unit tests - PHP 5.4 - 8.0
+        if: ${{ matrix.php != '8.1' }}
         run: composer run-tests
+
+      - name: Run the unit tests - PHP 8.1
+        if: ${{ matrix.php == '8.1' }}
+        run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests

From d710432bae4d43015963dfa2bdaa63fce43c5834 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 28 Feb 2021 07:33:39 +0100
Subject: [PATCH 095/822] GH Actions: report CS violations in the PR

The cs2pr tool will allow to display the results from an action run in checkstyle format in-line in the PR code view, which should improve usability of the workflow results.

Ref: https://github.com/staabm/annotate-pull-request-from-checkstyle
---
 .github/workflows/ruleset-checks-sniffs.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 5462db8384..dd8a108f79 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -38,6 +38,7 @@ jobs:
         with:
           php-version: '7.4'
           coverage: none
+          tools: cs2pr
 
       # Using PHPCS `master` as an early detection system for bugs upstream.
       - name: Set PHPCS version
@@ -57,7 +58,11 @@ jobs:
       # @link https://github.com/WordPress/WordPress-Coding-Standards
       # @link http://pear.php.net/package/PHP_CodeSniffer/
       - name: Run PHPCS ignoring warnings
-        run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
+        continue-on-error: true
+        run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --report-full --report-checkstyle=./phpcs-report.xml
+
+      - name: Show PHPCS results in PR
+        run: cs2pr ./phpcs-report.xml --graceful-warnings
 
       # Validate the XML files.
       # @link http://xmlsoft.org/xmllint.html

From d4731efaf5322c66e72769c46ad4bdb12afe62fc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:31:59 +0200
Subject: [PATCH 096/822] GH Actions: don't use cs2pr in quicktest

... as the `quicktest` workflow is run on `push` events, not on PRs, so displaying results in a PR is not relevant (and is done via the `test` workflow which _is_ run on `pull` events anyhow).
---
 .github/workflows/quicktest.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 7085ec8d31..76e09e8bd3 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -55,7 +55,6 @@ jobs:
           php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
           coverage: none
-          tools: cs2pr
 
       - name: Set PHPCS version
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
@@ -65,7 +64,7 @@ jobs:
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
-        run: composer lint-ci | cs2pr
+        run: composer lint-ci
 
       - name: Run unit tests
         run: composer run-tests

From 88c56085b987ea5a0d6b0d1ca85e42db6af1d680 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 22 Sep 2019 19:58:33 +0200
Subject: [PATCH 097/822] OneObjectStructurePerFile: move from `Extra` to
 `Core`

Per the discussion had on Slack about this initiated by GaryJones.
WP Core currently has 27 violations against this rule.

In `Extra` the error message was changed and downgraded to a `warning`.

Now the sniff will be added to `Core`, per this PR, the:
* Message text will still be changed a little to be clearer, but will be stricter.
* The message will be an `error` and not be downgraded to a `warning`.

To do:
- [ ] Add a rule to this effect to the handbook.
---
 WordPress-Core/ruleset.xml  | 6 ++++++
 WordPress-Extra/ruleset.xml | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index e3b77923c2..89752c350f 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -517,6 +517,12 @@
 		<severity>0</severity>
 	</rule>
 
+	<!-- Encourage having only one class/interface/trait per file.
+		 Moved from Extra to Core after discussion on Slack. -->
+	<rule ref="Generic.Files.OneObjectStructurePerFile">
+		<message>Best practices: Declare only one class/interface/trait in a file.</message>
+	</rule>
+
 	<!--
 	#############################################################################
 	Not in the coding standard handbook: WP specific sniffs.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 1ab4f3757e..c493f65e29 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -56,12 +56,6 @@
 	<!-- https://github.com/WordPress/WordPress-Coding-Standards/pull/382#discussion_r29981655 -->
 	<!--<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>-->
 
-	<!-- Encourage having only one class/interface/trait per file. -->
-	<rule ref="Generic.Files.OneObjectStructurePerFile">
-		<type>warning</type>
-		<message>Best practice suggestion: Declare only one class/interface/trait in a file.</message>
-	</rule>
-
 	<!-- Verify modifier keywords for declared methods and properties in classes.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
 	<rule ref="Squiz.Scope.MethodScope"/>

From 4dc9ac66f7f82fc766ba74de294b1458b91df21b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:40:30 +0200
Subject: [PATCH 098/822] CS: get rid of "commented out code" warnings

... which show through in PRs, even when the code in those files has not been adjusted in the PR.

There's only one such warning remaining now, which is _actual_ commented out code.
---
 ...bstractArrayAssignmentRestrictionsSniff.php |  8 ++++----
 WordPress/AbstractClassRestrictionsSniff.php   |  2 +-
 WordPress/Sniff.php                            |  2 +-
 .../ControlStructureSpacingSniff.php           | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index d235862f89..df9932bb7d 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -153,9 +153,9 @@ public function process_token( $stackPtr ) {
 		$inst = array();
 
 		/*
-		 * Covers:
-		 * $foo = array( 'bar' => 'taz' );
-		 * $foo['bar'] = $taz;
+		 * Covers array assignments:
+		 * `$foo = array( 'bar' => 'taz' );`
+		 * `$foo['bar'] = $taz;`
 		 */
 		if ( \in_array( $token['code'], array( \T_CLOSE_SQUARE_BRACKET, \T_DOUBLE_ARROW ), true ) ) {
 			$operator = $stackPtr; // T_DOUBLE_ARROW.
@@ -173,7 +173,7 @@ public function process_token( $stackPtr ) {
 				$inst[ $key ][] = array( $val, $token['line'] );
 			}
 		} elseif ( \in_array( $token['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
-			// $foo = 'bar=taz&other=thing';
+			// Covers assignments via query parameters: `$foo = 'bar=taz&other=thing';`.
 			if ( preg_match_all( '#(?:^|&)([a-z_]+)=([^&]*)#i', TextStrings::stripQuotes( $token['content'] ), $matches ) <= 0 ) {
 				return; // No assignments here, nothing to check.
 			}
diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 882587edf8..612737d91c 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -150,7 +150,7 @@ public function is_targetted_token( $stackPtr ) {
 			return false;
 		}
 
-		// Nothing to do if 'parent', 'self' or 'static'.
+		// Nothing to do if one of the hierarchy keywords - 'parent', 'self' or 'static' - is used.
 		if ( \in_array( $classname, array( 'parent', 'self', 'static' ), true ) ) {
 			return false;
 		}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 9413b0fbf9..7b41a4e446 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1923,7 +1923,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 					$prev = $i;
 					do {
 						$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
-						// Skip over array keys, like $_GET['key']['subkey'].
+						// Skip over array keys, like `$_GET['key']['subkey']`.
 						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ]['code'] ) {
 							$prev = $this->tokens[ $prev ]['bracket_opener'];
 							continue;
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index cbca5fe47c..0cdaf84396 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -183,7 +183,7 @@ public function process_token( $stackPtr ) {
 
 			} elseif ( \T_BITWISE_AND === $this->tokens[ $parenthesisOpener ]['code'] ) {
 
-				// This function returns by reference (function &function_name() {}).
+				// This function returns by reference, i.e. `function &function_name() {}`.
 				$parenthesisOpener = $this->phpcsFile->findNext(
 					Tokens::$emptyTokens,
 					( $parenthesisOpener + 1 ),
@@ -201,7 +201,7 @@ public function process_token( $stackPtr ) {
 					true
 				);
 
-				// Checking this: function my_function[*](...) {}.
+				// Checking space between name and open parentheses, i.e. `function my_function[*](...) {}`.
 				if ( ( $function_name_ptr + 1 ) !== $parenthesisOpener ) {
 
 					$error = 'Space between function name and opening parenthesis is prohibited.';
@@ -247,7 +247,7 @@ public function process_token( $stackPtr ) {
 			) {
 
 				if ( ( $stackPtr + 1 ) !== $parenthesisOpener ) {
-					// Checking this: function[*](...) {}.
+					// Checking space between keyword and open parenthesis, i.e. `function[*](...) {}`.
 					$error = 'Space before closure opening parenthesis is prohibited';
 					$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'SpaceBeforeClosureOpenParenthesis' );
 
@@ -263,7 +263,7 @@ public function process_token( $stackPtr ) {
 				&& ( $stackPtr + 1 ) === $parenthesisOpener
 			) {
 
-				// Checking this: if[*](...) {}.
+				// Checking space between keyword and open parenthesis, i.e. `if[*](...) {}`.
 				$error = 'No space before opening parenthesis is prohibited';
 				$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
 
@@ -276,7 +276,7 @@ public function process_token( $stackPtr ) {
 		if ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code']
 			&& ' ' !== $this->tokens[ ( $stackPtr + 1 ) ]['content']
 		) {
-			// Checking this: if [*](...) {}.
+			// Checking (too much) space between keyword and open parenthesis, i.e. `if [*](...) {}`.
 			$error = 'Expected exactly one space before opening parenthesis; "%s" found.';
 			$fix   = $this->phpcsFile->addFixableError(
 				$error,
@@ -292,7 +292,7 @@ public function process_token( $stackPtr ) {
 
 		if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
 			if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
-				// Checking this: $value = my_function([*]...).
+				// Checking space directly after the open parenthesis, i.e. `$value = my_function([*]...)`.
 				$error = 'No space after opening parenthesis is prohibited';
 				$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceAfterOpenParenthesis' );
 
@@ -304,7 +304,7 @@ public function process_token( $stackPtr ) {
 				&& "\r\n" !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['content'] )
 				&& ! isset( $this->ignore_extra_space_after_open_paren[ $this->tokens[ $stackPtr ]['code'] ] )
 			) {
-				// Checking this: if ([*]...) {}.
+				// Checking (too much) space directly after the open parenthesis, i.e. `if ([*]...) {}`.
 				$error = 'Expected exactly one space after opening parenthesis; "%s" found.';
 				$fix   = $this->phpcsFile->addFixableError(
 					$error,
@@ -325,7 +325,7 @@ public function process_token( $stackPtr ) {
 
 			if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
 
-				// Checking this: if (...[*]) {}.
+				// Checking space directly before the close parenthesis, i.e. `if (...[*]) {}`.
 				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser - 1 ) ]['code'] ) {
 					$error = 'No space before closing parenthesis is prohibited';
 					$fix   = $this->phpcsFile->addFixableError( $error, $parenthesisCloser, 'NoSpaceBeforeCloseParenthesis' );
@@ -393,7 +393,7 @@ public function process_token( $stackPtr ) {
 				&& ' ' !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
 			) {
 
-				// Checking this: if (...) [*]{}.
+				// Checking space between the close parenthesis and the open brace, i.e. `if (...) [*]{}`.
 				$error = 'Expected exactly one space between closing parenthesis and opening control structure; "%s" found.';
 				$fix   = $this->phpcsFile->addFixableError(
 					$error,

From b1a02ac423b516ed0e2faf09013ef3ccaf884b3b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:45:36 +0200
Subject: [PATCH 099/822] QA: remove unnecessary assignment

---
 WordPress/Sniff.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 7b41a4e446..0aa237774c 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1027,9 +1027,7 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 
 		// We've made it to the next line, back up one to the last in the previous line.
 		// We do this for micro-optimization of the above loop.
-		$lastPtr = ( $nextPtr - 1 );
-
-		return $lastPtr;
+		return ( $nextPtr - 1 );
 	}
 
 	/**

From ae6bc021d00e7bf51fd985cde3e1318aa7dcf926 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:46:23 +0200
Subject: [PATCH 100/822] QA: use fully qualified global constant references

---
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php   | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php | 2 +-
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php   | 4 ++--
 WordPress/Sniffs/WP/I18nSniff.php                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index a1b461aba8..25c6e8cbdd 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -75,7 +75,7 @@ class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 	 */
 	public function getGroups() {
 		// Make sure all array keys are lowercase.
-		$this->deprecated_classes = array_change_key_case( $this->deprecated_classes, CASE_LOWER );
+		$this->deprecated_classes = array_change_key_case( $this->deprecated_classes, \CASE_LOWER );
 
 		return array(
 			'deprecated_classes' => array(
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index c33c512b99..2676c82dcb 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1377,7 +1377,7 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 */
 	public function getGroups() {
 		// Make sure all array keys are lowercase.
-		$this->deprecated_functions = array_change_key_case( $this->deprecated_functions, CASE_LOWER );
+		$this->deprecated_functions = array_change_key_case( $this->deprecated_functions, \CASE_LOWER );
 
 		return array(
 			'deprecated_functions' => array(
diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index e4c34e037a..b462e20c3c 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -61,7 +61,7 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, PREG_OFFSET_CAPTURE ) > 0 ) {
+		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
 			foreach ( $matches[0] as $match ) {
 				$this->phpcsFile->addError(
 					'Stylesheets must be registered/enqueued via wp_enqueue_style',
@@ -71,7 +71,7 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		if ( preg_match_all( '#<script[^>]*(?<=src=)#', $content, $matches, PREG_OFFSET_CAPTURE ) > 0 ) {
+		if ( preg_match_all( '#<script[^>]*(?<=src=)#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
 			foreach ( $matches[0] as $match ) {
 				$this->phpcsFile->addError(
 					'Scripts must be registered/enqueued via wp_enqueue_script',
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 41f02661d8..6c3814bf97 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -648,7 +648,7 @@ protected function check_text( $context ) {
 		 * Strip surrounding quotes.
 		 */
 		$reader = new \XMLReader();
-		$reader->XML( $content_without_quotes, 'UTF-8', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING );
+		$reader->XML( $content_without_quotes, 'UTF-8', \LIBXML_NOERROR | \LIBXML_ERR_NONE | \LIBXML_NOWARNING );
 
 		// Is the first node an HTML element?
 		if ( ! $reader->read() || \XMLReader::ELEMENT !== $reader->nodeType ) {

From 69caed7f2045e99c3fe36f6d3185073a7030c7c3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:46:34 +0200
Subject: [PATCH 101/822] QA: import all used classes

---
 WordPress/Sniffs/WP/I18nSniff.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 6c3814bf97..d2bfe32bad 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -9,10 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\TextStrings;
+use XMLReader;
+use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -647,11 +648,11 @@ protected function check_text( $context ) {
 		 *
 		 * Strip surrounding quotes.
 		 */
-		$reader = new \XMLReader();
+		$reader = new XMLReader();
 		$reader->XML( $content_without_quotes, 'UTF-8', \LIBXML_NOERROR | \LIBXML_ERR_NONE | \LIBXML_NOWARNING );
 
 		// Is the first node an HTML element?
-		if ( ! $reader->read() || \XMLReader::ELEMENT !== $reader->nodeType ) {
+		if ( ! $reader->read() || XMLReader::ELEMENT !== $reader->nodeType ) {
 			return;
 		}
 

From 75ec4e2dffa93d0099e085f7dc03bf33ca45fe02 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 14 Jun 2021 21:59:52 +0200
Subject: [PATCH 102/822] Bug report template: various improvements

After the umpteenth time of getting a non-reproducible bug report (not just in this repo, mind you), I figured it may help to add some more guidance to the bug report template.

More important changes:
* Ask for the actual CLI command people have used.
* Ask for the custom ruleset used (if used).
* Give some guidance on how to find out the version numbers of the tooling used.
---
 .github/ISSUE_TEMPLATE/bug_report.md | 46 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5fec9e2c30..6804dffcc7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,6 +4,11 @@ about: Create a report to help us improve
 
 ---
 
+<!--
+PLEASE FILL OUT THE TEMPLATE COMPLETELY.
+BUG REPORTS WHICH CANNOT BE REPRODUCED BASED ON THE INFORMATION PROVIDED WILL BE CLOSED.
+-->
+
 ## Bug Description
 <!--
 Please provide a clear and concise description of what the bug is.
@@ -12,13 +17,29 @@ What did you expect to happen? What actually happened?
 -->
 
 ## Minimal Code Snippet
-<!-- Please provide example code that demonstrates the issue. Do NOT paste screenshots of code! -->
+<!-- Please provide example code that allows us to reproduce the issue. Do NOT paste screenshots of code! -->
+
+The issue happens when running this command:
+```bash
+phpcs ...
+```
+
+... over a file containing this code:
+```php
+// Place your code sample here.
+```
+
+<!-- For bugs with fixers: How was the code fixed? How did you expect the code to be fixed? -->
 
+The file was auto-fixed via `phpcbf` to:
 ```php
 // Place your code sample here.
 ```
 
-For bugs with fixers: How was the code fixed? How did you expect the code to be fixed?
+... while I expected the code to be fixed to:
+```php
+// Place your code sample here.
+```
 
 ## Error Code
 <!--
@@ -29,11 +50,30 @@ e.g. `WordPress.PHP.NoSilencedErrors.Discouraged`
 You can leave this section empty if you are reporting a false negative.
 -->
 
+## Custom ruleset
+<!--
+If the issue cannot be reproduced when using `--standard=WordPress` on the command line,
+please post the relevant part of your custom ruleset here.
+-->
+
+```xml
+<?xml version="1.0"?>
+<ruleset name="My Custom Standard">
+  ...
+</ruleset>
+```
+
 ## Environment
+<!--
+To find out the versions used:
+* PHP: run `php -v`.
+* PHPCS: run `[vendor/bin/]phpcs --version`
+* WPCS: run `composer [global] info` for a Composer install.
+-->
 
 | Question               | Answer
 | ------------------------| -------
-| PHP version             | x.y.z 
+| PHP version             | x.y.z
 | PHP_CodeSniffer version | x.y.z
 | WPCS version            | x.y.z
 | WPCS install type       | e.g. Composer global, Composer project local, git clone, other (please expand)

From a844b50f8a833467cf7a7db6b72c0fed0bd8bc57 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 22 Jun 2021 03:23:17 +0200
Subject: [PATCH 103/822] GH Actions: turn display_errors on

Turns out the default setting for `error_reporting` used by the SetupPHP action is `error_reporting=E_ALL & ~E_DEPRECATED & ~E_STRICT` and `display_errors` is set to `Off`.

For the purposes of CI, I'd recommend running with `E_ALL` and `display_errors=On` to ensure **all** PHP notices are shown.

In this script, error_reporting was already enabled, but the error display was not yet fixed. Sorted now.
---
 .github/workflows/quicktest.yml  | 4 ++--
 .github/workflows/unit-tests.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 76e09e8bd3..734a365152 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -44,9 +44,9 @@ jobs:
         id: set_ini
         run: |
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED'
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
           else
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL'
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL, display_errors=On'
           fi
 
       - name: Set up PHP
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 40e7511785..9472dd8a5e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -57,9 +57,9 @@ jobs:
         id: set_ini
         run: |
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED'
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
           else
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL'
+            echo '::set-output name=PHP_INI::error_reporting=E_ALL, display_errors=On'
           fi
 
       - name: Set up PHP

From 2f7d1ebef834f77d57e83491e98a034006ab0884 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 1 Mar 2021 13:13:50 +0100
Subject: [PATCH 104/822] PHP/NoSilencedErrors: add
 libxml_disable_entity_loader()

... to the default "ignore" list.

The `libxml_disable_entity_loader()` function is deprecated in PHP 8.0, but a call to the function is still needed in select circumstances, in which case silencing the deprecation warning is perfectly acceptable.
---
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index ee3b3b3a51..6a16803275 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -81,61 +81,64 @@ class NoSilencedErrorsSniff extends Sniff {
 	 */
 	protected $function_whitelist = array(
 		// Directory extension.
-		'chdir'                 => true,
-		'opendir'               => true,
-		'scandir'               => true,
+		'chdir'                        => true,
+		'opendir'                      => true,
+		'scandir'                      => true,
 
 		// File extension.
-		'file_exists'           => true,
-		'file_get_contents'     => true,
-		'file'                  => true,
-		'fileatime'             => true,
-		'filectime'             => true,
-		'filegroup'             => true,
-		'fileinode'             => true,
-		'filemtime'             => true,
-		'fileowner'             => true,
-		'fileperms'             => true,
-		'filesize'              => true,
-		'filetype'              => true,
-		'fopen'                 => true,
-		'is_dir'                => true,
-		'is_executable'         => true,
-		'is_file'               => true,
-		'is_link'               => true,
-		'is_readable'           => true,
-		'is_writable'           => true,
-		'is_writeable'          => true,
-		'lstat'                 => true,
-		'mkdir'                 => true,
-		'move_uploaded_file'    => true,
-		'readfile'              => true,
-		'readlink'              => true,
-		'rename'                => true,
-		'rmdir'                 => true,
-		'stat'                  => true,
-		'unlink'                => true,
+		'file_exists'                  => true,
+		'file_get_contents'            => true,
+		'file'                         => true,
+		'fileatime'                    => true,
+		'filectime'                    => true,
+		'filegroup'                    => true,
+		'fileinode'                    => true,
+		'filemtime'                    => true,
+		'fileowner'                    => true,
+		'fileperms'                    => true,
+		'filesize'                     => true,
+		'filetype'                     => true,
+		'fopen'                        => true,
+		'is_dir'                       => true,
+		'is_executable'                => true,
+		'is_file'                      => true,
+		'is_link'                      => true,
+		'is_readable'                  => true,
+		'is_writable'                  => true,
+		'is_writeable'                 => true,
+		'lstat'                        => true,
+		'mkdir'                        => true,
+		'move_uploaded_file'           => true,
+		'readfile'                     => true,
+		'readlink'                     => true,
+		'rename'                       => true,
+		'rmdir'                        => true,
+		'stat'                         => true,
+		'unlink'                       => true,
 
 		// FTP extension.
-		'ftp_chdir'             => true,
-		'ftp_login'             => true,
-		'ftp_rename'            => true,
+		'ftp_chdir'                    => true,
+		'ftp_login'                    => true,
+		'ftp_rename'                   => true,
 
 		// Stream extension.
-		'stream_select'         => true,
-		'stream_set_chunk_size' => true,
+		'stream_select'                => true,
+		'stream_set_chunk_size'        => true,
 
 		// Zlib extension.
-		'deflate_add'           => true,
-		'deflate_init'          => true,
-		'inflate_add'           => true,
-		'inflate_init'          => true,
-		'readgzfile'            => true,
+		'deflate_add'                  => true,
+		'deflate_init'                 => true,
+		'inflate_add'                  => true,
+		'inflate_init'                 => true,
+		'readgzfile'                   => true,
+
+		// LibXML extension.
+		'libxml_disable_entity_loader' => true, // PHP 8.0 deprecation warning, but function call still needed in select cases.
 
 		// Miscellaneous other functions.
-		'imagecreatefromstring' => true,
-		'parse_url'             => true, // Pre-PHP 5.3.3 an E_WARNING was thrown when URL parsing failed.
-		'unserialize'           => true,
+		'imagecreatefromstring'        => true,
+		'parse_url'                    => true, // Pre-PHP 5.3.3 an E_WARNING was thrown when URL parsing failed.
+		'unserialize'                  => true,
 	);
 
 	/**

From 92c2528e827b18269dd6420b226cf4200b9b2241 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:17:48 +0200
Subject: [PATCH 105/822] PHP/NoSilencedErrors: add `imagecreatefromwebp`

... as WP now includes WebP support.
---
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 6a16803275..95dd4132a8 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -137,6 +137,7 @@ class NoSilencedErrorsSniff extends Sniff {
 
 		// Miscellaneous other functions.
 		'imagecreatefromstring'        => true,
+		'imagecreatefromwebp'          => true,
 		'parse_url'                    => true, // Pre-PHP 5.3.3 an E_WARNING was thrown when URL parsing failed.
 		'unserialize'                  => true,
 	);

From 6a7b8e3857b94cd962541d6176452d91fc095f6e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 23 Dec 2021 05:05:41 +0100
Subject: [PATCH 106/822] Composer: allow the PHPCS plugin

The `dealerdirect/phpcodesniffer-composer-installer` Composer plugin is used to register external PHPCS standards with PHPCS.

As of Composer 2.2.0, Composer plugins need to be explicitly allowed to run. This adds the necessary configuration for that.

Refs:
* https://blog.packagist.com/composer-2-2/#more-secure-plugin-execution
---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index addfdf45e6..88e057fa11 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,11 @@
 		"php-parallel-lint/php-parallel-lint": "^1.0",
 		"php-parallel-lint/php-console-highlighter": "^0.5"
 	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
+	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"scripts": {

From 94a7102d3e09b507ad6c88d770200522439c756c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 23 Dec 2021 05:06:02 +0100
Subject: [PATCH 107/822] GH Actions: auto-cancel previous builds for same
 branch

Previously, in Travis, when the same branch was pushed again and the "Auto cancellation" option on the "Settings" page had been turned on (as it was for most repos), any still running builds for the same branch would be stopped in favour of starting the build for the newly pushed version of the branch.

To enable this behaviour in GH Actions, a `concurrency` configuration needs to be added to each workflow for which this should applied to.

More than anything, this is a way to be kind to GitHub by not wasting resources which they so kindly provide to us for free.

Refs:
* https://github.blog/changelog/2021-04-19-github-actions-limit-workflow-run-or-job-concurrency/
* https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
---
 .github/workflows/quicktest.yml             | 6 ++++++
 .github/workflows/ruleset-checks-sniffs.yml | 6 ++++++
 .github/workflows/unit-tests.yml            | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 734a365152..72b7f8a564 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -9,6 +9,12 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Performs some quick tests.
   # This is a much quicker test suite which only runs the unit tests and linting
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index dd8a108f79..67a5e5aa2c 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -6,6 +6,12 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Performs some code-style related checks.
   #
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 9472dd8a5e..4bd6df487f 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -8,6 +8,12 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Runs the test suite against all supported branches and combinations.
   #

From 814d1015b651e5dae3f02ac5f606187fd0235962 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 23 Dec 2021 05:07:10 +0100
Subject: [PATCH 108/822] GH Actions: use `error_reporting=-1`

... as `E_ALL` does not always contain _all_ errors across PHP versions.
---
 .github/workflows/quicktest.yml  | 2 +-
 .github/workflows/unit-tests.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 72b7f8a564..2d83f8d29e 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -52,7 +52,7 @@ jobs:
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
             echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
           else
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL, display_errors=On'
+            echo '::set-output name=PHP_INI::error_reporting=-1, display_errors=On'
           fi
 
       - name: Set up PHP
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 4bd6df487f..a588b95dfd 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -65,7 +65,7 @@ jobs:
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
             echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
           else
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL, display_errors=On'
+            echo '::set-output name=PHP_INI::error_reporting=-1, display_errors=On'
           fi
 
       - name: Set up PHP

From 3d682988342354bb96626c01b995e1ea7f8651b5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 23 Dec 2021 05:09:03 +0100
Subject: [PATCH 109/822] GH Actions: update for the release of PHP 8.1

This commit makes the necessary adjustments to the test matrix to account for that.

Note: the protected branch settings should be adjusted after this change to include the two new PHP 8.1 builds.
---
 .github/workflows/unit-tests.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a588b95dfd..ba8d8c7b07 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -38,6 +38,13 @@ jobs:
         phpcs_version: [ 'dev-master', '3.5.0' ]
         allowed_failure: [ false ]
         include:
+          - php: '8.1'
+            phpcs_version: 'dev-master'
+            allowed_failure: false
+          # PHPCS is only compatible with PHP 8.1 as of version 3.6.1.
+          - php: '8.1'
+            phpcs_version: '3.6.1'
+            allowed_failure: false
           - php: '8.0'
             phpcs_version: 'dev-master'
             allowed_failure: false
@@ -49,7 +56,7 @@ jobs:
           #- php: '7.4'
           #  phpcs_version: '4.0.x-dev as 3.9.99'
           #  allowed_failure: true
-          - php: '8.1'
+          - php: '8.2'
             phpcs_version: 'dev-master'
             allowed_failure: true
 
@@ -101,9 +108,9 @@ jobs:
         run: composer lint-ci | cs2pr
 
       - name: Run the unit tests - PHP 5.4 - 8.0
-        if: ${{ matrix.php != '8.1' }}
+        if: ${{ matrix.php < '8.1' }}
         run: composer run-tests
 
       - name: Run the unit tests - PHP 8.1
-        if: ${{ matrix.php == '8.1' }}
+        if: ${{ matrix.php >= '8.1' }}
         run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests

From 17380017de5a51dc1301411634fff1d41fd32821 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Dec 2021 05:45:02 +0100
Subject: [PATCH 110/822] GH Actions: version update for
 `ramsey/composer-install`

The action used to install Composer packages and handle the caching has released a new major (and some follow-up patch releases), which means, the action reference needs to be updated to benefit from it.

Includes adding `--no-interaction` to "plain" Composer commands to potentially prevent CI hanging if, for whatever reason, interaction would be needed in the future.

Refs:
* https://github.com/ramsey/composer-install/releases/tag/2.0.0
* https://github.com/ramsey/composer-install/releases/tag/2.0.1
* https://github.com/ramsey/composer-install/releases/tag/2.0.2
---
 .github/workflows/quicktest.yml             | 4 ++--
 .github/workflows/ruleset-checks-sniffs.yml | 8 ++++----
 .github/workflows/unit-tests.yml            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 2d83f8d29e..19b201b737 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -63,10 +63,10 @@ jobs:
           coverage: none
 
       - name: Set PHPCS version
-        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 67a5e5aa2c..b618c6ff8d 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -48,10 +48,10 @@ jobs:
 
       # Using PHPCS `master` as an early detection system for bugs upstream.
       - name: Set PHPCS version
-        run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts
+        run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Install xmllint
         run: sudo apt-get install libxml2-utils
@@ -128,10 +128,10 @@ jobs:
           coverage: none
 
       - name: Set PHPCS version
-        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Test the WordPress-Core ruleset
         run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index ba8d8c7b07..494fc0d9c7 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -91,15 +91,15 @@ jobs:
         run: composer config preferred-install.squizlabs/php_codesniffer source
 
       - name: Set PHPCS version
-        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts
+        run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies (PHP < 8.0 )
         if: ${{ matrix.php < 8.0 }}
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Install Composer dependencies (PHP >= 8.0)
         if: ${{ matrix.php >= 8.0 }}
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
         with:
           composer-options: --ignore-platform-reqs
 

From 0052562dee5e0c2229913e371d05cd925bba523d Mon Sep 17 00:00:00 2001
From: Slava Abakumov <slaFFik@users.noreply.github.com>
Date: Thu, 30 Dec 2021 16:39:36 +0200
Subject: [PATCH 111/822] Update the min support PHP version

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bcacabee25..d61fb239be 100644
--- a/README.md
+++ b/README.md
@@ -155,13 +155,13 @@ The [PHPCompatibilityWP](https://github.com/PHPCompatibility/PHPCompatibilityWP)
 
 Install either as a separate ruleset and run it separately against your code or add it to your custom ruleset, like so:
 ```xml
-<config name="testVersion" value="5.2-"/>
+<config name="testVersion" value="5.6-"/>
 <rule ref="PHPCompatibilityWP">
     <include-pattern>*\.php$</include-pattern>
 </rule>
 ```
 
-Whichever way you run it, do make sure you set the `testVersion` to run the sniffs against. The `testVersion` determines for which PHP versions you will receive compatibility information. The recommended setting for this at this moment is  `5.2-` to support the same PHP versions as WordPress Core supports.
+Whichever way you run it, do make sure you set the `testVersion` to run the sniffs against. The `testVersion` determines for which PHP versions you will receive compatibility information. The recommended setting for this at this moment is  `5.6-` to support the same PHP versions as WordPress Core supports.
 
 For more information about setting the `testVersion`, see:
 * [PHPCompatibility: Sniffing your code for compatibility with specific PHP version(s)](https://github.com/PHPCompatibility/PHPCompatibility#sniffing-your-code-for-compatibility-with-specific-php-versions)

From dd26f30297ebfe6ecd4d699bf733b65a078c3faa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:12:27 +0100
Subject: [PATCH 112/822] WP/CronInterval: bug fix for parentheses

This allows for a time calculation to be wrapped in parentheses.

Fixes 2025

---

Note: just looking at the code, I can see multiple additional improvements which could/should be made:
* Only search for close parenthesis as a "valueEnd" if the `$valueStart` token is an open parenthesis.
* Allow for more assignment operators - the new schedule could be build up bit by bit and only assigned to the array later.

These additional things are not addressed here. This just addresses the immediate issue.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   | 11 ++++++++---
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 16 ++++++++++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 5a3595a925..65badaa90a 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -177,10 +177,15 @@ public function process_token( $stackPtr ) {
 					$valueStart = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true, null, true );
 					$valueEnd   = $this->phpcsFile->findNext( array( \T_COMMA, \T_CLOSE_PARENTHESIS ), ( $valueStart + 1 ) );
 					$value      = '';
-					for ( $j = $valueStart; $j < $valueEnd; $j++ ) {
+					for ( $j = $valueStart; $j <= $valueEnd; $j++ ) {
 						if ( isset( Tokens::$emptyTokens[ $this->tokens[ $j ]['code'] ] ) ) {
 							continue;
 						}
+
+						if ( $j === $valueEnd && \T_COMMA === $this->tokens[ $j ]['code'] ) {
+							break;
+						}
+
 						$value .= $this->tokens[ $j ]['content'];
 					}
 
@@ -192,8 +197,8 @@ public function process_token( $stackPtr ) {
 					// Deal correctly with WP time constants.
 					$value = str_replace( array_keys( $this->wp_time_constants ), array_values( $this->wp_time_constants ), $value );
 
-					// If all digits and operators, eval!
-					if ( preg_match( '#^[\s\d+*/-]+$#', $value ) > 0 ) {
+					// If all parentheses, digits and operators, eval!
+					if ( preg_match( '#^[\s\d()+*/-]+$#', $value ) > 0 ) {
 						$interval = eval( "return ( $value );" ); // phpcs:ignore Squiz.PHP.Eval -- No harm here.
 						break;
 					}
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 19b061fe34..330084676c 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -144,3 +144,19 @@ Custom::add_filter( 'cron_schedules', array( $class, $method ) ); // OK, not the
 add_filter( 'some_hook', array( $place, 'cron_schedules' ) ); // OK, not the hook we're looking for.
 add_filter( function() { return get_hook_name('cron_schedules'); }(), array( $class, $method ) ); // OK, nested in another function call.
 
+// Deal correctly with the time calculations within parentheses.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_2_days_and_a_bit'] = [
+		'interval' => ( 2 * DAY_IN_SECONDS + 2 * HOUR_IN_SECONDS ),
+		'display' => __( 'Once every 2 days and a bit' )
+	];
+	return $schedules;
+} ); // Ok: > 15 min.
+
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_8_minutes'] = [
+		'interval' => (8 * MINUTE_IN_SECONDS),
+		'display' => __( 'Once every 8 minutes' )
+	];
+	return $schedules;
+} ); // Error: 8 min.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index afbf6a6b69..522e45211f 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -51,7 +51,7 @@ public function getWarningList() {
 			108 => 1,
 			115 => 1,
 			133 => 1,
+			156 => 1,
 		);
 	}
-
 }

From 186f90eca43ceddbb61172f820c84439854afca1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 5 Mar 2022 18:51:19 +0100
Subject: [PATCH 113/822] GH Actions: version update for various predefined
 actions

A number of predefined actions have had major release, which warrant an update the workflow(s).

These updates don't actually contain any changed functionality, they are mostly just a change of the Node version used by the action itself (from Node 14 to Node 16).

Refs:
* https://github.com/actions/checkout/releases
---
 .github/workflows/quicktest.yml             | 2 +-
 .github/workflows/ruleset-checks-sniffs.yml | 4 ++--
 .github/workflows/unit-tests.yml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 19b201b737..d060662cdc 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # On stable PHPCS versions, 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.
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index b618c6ff8d..71495e9731 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -117,7 +117,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 494fc0d9c7..ce7d35c60e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -62,7 +62,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # On stable PHPCS versions, 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 abc2d8540dfeb1399c83fa3ed9ab751aff5a9a1d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 19 Mar 2022 09:46:38 +0100
Subject: [PATCH 114/822] GH Actions/CS: fix build failure

Fix failing installation of the xmllint tooling.
---
 .github/workflows/ruleset-checks-sniffs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 71495e9731..9d6aef3e99 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -54,7 +54,9 @@ jobs:
         uses: ramsey/composer-install@v2
 
       - name: Install xmllint
-        run: sudo apt-get install libxml2-utils
+        run: |
+          sudo apt-get update
+          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 664adf643a5da563087e5f7ba4ebc49d1e141c26 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 09:57:09 +0200
Subject: [PATCH 115/822] Core: add the
 `Generic.VersionControl.GitMergeConflict` sniff

Fixes 1500
---
 WordPress-Core/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 89752c350f..e9f604805e 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -523,6 +523,9 @@
 		<message>Best practices: Declare only one class/interface/trait in a file.</message>
 	</rule>
 
+	<!-- Error on merge conflict markers. -->
+	<rule ref="Generic.VersionControl.GitMergeConflict"/>
+
 	<!--
 	#############################################################################
 	Not in the coding standard handbook: WP specific sniffs.

From fc6958b0c9696fda3b1ceb0dd2c3e3131551da14 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 16:08:21 +0200
Subject: [PATCH 116/822] GH Actions: show deprecations when linting

While rare, there are some deprecations which PHP can show when a file is being linted.
By default these are ignored by PHP-Parallel-Lint.

Apparently though, there is an option to show them (wasn't documented until recently), so let's turn that option on.
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 88e057fa11..070581f2a9 100644
--- a/composer.json
+++ b/composer.json
@@ -36,10 +36,10 @@
 	"prefer-stable": true,
 	"scripts": {
 		"lint": [
-			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git"
+			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
 		],
 		"lint-ci": [
-			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git --checkstyle"
+			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git --checkstyle"
 		],
 		"check-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"

From b7e4c7a2d2f093574db1f07966308d17f34c108c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 24 Apr 2022 03:19:04 +0200
Subject: [PATCH 117/822] Composer: update PHP Parallel Lint and Console
 Highlighter

PHP Console Highlighter has released version `1.0.0` and PHP Parallel Lint version `1.3.2` is the first PHP Parallel Lint version which supports PHP Console Highlighter `1.0.0`.

As the minimum supported PHP version is still PHP 5.3 for both, we can safely update both dependency requirements.

Refs:
* https://github.com/php-parallel-lint/PHP-Console-Highlighter/releases/tag/v1.0.0
* https://github.com/php-parallel-lint/PHP-Parallel-Lint/releases/tag/v1.3.2
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 88e057fa11..2cc6206688 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,8 @@
 		"phpcompatibility/php-compatibility": "^9.0",
 		"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
 		"phpcsstandards/phpcsdevtools": "^1.0",
-		"php-parallel-lint/php-parallel-lint": "^1.0",
-		"php-parallel-lint/php-console-highlighter": "^0.5"
+		"php-parallel-lint/php-parallel-lint": "^1.3.2",
+		"php-parallel-lint/php-console-highlighter": "^1.0.0"
 	},
 	"config": {
 		"allow-plugins": {

From e5e0fdf7e2d15be72037d5a56355282089029fad Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 10:44:07 +0200
Subject: [PATCH 118/822] Composer: up the minimum PHPCS version to 3.6.2

While the minimum PHPCS version has already been upped to PHPCS 3.5.0 previously for the WPCS 3.0.0 branch, I'm proposing to up it yet further to the latest PHPCS version available.

PHP 8.0 and 8.1 introduced a lot of new syntaxes and, while a lot of this can be supported for older PHPCS versions via PHPCSUtils, this will always impact performance and precision, so it is strongly advisable to use the latest PHPCS version as the new minimum if we want to support the newly available PHP syntaxes.

For now, I'm upping the minimum version to PHPCS 3.6.2, which is the latest PHPCS release. This will unblock PRs to add support for PHP 8.0 features to WPCS.
Once PHPCS 3.7.0 has been released, the minimum PHPCS version should be upped again to unblock adding support for PHP 8.1 features to WPCS.

Includes updating the GH Actions matrixes for this change.

Also see #2048
---
 .github/CONTRIBUTING.md                     |  2 +-
 .github/ISSUE_TEMPLATE/dependency-change.md |  2 +-
 .github/workflows/quicktest.yml             |  4 ++--
 .github/workflows/ruleset-checks-sniffs.yml |  2 +-
 .github/workflows/unit-tests.yml            | 18 ++----------------
 README.md                                   |  2 +-
 composer.json                               |  2 +-
 7 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index dc8adf1b22..7fd8c23149 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 
 ## Pre-requisites
 * WordPress-Coding-Standards
-* PHP_CodeSniffer 3.3.1 or higher
+* PHP_CodeSniffer 3.6.2 or higher
 * PHPUnit 4.x, 5.x, 6.x or 7.x
 
 The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
diff --git a/.github/ISSUE_TEMPLATE/dependency-change.md b/.github/ISSUE_TEMPLATE/dependency-change.md
index 1208b19678..d6de56e870 100644
--- a/.github/ISSUE_TEMPLATE/dependency-change.md
+++ b/.github/ISSUE_TEMPLATE/dependency-change.md
@@ -4,7 +4,7 @@ about: A reminder to take action when a WPCS dependency changes
 
 ---
 
-<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 3.5: ... -->
+<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 3.7.0: ... -->
 
 ## Rationale
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index d060662cdc..1267203d40 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -36,9 +36,9 @@ jobs:
         phpcs_version: [ 'dev-master' ]
         include:
           - php: '7.3'
-            phpcs_version: '3.5.0'
+            phpcs_version: '3.6.2'
           - php: '5.4'
-            phpcs_version: '3.5.0'
+            phpcs_version: '3.6.2'
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 9d6aef3e99..616ab0e200 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -115,7 +115,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.4' ]
-        phpcs_version: [ 'dev-master', '3.5.0' ]
+        phpcs_version: [ 'dev-master', '3.6.2' ]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index ce7d35c60e..f2052d3028 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -34,24 +34,10 @@ jobs:
     continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
       matrix:
-        php: [ '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
-        phpcs_version: [ 'dev-master', '3.5.0' ]
+        php: [ '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
+        phpcs_version: [ 'dev-master', '3.6.2' ]
         allowed_failure: [ false ]
         include:
-          - php: '8.1'
-            phpcs_version: 'dev-master'
-            allowed_failure: false
-          # PHPCS is only compatible with PHP 8.1 as of version 3.6.1.
-          - php: '8.1'
-            phpcs_version: '3.6.1'
-            allowed_failure: false
-          - php: '8.0'
-            phpcs_version: 'dev-master'
-            allowed_failure: false
-          # PHPCS is only compatible with PHP 8.0 as of version 3.5.7.
-          - php: '8.0'
-            phpcs_version: '3.5.7'
-            allowed_failure: false
           # Add extra build to test against PHPCS 4.
           #- php: '7.4'
           #  phpcs_version: '4.0.x-dev as 3.9.99'
diff --git a/README.md b/README.md
index d61fb239be..0523a09cc7 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/P
 
 ### Requirements
 
-The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.3.1** or higher.
+The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.6.2** or higher.
 
 ### Composer
 
diff --git a/composer.json b/composer.json
index c9354dd1f8..2ca4eaea60 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"squizlabs/php_codesniffer": "^3.5.0",
+		"squizlabs/php_codesniffer": "^3.6.2",
 		"phpcsstandards/phpcsutils": "^1.0",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},

From 76f3376730fb0fd220f313dabb630fcf186d0b5d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 14 May 2022 18:43:28 +0200
Subject: [PATCH 119/822] Move "interpolated variable" related utilities to
 dedicated `TextStringHelper`

The "interpolated variable" related utilities are only used by a small set of sniffs, so are better placed in a dedicated class.

This commit moves the `REGEX_COMPLEX_VARS` constant, the `get_interpolated_variables()` method and the `strip_interpolated_variables()` method to a new `WordPressCS\WordPress\Helpers\TextStringHelper` and starts using that class in the relevant sniffs.

In contrast to some of the other "move methods out of the Sniff class" PRs, these methods have been moved to a class and made `static` - instead of moved to a `trait`.
The reason for this difference is that the methods in other "moves" are setting properties which the sniff classes would need access to, while these methods are 100% stand-alone.

**Note**:
It is expected for PHPCSUtils to have dedicated methods for the same at some point in the future. If/when those methods become available, it is recommended for the sniffs to start using the PHPCSUtils methods and for this class to be deprecated and removed in the next major release.

Also note that PHP 8.2 will be making changes to the kind of interpolation supported by PHP. This will need further investigation at a future point in time (probably in PHPCSUtils rather than here), if nothing else to ensure that what was supported in PHP prior to PHP 8.2 is fully supported by these methods (which is probably not the case at this moment).
Ref: https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation

Related to 1465
---
 WordPress/Helpers/TextStringHelper.php        | 79 +++++++++++++++++++
 WordPress/Sniff.php                           | 51 ------------
 .../DB/PreparedSQLPlaceholdersSniff.php       |  7 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php      |  5 +-
 .../ValidPostTypeSlugSniff.php                |  5 +-
 .../Security/ValidatedSanitizedInputSniff.php |  5 +-
 WordPress/Sniffs/WP/I18nSniff.php             |  3 +-
 7 files changed, 94 insertions(+), 61 deletions(-)
 create mode 100644 WordPress/Helpers/TextStringHelper.php

diff --git a/WordPress/Helpers/TextStringHelper.php b/WordPress/Helpers/TextStringHelper.php
new file mode 100644
index 0000000000..13b63aa022
--- /dev/null
+++ b/WordPress/Helpers/TextStringHelper.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper utilities for handling text strings.
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The constant and methods in this class were previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ */
+final class TextStringHelper {
+
+	/**
+	 * Regex to get complex variables from T_DOUBLE_QUOTED_STRING or T_HEREDOC.
+	 *
+	 * @since 0.14.0
+	 * @since 3.0.0  Moved from the Sniff class to this class.
+	 *
+	 * @var string
+	 */
+	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
+
+	/**
+	 * Get the interpolated variable names from a string.
+	 *
+	 * Check if '$' is followed by a valid variable name, and that it is not preceded by an escape sequence.
+	 *
+	 * @since 0.9.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility is now `public` (was `protected`) and the method `static`.
+	 *
+	 * @param string $string The contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
+	 *
+	 * @return array Variable names (without '$' sigil).
+	 */
+	public static function get_interpolated_variables( $string ) {
+		$variables = array();
+		if ( preg_match_all( '/(?P<backslashes>\\\\*)\$(?P<symbol>\w+)/', $string, $match_sets, \PREG_SET_ORDER ) ) {
+			foreach ( $match_sets as $matches ) {
+				if ( ! isset( $matches['backslashes'] ) || ( \strlen( $matches['backslashes'] ) % 2 ) === 0 ) {
+					$variables[] = $matches['symbol'];
+				}
+			}
+		}
+		return $variables;
+	}
+
+	/**
+	 * Strip variables from an arbitrary double quoted/heredoc string.
+	 *
+	 * Intended for use with the contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
+	 *
+	 * @since 0.14.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method was made `static`.
+	 *
+	 * @param string $string The raw string.
+	 *
+	 * @return string String without variables in it.
+	 */
+	public static function strip_interpolated_variables( $string ) {
+		if ( strpos( $string, '$' ) === false ) {
+			return $string;
+		}
+
+		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 0aa237774c..f61931d558 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -38,15 +38,6 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	/**
-	 * Regex to get complex variables from T_DOUBLE_QUOTED_STRING or T_HEREDOC.
-	 *
-	 * @since 0.14.0
-	 *
-	 * @var string
-	 */
-	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
-
 	/**
 	 * List of the functions which verify nonces.
 	 *
@@ -2063,48 +2054,6 @@ protected function is_in_array_comparison( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Get the interpolated variable names from a string.
-	 *
-	 * Check if '$' is followed by a valid variable name, and that it is not preceded by an escape sequence.
-	 *
-	 * @since 0.9.0
-	 *
-	 * @param string $string The contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
-	 *
-	 * @return array Variable names (without '$' sigil).
-	 */
-	protected function get_interpolated_variables( $string ) {
-		$variables = array();
-		if ( preg_match_all( '/(?P<backslashes>\\\\*)\$(?P<symbol>\w+)/', $string, $match_sets, \PREG_SET_ORDER ) ) {
-			foreach ( $match_sets as $matches ) {
-				if ( ! isset( $matches['backslashes'] ) || ( \strlen( $matches['backslashes'] ) % 2 ) === 0 ) {
-					$variables[] = $matches['symbol'];
-				}
-			}
-		}
-		return $variables;
-	}
-
-	/**
-	 * Strip variables from an arbitrary double quoted/heredoc string.
-	 *
-	 * Intended for use with the contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
-	 *
-	 * @since 0.14.0
-	 *
-	 * @param string $string The raw string.
-	 *
-	 * @return string String without variables in it.
-	 */
-	public function strip_interpolated_variables( $string ) {
-		if ( strpos( $string, '$' ) === false ) {
-			return $string;
-		}
-
-		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
-	}
-
 	/**
 	 * Checks whether this is a call to a $wpdb method that we want to sniff.
 	 *
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index e6c1f664a7..836b6e51dd 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -9,10 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\DB;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\TextStringHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Check for incorrect use of the $wpdb->prepare method.
@@ -278,9 +279,9 @@ public function process_token( $stackPtr ) {
 				|| \T_HEREDOC === $this->tokens[ $i ]['code']
 			) {
 				// Only interested in actual query text, so strip out variables.
-				$stripped_content = $this->strip_interpolated_variables( $content );
+				$stripped_content = TextStringHelper::strip_interpolated_variables( $content );
 				if ( $stripped_content !== $content ) {
-					$interpolated_vars = $this->get_interpolated_variables( $content );
+					$interpolated_vars = TextStringHelper::get_interpolated_variables( $content );
 					$vars_without_wpdb = array_diff( $interpolated_vars, array( 'wpdb' ) );
 					$content           = $stripped_content;
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 57781d61af..c15826c14c 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\DB;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Helpers\TextStringHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Sniff for prepared SQL.
@@ -138,7 +139,7 @@ public function process_token( $stackPtr ) {
 			) {
 
 				$bad_variables = array_filter(
-					$this->get_interpolated_variables( $this->tokens[ $this->i ]['content'] ),
+					TextStringHelper::get_interpolated_variables( $this->tokens[ $this->i ]['content'] ),
 					function ( $symbol ) {
 						return ( 'wpdb' !== $symbol );
 					}
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 9edcff7792..673557efae 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\TextStringHelper;
 
 /**
  * Validates post type names.
@@ -161,7 +162,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				'PartiallyDynamic',
 				$data
 			);
-			$post_type = $this->strip_interpolated_variables( $post_type );
+			$post_type = TextStringHelper::strip_interpolated_variables( $post_type );
 		}
 
 		if ( preg_match( self::POST_TYPE_CHARACTER_WHITELIST, $post_type ) === 0 ) {
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 54b43184e7..00289b07bd 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Helpers\TextStringHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Flag any non-validated/sanitized input ( _GET / _POST / etc. ).
@@ -100,7 +101,7 @@ public function process_token( $stackPtr ) {
 				function ( $symbol ) {
 					return '$' . $symbol;
 				},
-				$this->get_interpolated_variables( $this->tokens[ $stackPtr ]['content'] )
+				TextStringHelper::get_interpolated_variables( $this->tokens[ $stackPtr ]['content'] )
 			);
 			foreach ( array_intersect( $interpolated_variables, $superglobals ) as $bad_variable ) {
 				$this->phpcsFile->addError( 'Detected usage of a non-sanitized, non-validated input variable %s: %s', $stackPtr, 'InputNotValidatedNotSanitized', array( $bad_variable, $this->tokens[ $stackPtr ]['content'] ) );
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index d2bfe32bad..8dd700ae0d 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -14,6 +14,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use XMLReader;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\TextStringHelper;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -470,7 +471,7 @@ protected function check_argument_tokens( $context ) {
 		}
 
 		if ( \T_DOUBLE_QUOTED_STRING === $tokens[0]['code'] || \T_HEREDOC === $tokens[0]['code'] ) {
-			$interpolated_variables = $this->get_interpolated_variables( $content );
+			$interpolated_variables = TextStringHelper::get_interpolated_variables( $content );
 			foreach ( $interpolated_variables as $interpolated_variable ) {
 				$code = $this->string_to_errorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
 				$this->addMessage( 'The $%s arg must not contain interpolated variables. Found "$%s".', $stack_ptr, $is_error, $code, array( $arg_name, $interpolated_variable ) );

From 20d906d01bc974a3eb08da0937eba79843af690c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:20:47 +0200
Subject: [PATCH 120/822] IsUnitTestTrait: update test class list

Update the test class list based on changes in WP Core:
* The `Block_Supported_Styles_Test` was never a `TestCase`, but was a concrete test placed in the wrong directory.
* The `PHPUnit_Adapter_TestCase` class was added to allow for PHPUnit cross-version support.

Other than that, the list is now alphabetized within each category and the categories are annotated with comments.
---
 WordPress/Helpers/IsUnitTestTrait.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 801c1e5a5b..b3712da57c 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -79,16 +79,21 @@ trait IsUnitTestTrait {
 	 * @var string[]
 	 */
 	protected $known_test_classes = array(
-		'WP_UnitTestCase_Base'                       => true,
+		// Base test cases.
 		'WP_UnitTestCase'                            => true,
+		'WP_UnitTestCase_Base'                       => true,
+		'PHPUnit_Adapter_TestCase'                   => true,
+
+		// Domain specific base test cases.
 		'WP_Ajax_UnitTestCase'                       => true,
-		'Block_Supported_Styles_Test'                => true,
 		'WP_Canonical_UnitTestCase'                  => true,
-		'WP_Test_REST_TestCase'                      => true,
 		'WP_Test_REST_Controller_Testcase'           => true,
 		'WP_Test_REST_Post_Type_Controller_Testcase' => true,
+		'WP_Test_REST_TestCase'                      => true,
 		'WP_Test_XML_TestCase'                       => true,
 		'WP_XMLRPC_UnitTestCase'                     => true,
+
+		// PHPUnit native test cases.
 		'PHPUnit_Framework_TestCase'                 => true,
 		'PHPUnit\Framework\TestCase'                 => true,
 		// PHPUnit native TestCase class when imported via use statement.

From 43a2cbd5968ea7e69b5aa99ba6d5d377750bb0d7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 14 May 2022 19:45:45 +0200
Subject: [PATCH 121/822] Move "deprecation" related utilities to dedicated
 `DeprecationHelper`

The "deprecation" related utilities are only used by a small set of sniffs, so are better placed in a dedicated class.

This commit moves the `is_function_deprecated()` method to a new `WordPressCS\WordPress\Helpers\DeprecationHelper` and starts using that class in the relevant sniffs.

**Note**:
It is expected for PHPCSUtils to have dedicated methods for the same at some point in the future. If/when those methods become available, it is recommended for the sniffs to start using the PHPCSUtils methods and for this class to be deprecated and removed in the next major release.

Related to 1465
---
 WordPress/Helpers/DeprecationHelper.php       | 60 +++++++++++++++++++
 WordPress/Sniff.php                           | 35 -----------
 .../PrefixAllGlobalsSniff.php                 |  3 +-
 .../ValidFunctionNameSniff.php                |  5 +-
 4 files changed, 65 insertions(+), 38 deletions(-)
 create mode 100644 WordPress/Helpers/DeprecationHelper.php

diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
new file mode 100644
index 0000000000..3363a75efe
--- /dev/null
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Helper utilities for checking whether something has been marked as deprecated.
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class DeprecationHelper {
+
+	/**
+	 * Check whether a function has been marked as deprecated via a @deprecated tag
+	 * in the function docblock.
+	 *
+	 * @since 2.2.0
+	 * @since 3.0.0 Moved from the Sniff class to this class.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of a T_FUNCTION
+	 *                                               token in the stack.
+	 *
+	 * @return bool
+	 */
+	public static function is_function_deprecated( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+		$find   = Tokens::$methodPrefixes;
+		$find[] = \T_WHITESPACE;
+
+		$comment_end = $phpcsFile->findPrevious( $find, ( $stackPtr - 1 ), null, true );
+		if ( \T_DOC_COMMENT_CLOSE_TAG !== $tokens[ $comment_end ]['code'] ) {
+			// Function doesn't have a doc comment or is using the wrong type of comment.
+			return false;
+		}
+
+		$comment_start = $tokens[ $comment_end ]['comment_opener'];
+		foreach ( $tokens[ $comment_start ]['comment_tags'] as $tag ) {
+			if ( '@deprecated' === $tokens[ $tag ]['content'] ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 0aa237774c..4937753711 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2396,39 +2396,4 @@ protected function get_list_variables( $stackPtr, $list_open_close = array() ) {
 
 		return $var_pointers;
 	}
-
-	/**
-	 * Check whether a function has been marked as deprecated via a @deprecated tag
-	 * in the function docblock.
-	 *
-	 * {@internal This method is static to allow the ValidFunctionName class to use it.}}
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-	 * @param int                         $stackPtr  The position of a T_FUNCTION
-	 *                                               token in the stack.
-	 *
-	 * @return bool
-	 */
-	public static function is_function_deprecated( File $phpcsFile, $stackPtr ) {
-		$tokens = $phpcsFile->getTokens();
-		$find   = Tokens::$methodPrefixes;
-		$find[] = \T_WHITESPACE;
-
-		$comment_end = $phpcsFile->findPrevious( $find, ( $stackPtr - 1 ), null, true );
-		if ( \T_DOC_COMMENT_CLOSE_TAG !== $tokens[ $comment_end ]['code'] ) {
-			// Function doesn't have a doc comment or is using the wrong type of comment.
-			return false;
-		}
-
-		$comment_start = $tokens[ $comment_end ]['comment_opener'];
-		foreach ( $tokens[ $comment_start ]['comment_tags'] as $tag ) {
-			if ( '@deprecated' === $tokens[ $tag ]['content'] ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
 }
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 1d0eceb444..d2817ede48 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -16,6 +16,7 @@
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 
 /**
@@ -386,7 +387,7 @@ public function process_token( $stackPtr ) {
 						return;
 					}
 
-					if ( $this->is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
+					if ( DeprecationHelper::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
 						/*
 						 * Deprecated functions don't have to comply with the naming conventions,
 						 * otherwise functions deprecated in favour of a function with a compliant
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 84a3267718..034613b72a 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -9,11 +9,12 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use WordPressCS\WordPress\Sniff;
 use PHPCSUtils\BackCompat\BCTokens;
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Scopes;
+use WordPressCS\WordPress\Helpers\DeprecationHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces WordPress function name and method name format, based upon Squiz code.
@@ -55,7 +56,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( Sniff::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
+		if ( DeprecationHelper::is_function_deprecated( $this->phpcsFile, $stackPtr ) === true ) {
 			/*
 			 * Deprecated functions don't have to comply with the naming conventions,
 			 * otherwise functions deprecated in favour of a function with a compliant

From ac80e89232de2520a69a953ef406df0803a0db9e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 14 May 2022 20:01:36 +0200
Subject: [PATCH 122/822] PHP 8.0 | DeprecationHelper: allow for attributes
 between function declaration and docblock

PHP 8.0 introduced attributes, which can be placed - and commonly are placed - between a function declaration and its docblock.
Ref: https://www.php.net/manual/en/language.attributes.php

This commit updates the `is_function_deprecated()` method to skip over attributes. This prevents false positives when a function is deprecated, but also has an attribute.

Tested via both sniffs using the helper class.

Includes renaming a local variable to be more descriptive (`$ignore` instead of `$find`).
---
 WordPress/Helpers/DeprecationHelper.php       | 22 +++++++++++++++----
 .../PrefixAllGlobalsUnitTest.1.inc            | 14 ++++++++++++
 .../ValidFunctionNameUnitTest.inc             | 14 ++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
index 3363a75efe..dc6a992755 100644
--- a/WordPress/Helpers/DeprecationHelper.php
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -38,11 +38,25 @@ final class DeprecationHelper {
 	 * @return bool
 	 */
 	public static function is_function_deprecated( File $phpcsFile, $stackPtr ) {
-		$tokens = $phpcsFile->getTokens();
-		$find   = Tokens::$methodPrefixes;
-		$find[] = \T_WHITESPACE;
+		$tokens                  = $phpcsFile->getTokens();
+		$ignore                  = Tokens::$methodPrefixes;
+		$ignore[ \T_WHITESPACE ] = \T_WHITESPACE;
+
+		for ( $comment_end = ( $stackPtr - 1 ); $comment_end >= 0; $comment_end-- ) {
+			if ( isset( $ignore[ $tokens[ $comment_end ]['code'] ] ) === true ) {
+				continue;
+			}
+
+			if ( \T_ATTRIBUTE_END === $tokens[ $comment_end ]['code']
+				&& isset( $tokens[ $comment_end ]['attribute_opener'] ) === true
+			) {
+				$comment_end = $tokens[ $comment_end ]['attribute_opener'];
+				continue;
+			}
+
+			break;
+		}
 
-		$comment_end = $phpcsFile->findPrevious( $find, ( $stackPtr - 1 ), null, true );
 		if ( \T_DOC_COMMENT_CLOSE_TAG !== $tokens[ $comment_end ]['code'] ) {
 			// Function doesn't have a doc comment or is using the wrong type of comment.
 			return false;
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index d2bbe40147..2c1242788e 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -482,6 +482,20 @@ function acronym_lists_in_function_scope() {
  */
 function deprecated_function() {}
 
+/**
+ * Function description.
+ *
+ * @since 1.2.3
+ * @deprecated 2.3.4
+ *
+ * @return void
+ */
+#[MyAttribute([
+	'something',
+	'something else',
+])]
+function deprecated_function_with_attribute() {}
+
 /*
  * Bad: Issue https://github.com/WordPress/WordPress-Coding-Standards/issues/1733.
  *
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index e40fdde8d6..e7f2da4e56 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -163,3 +163,17 @@ function ___triple_underscore() {} // OK.
 class Triple {
 	function ___triple_underscore() {} // OK.
 }
+
+class DeprecatedWithAttribute {
+	/**
+	 * Function description.
+	 *
+	 * @since 1.2.3
+	 * @deprecated 2.3.4
+	 *
+	 * @return void
+	 */
+	#[SomeAttribute]
+	#[AnotherAttribute]
+	public static function __deprecatedMethod() {}
+}

From 5b3cde7f0c78bff55de2ff8183e62c2f0018dead Mon Sep 17 00:00:00 2001
From: Juliette <663378+jrfnl@users.noreply.github.com>
Date: Mon, 16 May 2022 14:16:40 +0200
Subject: [PATCH 123/822] Add Code of Conduct

Based on the [Contributor Covenant](https://www.contributor-covenant.org) version 2.0.

As there is no email address available for the project, I'm proposing to use the WP Core Slack channel #core-coding-standards as the official channel to report violations. Depending on the violation, details can shared in private via DMs if needed to protect the privacy of the parties involved.
---
 CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..c0a53dc110
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement in
+the [WordPress Slack](https://make.wordpress.org/chat/) in the [#core-coding-standards channel](https://wordpress.slack.com/archives/C5VCTJGH3).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

From 222251d7a9ffba0cf0348b14d5454705ec910142 Mon Sep 17 00:00:00 2001
From: "Ipstenu (Mika Epstein)" <Ipstenu@users.noreply.github.com>
Date: Mon, 16 May 2022 07:14:45 -0700
Subject: [PATCH 124/822] Document YodaConditionals you must (#1724)

* Document YodaConditionals you must

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 WordPress/Docs/PHP/YodaConditionsStandard.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 WordPress/Docs/PHP/YodaConditionsStandard.xml

diff --git a/WordPress/Docs/PHP/YodaConditionsStandard.xml b/WordPress/Docs/PHP/YodaConditionsStandard.xml
new file mode 100644
index 0000000000..169cbcc368
--- /dev/null
+++ b/WordPress/Docs/PHP/YodaConditionsStandard.xml
@@ -0,0 +1,26 @@
+<documentation title="Yoda Conditions">
+    <standard>
+    <![CDATA[
+    When doing logical comparisons involving variables, the variable must be placed on the right side. All constants, literals, and function calls must be placed on the left side. If neither side is a variable, the order is unimportant.
+
+    For more information:
+    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: The variable is placed on the right">
+        <![CDATA[
+if ( <em>true === $the_force</em> ) {
+    $victorious = you_will( $be );
+}
+        ]]>
+        </code>
+        <code title="Invalid: The variable has been placed on the left">
+        <![CDATA[
+if ( <em>$the_force === false</em> ) {
+    $victorious = you_will_not( $be );
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 7d8c9fe9c6126a52379c39bfce70d234ae7b1493 Mon Sep 17 00:00:00 2001
From: Christopher Kanitz <ckanitz@users.noreply.github.com>
Date: Tue, 17 May 2022 10:52:17 +0200
Subject: [PATCH 125/822] Docs/WordPress.WhiteSpace.OperatorSpacing (#1727)

* Create OperatorSpacingStandard.xml

Co-Authored-By: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../WhiteSpace/OperatorSpacingStandard.xml    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml

diff --git a/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml b/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml
new file mode 100644
index 0000000000..ca17e57ff5
--- /dev/null
+++ b/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml
@@ -0,0 +1,57 @@
+<documentation title="Operator Spacing">
+    <standard>
+    <![CDATA[
+    Always put one space on both sides of logical, comparison and concatenation operators.
+    Always put one space after an assignment operator.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: one space before and after an operator.">
+        <![CDATA[
+if ( $a<em> === </em>$b<em> && </em>$b<em> === </em>$c ) {}
+if (<em> ! </em>$var ) {}
+        ]]>
+        </code>
+        <code title="Invalid: too much/little space.">
+        <![CDATA[
+// Too much space.
+if ( $a === $b<em>   &&   </em>$b<em> ===      </em>$c ) {}
+if (<em>  ! </em>$var ) {}
+
+// Too little space.
+if ( $a<em>===</em>$b<em> &&</em>$b<em> ===</em>$c ) {}
+if (<em> !</em>$var ) {}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: a new line instead of a space is okay too.">
+        <![CDATA[
+if ( $a === $b<em>
+    && </em>$b === $c
+) {}
+        ]]>
+        </code>
+        <code title="Invalid: too much space after operator on new line.">
+        <![CDATA[
+if ( $a === $b<em>
+    &&     </em>$b === $c
+) {}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: one space after assignment operator.">
+        <![CDATA[
+$a   <em>= </em>'foo';
+$all <em>= </em>'foobar';
+        ]]>
+        </code>
+        <code title="Invalid: too much/little space after assignment operator.">
+        <![CDATA[
+$a   <em>=     </em>'foo';
+$all <em>=</em>'foobar';
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 8df97123737e448c62a8952a9c23a6ee5d629c67 Mon Sep 17 00:00:00 2001
From: Marco Martins <marcomartins@fimdalinha.com>
Date: Tue, 17 May 2022 11:52:54 +0300
Subject: [PATCH 126/822] Add PHP.StrictInArray XML documentation (#1740)

* Add PHP.StrictInArray XML documentation

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 WordPress/Docs/PHP/StrictInArrayStandard.xml | 49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 WordPress/Docs/PHP/StrictInArrayStandard.xml

diff --git a/WordPress/Docs/PHP/StrictInArrayStandard.xml b/WordPress/Docs/PHP/StrictInArrayStandard.xml
new file mode 100644
index 0000000000..ccd8a0f752
--- /dev/null
+++ b/WordPress/Docs/PHP/StrictInArrayStandard.xml
@@ -0,0 +1,49 @@
+<documentation title="Strict In Array Syntax">
+    <standard>
+    <![CDATA[
+    When using functions which compare a value to a range of values in an array, make sure a strict comparison is executed.
+
+    Typically, this rule verifies function calls to the PHP native `in_array()`, `array_search()` and `array_keys()` functions pass the `$strict` parameter.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: calling in_array() with the $strict parameter set to `true`.">
+        <![CDATA[
+$array = array( '1', 1, true );
+if ( in_array( $value, $array, <em>true</em> ) ) {}
+        ]]>
+        </code>
+        <code title="Invalid: calling in_array() without passing the $strict parameter.">
+        <![CDATA[
+$array = array( '1', 1, true );
+if ( in_array( $value, $array<em> </em>) ) {}
+        ]]>
+        </code>
+    </code_comparison>
+
+    <code_comparison>
+        <code title="Valid: calling array_search() with the $strict parameter set to `true`.">
+        <![CDATA[
+$key = array_search( 1, $array, <em>true</em> );
+        ]]>
+        </code>
+        <code title="Invalid: calling array_search() without passing the $strict parameter.">
+        <![CDATA[
+$key = array_search( 1, $array<em> </em>);
+        ]]>
+        </code>
+    </code_comparison>
+
+    <code_comparison>
+        <code title="Valid: calling array_keys() with a $search_value and the $strict parameter set to `true`.">
+        <![CDATA[
+$keys = array_keys( $array, $key, <em>true</em> );
+        ]]>
+        </code>
+        <code title="Invalid: calling array_keys() with a $search_value without passing the $strict parameter.">
+        <![CDATA[
+$keys = array_keys( $array, $key<em> </em>);
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 11c354d83c8016443325243bcc9d76e0157fcf0d Mon Sep 17 00:00:00 2001
From: Marco Martins <marcomartins@fimdalinha.com>
Date: Tue, 17 May 2022 11:54:35 +0300
Subject: [PATCH 127/822] Add the documentation for
 WordPress.Arrays.CommaAfterArrayItem (#1734)

* Add the documentation for WordPress.Arrays.CommaAfterArrayItem

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 .../Arrays/CommaAfterArrayItemStandard.xml    | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml

diff --git a/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml b/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
new file mode 100644
index 0000000000..a42d39771c
--- /dev/null
+++ b/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
@@ -0,0 +1,94 @@
+<documentation title="Comma After Array Item">
+    <standard>
+    <![CDATA[
+    There should be no space between an array item and the comma following it.
+    There should be either exactly one space, or a new line, after the comma.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No space before a comma.">
+        <![CDATA[
+$array = array(
+    'type'   => 'value'<em>,</em>
+    'values' => array( 1 )<em>,</em>
+    'extra'  => 'c'<em>,</em> /* Comment. */
+);
+        ]]>
+        </code>
+        <code title="Invalid: One or more spaces before a comma.">
+        <![CDATA[
+$array = array(
+    'type'   => 'value'<em>  ,</em>
+    'values' => array( 1 ),
+    'extra'  => 'c'<em>       ,</em> /* Comment. */
+);
+        ]]>
+        </code>
+    </code_comparison>
+
+    <code_comparison>
+        <code title="Valid: Exactly one space after a comma in a single line array.">
+        <![CDATA[
+$array = array( 'a'<em>, </em>'b'<em>, </em>'c' );
+        ]]>
+        </code>
+        <code title="Invalid: Multiple or no spaces after a comma in a single line array.">
+        <![CDATA[
+$array = array( 'a'<em>,</em>'b'<em>,    </em>'c' );
+        ]]>
+        </code>
+    </code_comparison>
+
+    <standard>
+    <![CDATA[
+    Single line arrays should not have a trailing comma after the last array item.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Single line array without a trailing comma.">
+        <![CDATA[
+$array = array( 'a', 'b', <em>'c' </em>);
+        ]]>
+        </code>
+        <code title="Invalid: Single line array with a trailing comma.">
+        <![CDATA[
+$array = array( 'a', 'b', <em>'c', </em>);
+        ]]>
+        </code>
+    </code_comparison>
+
+    <standard>
+    <![CDATA[
+    Multi-line arrays must have a trailing comma after the last array item.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Comma after each item in a multi-line array.">
+        <![CDATA[
+$array = array(
+    'a',
+    <em>'c',</em>
+);
+
+$assoc = array(
+    'type' => 'value',
+    'key'  => <em>'c'</em>,
+);
+        ]]>
+        </code>
+
+        <code title="Invalid: Missing trailing comma after last item in a multi-line array.">
+        <![CDATA[
+$array = array(
+    'a',
+    <em>'c'</em>
+);
+
+$assoc = array(
+    'type' => 'value',
+    'key' => <em>'c'</em>
+);
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From cfdb6d15818ce1ce4c6db0841d688c0d03ee8607 Mon Sep 17 00:00:00 2001
From: "Ipstenu (Mika Epstein)" <Ipstenu@users.noreply.github.com>
Date: Thu, 2 Jun 2022 09:44:05 -0700
Subject: [PATCH 128/822] Prefix Your Globals (#1726)

* Prefix Your Globals documentation
  * Use consistent indentation in the file.
  * Expand the base explanation.
  * Improve the valid/invalid descriptions.
  * Use `<em>` tags to mark valid/invalid code.
  * Expand the code samples.
  * Add a code comparison demonstrating how namespaces affect the prefixes.
  * Remove the unclear sentence regarding reserved prefixes.
  * Clarify the three character minimum length rule.

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 .../PrefixAllGlobalsStandard.xml              | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml

diff --git a/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
new file mode 100644
index 0000000000..855dba8e6c
--- /dev/null
+++ b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
@@ -0,0 +1,115 @@
+<documentation title="Prefix All Globals">
+    <standard>
+    <![CDATA[
+    All globals terms must be prefixed with a theme/plugin specific term. Global terms include Namespace names, Class/Interface/Trait names (when not namespaced), Functions (when not namespaced or in an OO structure), Constants/Variable names declared in the global namespace, and Hook names.
+
+    A prefix must be distinct and unique to the plugin/theme, in order to prevent potential conflicts with other plugins/themes and with WordPress itself.
+
+    The prefix used for a plugin/theme may be chosen by the developers and should be defined in a custom PHPCS ruleset to allow for this sniff to verify that the prefix is consistently used.
+    Prefixes will be treated in a case-insensitive manner.
+    https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#naming-conventions-prefix-everything-in-the-global-namespace
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using the prefix ECPT_">
+        <![CDATA[
+define( <em>'ECPT_VERSION'</em>, '1.0' );
+
+<em>$ecpt_admin</em> = new ECPT_Admin_Page();
+
+class <em>ECPT_Admin_Page</em> {}
+
+apply_filter(
+    <em>'ecpt_modify_content'</em>,
+    $ecpt_content
+);
+        ]]>
+        </code>
+        <code title="Invalid: non-prefixed code">
+        <![CDATA[
+define( <em>'PLUGIN_VERSION'</em>, '1.0' );
+
+<em>$admin</em> = new Admin_Page();
+
+class <em>Admin_Page</em> {}
+
+apply_filter(
+    <em>'modify_content'</em>,
+    $content
+);
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Using the prefix ECPT_ in namespaced code">
+        <![CDATA[
+namespace <em>ECPT_Plugin\Admin</em>;
+
+// Constants declared using `const` will
+// be namespaced and therefore prefixed.
+const VERSION = 1.0;
+
+// A class declared in a (prefixed) namespace
+// is automatically prefixed.
+class Admin_Page {}
+
+// Variables in a namespaced file are not
+// namespaced, so still need prefixing.
+<em>$ecpt_admin</em> = new Admin_Page();
+
+// Hook names are not subject to namespacing.
+apply_filter(
+    <em>'ecpt_modify_content'</em>,
+    $ecpt_content
+);
+        ]]>
+        </code>
+        <code title="Invalid: using a non-prefixed namespace">
+        <![CDATA[
+namespace <em>Admin</em>;
+
+// As the namespace is not prefixed, this
+// is still bad.
+const VERSION = 1.0;
+
+// As the namespace is not prefixed, this
+// is still bad.
+class Admin_Page {}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    Using prefixes reserved for WordPress is not permitted, even if WordPress is not currently using the prefix (yet).
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using the prefix mycoolplugin_">
+        <![CDATA[
+function <em>mycoolplugin_save_post()</em> {}
+        ]]>
+        </code>
+        <code title="Invalid: Using a WordPress reserved prefix wp_">
+        <![CDATA[
+function <em>wp_save_post()</em> {}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    Prefixes must have a minimum length of three character to be considered valid, as many plugins and themes share the same initials.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using the distinct prefix MyPlugin">
+        <![CDATA[
+interface <em>MyPluginIsCool</em> {}
+        ]]>
+        </code>
+        <code title="Invalid: Using a two-letter prefix My">
+        <![CDATA[
+interface <em>My</em> {}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 4d803981d9e55dd686ccd90e2b3dd95ba7058699 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 3 Jun 2022 16:15:29 +0200
Subject: [PATCH 129/822] NamingConventions/ValidHookName: bug fix - ignore
 parameters passed to function calls

This commit changes the sniff to ignore parameters passed to function calls by skipping over the tokens containing within parentheses, but only if those parentheses appear to be for a literal function call (last non-empty token before the open parenthesis is a `T_STRING`). Text string tokens within _arbitrary_ parentheses will still be examined.

Note: this does not take variable function calls into account, but as, generally speaking, the hook name shouldn't be generated via a function call anyway, I don't think that's an issue we need to worry about (unless someone submits a bug report for it).

Includes unit tests.

Fixes 2055
---
 .../NamingConventions/ValidHookNameSniff.php  | 24 ++++-
 .../ValidHookNameUnitTest.1.inc               | 14 +++
 .../ValidHookNameUnitTest.php                 | 92 ++++++++++---------
 3 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index f0d3558ca8..7ce5f8f916 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -100,10 +100,11 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		$regex = $this->prepare_regex();
 
-		$case_errors = 0;
-		$underscores = 0;
-		$content     = array();
-		$expected    = array();
+		$case_errors    = 0;
+		$underscores    = 0;
+		$content        = array();
+		$expected       = array();
+		$last_non_empty = null;
 
 		for ( $i = $parameters[1]['start']; $i <= $parameters[1]['end']; $i++ ) {
 			// Skip past comment tokens.
@@ -129,15 +130,28 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 				} while ( isset( $this->tokens[ $i ] ) && $i <= $parameters[1]['end'] );
 
+				$last_non_empty = $i;
+				continue;
+			}
+
+			// Skip over parameters passed to function calls.
+			if ( \T_OPEN_PARENTHESIS === $this->tokens[ $i ]['code']
+				&& \T_STRING === $this->tokens[ $last_non_empty ]['code']
+				&& isset( $this->tokens[ $i ]['parenthesis_closer'] )
+			) {
+				$i              = $this->tokens[ $i ]['parenthesis_closer'];
+				$last_non_empty = $i;
 				continue;
 			}
 
 			// Skip past non-string tokens.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) === false ) {
+				$last_non_empty = $i;
 				continue;
 			}
 
-			$string = TextStrings::stripQuotes( $this->tokens[ $i ]['content'] );
+			$last_non_empty = $i;
+			$string         = TextStrings::stripQuotes( $this->tokens[ $i ]['content'] );
 
 			/*
 			 * Here be dragons - a double quoted string can contain extrapolated variables
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
index 039ca6484e..2c03bfe5fa 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
@@ -94,3 +94,17 @@ do_action(
 	// phpcs:ignore Stnd.Cat.Sniff -- For reasons.
 	'prefix_hook-name' /* comment */
 );
+
+// Ignore text strings when passed as parameters to a function call. WPCS #2055.
+$value = apply_filters(
+	get_filter_name( 'UPPERCASE', 'wrong-delimiter' ),
+	$value,
+	$attributes
+);
+
+// ... but do not ignore text strings in arbitrary parentheses.
+$value = apply_filters(
+	( $name ? 'UPPERCASE' : 'wrong-delimiter' ),
+	$value,
+	$attributes
+);
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index c55be6b044..b01a626282 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -32,43 +32,44 @@ public function getErrorList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 		switch ( $testFile ) {
 			case 'ValidHookNameUnitTest.1.inc':
 				return array(
-					14 => 1,
-					15 => 1,
-					16 => 1,
-					17 => 1,
-					28 => 1,
-					29 => 1,
-					30 => 1,
-					33 => 1,
-					53 => 1,
-					54 => 1,
-					55 => 1,
-					56 => 1,
-					57 => 1,
-					58 => 1,
-					59 => 1,
-					60 => 1,
-					61 => 1,
-					62 => 1,
-					63 => 1,
-					64 => 1,
-					65 => 1,
-					66 => 1,
-					68 => 1,
-					69 => 1,
-					70 => 1,
-					71 => 1,
-					72 => 1,
-					73 => 1,
-					74 => 1,
-					75 => 1,
-					76 => 1,
-					77 => 1,
-					78 => 1,
-					79 => 1,
-					80 => 1,
-					81 => 1,
-					89 => 1,
+					14  => 1,
+					15  => 1,
+					16  => 1,
+					17  => 1,
+					28  => 1,
+					29  => 1,
+					30  => 1,
+					33  => 1,
+					53  => 1,
+					54  => 1,
+					55  => 1,
+					56  => 1,
+					57  => 1,
+					58  => 1,
+					59  => 1,
+					60  => 1,
+					61  => 1,
+					62  => 1,
+					63  => 1,
+					64  => 1,
+					65  => 1,
+					66  => 1,
+					68  => 1,
+					69  => 1,
+					70  => 1,
+					71  => 1,
+					72  => 1,
+					73  => 1,
+					74  => 1,
+					75  => 1,
+					76  => 1,
+					77  => 1,
+					78  => 1,
+					79  => 1,
+					80  => 1,
+					81  => 1,
+					89  => 1,
+					107 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':
@@ -89,14 +90,15 @@ public function getWarningList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 		switch ( $testFile ) {
 			case 'ValidHookNameUnitTest.1.inc':
 				return array(
-					8  => 1,
-					9  => 1,
-					10 => 1,
-					11 => 1,
-					68 => 1,
-					72 => 1,
-					77 => 1,
-					95 => 1,
+					8   => 1,
+					9   => 1,
+					10  => 1,
+					11  => 1,
+					68  => 1,
+					72  => 1,
+					77  => 1,
+					95  => 1,
+					107 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':

From 750cb11d78c42564708e3f16920557ad94fb841b Mon Sep 17 00:00:00 2001
From: Gary Jones <github@garyjones.io>
Date: Sat, 4 Jun 2022 11:11:49 +0100
Subject: [PATCH 130/822] Docs: Add TimezoneChange XML doc (#1731)

* Docs: Add TimezoneChange XML doc
---
 .../DateTime/RestrictedFunctionsStandard.xml  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml

diff --git a/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml b/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml
new file mode 100644
index 0000000000..c8cc932cc9
--- /dev/null
+++ b/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml
@@ -0,0 +1,50 @@
+<documentation title="Restricted Date and Time Functions">
+    <standard>
+    <![CDATA[
+    The restricted functions date_default_timezone_set() and date() should not be used.
+    ]]>
+    </standard>
+    <standard>
+    <![CDATA[
+    Using the PHP native date_default_timezone_set() function isn't allowed, because WordPress Core needs the default time zone to be set to UTC for timezone calculations using the WP Core API to work correctly.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using DateTime object.">
+        <![CDATA[
+$date = new <em>DateTime()</em>;
+$date->setTimezone(
+    new DateTimeZone( 'Europe/Amsterdam' )
+);
+        ]]>
+        </code>
+        <code title="Invalid: Using date_default_timezone_set().">
+        <![CDATA[
+<em>date_default_timezone_set</em>( 'Europe/Amsterdam' );
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    Using the PHP native date() function isn't allowed, as it is affected by runtime timezone changes which can cause the date/time to be incorrectly displayed. Use gmdate() instead.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using gmdate().">
+        <![CDATA[
+$last_updated = <em>gmdate</em>(
+    'Y-m-d\TH:i:s',
+    strtotime( $plugin['last_updated'] )
+);
+        ]]>
+        </code>
+        <code title="Invalid: Using date().">
+        <![CDATA[
+$last_updated = <em>date</em>(
+    'Y-m-d\TH:i:s',
+    strtotime( $plugin['last_updated'] )
+);
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From def118b099db14c2fbfea6a488f660c49e1d917c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 16:30:03 +0200
Subject: [PATCH 131/822] Composer: up the minimum PHPCS version to 3.7.0

As discussed in issue 2048 and PR 2049, to add support for PHP 8.1 features to WPCS and prevent false positives related to PHP 8.1 features, this commit ups the minimum supported PHPCS version to PHPCS 3.7.0.

Includes updating the GH Actions matrixes for this change.

Fixes 2048
---
 .github/CONTRIBUTING.md                     | 2 +-
 .github/ISSUE_TEMPLATE/dependency-change.md | 2 +-
 .github/workflows/quicktest.yml             | 4 ++--
 .github/workflows/ruleset-checks-sniffs.yml | 2 +-
 .github/workflows/unit-tests.yml            | 2 +-
 README.md                                   | 2 +-
 composer.json                               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 7fd8c23149..4acbf78a09 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 
 ## Pre-requisites
 * WordPress-Coding-Standards
-* PHP_CodeSniffer 3.6.2 or higher
+* PHP_CodeSniffer 3.7.0 or higher
 * PHPUnit 4.x, 5.x, 6.x or 7.x
 
 The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
diff --git a/.github/ISSUE_TEMPLATE/dependency-change.md b/.github/ISSUE_TEMPLATE/dependency-change.md
index d6de56e870..a8ce13adbe 100644
--- a/.github/ISSUE_TEMPLATE/dependency-change.md
+++ b/.github/ISSUE_TEMPLATE/dependency-change.md
@@ -4,7 +4,7 @@ about: A reminder to take action when a WPCS dependency changes
 
 ---
 
-<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 3.7.0: ... -->
+<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 4.0.0: ... -->
 
 ## Rationale
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 1267203d40..f7998e2909 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -36,9 +36,9 @@ jobs:
         phpcs_version: [ 'dev-master' ]
         include:
           - php: '7.3'
-            phpcs_version: '3.6.2'
+            phpcs_version: '3.7.0'
           - php: '5.4'
-            phpcs_version: '3.6.2'
+            phpcs_version: '3.7.0'
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 616ab0e200..fddc940360 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -115,7 +115,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.4' ]
-        phpcs_version: [ 'dev-master', '3.6.2' ]
+        phpcs_version: [ 'dev-master', '3.7.0' ]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index f2052d3028..5020375e05 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php: [ '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
-        phpcs_version: [ 'dev-master', '3.6.2' ]
+        phpcs_version: [ 'dev-master', '3.7.0' ]
         allowed_failure: [ false ]
         include:
           # Add extra build to test against PHPCS 4.
diff --git a/README.md b/README.md
index 0523a09cc7..1b1a859456 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/P
 
 ### Requirements
 
-The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.6.2** or higher.
+The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.0** or higher.
 
 ### Composer
 
diff --git a/composer.json b/composer.json
index 2ca4eaea60..74b01ea39b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"squizlabs/php_codesniffer": "^3.6.2",
+		"squizlabs/php_codesniffer": "^3.7.0",
 		"phpcsstandards/phpcsutils": "^1.0",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},

From ae49dcf5d83e496a24090b94dc464e74b0e89265 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 12:22:10 +0200
Subject: [PATCH 132/822] Helper classes: explicitly state there is no BC
 promise

For the `Helper` classes which do not contain WordPress specific code and for which it is likely that PHPCSUtils may at some point replace the functionality, make it very clear that those classes are not covered by a promise of backward-compatibility.

By doing this, we buy ourselves the freedom to remove methods from these classes/the classes completely if/when PHPCSUtils would offer similar functionality, without the need to create a new major release of WPCS when we do.
---
 WordPress/Helpers/DeprecationHelper.php | 5 +++++
 WordPress/Helpers/TextStringHelper.php  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
index dc6a992755..fa55b143a1 100644
--- a/WordPress/Helpers/DeprecationHelper.php
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -15,6 +15,11 @@
 /**
  * Helper utilities for checking whether something has been marked as deprecated.
  *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
diff --git a/WordPress/Helpers/TextStringHelper.php b/WordPress/Helpers/TextStringHelper.php
index 13b63aa022..9246835280 100644
--- a/WordPress/Helpers/TextStringHelper.php
+++ b/WordPress/Helpers/TextStringHelper.php
@@ -12,6 +12,11 @@
 /**
  * Helper utilities for handling text strings.
  *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *

From 0db0767092aa865aef299bcb5cacb42373570969 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 13:16:05 +0200
Subject: [PATCH 133/822] Move "array access keys" related utilities to
 dedicated `VariableHelper`

The "array access keys" related utilities are only used by a small set of sniffs, so are better placed in a dedicated class.

This commit moves the `get_array_access_keys()` method and the `get_array_access_key()` method to a new `WordPressCS\WordPress\Helpers\VariableHelper` and starts using that class in the relevant sniffs.

In contrast to some of the other "move methods out of the Sniff class" PRs, these methods have been moved to a class and made `static` - instead of moved to a `trait`.
The reason for this difference is that the methods in other "moves" are setting properties which the sniff classes would need access to, while these methods are 100% stand-alone.

**Note**:
It is expected for PHPCSUtils to have dedicated methods for the same at some point in the future. If/when those methods become available, it is recommended for the sniffs to start using the PHPCSUtils methods. With this in mind, this class has been marked as "internal" without BC promise.

Related to 1465
---
 WordPress/Helpers/VariableHelper.php          | 113 ++++++++++++++++++
 WordPress/Sniff.php                           |  83 +------------
 .../Sniffs/Security/EscapeOutputSniff.php     |   5 +-
 .../Security/ValidatedSanitizedInputSniff.php |   3 +-
 .../WP/GlobalVariablesOverrideSniff.php       |   5 +-
 5 files changed, 125 insertions(+), 84 deletions(-)
 create mode 100644 WordPress/Helpers/VariableHelper.php

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
new file mode 100644
index 0000000000..60f7ffa422
--- /dev/null
+++ b/WordPress/Helpers/VariableHelper.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Helper utilities for working with variables representing arrays.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The methods in this class were previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ */
+final class VariableHelper {
+
+	/**
+	 * Get the index keys of an array variable.
+	 *
+	 * E.g., "bar" and "baz" in $foo['bar']['baz'].
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility is now `public` (was `protected`) and the method `static`.
+	 *              - The $phpcsFile parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the variable token in the stack.
+	 * @param bool                        $all       Whether to get all keys or only the first.
+	 *                                               Defaults to `true`(= all).
+	 *
+	 * @return array An array of index keys whose value is being accessed.
+	 *               or an empty array if this is not array access.
+	 */
+	public static function get_array_access_keys( File $phpcsFile, $stackPtr, $all = true ) {
+		$tokens = $phpcsFile->getTokens();
+		$keys   = array();
+
+		if ( \T_VARIABLE !== $tokens[ $stackPtr ]['code'] ) {
+			return $keys;
+		}
+
+		$current = $stackPtr;
+
+		do {
+			// Find the next non-empty token.
+			$open_bracket = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				( $current + 1 ),
+				null,
+				true
+			);
+
+			// If it isn't a bracket, this isn't an array-access.
+			if ( false === $open_bracket
+				|| \T_OPEN_SQUARE_BRACKET !== $tokens[ $open_bracket ]['code']
+				|| ! isset( $tokens[ $open_bracket ]['bracket_closer'] )
+			) {
+				break;
+			}
+
+			$key = $phpcsFile->getTokensAsString(
+				( $open_bracket + 1 ),
+				( $tokens[ $open_bracket ]['bracket_closer'] - $open_bracket - 1 )
+			);
+
+			$keys[]  = trim( $key );
+			$current = $tokens[ $open_bracket ]['bracket_closer'];
+		} while ( isset( $tokens[ $current ] ) && true === $all );
+
+		return $keys;
+	}
+
+	/**
+	 * Get the index key of an array variable.
+	 *
+	 * E.g., "bar" in $foo['bar'].
+	 *
+	 * @since 0.5.0
+	 * @since 2.1.0 Now uses get_array_access_keys() under the hood.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility is now `public` (was `protected`) and the method `static`.
+	 *              - The $phpcsFile parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return string|false The array index key whose value is being accessed.
+	 */
+	public static function get_array_access_key( File $phpcsFile, $stackPtr ) {
+		$keys = self::get_array_access_keys( $phpcsFile, $stackPtr, false );
+		if ( isset( $keys[0] ) ) {
+			return $keys[0];
+		}
+
+		return false;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 0e38885671..fa5dfd4720 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -16,6 +16,7 @@
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\VariableHelper;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -1613,82 +1614,6 @@ public function add_unslash_error( $stackPtr ) {
 		);
 	}
 
-	/**
-	 * Get the index keys of an array variable.
-	 *
-	 * E.g., "bar" and "baz" in $foo['bar']['baz'].
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int  $stackPtr The index of the variable token in the stack.
-	 * @param bool $all      Whether to get all keys or only the first.
-	 *                       Defaults to `true`(= all).
-	 *
-	 * @return array An array of index keys whose value is being accessed.
-	 *               or an empty array if this is not array access.
-	 */
-	protected function get_array_access_keys( $stackPtr, $all = true ) {
-
-		$keys = array();
-
-		if ( \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
-			return $keys;
-		}
-
-		$current = $stackPtr;
-
-		do {
-			// Find the next non-empty token.
-			$open_bracket = $this->phpcsFile->findNext(
-				Tokens::$emptyTokens,
-				( $current + 1 ),
-				null,
-				true
-			);
-
-			// If it isn't a bracket, this isn't an array-access.
-			if ( false === $open_bracket
-				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ]['code']
-				|| ! isset( $this->tokens[ $open_bracket ]['bracket_closer'] )
-			) {
-				break;
-			}
-
-			$key = $this->phpcsFile->getTokensAsString(
-				( $open_bracket + 1 ),
-				( $this->tokens[ $open_bracket ]['bracket_closer'] - $open_bracket - 1 )
-			);
-
-			$keys[]  = trim( $key );
-			$current = $this->tokens[ $open_bracket ]['bracket_closer'];
-		} while ( isset( $this->tokens[ $current ] ) && true === $all );
-
-		return $keys;
-	}
-
-	/**
-	 * Get the index key of an array variable.
-	 *
-	 * E.g., "bar" in $foo['bar'].
-	 *
-	 * @since 0.5.0
-	 * @since 2.1.0 Now uses get_array_access_keys() under the hood.
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return string|false The array index key whose value is being accessed.
-	 */
-	protected function get_array_access_key( $stackPtr ) {
-
-		$keys = $this->get_array_access_keys( $stackPtr, false );
-
-		if ( isset( $keys[0] ) ) {
-			return $keys[0];
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if the existence of a variable is validated with isset(), empty(), array_key_exists()
 	 * or key_exists().
@@ -1826,7 +1751,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						// If we're checking for specific array keys (ex: 'hello' in
 						// $_POST['hello']), that must match too. Quote-style, however, doesn't matter.
 						if ( ! empty( $bare_array_keys ) ) {
-							$found_keys = $this->get_array_access_keys( $i );
+							$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $i );
 							$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 							$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 							if ( ! empty( $diff ) ) {
@@ -1887,7 +1812,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						 * parameter, so we need to check both options.
 						 */
 
-						$found_keys = $this->get_array_access_keys( $param2_first_token );
+						$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $param2_first_token );
 						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 
 						// First try matching the complete set against the second parameter.
@@ -1931,7 +1856,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 					}
 
 					if ( ! empty( $bare_array_keys ) ) {
-						$found_keys = $this->get_array_access_keys( $prev );
+						$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $prev );
 						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
 						$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 						if ( ! empty( $diff ) ) {
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 09cd206ff3..ce686ac05d 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -9,10 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\VariableHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Verifies that all outputted strings are escaped.
@@ -452,7 +453,7 @@ public function process_token( $stackPtr ) {
 
 			// Make the error message a little more informative for array access variables.
 			if ( \T_VARIABLE === $this->tokens[ $ptr ]['code'] ) {
-				$array_keys = $this->get_array_access_keys( $ptr );
+				$array_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $ptr );
 
 				if ( ! empty( $array_keys ) ) {
 					$content .= '[' . implode( '][', $array_keys ) . ']';
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 00289b07bd..1e1847fbb5 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use WordPressCS\WordPress\Helpers\TextStringHelper;
+use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -125,7 +126,7 @@ function ( $symbol ) {
 			return;
 		}
 
-		$array_keys = $this->get_array_access_keys( $stackPtr );
+		$array_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $stackPtr );
 
 		if ( empty( $array_keys ) ) {
 			return;
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index d07064c489..0ab1bcd1d5 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -13,8 +13,9 @@
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
-use WordPressCS\WordPress\Sniff;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Helpers\VariableHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Warns about overwriting WordPress native global variables.
@@ -384,7 +385,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				foreach ( $var_pointers as $ptr ) {
 					$var_name = $this->tokens[ $ptr ]['content'];
 					if ( '$GLOBALS' === $var_name ) {
-						$var_name = '$' . TextStrings::stripQuotes( $this->get_array_access_key( $ptr ) );
+						$var_name = '$' . TextStrings::stripQuotes( VariableHelper::get_array_access_key( $this->phpcsFile, $ptr ) );
 					}
 
 					if ( \in_array( $var_name, $search, true ) ) {

From 8d3bb6fd44d6db98d6e80923371659c9ae353bc4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 13:30:23 +0200
Subject: [PATCH 134/822] VariableHelper::get_array_access_keys() use
 PHPCSUtils

Use the PHPCSUtils `GetTokensAsString::compact()` method to retrieve array access keys without extraneous whitespace or comments.
---
 WordPress/Helpers/VariableHelper.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 60f7ffa422..de12ac98f2 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\GetTokensAsString;
 
 /**
  * Helper utilities for working with variables representing arrays.
@@ -74,9 +75,11 @@ public static function get_array_access_keys( File $phpcsFile, $stackPtr, $all =
 				break;
 			}
 
-			$key = $phpcsFile->getTokensAsString(
+			$key = GetTokensAsString::compact(
+				$phpcsFile,
 				( $open_bracket + 1 ),
-				( $tokens[ $open_bracket ]['bracket_closer'] - $open_bracket - 1 )
+				( $tokens[ $open_bracket ]['bracket_closer'] - 1 ),
+				true
 			);
 
 			$keys[]  = trim( $key );

From bb5822a1866506eb7959f9e3d635bfa7872c09a3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 13:43:19 +0200
Subject: [PATCH 135/822] Move "is comparison" related utility to dedicated
 `VariableHelper`

The "is comparison" related utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

As this method also expects a `T_VARIABLE` token as input, the `VariableHelper` class seems appropriate.

This commit moves the `is_comparison()` method to the new `WordPressCS\WordPress\Helpers\VariableHelper` and starts using that class in the relevant sniffs.

**Note**:
It is expected for PHPCSUtils to have dedicated methods for the same at some point in the future. If/when those methods become available, it is recommended for the sniffs to start using the PHPCSUtils methods.

Related to 1465
---
 WordPress/Helpers/VariableHelper.php          | 75 ++++++++++++++++-
 WordPress/Sniff.php                           | 81 +------------------
 .../Security/ValidatedSanitizedInputSniff.php |  2 +-
 3 files changed, 76 insertions(+), 82 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index de12ac98f2..4714b066b9 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -14,7 +14,7 @@
 use PHPCSUtils\Utils\GetTokensAsString;
 
 /**
- * Helper utilities for working with variables representing arrays.
+ * Helper utilities for working with variables.
  *
  * ---------------------------------------------------------------------------------------------
  * This class is only intended for internal use by WordPressCS and is not part of the public API.
@@ -113,4 +113,77 @@ public static function get_array_access_key( File $phpcsFile, $stackPtr ) {
 
 		return false;
 	}
+
+	/**
+	 * Check whether a variable is being compared to another value.
+	 *
+	 * E.g., $var === 'foo', 1 <= $var, etc.
+	 *
+	 * Also recognizes `switch ( $var )`.
+	 *
+	 * @since 0.5.0
+	 * @since 2.1.0 Added the $include_coalesce parameter.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility is now `public` (was `protected`) and the method `static`.
+	 *              - The $phpcsFile parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile        The file being scanned.
+	 * @param int                         $stackPtr         The index of this token in the stack.
+	 * @param bool                        $include_coalesce Optional. Whether or not to regard the null
+	 *                                                      coalesce operator - ?? - as a comparison operator.
+	 *                                                      Defaults to true.
+	 *                                                      Null coalesce is a special comparison operator in this
+	 *                                                      sense as it doesn't compare a variable to whatever is
+	 *                                                      on the other side of the comparison operator.
+	 *
+	 * @return bool Whether this is a comparison.
+	 */
+	public static function is_comparison( File $phpcsFile, $stackPtr, $include_coalesce = true ) {
+		$tokens           = $phpcsFile->getTokens();
+		$comparisonTokens = Tokens::$comparisonTokens;
+		if ( false === $include_coalesce ) {
+			unset( $comparisonTokens[ \T_COALESCE ] );
+		}
+
+		// We first check if this is a switch statement (switch ( $var )).
+		if ( isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
+			$close_parenthesis  = end( $nested_parenthesis );
+
+			if (
+				isset( $tokens[ $close_parenthesis ]['parenthesis_owner'] )
+				&& \T_SWITCH === $tokens[ $tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code']
+			) {
+				return true;
+			}
+		}
+
+		// Find the previous non-empty token. We check before the var first because
+		// yoda conditions are usually expected.
+		$previous_token = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+
+		if ( isset( $comparisonTokens[ $tokens[ $previous_token ]['code'] ] ) ) {
+			return true;
+		}
+
+		// Maybe the comparison operator is after this.
+		$next_token = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+
+		// This might be an opening square bracket in the case of arrays ($var['a']).
+		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $tokens[ $next_token ]['code'] ) {
+
+			$next_token = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				( $tokens[ $next_token ]['bracket_closer'] + 1 ),
+				null,
+				true
+			);
+		}
+
+		if ( false !== $next_token && isset( $comparisonTokens[ $tokens[ $next_token ]['code'] ] ) ) {
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index fa5dfd4720..c54d6c23c4 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1124,7 +1124,7 @@ protected function has_nonce_check( $stackPtr ) {
 		$allow_nonce_after = false;
 		if ( $this->is_in_isset_or_empty( $stackPtr )
 			|| $this->is_in_type_test( $stackPtr )
-			|| $this->is_comparison( $stackPtr )
+			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| $this->is_in_array_comparison( $stackPtr )
 			|| $this->is_in_function_call( $stackPtr, $this->unslashingFunctions ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
@@ -1872,85 +1872,6 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 		return false;
 	}
 
-	/**
-	 * Check whether a variable is being compared to another value.
-	 *
-	 * E.g., $var === 'foo', 1 <= $var, etc.
-	 *
-	 * Also recognizes `switch ( $var )`.
-	 *
-	 * @since 0.5.0
-	 * @since 2.1.0 Added the $include_coalesce parameter.
-	 *
-	 * @param int  $stackPtr         The index of this token in the stack.
-	 * @param bool $include_coalesce Optional. Whether or not to regard the null
-	 *                               coalesce operator - ?? - as a comparison operator.
-	 *                               Defaults to true.
-	 *                               Null coalesce is a special comparison operator in this
-	 *                               sense as it doesn't compare a variable to whatever is
-	 *                               on the other side of the comparison operator.
-	 *
-	 * @return bool Whether this is a comparison.
-	 */
-	protected function is_comparison( $stackPtr, $include_coalesce = true ) {
-
-		$comparisonTokens = Tokens::$comparisonTokens;
-		if ( false === $include_coalesce ) {
-			unset( $comparisonTokens[ \T_COALESCE ] );
-		}
-
-		// We first check if this is a switch statement (switch ( $var )).
-		if ( isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-			$close_parenthesis  = end( $nested_parenthesis );
-
-			if (
-				isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] )
-				&& \T_SWITCH === $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code']
-			) {
-				return true;
-			}
-		}
-
-		// Find the previous non-empty token. We check before the var first because
-		// yoda conditions are usually expected.
-		$previous_token = $this->phpcsFile->findPrevious(
-			Tokens::$emptyTokens,
-			( $stackPtr - 1 ),
-			null,
-			true
-		);
-
-		if ( isset( $comparisonTokens[ $this->tokens[ $previous_token ]['code'] ] ) ) {
-			return true;
-		}
-
-		// Maybe the comparison operator is after this.
-		$next_token = $this->phpcsFile->findNext(
-			Tokens::$emptyTokens,
-			( $stackPtr + 1 ),
-			null,
-			true
-		);
-
-		// This might be an opening square bracket in the case of arrays ($var['a']).
-		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_token ]['code'] ) {
-
-			$next_token = $this->phpcsFile->findNext(
-				Tokens::$emptyTokens,
-				( $this->tokens[ $next_token ]['bracket_closer'] + 1 ),
-				null,
-				true
-			);
-		}
-
-		if ( false !== $next_token && isset( $comparisonTokens[ $this->tokens[ $next_token ]['code'] ] ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if a token is inside of an array-value comparison function.
 	 *
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 1e1847fbb5..d3810ff68e 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -179,7 +179,7 @@ function ( $symbol ) {
 		}
 
 		// If this is a comparison ('a' == $_POST['foo']), sanitization isn't needed.
-		if ( $this->is_comparison( $stackPtr, false ) ) {
+		if ( VariableHelper::is_comparison( $this->phpcsFile, $stackPtr, false ) ) {
 			return;
 		}
 

From 54d6474045145a1678c529f4e31233c4f11d2ea5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 13:54:00 +0200
Subject: [PATCH 136/822] VariableHelper::is_comparison(): use PHPCSUtils

... to get the potential parentheses opener.
---
 WordPress/Helpers/VariableHelper.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 4714b066b9..7c47660d69 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\GetTokensAsString;
+use PHPCSUtils\Utils\Parentheses;
 
 /**
  * Helper utilities for working with variables.
@@ -146,16 +147,8 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 		}
 
 		// We first check if this is a switch statement (switch ( $var )).
-		if ( isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
-			$close_parenthesis  = end( $nested_parenthesis );
-
-			if (
-				isset( $tokens[ $close_parenthesis ]['parenthesis_owner'] )
-				&& \T_SWITCH === $tokens[ $tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code']
-			) {
-				return true;
-			}
+		if ( Parentheses::lastOwnerIn( $phpcsFile, $stackPtr, array( \T_SWITCH ) ) !== false ) {
+			return true;
 		}
 
 		// Find the previous non-empty token. We check before the var first because

From c592999c8dbf8ae25f47c9314fdef90ab653bdd6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 15 May 2022 14:03:29 +0200
Subject: [PATCH 137/822] PHP 8.0 | VariableHelper::is_comparison(): add
 support for variables being compared in a `match` expression

PHP 8.0 introduced `match` expressions, which do a (strict) comparison on the value in the condition against the options in the `match` body.
Ref: https://www.php.net/manual/en/control-structures.match.php

This commit updates the `is_comparison()` method to allow for variables in the "condition" part of a `match` expression to be considered part of a comparison.

Tested via the `ValidatedSanitizedInput` sniff.
---
 WordPress/Helpers/VariableHelper.php                        | 6 +++---
 .../Tests/Security/ValidatedSanitizedInputUnitTest.inc      | 3 +++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 7c47660d69..a1a5e46362 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -120,7 +120,7 @@ public static function get_array_access_key( File $phpcsFile, $stackPtr ) {
 	 *
 	 * E.g., $var === 'foo', 1 <= $var, etc.
 	 *
-	 * Also recognizes `switch ( $var )`.
+	 * Also recognizes `switch ( $var )` and `match ( $var )`.
 	 *
 	 * @since 0.5.0
 	 * @since 2.1.0 Added the $include_coalesce parameter.
@@ -146,8 +146,8 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 			unset( $comparisonTokens[ \T_COALESCE ] );
 		}
 
-		// We first check if this is a switch statement (switch ( $var )).
-		if ( Parentheses::lastOwnerIn( $phpcsFile, $stackPtr, array( \T_SWITCH ) ) !== false ) {
+		// We first check if this is a switch or match statement (switch ( $var )).
+		if ( Parentheses::lastOwnerIn( $phpcsFile, $stackPtr, array( \T_SWITCH, \T_MATCH ) ) !== false ) {
 			return true;
 		}
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
index 12f9f65309..f5d5dd6e07 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
@@ -333,3 +333,6 @@ function test_using_different_unslashing_functions() {
 }
 
 echo wp_sanitize_redirect( wp_unslash( $_GET['test'] ) ); // OK.
+
+$result = match ( $_POST['foo'] ) {}; // Ok.
+$result = match ( do_something( wp_unslash( $_POST['foo'] ) ) ) {}; // Bad.
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 8643c2a78d..ac41f98ad2 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -80,6 +80,7 @@ public function getErrorList() {
 			315 => 2,
 			317 => 1,
 			323 => 1,
+			338 => 1,
 		);
 	}
 

From df1b997912e3377590d20bc7edd0452ea323cd44 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 13:53:02 +0200
Subject: [PATCH 138/822] DB/DirectDatabaseQuery: remove custom ignore
 annotation support

Follow up on 1583 / PR 1908 which removed the `Sniff::has_whitelist_comment()`.

The `WordPress.DB.DirectDatabaseQuery` had its own - even more custom - ignore annotation mechanism.

This commit removes that mechanism and updates (and cleans up) the unit tests.
---
 .../Sniffs/DB/DirectDatabaseQuerySniff.php    |  23 +---
 .../Tests/DB/DirectDatabaseQueryUnitTest.inc  | 117 +++++++-----------
 .../Tests/DB/DirectDatabaseQueryUnitTest.php  |  59 ++++++---
 3 files changed, 96 insertions(+), 103 deletions(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 583e9d9c50..6f65eac360 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -24,6 +24,7 @@
  * @since   0.11.0 This class now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ * @since   3.0.0  Support for the very sniff specific WPCS native ignore comment syntax has been removed.
  */
 class DirectDatabaseQuerySniff extends Sniff {
 
@@ -146,11 +147,6 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		$whitelisted_db_call = false;
-		if ( preg_match( '/db call\W*(?:ok|pass|clear|whitelist)/i', $endOfLineComment ) ) {
-			$whitelisted_db_call = true;
-		}
-
 		// Check for Database Schema Changes.
 		for ( $_pos = ( $stackPtr + 1 ); $_pos < $endOfStatement; $_pos++ ) {
 			$_pos = $this->phpcsFile->findNext( Tokens::$textStringTokens, $_pos, $endOfStatement, false, null, true );
@@ -163,22 +159,15 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		// Flag instance if not whitelisted.
-		if ( ! $whitelisted_db_call ) {
-			$this->phpcsFile->addWarning( 'Usage of a direct database call is discouraged.', $stackPtr, 'DirectQuery' );
-		}
+		$this->phpcsFile->addWarning( 'Usage of a direct database call is discouraged.', $stackPtr, 'DirectQuery' );
 
 		if ( ! isset( $this->methods['cachable'][ $method ] ) ) {
 			return $endOfStatement;
 		}
 
-		$whitelisted_cache = false;
-		$cached            = false;
-		$wp_cache_get      = false;
-		if ( preg_match( '/cache\s+(?:ok|pass|clear|whitelist)/i', $endOfLineComment ) ) {
-			$whitelisted_cache = true;
-		}
-		if ( ! $whitelisted_cache && ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+		$cached       = false;
+		$wp_cache_get = false;
+		if ( ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
 			$scope_function = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
 
 			if ( false === $scope_function ) {
@@ -214,7 +203,7 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		if ( ! $cached && ! $whitelisted_cache ) {
+		if ( ! $cached ) {
 			$message = 'Direct database call without caching detected. Consider using wp_cache_get() / wp_cache_set() or wp_cache_delete().';
 			$this->phpcsFile->addWarning( $message, $stackPtr, 'NoCaching' );
 		}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 2f735dd7f5..88f1fba18d 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -2,19 +2,14 @@
 
 function foo() {
 	global $wpdb;
-
-	$listofthings = $wpdb->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // Error + Warning.
-
-	$listofthings = $wpdb->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // DB call okay ( No Warning, but Error for not caching! ).
-
-	return $listofthings;
+	return $wpdb->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // Warning x 2.
 }
 
 function bar() {
 	global $wpdb;
 
 	if ( ! ( $listofthings = wp_cache_get( $foo ) ) ) {
-		$listofthings = $wpdb->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // Warning.
+		$listofthings = $wpdb->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // Warning direct DB call.
 		wp_cache_set( 'foo', $listofthings );
 	}
 
@@ -28,33 +23,25 @@ function baz() {
 	global $wpdb;
 	$baz = wp_cache_get( 'baz' );
 	if ( false !== $baz ) {
-
-		$wpdb->query( 'ALTER TABLE TO ADD SOME FIELDS' ); // DB call okay (but not really because ALTER TABLE!).
-
-		$wpdb->query( $wpdb->prepare( 'CREATE TABLE ' ) ); // DB call okay (but not really because CREATE TABLE!).
-
-		$wpdb->query( 'SELECT QUERY' ); // DB call okay.
-
-		$baz = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) );
-
+		$wpdb->query( 'ALTER TABLE TO ADD SOME FIELDS' ); // Warning x 2.
+		$wpdb->query( $wpdb->prepare( 'CREATE TABLE ' ) ); // Warning x 2.
+		$wpdb->query( 'SELECT QUERY' ); // Warning.
+		$baz = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) ); // Warning.
 		wp_cache_set( 'baz', $baz );
 	}
-
-
 }
 
 function quux() {
 	global $wpdb;
 	$quux = wp_cache_get( 'quux' );
 	if ( false !== $quux ) {
-		$quux = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) ); // Bad, no wp_cache_set, results in Error + Warning.
+		$quux = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) ); // Bad, no wp_cache_set, results in Warning x 2.
 	}
-
 }
 
 function barzd() {
 	global $wpdb;
-	$autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option_name ) ); // DB call ok; no-cache ok.
+	$autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option_name ) ); // Warning x 2.
 }
 
 function taz() {
@@ -70,35 +57,33 @@ function cache_delete_only() {
 	$data = $where = array();
 
 	// These methods are allowed to be used with just wp_cache_delete().
-	$wpdb->update( $wpdb->users, $data, $where ); // DB call ok; OK.
-	$wpdb->replace( $wpdb->users, $data, $where ); // DB call ok; OK.
-	$wpdb->delete( $wpdb->users, $data, $where ); // DB call ok; OK.
-	$wpdb->query( 'SELECT X FROM Y' ); // DB call ok; OK.
+	$wpdb->update( $wpdb->users, $data, $where ); // Warning direct DB call.
+	$wpdb->replace( $wpdb->users, $data, $where ); // Warning direct DB call.
+	$wpdb->delete( $wpdb->users, $data, $where ); // Warning direct DB call.
+	$wpdb->query( 'SELECT X FROM Y' ); // Warning direct DB call.
 
-	$wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; Bad.
-	$wpdb->get_row( 'SELECT X FROM Y' ); // DB call ok; Bad.
-	$wpdb->get_col( 'SELECT X FROM Y' ); // DB call ok; Bad.
+	$wpdb->get_results( 'SELECT X FROM Y' ); // Warning x 2.
+	$wpdb->get_row( 'SELECT X FROM Y' ); // Warning x 2.
+	$wpdb->get_col( 'SELECT X FROM Y' ); // Warning x 2.
 
 	wp_cache_delete( 'key', 'group' );
 }
 
-// It is OK to use the wp_cache_add() function in place of wp_cache_set().
+// It is OK to use the wp_cache_add() function instead of wp_cache_set().
 function cache_add_instead_of_set() {
 	global $wpdb;
 
 	$baz = wp_cache_get( 'baz' );
-
 	if ( false !== $baz ) {
-
 		$data = $where = array();
 
-		$wpdb->update( $wpdb->users, $data, $where ); // DB call ok; OK.
-		$wpdb->replace( $wpdb->users, $data, $where ); // DB call ok; OK.
-		$wpdb->delete( $wpdb->users, $data, $where ); // DB call ok; OK.
-		$wpdb->query( 'SELECT X FROM Y' ); // DB call ok; OK.
-		$wpdb->get_row( 'SELECT X FROM Y' ); // DB call ok; OK.
-		$wpdb->get_col( 'SELECT X FROM Y' ); // DB call ok; OK.
-		$baz = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) ); // DB call ok; OK.
+		$wpdb->update( $wpdb->users, $data, $where ); // Warning direct DB call.
+		$wpdb->replace( $wpdb->users, $data, $where ); // Warning direct DB call.
+		$wpdb->delete( $wpdb->users, $data, $where ); // Warning direct DB call.
+		$wpdb->query( 'SELECT X FROM Y' ); // Warning direct DB call.
+		$wpdb->get_row( 'SELECT X FROM Y' ); // Warning direct DB call.
+		$wpdb->get_col( 'SELECT X FROM Y' ); // Warning direct DB call.
+		$baz = $wpdb->get_results( $wpdb->prepare( 'SELECT X FROM Y ' ) ); // Warning direct DB call.
 
 		wp_cache_add( 'baz', $baz );
 	}
@@ -124,28 +109,25 @@ $b = function () {
 // phpcs:set WordPress.DB.DirectDatabaseQuery customCacheDeleteFunctions[] my_cachedel
 function cache_customA() {
 	global $wpdb;
-
 	$quux = my_cacheget( 'quux' );
 	if ( false !== $quux ) {
-		$wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; OK.
+		$wpdb->get_results( 'SELECT X FROM Y' ); // Warning direct DB call.
 		my_cacheset( 'key', 'group' );
 	}
 }
 
 function cache_customB() {
 	global $wpdb;
-
 	$quux = my_cacheget( 'quux' );
 	if ( false !== $quux ) {
-		$wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; OK.
+		$wpdb->get_results( 'SELECT X FROM Y' ); // Warning direct DB call.
 		my_other_cacheset( 'key', 'group' );
 	}
 }
 
 function cache_customC() {
 	global $wpdb;
-
-	$wpdb->query( 'SELECT X FROM Y' ); // DB call ok; OK.
+	$wpdb->query( 'SELECT X FROM Y' ); // Warning direct DB call.
 	my_cachedel( 'key', 'group' );
 }
 
@@ -154,28 +136,25 @@ function cache_customC() {
 
 function cache_customD() {
 	global $wpdb;
-
 	$quux = my_cacheget( 'quux' );
 	if ( false !== $quux ) {
-		$wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; OK.
+		$wpdb->get_results( 'SELECT X FROM Y' ); // Warning direct DB call.
 		my_cacheset( 'key', 'group' );
 	}
 }
 
 function cache_customE() {
 	global $wpdb;
-
 	$quux = my_cacheget( 'quux' );
 	if ( false !== $quux ) {
-		$wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; Bad.
+		$wpdb->get_results( 'SELECT X FROM Y' ); // Warning x 2.
 		my_other_cacheset( 'key', 'group' );
 	}
 }
 
 function cache_customF() {
 	global $wpdb;
-
-	$wpdb->query( 'SELECT X FROM Y' ); // DB call ok; Bad.
+	$wpdb->query( 'SELECT X FROM Y' ); // Warning x 2.
 	my_cachedel( 'key', 'group' );
 }
 
@@ -184,62 +163,61 @@ function cache_customF() {
 
 function cache_customG() {
 	global $wpdb;
-
 	$quux = my_cacheget( 'quux' );
 	if ( false !== $quux ) {
-		$quux = $wpdb->get_results( 'SELECT X FROM Y' ); // DB call ok; Bad.
+		$quux = $wpdb->get_results( 'SELECT X FROM Y' ); // Warning x 2.
 		my_cacheset( 'key', 'group' );
 	}
 }
 
 function custom_modify_attachment() {
 	global $wpdb;
-	$wpdb->update( $wpdb->posts, array( 'post_title' => 'Hello' ), array( 'ID' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->posts, array( 'post_title' => 'Hello' ), array( 'ID' => 1 ) ); // Warning direct DB call.
 	clean_attachment_cache( 1 );
 }
 function custom_modify_post() {
 	global $wpdb;
-	$wpdb->update( $wpdb->posts, array( 'post_title' => 'Hello' ), array( 'ID' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->posts, array( 'post_title' => 'Hello' ), array( 'ID' => 1 ) ); // Warning direct DB call.
 	clean_post_cache( 1 );
 }
 function custom_modify_term() {
 	global $wpdb;
-	$wpdb->update( $wpdb->terms, array( 'slug' => 'test' ), array( 'term_id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->terms, array( 'slug' => 'test' ), array( 'term_id' => 1 ) ); // Warning direct DB call.
 	clean_term_cache( 1 );
 }
 function custom_clean_category_cache() {
 	global $wpdb;
-	$wpdb->update( $wpdb->terms, array( 'slug' => 'test' ), array( 'term_id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->terms, array( 'slug' => 'test' ), array( 'term_id' => 1 ) ); // Warning direct DB call.
 	clean_category_cache( 1 );
 }
 function custom_modify_links() {
 	global $wpdb;
-	$wpdb->update( $wpdb->links, array( 'link_name' => 'Test' ), array( 'link_id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->links, array( 'link_name' => 'Test' ), array( 'link_id' => 1 ) ); // Warning direct DB call.
 	clean_bookmark_cache( 1 );
 }
 function custom_modify_comments() {
 	global $wpdb;
-	$wpdb->update( $wpdb->comments, array( 'comment_content' => 'Test' ), array( 'comment_ID' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->comments, array( 'comment_content' => 'Test' ), array( 'comment_ID' => 1 ) ); // Warning direct DB call.
 	clean_comment_cache( 1 );
 }
 function custom_modify_users() {
 	global $wpdb;
-	$wpdb->update( $wpdb->users, array( 'user_email' => 'Test' ), array( 'ID' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->users, array( 'user_email' => 'Test' ), array( 'ID' => 1 ) ); // Warning direct DB call.
 	clean_user_cache( 1 );
 }
 function custom_modify_blogs() {
 	global $wpdb;
-	$wpdb->update( $wpdb->blogs, array( 'domain' => 'example.com' ), array( 'blog_id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->blogs, array( 'domain' => 'example.com' ), array( 'blog_id' => 1 ) ); // Warning direct DB call.
 	clean_blog_cache( 1 );
 }
 function custom_modify_sites() {
 	global $wpdb;
-	$wpdb->update( $wpdb->sites, array( 'domain' => 'example.com' ), array( 'id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->sites, array( 'domain' => 'example.com' ), array( 'id' => 1 ) ); // Warning direct DB call.
 	clean_network_cache( 1 );
 }
 function custom_modify_term_relationship() {
 	global $wpdb;
-	$wpdb->update( $wpdb->term_relationships, array( 'term_order' => 1 ), array( 'object_id' => 1 ) ); // DB call ok; OK.
+	$wpdb->update( $wpdb->term_relationships, array( 'term_order' => 1 ), array( 'object_id' => 1 ) ); // Warning direct DB call.
 	clean_object_term_cache( 1 );
 }
 
@@ -252,14 +230,14 @@ function foofoo() {
 		FROM somewhere
 		WHERE someotherthing = 1
 EOD
-	); // Error + Warning.
+	); // Warning x 2.
 
 	$listofthings = $wpdb->get_col( <<<EOD
 		SELECT something
 		FROM somewhere
 		WHERE someotherthing = 1
 EOD
-	); // DB call okay ( No Warning, but Error for not caching! ).
+	); // Warning x 2.
 
 	return $listofthings;
 }
@@ -273,7 +251,7 @@ function bazbaz() {
 		$wpdb->query( <<<'EOD'
 			ALTER TABLE TO ADD SOME FIELDS
 EOD
-		); // DB call okay (but not really because ALTER TABLE!).
+		); // Warning on line 273 + 274.
 		wp_cache_set( 'baz', $baz );
 	}
 }
@@ -282,20 +260,17 @@ function cache_add_instead_of_setter() {
 	global $wpdb;
 
 	$baz = wp_cache_get( 'baz' );
-
 	if ( false !== $baz ) {
-
 		$data = $where = array();
-
 		$wpdb->query( <<<EOD
 			SELECT X FROM Y
 EOD
-		); // DB call ok; OK.
+		); // Warning direct DB call.
 		$wpdb->get_row( <<<'EOD'
 			SELECT X FROM Y
 EOD
-		); // DB call ok; OK.
+		);// Warning direct DB call.
 
 		wp_cache_add( 'baz', $baz );
 	}
-}
\ No newline at end of file
+}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index cf15554f92..02117429f3 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -38,23 +38,52 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			6   => 2,
-			8   => 1,
-			17  => 1,
-			32  => 1,
-			34  => 1,
-			38  => 1,
-			50  => 2,
-			78  => 1,
-			79  => 1,
+			5   => 2,
+			12  => 1,
+			26  => 2,
+			27  => 2,
+			28  => 1,
+			29  => 1,
+			38  => 2,
+			44  => 2,
+			60  => 1,
+			61  => 1,
+			62  => 1,
+			63  => 1,
+			65  => 2,
+			66  => 2,
+			67  => 2,
 			80  => 1,
-			112 => 1,
-			170 => 1,
-			178 => 1,
+			81  => 1,
+			82  => 1,
+			83  => 1,
+			84  => 1,
+			85  => 1,
+			86  => 1,
+			97  => 1,
+			114 => 1,
+			123 => 1,
+			130 => 1,
+			141 => 1,
+			150 => 2,
+			157 => 2,
+			168 => 2,
+			175 => 1,
+			180 => 1,
+			185 => 1,
 			190 => 1,
-			250 => 2,
-			257 => 1,
-			274 => 1,
+			195 => 1,
+			200 => 1,
+			205 => 1,
+			210 => 1,
+			215 => 1,
+			220 => 1,
+			228 => 2,
+			235 => 2,
+			251 => 1,
+			252 => 1,
+			265 => 1,
+			269 => 1,
 		);
 	}
 

From 117b5e9a4570761635bd7d04fb2e55591d43f864 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Jun 2022 12:43:35 +0200
Subject: [PATCH 139/822] DB/DirectDatabaseQuery: minor improvement error
 message text

---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 6f65eac360..9cfeea2d09 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -159,7 +159,7 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		$this->phpcsFile->addWarning( 'Usage of a direct database call is discouraged.', $stackPtr, 'DirectQuery' );
+		$this->phpcsFile->addWarning( 'Use of a direct database call is discouraged.', $stackPtr, 'DirectQuery' );
 
 		if ( ! isset( $this->methods['cachable'][ $method ] ) ) {
 			return $endOfStatement;

From b2677739b483758688901a26990872a982463966 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:20:54 +0200
Subject: [PATCH 140/822] AbstractFunctionRestrictionsSniff: rename array key

... and update sniffs using that array key.
---
 WordPress/AbstractFunctionRestrictionsSniff.php   | 8 ++++----
 WordPress/Sniffs/DB/RestrictedFunctionsSniff.php  | 2 +-
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 53ea9a255e..af8cd10b18 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -97,14 +97,14 @@ abstract class AbstractFunctionRestrictionsSniff extends Sniff {
 	 *         'message'   => 'Use anonymous functions instead please!',
 	 *         'functions' => array( 'file_get_contents', 'create_function', 'mysql_*' ),
 	 *         // Only useful when using wildcards:
-	 *         'whitelist' => array( 'mysql_to_rfc3339' => true, ),
+	 *         'allow' => array( 'mysql_to_rfc3339' => true, ),
 	 *     )
 	 * )
 	 *
 	 * You can use * wildcards to target a group of functions.
 	 * When you use * wildcards, you may inadvertently restrict too many
-	 * functions. In that case you can add the `whitelist` key to
-	 * whitelist individual functions to prevent false positives.
+	 * functions. In that case you can add the `allow` key to
+	 * safe list individual functions to prevent false positives.
 	 *
 	 * @return array
 	 */
@@ -280,7 +280,7 @@ public function check_for_matches( $stackPtr ) {
 				continue;
 			}
 
-			if ( isset( $group['whitelist'][ $token_content ] ) ) {
+			if ( isset( $group['allow'][ $token_content ] ) ) {
 				continue;
 			}
 
diff --git a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
index dbab49fec9..83d3d92ce6 100644
--- a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
@@ -56,7 +56,7 @@ public function getGroups() {
 					'mysqlnd_memcache_*',
 					'maxdb_*',
 				),
-				'whitelist' => array(
+				'allow'     => array(
 					'mysql_to_rfc3339' => true,
 				),
 			),
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 99f66b8cb0..9a0e17b0d6 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -94,7 +94,7 @@ public function getGroups() {
 				'functions' => array(
 					'curl_*',
 				),
-				'whitelist' => array(
+				'allow'     => array(
 					'curl_version' => true,
 				),
 			),

From 63805313685666efa6e57cad89969be2535f6690 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:14:33 +0200
Subject: [PATCH 141/822] PrefixAllGlobals: rename property [1]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index d2817ede48..b6091444ff 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -135,10 +135,11 @@ class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * A list of core hooks that are allowed to be called by plugins and themes.
 	 *
 	 * @since 0.14.0
+	 * @since 3.0.0 Renamed from `$whitelisted_core_hooks` to `$allowed_core_hooks`.
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_core_hooks = array(
+	protected $allowed_core_hooks = array(
 		'widget_title'   => true,
 		'add_meta_boxes' => true,
 	);
@@ -806,7 +807,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$raw_content = TextStrings::stripQuotes( $parameters[1]['raw'] );
 
 		if ( ( 'define' !== $matched_content
-			&& isset( $this->whitelisted_core_hooks[ $raw_content ] ) )
+			&& isset( $this->allowed_core_hooks[ $raw_content ] ) )
 			|| ( 'define' === $matched_content
 			&& isset( $this->whitelisted_core_constants[ $raw_content ] ) )
 		) {

From bd7e1c9ff9546a62098dfc5005f583add9b8c72a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:15:28 +0200
Subject: [PATCH 142/822] PrefixAllGlobals: rename property [2]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index b6091444ff..6437542311 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -148,6 +148,7 @@ class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * A list of core constants that are allowed to be defined by plugins and themes.
 	 *
 	 * @since 1.0.0
+	 * @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
 	 *
 	 * Source: {@link https://core.trac.wordpress.org/browser/trunk/src/wp-includes/default-constants.php#L0}
 	 * The constants are listed in the order they are found in the source file
@@ -157,7 +158,7 @@ class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_core_constants = array(
+	protected $allowed_core_constants = array(
 		'WP_MEMORY_LIMIT'      => true,
 		'WP_MAX_MEMORY_LIMIT'  => true,
 		'WP_CONTENT_DIR'       => true,
@@ -468,7 +469,7 @@ public function process_token( $stackPtr ) {
 						return;
 					}
 
-					if ( isset( $this->whitelisted_core_constants[ $item_name ] ) ) {
+					if ( isset( $this->allowed_core_constants[ $item_name ] ) ) {
 						// Defining a WP Core constant intended for overruling.
 						return;
 					}
@@ -809,7 +810,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		if ( ( 'define' !== $matched_content
 			&& isset( $this->allowed_core_hooks[ $raw_content ] ) )
 			|| ( 'define' === $matched_content
-			&& isset( $this->whitelisted_core_constants[ $raw_content ] ) )
+			&& isset( $this->allowed_core_constants[ $raw_content ] ) )
 		) {
 			return;
 		}

From b6b15ee668f751cf893512d47d94098ac724dd1f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:33:08 +0200
Subject: [PATCH 143/822] PrefixAllGlobals: rename property [3]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php   | 9 +++++----
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc     | 2 +-
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.php | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 6437542311..c9b7c4f272 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -64,13 +64,14 @@ class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	public $prefixes = '';
 
 	/**
-	 * Prefix blacklist.
+	 * Prefix blocklist.
 	 *
 	 * @since 0.12.0
+	 * @since 3.0.0  Renamed from `$prefix_blacklist` to `$prefix_blocklist`.
 	 *
 	 * @var string[]
 	 */
-	protected $prefix_blacklist = array(
+	protected $prefix_blocklist = array(
 		'wordpress' => true,
 		'wp'        => true,
 		'_'         => true,
@@ -949,7 +950,7 @@ private function variable_prefixed_or_whitelisted( $stackPtr, $name ) {
 	 * Validate an array of prefixes as passed through a custom property or via the command line.
 	 *
 	 * Checks that the prefix:
-	 * - is not one of the blacklisted ones.
+	 * - is not one of the blocked ones.
 	 * - complies with the PHP rules for valid function, class, variable, constant names.
 	 *
 	 * @since 0.12.0
@@ -968,7 +969,7 @@ private function validate_prefixes() {
 		foreach ( $this->prefixes as $key => $prefix ) {
 			$prefixLC = strtolower( $prefix );
 
-			if ( isset( $this->prefix_blacklist[ $prefixLC ] ) ) {
+			if ( isset( $this->prefix_blocklist[ $prefixLC ] ) ) {
 				$this->phpcsFile->addError(
 					'The "%s" prefix is not allowed.',
 					0,
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 2c1242788e..8c9c3e2e2b 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -399,7 +399,7 @@ class Some_Test_Class extends NonTestClass { // Bad.
 }
 
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] wordpress,somethingelse
-// The above line adds an issue to line 1 about a blacklisted prefix.
+// The above line adds an issue to line 1 about a blocked prefix.
 function wordpress_do_something() {} // Bad.
 function somethingelse_do_something() {} // OK.
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index b6ace2e4e0..c2008776b3 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 		switch ( $testFile ) {
 			case 'PrefixAllGlobalsUnitTest.1.inc':
 				return array(
-					1   => 8, // 2 x error for blacklisted prefix passed. 4 x error for short prefixes. 2 x no prefix.
+					1   => 8, // 2 x error for blocked prefix passed. 4 x error for short prefixes. 2 x no prefix.
 					10  => 1,
 					18  => 1,
 					21  => 1,
@@ -86,7 +86,7 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':
 				return array(
-					1  => 1, // 1 x error for blacklisted prefix passed.
+					1  => 1, // 1 x error for blocked prefix passed.
 					18 => 1,
 				);
 

From d76cf025cbc840ed7fb610b7cb0672dcf5acf8d9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:17:13 +0200
Subject: [PATCH 144/822] PrefixAllGlobals: rename (private) method

---
 .../NamingConventions/PrefixAllGlobalsSniff.php       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index c9b7c4f272..616f89a723 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -637,7 +637,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		$variable_name = substr( $this->tokens[ $stackPtr ]['content'], 1 ); // Strip the dollar sign.
 
 		// Bow out early if we know for certain no prefix is needed.
-		if ( $this->variable_prefixed_or_whitelisted( $stackPtr, $variable_name ) === true ) {
+		if ( $this->variable_prefixed_or_allowed( $stackPtr, $variable_name ) === true ) {
 			return;
 		}
 
@@ -659,7 +659,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 
 			// Check whether a prefix is needed.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $array_key ]['code'] ] )
-				&& $this->variable_prefixed_or_whitelisted( $stackPtr, $variable_name ) === true
+				&& $this->variable_prefixed_or_allowed( $stackPtr, $variable_name ) === true
 			) {
 				return;
 			}
@@ -670,7 +670,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 				$exploded = explode( '$', $variable_name );
 				$first    = rtrim( $exploded[0], '{' );
 				if ( '' !== $first ) {
-					if ( $this->variable_prefixed_or_whitelisted( $array_key, $first ) === true ) {
+					if ( $this->variable_prefixed_or_allowed( $array_key, $first ) === true ) {
 						return;
 					}
 				} else {
@@ -930,14 +930,15 @@ private function is_prefixed( $stackPtr, $name ) {
 	 *
 	 * @since 0.12.0
 	 * @since 1.0.1  Added $stackPtr parameter.
+	 * @since 3.0.0  Renamed from `variable_prefixed_or_whitelisted()` to `variable_prefixed_or_allowed()`.
 	 *
 	 * @param int    $stackPtr The position of the token to record the metric against.
 	 * @param string $name     Variable name without the dollar sign.
 	 *
-	 * @return bool True if the variable name is whitelisted or already prefixed.
+	 * @return bool True if the variable name is allowed or already prefixed.
 	 *              False otherwise.
 	 */
-	private function variable_prefixed_or_whitelisted( $stackPtr, $name ) {
+	private function variable_prefixed_or_allowed( $stackPtr, $name ) {
 		// Ignore superglobals and WP global variables.
 		if ( isset( $this->superglobals[ $name ] ) || isset( $this->wp_globals[ $name ] ) ) {
 			return true;

From 6c058ea19bbf5fb6fc2d231b65c9d0a631f49516 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:18:10 +0200
Subject: [PATCH 145/822] ValidPostTypeSlug: rename constant

---
 .../Sniffs/NamingConventions/ValidPostTypeSlugSniff.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 673557efae..0d76b5c74b 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -38,14 +38,15 @@ class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	const POST_TYPE_MAX_LENGTH = 20;
 
 	/**
-	 * Regex that whitelists characters that can be used as the post type slug.
+	 * Regex to validate the characters that can be used as the post type slug.
 	 *
 	 * @link https://developer.wordpress.org/reference/functions/register_post_type/
 	 * @since 2.2.0
+	 * @since 3.0.0 Renamed from `POST_TYPE_CHARACTER_WHITELIST` to `VALID_POST_TYPE_CHARACTERS`.
 	 *
 	 * @var string
 	 */
-	const POST_TYPE_CHARACTER_WHITELIST = '/^[a-z0-9_-]+$/';
+	const VALID_POST_TYPE_CHARACTERS = '/^[a-z0-9_-]+$/';
 
 	/**
 	 * Array of functions that must be checked.
@@ -165,7 +166,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$post_type = TextStringHelper::strip_interpolated_variables( $post_type );
 		}
 
-		if ( preg_match( self::POST_TYPE_CHARACTER_WHITELIST, $post_type ) === 0 ) {
+		if ( preg_match( self::VALID_POST_TYPE_CHARACTERS, $post_type ) === 0 ) {
 			// Error for invalid characters.
 			$this->phpcsFile->addError(
 				'register_post_type() called with invalid post type %s. Post type contains invalid characters. Only lowercase alphanumeric characters, dashes, and underscores are allowed.',

From f1469af23acca4899a9a55fd9ce25c54101c3346 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:18:38 +0200
Subject: [PATCH 146/822] ValidVariableName: rename property [1]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 .../NamingConventions/ValidVariableNameSniff.php    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 34314ff186..2832e37c85 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -59,10 +59,11 @@ class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 *
 	 * @since 0.9.0
 	 * @since 0.11.0 Changed from public to protected.
+	 * @since 3.0.0  Renamed from `$whitelisted_mixed_case_member_var_names` to `$allowed_mixed_case_member_var_names`.
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_mixed_case_member_var_names = array(
+	protected $allowed_mixed_case_member_var_names = array(
 		'ID'                => true,
 		'comment_ID'        => true,
 		'comment_post_ID'   => true,
@@ -139,7 +140,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 						$obj_var_name = substr( $obj_var_name, 1 );
 					}
 
-					if ( ! isset( $this->whitelisted_mixed_case_member_var_names[ $obj_var_name ] ) && self::isSnakeCase( $obj_var_name ) === false ) {
+					if ( ! isset( $this->allowed_mixed_case_member_var_names[ $obj_var_name ] ) && self::isSnakeCase( $obj_var_name ) === false ) {
 						$error = 'Object property "$%s" is not in valid snake_case format, try "$%s"';
 						$data  = array(
 							$original_var_name,
@@ -168,7 +169,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 		}
 
 		if ( self::isSnakeCase( $var_name ) === false ) {
-			if ( $in_class && ! isset( $this->whitelisted_mixed_case_member_var_names[ $var_name ] ) ) {
+			if ( $in_class && ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) ) {
 				$error      = 'Object property "$%s" is not in valid snake_case format, try "$%s"';
 				$error_name = 'UsedPropertyNotSnakeCase';
 			} elseif ( ! $in_class ) {
@@ -212,7 +213,7 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 		// Merge any custom variables with the defaults.
 		$this->mergeWhiteList();
 
-		if ( ! isset( $this->whitelisted_mixed_case_member_var_names[ $var_name ] ) && false === self::isSnakeCase( $var_name ) ) {
+		if ( ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) && false === self::isSnakeCase( $var_name ) ) {
 			$error = 'Member variable "$%s" is not in valid snake_case format, try "$%s"';
 			$data  = array(
 				$var_name,
@@ -287,9 +288,9 @@ protected function mergeWhiteList() {
 			// Fix property potentially passed as comma-delimited string.
 			$customProperties = Sniff::merge_custom_array( $this->customPropertiesWhitelist, array(), false );
 
-			$this->whitelisted_mixed_case_member_var_names = Sniff::merge_custom_array(
+			$this->allowed_mixed_case_member_var_names = Sniff::merge_custom_array(
 				$customProperties,
-				$this->whitelisted_mixed_case_member_var_names
+				$this->allowed_mixed_case_member_var_names
 			);
 
 			$this->addedCustomProperties['properties'] = $this->customPropertiesWhitelist;

From cc9eb4c0e07c427109a0237786ac01821826cc02 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:36:05 +0200
Subject: [PATCH 147/822] ValidVariableName: rename property [2]

As this is a `public` property, this is a BC-break and should be annotated as such in the upgrade guide/changelog.
---
 .../NamingConventions/ValidVariableNameSniff.php     |  9 +++++----
 .../NamingConventions/ValidVariableNameUnitTest.inc  | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 2832e37c85..0b94fa3285 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -76,10 +76,11 @@ class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * Custom list of properties which can have mixed case.
 	 *
 	 * @since 0.11.0
+	 * @since 3.0.0  Renamed from `$customPropertiesWhitelist` to `$allowed_custom_properties`.
 	 *
 	 * @var string|string[]
 	 */
-	public $customPropertiesWhitelist = array();
+	public $allowed_custom_properties = array();
 
 	/**
 	 * Cache of previously added custom functions.
@@ -284,16 +285,16 @@ public static function isSnakeCase( $var_name ) {
 	 * @return void
 	 */
 	protected function mergeWhiteList() {
-		if ( $this->customPropertiesWhitelist !== $this->addedCustomProperties['properties'] ) {
+		if ( $this->allowed_custom_properties !== $this->addedCustomProperties['properties'] ) {
 			// Fix property potentially passed as comma-delimited string.
-			$customProperties = Sniff::merge_custom_array( $this->customPropertiesWhitelist, array(), false );
+			$customProperties = Sniff::merge_custom_array( $this->allowed_custom_properties, array(), false );
 
 			$this->allowed_mixed_case_member_var_names = Sniff::merge_custom_array(
 				$customProperties,
 				$this->allowed_mixed_case_member_var_names
 			);
 
-			$this->addedCustomProperties['properties'] = $this->customPropertiesWhitelist;
+			$this->addedCustomProperties['properties'] = $this->allowed_custom_properties;
 		}
 	}
 
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 0186491d75..16221b7dd8 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -129,13 +129,13 @@ echo "This is $PHP_SELF with $HTTP_RAW_POST_DATA"; // Ok.
 /*
  * Unit test whitelisting.
  */
-// phpcs:set WordPress.NamingConventions.ValidVariableName customPropertiesWhitelist[] varName,DOMProperty
-echo MyClass::$varName; // Ok, whitelisted.
-echo $this->DOMProperty; // Ok, whitelisted.
-echo $object->varName;  // Ok, whitelisted.
-// phpcs:set WordPress.NamingConventions.ValidVariableName customPropertiesWhitelist[]
+// phpcs:set WordPress.NamingConventions.ValidVariableName allowed_custom_properties[] varName,DOMProperty
+echo MyClass::$varName; // Ok, allowed.
+echo $this->DOMProperty; // Ok, allowed.
+echo $object->varName;  // Ok, allowed.
+// phpcs:set WordPress.NamingConventions.ValidVariableName allowed_custom_properties[]
 
-echo $object->varName;  // Bad, no longer whitelisted.
+echo $object->varName;  // Bad, no longer allowed.
 
 // Code style independent token checking.
 echo $object

From 80995e988c19338ff648b57f3a8a6ef41ffb33d3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:42:09 +0200
Subject: [PATCH 148/822] ValidVariableNameSniff: rename method

---
 .../NamingConventions/ValidVariableNameSniff.php      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 0b94fa3285..91aeec617c 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -117,7 +117,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 		}
 
 		// Merge any custom variables with the defaults.
-		$this->mergeWhiteList();
+		$this->merge_allow_lists();
 
 		// Likewise if it is a mixed-case var used by WordPress core.
 		if ( isset( $this->wordpress_mixed_case_vars[ $var_name ] ) ) {
@@ -212,7 +212,7 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 		}
 
 		// Merge any custom variables with the defaults.
-		$this->mergeWhiteList();
+		$this->merge_allow_lists();
 
 		if ( ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) && false === self::isSnakeCase( $var_name ) ) {
 			$error = 'Member variable "$%s" is not in valid snake_case format, try "$%s"';
@@ -240,7 +240,7 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 		if ( preg_match_all( '|[^\\\]\${?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)|', $tokens[ $stack_ptr ]['content'], $matches ) > 0 ) {
 
 			// Merge any custom variables with the defaults.
-			$this->mergeWhiteList();
+			$this->merge_allow_lists();
 
 			foreach ( $matches[1] as $var_name ) {
 				// If it's a php reserved var, then its ok.
@@ -276,15 +276,16 @@ public static function isSnakeCase( $var_name ) {
 	}
 
 	/**
-	 * Merge a custom whitelist provided via a custom ruleset with the predefined whitelist,
+	 * Merge a custom allow list provided via a custom ruleset with the predefined allow list,
 	 * if we haven't already.
 	 *
 	 * @since 0.10.0
 	 * @since 2.0.0  Removed unused $phpcs_file parameter.
+	 * @since 3.0.0  Renamed from `mergeWhiteList()` to `merge_allow_lists()`.
 	 *
 	 * @return void
 	 */
-	protected function mergeWhiteList() {
+	protected function merge_allow_lists() {
 		if ( $this->allowed_custom_properties !== $this->addedCustomProperties['properties'] ) {
 			// Fix property potentially passed as comma-delimited string.
 			$customProperties = Sniff::merge_custom_array( $this->allowed_custom_properties, array(), false );

From 45f543bdd01a4fe76d544c297f34b2832d3597a4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:25:51 +0200
Subject: [PATCH 149/822] IniSet: rename property [1]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 WordPress/Sniffs/PHP/IniSetSniff.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index e69f7cfde7..aacc5d97e1 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -15,7 +15,7 @@
 /**
  * Detect use of the `ini_set()` function.
  *
- * - Won't throw notices for "safe" ini directives as listed in the whitelist.
+ * - Won't throw notices for "safe" ini directives as listed in the safe-list.
  * - Throws errors for ini directives listed in the blacklist.
  * - A warning will be thrown in all other cases.
  *
@@ -44,15 +44,16 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 * Array of PHP configuration options that are allowed to be manipulated.
 	 *
 	 * @since 2.1.0
+	 * @since 3.0.0 Renamed from `$whitelisted_options` to `$safe_options`.
 	 *
 	 * @var array Multidimensional array with parameter details.
-	 *     $whitelisted_options = array(
+	 *     $safe_options = array(
 	 *         (string) option name. = array(
 	 *             (string[]) 'valid_values' = array()
 	 *         )
 	 *     );
 	 */
-	protected $whitelisted_options = array(
+	protected $safe_options = array(
 		'auto_detect_line_endings' => array(),
 		'highlight.bg'             => array(),
 		'highlight.comment'        => array(),
@@ -125,7 +126,7 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 * Process the parameter of a matched function.
 	 *
 	 * Errors if an option is found in the blacklist. Warns as
-	 * 'risky' when the option is not found in the whitelist.
+	 * 'risky' when the option is not found in the safe-list.
 	 *
 	 * @since 2.1.0
 	 *
@@ -139,8 +140,8 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 		$option_name  = TextStrings::stripQuotes( $parameters[1]['raw'] );
 		$option_value = TextStrings::stripQuotes( $parameters[2]['raw'] );
-		if ( isset( $this->whitelisted_options[ $option_name ] ) ) {
-			$whitelisted_option = $this->whitelisted_options[ $option_name ];
+		if ( isset( $this->safe_options[ $option_name ] ) ) {
+			$whitelisted_option = $this->safe_options[ $option_name ];
 			if ( ! isset( $whitelisted_option['valid_values'] ) || in_array( strtolower( $option_value ), $whitelisted_option['valid_values'], true ) ) {
 				return;
 			}

From 0f47dbe9c5615530bdaddf88e5d3c2cb2445a1b9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:27:31 +0200
Subject: [PATCH 150/822] IniSet: rename property [2]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).
---
 WordPress/Sniffs/PHP/IniSetSniff.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index aacc5d97e1..a0580af5bd 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -16,7 +16,7 @@
  * Detect use of the `ini_set()` function.
  *
  * - Won't throw notices for "safe" ini directives as listed in the safe-list.
- * - Throws errors for ini directives listed in the blacklist.
+ * - Throws errors for ini directives listed in the disallow-list.
  * - A warning will be thrown in all other cases.
  *
  * @package WPCS\WordPressCodingStandards
@@ -70,16 +70,17 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 * Array of PHP configuration options that are not allowed to be manipulated.
 	 *
 	 * @since 2.1.0
+	 * @since 3.0.0 Renamed from `$blacklisted_options` to `$disallowed_options`.
 	 *
 	 * @var array Multidimensional array with parameter details.
-	 *     $blacklisted_options = array(
+	 *     $disallowed_options = array(
 	 *         (string) option name. = array(
 	 *             (string[]) 'invalid_values' = array()
 	 *             (string) 'message'
 	 *         )
 	 *     );
 	 */
-	protected $blacklisted_options = array(
+	protected $disallowed_options = array(
 		'bcmath.scale' => array(
 			'message' => 'Use `bcscale()` instead.',
 		),
@@ -125,7 +126,7 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * Process the parameter of a matched function.
 	 *
-	 * Errors if an option is found in the blacklist. Warns as
+	 * Errors if an option is found in the disallow-list. Warns as
 	 * 'risky' when the option is not found in the safe-list.
 	 *
 	 * @since 2.1.0
@@ -147,8 +148,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 		}
 
-		if ( isset( $this->blacklisted_options[ $option_name ] ) ) {
-			$blacklisted_option = $this->blacklisted_options[ $option_name ];
+		if ( isset( $this->disallowed_options[ $option_name ] ) ) {
+			$blacklisted_option = $this->disallowed_options[ $option_name ];
 			if ( ! isset( $blacklisted_option['invalid_values'] ) || in_array( strtolower( $option_value ), $blacklisted_option['invalid_values'], true ) ) {
 				$this->phpcsFile->addError(
 					'%s(%s, %s) found. %s',

From 250f665369c4470ffdc25cfea19cff67606245a2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:31:21 +0200
Subject: [PATCH 151/822] IniSet: rename local variable [1]

---
 WordPress/Sniffs/PHP/IniSetSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index a0580af5bd..7d11bc01a4 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -142,8 +142,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$option_name  = TextStrings::stripQuotes( $parameters[1]['raw'] );
 		$option_value = TextStrings::stripQuotes( $parameters[2]['raw'] );
 		if ( isset( $this->safe_options[ $option_name ] ) ) {
-			$whitelisted_option = $this->safe_options[ $option_name ];
-			if ( ! isset( $whitelisted_option['valid_values'] ) || in_array( strtolower( $option_value ), $whitelisted_option['valid_values'], true ) ) {
+			$safe_option = $this->safe_options[ $option_name ];
+			if ( ! isset( $safe_option['valid_values'] ) || in_array( strtolower( $option_value ), $safe_option['valid_values'], true ) ) {
 				return;
 			}
 		}

From 56b97fae0574cc8c2289ac92a788d43aeb06c78d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:35:13 +0200
Subject: [PATCH 152/822] IniSet: rename local variable [2]

---
 WordPress/Sniffs/PHP/IniSetSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 7d11bc01a4..b321953808 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -149,8 +149,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		if ( isset( $this->disallowed_options[ $option_name ] ) ) {
-			$blacklisted_option = $this->disallowed_options[ $option_name ];
-			if ( ! isset( $blacklisted_option['invalid_values'] ) || in_array( strtolower( $option_value ), $blacklisted_option['invalid_values'], true ) ) {
+			$disallowed_option = $this->disallowed_options[ $option_name ];
+			if ( ! isset( $disallowed_option['invalid_values'] ) || in_array( strtolower( $option_value ), $disallowed_option['invalid_values'], true ) ) {
 				$this->phpcsFile->addError(
 					'%s(%s, %s) found. %s',
 					$stackPtr,
@@ -159,7 +159,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 						$matched_content,
 						$parameters[1]['raw'],
 						$parameters[2]['raw'],
-						$blacklisted_option['message'],
+						$disallowed_option['message'],
 					)
 				);
 				return;

From ce4c6a681c33889b4fe9df86ba6f04184870d34f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:30:20 +0200
Subject: [PATCH 153/822] IniSet: rename error code

---
 WordPress/Sniffs/PHP/IniSetSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index b321953808..08ab6a7bf8 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -154,7 +154,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$this->phpcsFile->addError(
 					'%s(%s, %s) found. %s',
 					$stackPtr,
-					$this->string_to_errorcode( $option_name . '_Blacklisted' ),
+					$this->string_to_errorcode( $option_name . '_Disallowed' ),
 					array(
 						$matched_content,
 						$parameters[1]['raw'],

From be76478f0d283e6349e2cbde737c9d29e8d044e6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 21 Jun 2022 07:33:05 +0200
Subject: [PATCH 154/822] IniSet: update the documentation for two properties

---
 WordPress/Sniffs/PHP/IniSetSniff.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 08ab6a7bf8..62ff297460 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -41,7 +41,8 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	);
 
 	/**
-	 * Array of PHP configuration options that are allowed to be manipulated.
+	 * Array of PHP configuration options that are safe to be manipulated, as changing
+	 * the value of these, won't cause interoperability issues between WP/plugins/themes.
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 Renamed from `$whitelisted_options` to `$safe_options`.
@@ -67,7 +68,8 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	);
 
 	/**
-	 * Array of PHP configuration options that are not allowed to be manipulated.
+	 * Array of PHP configuration options that are not allowed to be manipulated, as changing
+	 * the value of these, will be problematic for interoperability between WP/plugins/themes.
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 Renamed from `$blacklisted_options` to `$disallowed_options`.

From ba985a059b5d65743fd9eb4904ec1de617edd032 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:50:07 +0200
Subject: [PATCH 155/822] NoSilencedErrors: rename property [1]

As this is a `public` property, this is a BC-break and should be annotated as such in the upgrade guide/changelog.

Also note that the new name is in line with the name for the same property in an upcoming replacement sniff in PHPCSExtra. This should make the switch over to the replacement sniff more straight-forward (if and when).
---
 WordPress-Extra/ruleset.xml                      | 4 ++--
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php   | 9 +++++----
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index c493f65e29..3c33ad3111 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -147,11 +147,11 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1371 -->
 	<rule ref="WordPress.PHP.PregQuoteDelimiter"/>
 
-	<!-- The Core ruleset respects the whitelist. For `Extra` the sniff is stricter.
+	<!-- The Core ruleset respects the PHP allowed functions list. For `Extra` the sniff is stricter.
 		 https://github.com/WordPress/WordPress-Coding-Standards/pull/1450 -->
 	<rule ref="WordPress.PHP.NoSilencedErrors">
 		<properties>
-			<property name="use_default_whitelist" value="false"/>
+			<property name="usePHPFunctionsList" value="false"/>
 		</properties>
 	</rule>
 
diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 95dd4132a8..f41f64dad5 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -16,7 +16,7 @@
  * Discourage the use of the PHP error silencing operator.
  *
  * This sniff allows the error operator to be used with a select list
- * of whitelisted functions, as no amount of error checking can prevent
+ * of functions, as no amount of error checking can prevent
  * PHP from throwing errors when those functions are used.
  *
  * @package WPCS\WordPressCodingStandards
@@ -40,14 +40,15 @@ class NoSilencedErrorsSniff extends Sniff {
 	 *
 	 * Defaults to true.
 	 *
-	 * This property only affects whether the standard function whitelist is
+	 * This property only affects whether the standard function list is
 	 * used. The custom whitelist, if set, will always be respected.
 	 *
 	 * @since 1.1.0
+	 * @since 3.0.0 Renamed from `$use_default_whitelist` to `$usePHPFunctionsList`.
 	 *
 	 * @var bool
 	 */
-	public $use_default_whitelist = true;
+	public $usePHPFunctionsList = true;
 
 	/**
 	 * User defined whitelist.
@@ -194,7 +195,7 @@ public function process_token( $stackPtr ) {
 			$has_parenthesis = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true, null, true );
 			if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ]['code'] ) {
 				$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
-				if ( ( true === $this->use_default_whitelist
+				if ( ( true === $this->usePHPFunctionsList
 					&& isset( $this->function_whitelist[ $function_name ] ) === true )
 					|| ( ! empty( $this->custom_whitelist )
 					&& in_array( $function_name, $this->custom_whitelist, true ) === true )
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
index 3e52794bc9..01a2be9cb6 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
@@ -52,7 +52,7 @@ $unserialized = @unserialize( $str );
 /*
  * ... and test the same principle again, but now without using the whitelist.
  */
-// phpcs:set WordPress.PHP.NoSilencedErrors use_default_whitelist false
+// phpcs:set WordPress.PHP.NoSilencedErrors usePHPFunctionsList false
 
 // File extension.
 if ( @&file_exists( $filename ) && @ /*comment*/ is_readable( $filename ) ) { // Bad x2.
@@ -71,7 +71,7 @@ if (@is_dir($dir)) { // Bad.
 $files1 = @ & scandir($dir); // Bad.
 
 /*
- * Custom whitelist will be respected even when `use_default_whitelist` is set to false.
+ * Custom whitelist will be respected even when `usePHPFunctionsList` is set to false.
  */
 // phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[] fgetcsv,hex2bin
 while ( ( $csvdata = @fgetcsv( $handle, 2000, $separator ) ) !== false ) {}
@@ -79,4 +79,4 @@ echo @some_userland_function( $param ); // Bad.
 $decoded = @hex2bin( $data );
 // phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[]
 
-// phpcs:set WordPress.PHP.NoSilencedErrors use_default_whitelist true
+// phpcs:set WordPress.PHP.NoSilencedErrors usePHPFunctionsList true

From b7928b7a2748f70289cd9b53d9be74bd296bb705 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:54:24 +0200
Subject: [PATCH 156/822] NoSilencedErrors: rename property [2]

As this is a `public` property, this is a BC-break and should be annotated as such in the upgrade guide/changelog.

Also note that the new name is in line with the name for the same property in an upcoming replacement sniff in PHPCSExtra. This should make the switch over to the replacement sniff more straight-forward (if and when).
---
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      | 23 ++++++++++---------
 .../Tests/PHP/NoSilencedErrorsUnitTest.inc    | 10 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index f41f64dad5..026a8fb94e 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -40,8 +40,8 @@ class NoSilencedErrorsSniff extends Sniff {
 	 *
 	 * Defaults to true.
 	 *
-	 * This property only affects whether the standard function list is
-	 * used. The custom whitelist, if set, will always be respected.
+	 * This property only affects whether the standard function list is used.
+	 * The custom allowed functions list, if set, will always be respected.
 	 *
 	 * @since 1.1.0
 	 * @since 3.0.0 Renamed from `$use_default_whitelist` to `$usePHPFunctionsList`.
@@ -51,16 +51,17 @@ class NoSilencedErrorsSniff extends Sniff {
 	public $usePHPFunctionsList = true;
 
 	/**
-	 * User defined whitelist.
+	 * User defined function list.
 	 *
-	 * Allows users to pass a list of additional functions to whitelist
-	 * from their custom ruleset.
+	 * Allows users to pass a list of additional functions for which to allow
+	 * the use of the silence operator. This list can be set in a custom ruleset.
 	 *
 	 * @since 1.1.0
+	 * @since 3.0.0 Renamed from `$custom_whitelist` to `$customAllowedFunctionsList`.
 	 *
 	 * @var array
 	 */
-	public $custom_whitelist = array();
+	public $customAllowedFunctionsList = array();
 
 	/**
 	 * PHP native function whitelist.
@@ -180,9 +181,9 @@ public function register() {
 	 * @param int $stackPtr The position of the current token in the stack.
 	 */
 	public function process_token( $stackPtr ) {
-		// Handle the user-defined custom function whitelist.
-		$this->custom_whitelist = $this->merge_custom_array( $this->custom_whitelist, array(), false );
-		$this->custom_whitelist = array_map( 'strtolower', $this->custom_whitelist );
+		// Handle the user-defined custom function list.
+		$this->customAllowedFunctionsList = $this->merge_custom_array( $this->customAllowedFunctionsList, array(), false );
+		$this->customAllowedFunctionsList = array_map( 'strtolower', $this->customAllowedFunctionsList );
 
 		/*
 		 * Check if the error silencing is done for one of the whitelisted functions.
@@ -197,8 +198,8 @@ public function process_token( $stackPtr ) {
 				$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
 				if ( ( true === $this->usePHPFunctionsList
 					&& isset( $this->function_whitelist[ $function_name ] ) === true )
-					|| ( ! empty( $this->custom_whitelist )
-					&& in_array( $function_name, $this->custom_whitelist, true ) === true )
+					|| ( ! empty( $this->customAllowedFunctionsList )
+					&& in_array( $function_name, $this->customAllowedFunctionsList, true ) === true )
 				) {
 					$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', 'whitelisted function call: ' . $function_name );
 					return;
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
index 01a2be9cb6..d5e777e17a 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
@@ -39,11 +39,11 @@ if ( @ftp_fget($conn_id, $handle, $remote_file, FTP_ASCII, 0 ) ) { // Bad.
 }
 @ftp_close($conn_id); // Bad.
 
-// phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[] fgetcsv,hex2bin
+// phpcs:set WordPress.PHP.NoSilencedErrors customAllowedFunctionsList[] fgetcsv,hex2bin
 while ( ( $csvdata = @fgetcsv( $handle, 2000, $separator ) ) !== false ) {}
 echo @some_userland_function( $param ); // Bad.
 $decoded = @hex2bin( $data );
-// phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[]
+// phpcs:set WordPress.PHP.NoSilencedErrors customAllowedFunctionsList[]
 
 $decoded = @hex2bin( $data ); // Bad.
 
@@ -71,12 +71,12 @@ if (@is_dir($dir)) { // Bad.
 $files1 = @ & scandir($dir); // Bad.
 
 /*
- * Custom whitelist will be respected even when `usePHPFunctionsList` is set to false.
+ * The custom allowed functions list will be respected even when `usePHPFunctionsList` is set to false.
  */
-// phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[] fgetcsv,hex2bin
+// phpcs:set WordPress.PHP.NoSilencedErrors customAllowedFunctionsList[] fgetcsv,hex2bin
 while ( ( $csvdata = @fgetcsv( $handle, 2000, $separator ) ) !== false ) {}
 echo @some_userland_function( $param ); // Bad.
 $decoded = @hex2bin( $data );
-// phpcs:set WordPress.PHP.NoSilencedErrors custom_whitelist[]
+// phpcs:set WordPress.PHP.NoSilencedErrors customAllowedFunctionsList[]
 
 // phpcs:set WordPress.PHP.NoSilencedErrors usePHPFunctionsList true

From 5527d30d75a527f9d3d7b461c8440302a91d1afb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 16:59:44 +0200
Subject: [PATCH 157/822] NoSilencedErrors: rename property [3]

As this is a `protected` property, this is an internal change only (unless an external standard would be extending the sniff).

Also note that the new name is in line with the name for the same property in an upcoming replacement sniff in PHPCSExtra. This should make the switch over to the replacement sniff more straight-forward (if and when).
---
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php   | 9 +++++----
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 026a8fb94e..c6b64afdf5 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -36,7 +36,7 @@ class NoSilencedErrorsSniff extends Sniff {
 	public $context_length = 6;
 
 	/**
-	 * Whether or not the `$function_whitelist` should be used.
+	 * Whether or not the `$allowedFunctionsList` should be used.
 	 *
 	 * Defaults to true.
 	 *
@@ -64,7 +64,7 @@ class NoSilencedErrorsSniff extends Sniff {
 	public $customAllowedFunctionsList = array();
 
 	/**
-	 * PHP native function whitelist.
+	 * PHP native functions allow list.
 	 *
 	 * Errors caused by calls to any of these native PHP functions
 	 * are allowed to be silenced as file system permissions and such
@@ -78,10 +78,11 @@ class NoSilencedErrorsSniff extends Sniff {
 	 * error will be thrown on failure are accepted into this list.
 	 *
 	 * @since 1.1.0
+	 * @since 3.0.0 Renamed from `$function_whitelist` to `$allowedFunctionsList`.
 	 *
 	 * @var array <string function name> => <bool true>
 	 */
-	protected $function_whitelist = array(
+	protected $allowedFunctionsList = array(
 		// Directory extension.
 		'chdir'                        => true,
 		'opendir'                      => true,
@@ -197,7 +198,7 @@ public function process_token( $stackPtr ) {
 			if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ]['code'] ) {
 				$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
 				if ( ( true === $this->usePHPFunctionsList
-					&& isset( $this->function_whitelist[ $function_name ] ) === true )
+					&& isset( $this->allowedFunctionsList[ $function_name ] ) === true )
 					|| ( ! empty( $this->customAllowedFunctionsList )
 					&& in_array( $function_name, $this->customAllowedFunctionsList, true ) === true )
 				) {
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
index d5e777e17a..cc846d2dec 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
@@ -50,7 +50,7 @@ $decoded = @hex2bin( $data ); // Bad.
 $unserialized = @unserialize( $str );
 
 /*
- * ... and test the same principle again, but now without using the whitelist.
+ * ... and test the same principle again, but now without using the PHP function allow list.
  */
 // phpcs:set WordPress.PHP.NoSilencedErrors usePHPFunctionsList false
 

From a3d993f559d57a289f8c696abdc99754aac3ff74 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:03:11 +0200
Subject: [PATCH 158/822] NoSilencedErrors: fix up comments

---
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index c6b64afdf5..70249ee56c 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -187,9 +187,9 @@ public function process_token( $stackPtr ) {
 		$this->customAllowedFunctionsList = array_map( 'strtolower', $this->customAllowedFunctionsList );
 
 		/*
-		 * Check if the error silencing is done for one of the whitelisted functions.
+		 * Check if the error silencing is done for one of the allowed functions.
 		 *
-		 * @internal The function call name determination is done even when there is no whitelist active
+		 * @internal The function call name determination is done even when there is no allow list active
 		 * to allow the metrics to be more informative.
 		 */
 		$next_non_empty = $this->phpcsFile->findNext( $this->empty_tokens, ( $stackPtr + 1 ), null, true, null, true );

From 06dc19491395819329dd510ae1b71902e8462dc8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:24:45 +0200
Subject: [PATCH 159/822] NoSilencedErrors: rename a metric

---
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 70249ee56c..251805ab7f 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -202,7 +202,7 @@ public function process_token( $stackPtr ) {
 					|| ( ! empty( $this->customAllowedFunctionsList )
 					&& in_array( $function_name, $this->customAllowedFunctionsList, true ) === true )
 				) {
-					$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', 'whitelisted function call: ' . $function_name );
+					$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', 'silencing allowed function call: ' . $function_name );
 					return;
 				}
 			}

From 669fc23d666d51fd89653f14a04b8d48d3bf5ffe Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:55:44 +0200
Subject: [PATCH 160/822] Various language usage updates in comments

Includes:
* Removing a reference to a custom ignore annotation which was already removed in PR 1908.
* Removing a changelog entry referring to a custom ignore annotation which doesn't exist anymore.
* Use more inclusive language in various other comments.
---
 WordPress/Helpers/IsUnitTestTrait.php                |  4 ++--
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php |  4 ----
 WordPress/Sniffs/DB/SlowDBQuerySniff.php             |  3 ---
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php |  2 +-
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc |  4 ++--
 .../NamingConventions/ValidVariableNameUnitTest.inc  |  2 +-
 .../Tests/Security/NonceVerificationUnitTest.inc     |  2 +-
 .../Tests/Utils/I18nTextDomainFixerUnitTest.4.inc    |  2 +-
 .../Utils/I18nTextDomainFixerUnitTest.4.inc.fixed    |  2 +-
 .../Tests/WP/GlobalVariablesOverrideUnitTest.1.inc   |  2 +-
 .../WhiteSpace/PrecisionAlignmentUnitTest.2.inc      | 12 ++++++------
 .../WhiteSpace/PrecisionAlignmentUnitTest.7a.inc     |  8 ++++----
 .../WhiteSpace/PrecisionAlignmentUnitTest.7b.inc     |  8 ++++----
 .../WhiteSpace/PrecisionAlignmentUnitTest.7c.inc     |  8 ++++----
 14 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index b3712da57c..00c45c8717 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -140,7 +140,7 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 			$known_test_classes[ $k ] = ltrim( $v, '\\' );
 		}
 
-		// Is the class/trait one of the whitelisted test classes ?
+		// Is the class/trait one of the known test classes ?
 		$namespace = Namespaces::determineNamespace( $phpcsFile, $stackPtr );
 		$className = ObjectDeclarations::getName( $phpcsFile, $stackPtr );
 		if ( '' !== $namespace ) {
@@ -151,7 +151,7 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 			return true;
 		}
 
-		// Does the class/trait extend one of the whitelisted test classes ?
+		// Does the class/trait extend one of the known test classes ?
 		$extendedClassName = ObjectDeclarations::findExtendedClassName( $phpcsFile, $stackPtr );
 		if ( false === $extendedClassName ) {
 			return false;
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 836b6e51dd..fde54a9ce7 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -34,10 +34,6 @@
  * created using code along the lines of:
  * `sprintf( 'query .... IN (%s) ...', implode( ',', array_fill( 0, count( $something ), '%s' ) ) )`.
  *
- * A "PreparedSQLPlaceholders replacement count" whitelist comment is supported
- * specifically to silence the `ReplacementsWrongNumber` and `UnfinishedPrepare`
- * error codes. The other error codes are not affected by it.
- *
  * @link https://developer.wordpress.org/reference/classes/wpdb/prepare/
  * @link https://core.trac.wordpress.org/changeset/41496
  * @link https://core.trac.wordpress.org/changeset/41471
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index e6157cb020..714f89454b 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -19,9 +19,6 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.3.0
- * @since   0.12.0 Introduced new and more intuitively named 'slow query' whitelist
- *                 comment, replacing the 'tax_query' whitelist comment which is now
- *                 deprecated.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  */
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 0ab1bcd1d5..fb3f05f7d1 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -54,7 +54,7 @@ class GlobalVariablesOverrideSniff extends Sniff {
 	public $treat_files_as_scoped = false;
 
 	/**
-	 * Whitelist select variables from the Sniff::$wp_globals array.
+	 * Allow select variables from the Sniff::$wp_globals array to be overwritten.
 	 *
 	 * A few select variables in WP Core are _intended_ to be overwritten
 	 * by themes/plugins. This sniff should not throw an error for those.
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 8c9c3e2e2b..2966bb1a2b 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -157,7 +157,7 @@ namespace Acronym {
 
 
 /*
- * OK - exceptions whitelisted by default.
+ * OK - exceptions ignored by default.
  */
 $_POST['something'] = 'value';
 
@@ -319,7 +319,7 @@ namespace TGMPA\Testing {
 	define( 'MY\\' . __NAMESPACE__, __FILE__ ); // OK, even though strangely setup, the constant is in a namespace.
 }
 
-// OK: whitelisted core hooks.
+// OK: ignored core hooks.
 apply_filters( 'widget_title', $title );
 do_action( 'add_meta_boxes' );
 
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 16221b7dd8..e5923c3d1d 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -127,7 +127,7 @@ echo "This is a $comment_ID"; // Bad
 echo "This is $PHP_SELF with $HTTP_RAW_POST_DATA"; // Ok.
 
 /*
- * Unit test whitelisting.
+ * Ignoring unit tests.
  */
 // phpcs:set WordPress.NamingConventions.ValidVariableName allowed_custom_properties[] varName,DOMProperty
 echo MyClass::$varName; // Ok, allowed.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index 4f60f45aec..e3a12f28e2 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -165,7 +165,7 @@ function foo_8() {
  * Using a superglobal in a is_...() function is OK as long as a nonce check is done
  * before the variable is *really* used.
  */
-function test_whitelisting_use_in_type_test_functions() {
+function test_ignoring_use_in_type_test_functions() {
 	if ( ! is_numeric ( $_POST['foo'] ) ) { // OK.
 		return;
 	}
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
index 87d52fbba5..630639124a 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
@@ -67,7 +67,7 @@ _x( $text, $context, $variableTextdomain );
 _ex( $text, $context, CONSTANT_TEXTDOMAIN );
 
 /*
- * Text domains *not* in the whitelisted "old" domain list should be ignored.
+ * Text domains *not* in the "old" domain list should be ignored.
  */
 load_plugin_textdomain( 'tgmpa', false, '/languages/' );
 _e( $text, 'default' );
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
index 2c0c176ebd..bd50e3a2f9 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
@@ -67,7 +67,7 @@ _x( $text, $context, $variableTextdomain );
 _ex( $text, $context, CONSTANT_TEXTDOMAIN );
 
 /*
- * Text domains *not* in the whitelisted "old" domain list should be ignored.
+ * Text domains *not* in the "old" domain list should be ignored.
  */
 load_plugin_textdomain( 'tgmpa', false, '/languages/' );
 _e( $text, 'default' );
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index b916db85ff..7b97c5743d 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -107,7 +107,7 @@ trait My_Class {
 	}
 }
 
-// Test adding additional test classes to the whitelist.
+// Test adding additional test classes to the custom test classes list.
 // phpcs:set WordPress.WP.GlobalVariablesOverride custom_test_classes[] My_TestClass
 class Test_Class_D extends My_TestClass {
 
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
index 8ee264ae22..3997fb51dc 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
@@ -19,24 +19,24 @@ phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[] T_COMM
 	/**
 	 * OK: Doc comments are indented with tabs and one space.
 	 *
-	  * @var string  <= Bad, but not reported as token type is whitelisted.
+	  * @var string  <= Bad, but not reported as token type is ignored.
 	 * @access private
 	 */
 
 	/*
 	 * OK: Multi-line comments are indented with tabs and one space.
 	 *
-	   * <= Bad, but not reported as token type is whitelisted
+	   * <= Bad, but not reported as token type is ignored
 	 */
 
-	 function exampleFunctionD() {} // Bad, but not reported as token type is whitelisted.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is whitelisted.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is whitelisted.
+	 function exampleFunctionD() {} // Bad, but not reported as token type is ignored.
+	  function exampleFunctionE() {} // Bad, but not reported as token type is ignored.
+	   function exampleFunctionF() {} // Bad, but not reported as token type is ignored.
 
 ?>
 
 	<p>
-	  Bad: Some text with precision alignment, but not reported as token type is whitelisted.
+	  Bad: Some text with precision alignment, but not reported as token type is ignored.
 	</p>
 
 <?php
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
index 5335254df4..a616c84b55 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
@@ -9,7 +9,7 @@ phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[] T_COMM
  * 7a, 7b and 7c test files together test (against) the issue.
  */
 
-  // Bad, but not reported as token type is whitelisted.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is whitelisted.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is whitelisted.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is whitelisted.
+  // Bad, but not reported as token type is ignored.
+	 function exampleFunctionD() {} // Bad, but not reported as token type is ignored.
+	  function exampleFunctionE() {} // Bad, but not reported as token type is ignored.
+	   function exampleFunctionF() {} // Bad, but not reported as token type is ignored.
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
index 4c9395612d..6dfa0d90e9 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
@@ -9,7 +9,7 @@
  * This file should inherit the property settings from the 7a test case file.
  */
 
-  // Bad, but not reported as token type is whitelisted.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) whitelisted.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) whitelisted.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) whitelisted.
+  // Bad, but not reported as token type is ignored.
+	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) ignored.
+	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) ignored.
+	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) ignored.
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
index 423ad8a329..f6a8caa2b2 100644
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
+++ b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
@@ -9,9 +9,9 @@
  * This file should inherit the property settings from the 7a test case file.
  */
 
-  // Bad, but not reported as token type is whitelisted.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) whitelisted.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) whitelisted.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) whitelisted.
+  // Bad, but not reported as token type is ignored.
+	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) ignored.
+	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) ignored.
+	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) ignored.
 
 // phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[]

From 66e7064797267cb862a14df2e6fbf9a3e861a5ef Mon Sep 17 00:00:00 2001
From: Lucas Bustamante <lucasfbustamante@gmail.com>
Date: Fri, 24 Jun 2022 10:53:24 -0300
Subject: [PATCH 161/822] Add link to "Running in GitHub Actions" doc page

See #1976
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 1b1a859456..443a3d1221 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@
     + [Command line](#command-line)
     + [Using PHPCS and WPCS from within your IDE](#using-phpcs-and-wpcs-from-within-your-ide)
 * [Running your code through WPCS automatically using CI tools](#running-your-code-through-wpcs-automatically-using-ci-tools)
+    + [GitHub Actions](#github-actions)
     + [Travis CI](#travis-ci)
 * [Fixing errors or ignoring them](#fixing-errors-or-ignoring-them)
     + [Tools shipped with WPCS](#tools-shipped-with-wpcs)
@@ -225,6 +226,10 @@ Will result in following output:
 
 ## Running your code through WPCS automatically using CI tools
 
+### [GitHub Actions](https://github.com/features/actions)
+
+To run WPCS in GitHub Actions, check this documentation page: [Running in GitHub Actions](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-GitHub-Actions).
+
 ### [Travis CI](https://travis-ci.com/)
 
 To integrate PHPCS with WPCS with Travis CI, you'll need to install both `before_install` and add the run command to the `script`.

From e7765de1712833f8e8173e06f603101c0ab13d5a Mon Sep 17 00:00:00 2001
From: Lucas Bustamante <lucasfbustamante@gmail.com>
Date: Fri, 24 Jun 2022 12:03:45 -0300
Subject: [PATCH 162/822] Update README.md

---
 README.md | 47 ++---------------------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 443a3d1221..095c814294 100644
--- a/README.md
+++ b/README.md
@@ -226,51 +226,8 @@ Will result in following output:
 
 ## Running your code through WPCS automatically using CI tools
 
-### [GitHub Actions](https://github.com/features/actions)
-
-To run WPCS in GitHub Actions, check this documentation page: [Running in GitHub Actions](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-GitHub-Actions).
-
-### [Travis CI](https://travis-ci.com/)
-
-To integrate PHPCS with WPCS with Travis CI, you'll need to install both `before_install` and add the run command to the `script`.
-If your project uses Composer, the typical instructions might be different.
-
-If you use a matrix setup in Travis to test your code against different PHP and/or WordPress versions, you don't need to run PHPCS on each variant of the matrix as the results will be same.
-You can set an environment variable in the Travis matrix to only run the sniffs against one setup in the matrix.
-
-#### Travis CI example
-```yaml
-language: php
-
-matrix:
-  include:
-    # Arbitrary PHP version to run the sniffs against.
-    - php: '7.0'
-      env: SNIFF=1
-
-before_install:
-  - if [[ "$SNIFF" == "1" ]]; then export PHPCS_DIR=/tmp/phpcs; fi
-  - if [[ "$SNIFF" == "1" ]]; then export SNIFFS_DIR=/tmp/sniffs; fi
-  # Install PHP_CodeSniffer.
-  - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
-  # Install WordPress Coding Standards.
-  - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
-  # Set install path for WordPress Coding Standards.
-  - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/bin/phpcs --config-set installed_paths $SNIFFS_DIR; fi
-  # After CodeSniffer install you should refresh your path.
-  - if [[ "$SNIFF" == "1" ]]; then phpenv rehash; fi
-
-script:
-  # Run against WordPress Coding Standards.
-  # If you use a custom ruleset, change `--standard=WordPress` to point to your ruleset file,
-  # for example: `--standard=wpcs.xml`.
-  # You can use any of the normal PHPCS command line arguments in the command:
-  # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage
-  - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/bin/phpcs -p . --standard=WordPress; fi
-```
-
-More examples and advice about integrating PHPCS in your Travis build tests can be found here: https://github.com/jrfnl/make-phpcs-work-for-you/tree/master/travis-examples
-
+- [Running in GitHub Actions](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-GitHub-Actions)
+- [Running in Travis](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-Travis)
 
 ## Fixing errors or ignoring them
 

From aa3e9ec56d3f97c7005751d178c4d740fc624cd8 Mon Sep 17 00:00:00 2001
From: Lucas Bustamante <lucasfbustamante@gmail.com>
Date: Fri, 24 Jun 2022 12:06:32 -0300
Subject: [PATCH 163/822] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 095c814294..4043438803 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,6 @@
     + [Command line](#command-line)
     + [Using PHPCS and WPCS from within your IDE](#using-phpcs-and-wpcs-from-within-your-ide)
 * [Running your code through WPCS automatically using CI tools](#running-your-code-through-wpcs-automatically-using-ci-tools)
-    + [GitHub Actions](#github-actions)
-    + [Travis CI](#travis-ci)
 * [Fixing errors or ignoring them](#fixing-errors-or-ignoring-them)
     + [Tools shipped with WPCS](#tools-shipped-with-wpcs)
 * [Contributing](#contributing)

From 699466569b6b17d50b46e96df12a056ff60271af Mon Sep 17 00:00:00 2001
From: Juliette <663378+jrfnl@users.noreply.github.com>
Date: Tue, 9 Aug 2022 08:25:37 +0200
Subject: [PATCH 164/822] WP/CronInterval: update inline annotations in test
 case file (#2074)

See: https://github.com/WordPress/WordPress-Coding-Standards/pull/2073#discussion_r940007958

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
---
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 330084676c..bf5ac5fda1 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -9,12 +9,12 @@ function my_add_weekly( $schedules ) {
 	);
 	return $schedules;
 }
-add_filter( 'cron_schedules', 'my_add_weekly'); // Error: 6 min.
+add_filter( 'cron_schedules', 'my_add_weekly'); // Warning: 6 min.
 
 
 class Foo {
 	public function __construct() {
-		add_filter( 'cron_schedules', array( $this, 'my_add_quickly' ) ); // Error: 10 min.
+		add_filter( 'cron_schedules', array( $this, 'my_add_quickly' ) ); // Warning: 10 min.
 	}
 
 	public function my_add_quickly( $schedules ) {
@@ -34,7 +34,7 @@ class Foo {
 	}
 }
 
-add_filter( 'cron_schedules', array( 'Foo', 'my_add_quicklier' ) ); // Error: 5 min.
+add_filter( 'cron_schedules', array( 'Foo', 'my_add_quicklier' ) ); // Warning: 5 min.
 
 add_filter( 'cron_schedules', array( $some_other_place, 'some_other_method' ) ); // Warning: time undetermined.
 
@@ -46,11 +46,11 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 9 minutes' )
 	);
 	return $schedules;
-} ); // Error: 9 min.
+} ); // Warning: 9 min.
 
 add_filter( 'cron_schedules' ); // Ignore, no callback parameter.
 
-add_filter( 'cron_schedules', [ 'Foo', 'my_add_quicklier' ] ); // Error: 5 min.
+add_filter( 'cron_schedules', [ 'Foo', 'my_add_quicklier' ] ); // Warning: 5 min.
 
 // Ignore, not our function.
 My_Custom::add_filter( 'cron_schedules', [ 'Foo', 'my_add_quicklier' ] );
@@ -70,7 +70,7 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 8 minutes' )
 	];
 	return $schedules;
-} ); // Error: 8 min.
+} ); // Warning: 8 min.
 
 // Deal correctly with the function calls for interval.
 add_filter( 'cron_schedules', function ( $schedules ) {
@@ -88,7 +88,7 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 2 minutes' )
 	);
 	return $schedules;
-} ); // Error: 2 min.
+} ); // Warning: 2 min.
 add_filter( 'cron_schedules', function ( $schedules ) {
 	$schedules['every_10_mins'] = array(
 		'interval' => 10 * 60,
@@ -111,14 +111,14 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 2 minutes' )
 	);
 	return $schedules;
-} ); // Error: 2 min.
+} ); // Warning: 2 min.
 add_filter( 'cron_schedules', function ( $schedules ) {
 	$schedules['every_15_mins'] = array(
 		'interval' => 15 * 60,
 		'display' => __( 'Once every 15 minutes' )
 	);
 	return $schedules;
-} ); // Error: 15 min.
+} ); // Warning: 15 min.
 add_filter( 'cron_schedules', function ( $schedules ) {
 	$schedules['every_hour'] = [
 		'interval' => HOUR_IN_SECONDS,
@@ -138,7 +138,7 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 9 minutes' )
 	);
 	return $schedules;
-} ); // Error: 9 min.
+} ); // Warning: 9 min.
 
 Custom::add_filter( 'cron_schedules', array( $class, $method ) ); // OK, not the WP function.
 add_filter( 'some_hook', array( $place, 'cron_schedules' ) ); // OK, not the hook we're looking for.
@@ -159,4 +159,4 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 		'display' => __( 'Once every 8 minutes' )
 	];
 	return $schedules;
-} ); // Error: 8 min.
+} ); // Warning: 8 min.

From 935257b6dd0d7640e41790fb52afc98da460b81e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 7 Aug 2022 23:02:29 +0200
Subject: [PATCH 165/822] WP/CronInterval: bugfix for fully qualified time
 constants

If the WP time constants would be used in their fully qualified form, as is often encountered in namespaced files, the sniff would no longer be able to correctly determine the interval being scheduled.

This commit fixes that.

Note: To prevent constants from a different namespace accidentally matching the WP native constants, the namespace separator is replace by a space character rather than just ignored. The regex before running the `eval()` will prevent code with identifier names other than the WP time constants from being passed to the `eval()`, meaning those will still be reported as "interval undetermined".

Includes unit tests.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   |  5 +++
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 42 +++++++++++++++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php |  3 ++
 3 files changed, 50 insertions(+)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 65badaa90a..21ee0e9b87 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -182,6 +182,11 @@ public function process_token( $stackPtr ) {
 							continue;
 						}
 
+						if ( \T_NS_SEPARATOR === $this->tokens[ $j ]['code'] ) {
+							$value .= ' ';
+							continue;
+						}
+
 						if ( $j === $valueEnd && \T_COMMA === $this->tokens[ $j ]['code'] ) {
 							break;
 						}
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index bf5ac5fda1..7293774019 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -160,3 +160,45 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 	];
 	return $schedules;
 } ); // Warning: 8 min.
+
+// Correctly handle fully qualified WP time constants.
+class FQNConstants {
+	public function add_schedules() {
+		add_filter( 'cron_schedules', array( $this, 'add_weekly_schedule' ) ); // Ok: > 15 min.
+		add_filter( 'cron_schedules', array( $this, 'add_eight_minute_schedule' ) ); // Warning: 8 min.
+		add_filter( 'cron_schedules', array( $this, 'add_hundred_minute_schedule' ) ); // Warning: time undetermined.
+		add_filter( 'cron_schedules', array( $this, 'sneaky_fake_wp_constant_schedule' ) ); // Warning: time undetermined.
+	}
+
+	public function add_weekly_schedule( $schedules ) {
+		$schedules['weekly'] = [
+			'interval' => \WEEK_IN_SECONDS,
+			'display'  => \__( 'Once Weekly', 'text-domain' ),
+		];
+		return $schedules;
+	}
+
+	public function add_eight_minute_schedule( $schedules ) {
+		$schedules['every_8_minutes'] = [
+			'interval' => (8 * \MINUTE_IN_SECONDS),
+			'display' => __( 'Once every 8 minutes' )
+		];
+		return $schedules;
+	}
+
+	public function add_hundred_minute_schedule( $schedules ) {
+		$schedules['every_100_minutes'] = [
+			'interval' => (100 * My\Name\MINUTE_IN_SECONDS),
+			'display' => __( 'Once every 100 minutes' )
+		];
+		return $schedules;
+	}
+
+	public function sneaky_fake_wp_constant_schedule( $schedules ) {
+		$schedules['every_100_seconds'] = [
+			'interval' => (100 * MINUTE_\IN_\SECONDS),
+			'display' => __( 'Once every 100 minutes' )
+		];
+		return $schedules;
+	}
+}
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 522e45211f..db79d38475 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -52,6 +52,9 @@ public function getWarningList() {
 			115 => 1,
 			133 => 1,
 			156 => 1,
+			168 => 1,
+			169 => 1,
+			170 => 1,
 		);
 	}
 }

From 128e7e880924dbf8a002b32121ad456fb183f879 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 03:04:09 +0200
Subject: [PATCH 166/822] Arrays/ArrayKeySpacingRestrictions: don't warn on
 parse error

Most sniffs will silently bow out on parse errors. This is the preferred behaviour as sniffs are often run in IDEs during live coding.

The `ArrayKeySpacingRestrictions` sniff would, however, throw a warning when a close bracket was missing.

This commit removes that warning.

This is in line with similar changes (no longer throwing warnings/errors on parse errors) which will be included in PHPCS 4.x upstream.

Note: there were no tests covering the warning, so the test files are untouched.

Refs:
* squizlabs/PHP_CodeSniffer 2455
---
 WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 6b3203cd62..57559cbe89 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -49,7 +49,6 @@ public function process_token( $stackPtr ) {
 
 		$token = $this->tokens[ $stackPtr ];
 		if ( ! isset( $token['bracket_closer'] ) ) {
-			$this->phpcsFile->addWarning( 'Missing bracket closer.', $stackPtr, 'MissingBracketCloser' );
 			return;
 		}
 

From c04858aeb14bf9be438e498e94125df38b0f2634 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 04:34:48 +0200
Subject: [PATCH 167/822] Arrays/ArrayKeySpacingRestrictions: improve handling
 of brackets for array assignments without key

As it was, this was handled correctly, though the error message was unclear as it referred to "array keys", while these assignments don't have an explicit key.

To fix this, I'm now special casing array assignments without an explicit key.

The original error message in that situation was: "Array keys must NOT be surrounded by spaces if they only contain a string or an integer."
The new error message will be: "There should be no space between the square brackets for an array assignment without an explicit key. Found: ..."

The new error message will also have a different, new error code: `SpacesBetweenBrackets`.
Note: the new error code could be considered a breaking change, though I doubt many people will notice this as this is not typically an error code which would be used in inline ignore annotations.

Includes unit tests.

Note: the behaviour for array assignments without an explicit key, but with a comment between the brackets, has not been changed. In that case, the original `NoSpacesAroundArrayKeys` error will still be thrown.

All the same, tests have been added to verify and safeguard this.
---
 .../ArrayKeySpacingRestrictionsSniff.php      | 24 ++++++++++++++++++-
 .../ArrayKeySpacingRestrictionsUnitTest.inc   | 10 ++++++++
 ...ayKeySpacingRestrictionsUnitTest.inc.fixed |  9 +++++++
 .../ArrayKeySpacingRestrictionsUnitTest.php   |  3 +++
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 57559cbe89..a2f2a3955f 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Fixers\SpacesFixer;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Check for proper spacing in array key references.
@@ -52,6 +53,27 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		/*
+		 * Handle square brackets without a key (array assignments) first.
+		 */
+		$first_non_ws = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+		if ( $first_non_ws === $token['bracket_closer'] ) {
+			$error = 'There should be %1$s between the square brackets for an array assignment without an explicit key. Found: %2$s';
+			SpacesFixer::checkAndFix(
+				$this->phpcsFile,
+				$stackPtr,
+				$token['bracket_closer'],
+				0,
+				$error,
+				'SpacesBetweenBrackets'
+			);
+
+			return;
+		}
+
+		/*
+		 * Handle the spaces around explicit array keys.
+		 */
 		$need_spaces = $this->phpcsFile->findNext(
 			array( \T_CONSTANT_ENCAPSED_STRING, \T_LNUMBER, \T_WHITESPACE, \T_MINUS ),
 			( $stackPtr + 1 ),
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index ceaadfe52e..bf2f6aff8e 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -44,3 +44,13 @@ $arr[
 
 $a = $arr[    /*comment*/ 'key']; // Bad x 2.
 $a = $arr[/*comment*/ 'key'   ]; // Bad x 2.
+
+// Verify handling of array assignments without an explicit key.
+$bar[] = 10; // Good.
+$bar[   ] = 10; // Bad.
+$bar[
+    ] = 10; // Bad.
+
+// Verify handling of array assignments without an explicit key, but with a comment.
+$bar[ /*comment*/ ] = 10; // Good.
+$bar[/*comment*/] = 10; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index 88fe475feb..a4e29e9de7 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -37,3 +37,12 @@ $arr[ FooClass::FOO_KEY ]; // Bad x 2.
 
 $a = $arr[ /*comment*/ 'key' ]; // Bad x 2.
 $a = $arr[ /*comment*/ 'key' ]; // Bad x 2.
+
+// Verify handling of array assignments without an explicit key.
+$bar[] = 10; // Good.
+$bar[] = 10; // Bad.
+$bar[] = 10; // Bad.
+
+// Verify handling of array assignments without an explicit key, but with a comment.
+$bar[ /*comment*/ ] = 10; // Good.
+$bar[ /*comment*/ ] = 10; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 26b00a36f0..6fec267d61 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -47,6 +47,9 @@ public function getErrorList() {
 			40 => 1,
 			45 => 2,
 			46 => 2,
+			50 => 1,
+			51 => 1,
+			56 => 1,
 		);
 	}
 

From d7318591e23af682589c41d2dad3ae66be6b50c0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 03:45:25 +0200
Subject: [PATCH 168/822] Arrays/ArrayKeySpacingRestrictions: tweak test order

... to more easily allow for additional tests for integer keys to be added.
---
 .../ArrayKeySpacingRestrictionsUnitTest.inc      | 12 +++++++-----
 ...ArrayKeySpacingRestrictionsUnitTest.inc.fixed | 12 +++++++-----
 .../ArrayKeySpacingRestrictionsUnitTest.php      | 16 ++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index bf2f6aff8e..be7a226fc0 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -25,11 +25,6 @@ bar( $arr['string'.$var] ); // Bad.
 // Non-string/int.
 $arr[FooClass::FOO_KEY]; // Bad.
 
-$arr[0]; // Good.
-$arr[ 0 ]; // Bad.
-$arr[-1]; // Good.
-$arr[ -1 ]; // Bad.
-
 // Space size check.
 bar( $arr[
 	'test'
@@ -54,3 +49,10 @@ $bar[
 // Verify handling of array assignments without an explicit key, but with a comment.
 $bar[ /*comment*/ ] = 10; // Good.
 $bar[/*comment*/] = 10; // Bad.
+
+// Integer keys.
+$arr[0]; // Good.
+$arr[-1]; // Good.
+
+$arr[ 0 ]; // Bad.
+$arr[ -1 ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index a4e29e9de7..5fad75e99b 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -25,11 +25,6 @@ bar( $arr[ 'string'.$var ] ); // Bad.
 // Non-string/int.
 $arr[ FooClass::FOO_KEY ]; // Bad.
 
-$arr[0]; // Good.
-$arr[0]; // Bad.
-$arr[-1]; // Good.
-$arr[-1]; // Bad.
-
 // Space size check.
 bar( $arr['test'] ); // Bad.
 bar( $arr[ $test ] ); // Bad x 2.
@@ -46,3 +41,10 @@ $bar[] = 10; // Bad.
 // Verify handling of array assignments without an explicit key, but with a comment.
 $bar[ /*comment*/ ] = 10; // Good.
 $bar[ /*comment*/ ] = 10; // Bad.
+
+// Integer keys.
+$arr[0]; // Good.
+$arr[-1]; // Good.
+
+$arr[0]; // Bad.
+$arr[-1]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 6fec267d61..83308934ac 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -40,16 +40,16 @@ public function getErrorList() {
 			23 => 1,
 			26 => 1,
 			29 => 1,
-			31 => 1,
+			33 => 2,
 			34 => 1,
-			38 => 2,
-			39 => 1,
-			40 => 1,
-			45 => 2,
-			46 => 2,
-			50 => 1,
+			35 => 1,
+			40 => 2,
+			41 => 2,
+			45 => 1,
+			46 => 1,
 			51 => 1,
-			56 => 1,
+			57 => 1,
+			58 => 1,
 		);
 	}
 

From f773872d09b8ee26f127bc44bdbe3aea401ba0bb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 03:52:39 +0200
Subject: [PATCH 169/822] Arrays/ArrayKeySpacingRestrictions: rename three
 local variables

... to make them more descriptive.
---
 .../ArrayKeySpacingRestrictionsSniff.php      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index a2f2a3955f..fdbe87a4b9 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -74,35 +74,35 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Handle the spaces around explicit array keys.
 		 */
-		$need_spaces = $this->phpcsFile->findNext(
+		$needs_spaces = $this->phpcsFile->findNext(
 			array( \T_CONSTANT_ENCAPSED_STRING, \T_LNUMBER, \T_WHITESPACE, \T_MINUS ),
 			( $stackPtr + 1 ),
 			$token['bracket_closer'],
 			true
 		);
 
-		$spaced1 = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] );
-		$spaced2 = ( \T_WHITESPACE === $this->tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
+		$has_space_after_opener = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] );
+		$has_space_before_close = ( \T_WHITESPACE === $this->tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
 
 		// It should have spaces unless if it only has strings or numbers as the key.
-		if ( false !== $need_spaces
-			&& ( false === $spaced1 || false === $spaced2 )
+		if ( false !== $needs_spaces
+			&& ( false === $has_space_after_opener || false === $has_space_before_close )
 		) {
 			$error = 'Array keys must be surrounded by spaces unless they contain a string or an integer.';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpacesAroundArrayKeys' );
 			if ( true === $fix ) {
-				if ( ! $spaced1 ) {
+				if ( ! $has_space_after_opener ) {
 					$this->phpcsFile->fixer->addContentBefore( ( $stackPtr + 1 ), ' ' );
 				}
-				if ( ! $spaced2 ) {
+				if ( ! $has_space_before_close ) {
 					$this->phpcsFile->fixer->addContentBefore( $token['bracket_closer'], ' ' );
 				}
 			}
-		} elseif ( false === $need_spaces && ( $spaced1 || $spaced2 ) ) {
+		} elseif ( false === $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
 			$error = 'Array keys must NOT be surrounded by spaces if they only contain a string or an integer.';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'SpacesAroundArrayKeys' );
 			if ( true === $fix ) {
-				if ( $spaced1 ) {
+				if ( $has_space_after_opener ) {
 					$this->phpcsFile->fixer->beginChangeset();
 					$this->phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
 
@@ -116,7 +116,7 @@ public function process_token( $stackPtr ) {
 
 					$this->phpcsFile->fixer->endChangeset();
 				}
-				if ( $spaced2 ) {
+				if ( $has_space_before_close ) {
 					$this->phpcsFile->fixer->beginChangeset();
 					$this->phpcsFile->fixer->replaceToken( ( $token['bracket_closer'] - 1 ), '' );
 
@@ -134,8 +134,8 @@ public function process_token( $stackPtr ) {
 		}
 
 		// If spaces are needed, check that there is only one space.
-		if ( false !== $need_spaces && ( $spaced1 || $spaced2 ) ) {
-			if ( $spaced1 ) {
+		if ( false !== $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
+			if ( $has_space_after_opener ) {
 				$ptr    = ( $stackPtr + 1 );
 				$length = 0;
 				if ( $this->tokens[ $ptr ]['line'] !== $this->tokens[ ( $ptr + 1 ) ]['line'] ) {
@@ -171,7 +171,7 @@ public function process_token( $stackPtr ) {
 				}
 			}
 
-			if ( $spaced2 ) {
+			if ( $has_space_before_close ) {
 				$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $token['bracket_closer'] - 1 ), null, true );
 				$ptr            = ( $prev_non_empty + 1 );
 				$length         = 0;

From 010288c1825996563427ae6c7f87afe568e5e78f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 05:10:32 +0200
Subject: [PATCH 170/822] Arrays/ArrayKeySpacingRestrictions: bug fix - require
 spaces around calculations and allow for + sign

This commit fixes two bugs:
1. Signed integers with a plus sign would be treated differently from signed integers with a minus sign.
    While using the plus sign for unary integers will be rare, it is valid and they should be treated the same as unary integers with a minus sign.
2. When an array key consisted of a calculation with multiple integers and a minus sign, no spaces would be demanded around the array key, even though they key should be surrounded by spaces.

Both bugs have now been fixed by walking the tokens in the array key more precisely.

Includes unit tests covering both situations.

Includes minor tweaks to some conditions as the `$needs_spaces` variables will now always be boolean, so we can make the conditions in which the variable is being used more readable.
---
 .../ArrayKeySpacingRestrictionsSniff.php      | 25 +++++++++++++------
 .../ArrayKeySpacingRestrictionsUnitTest.inc   |  9 +++++++
 ...ayKeySpacingRestrictionsUnitTest.inc.fixed |  9 +++++++
 .../ArrayKeySpacingRestrictionsUnitTest.php   |  5 +++-
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index fdbe87a4b9..db55b91ef9 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -74,18 +74,27 @@ public function process_token( $stackPtr ) {
 		/*
 		 * Handle the spaces around explicit array keys.
 		 */
-		$needs_spaces = $this->phpcsFile->findNext(
-			array( \T_CONSTANT_ENCAPSED_STRING, \T_LNUMBER, \T_WHITESPACE, \T_MINUS ),
-			( $stackPtr + 1 ),
-			$token['bracket_closer'],
-			true
-		);
+		$needs_spaces = true;
+
+		// Skip over a potential plus/minus sign for integers.
+		$first_effective = $first_non_ws;
+		if ( \T_MINUS === $this->tokens[ $first_effective ]['code'] || \T_PLUS === $this->tokens[ $first_effective ]['code'] ) {
+			$first_effective = $this->phpcsFile->findNext( \T_WHITESPACE, ( $first_effective + 1 ), null, true );
+		}
+
+		$next_non_ws = $this->phpcsFile->findNext( \T_WHITESPACE, ( $first_effective + 1 ), null, true );
+		if ( ( \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_effective ]['code']
+			|| \T_LNUMBER === $this->tokens[ $first_effective ]['code'] )
+			&& $next_non_ws === $token['bracket_closer']
+		) {
+			$needs_spaces = false;
+		}
 
 		$has_space_after_opener = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] );
 		$has_space_before_close = ( \T_WHITESPACE === $this->tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
 
 		// It should have spaces unless if it only has strings or numbers as the key.
-		if ( false !== $needs_spaces
+		if ( true === $needs_spaces
 			&& ( false === $has_space_after_opener || false === $has_space_before_close )
 		) {
 			$error = 'Array keys must be surrounded by spaces unless they contain a string or an integer.';
@@ -134,7 +143,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		// If spaces are needed, check that there is only one space.
-		if ( false !== $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
+		if ( true === $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
 			if ( $has_space_after_opener ) {
 				$ptr    = ( $stackPtr + 1 );
 				$length = 0;
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index be7a226fc0..5b1b60e8cd 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -53,6 +53,15 @@ $bar[/*comment*/] = 10; // Bad.
 // Integer keys.
 $arr[0]; // Good.
 $arr[-1]; // Good.
+$arr[+1]; // Good.
 
 $arr[ 0 ]; // Bad.
 $arr[ -1 ]; // Bad.
+$arr[ +1 ]; // Bad.
+
+// Verify key calculations are handled correctly.
+$arr[ 10 + 5 ]; // Good.
+$arr[ 5-2 - -1 ]; // Good.
+
+$arr[ 10 + 5]; // Bad.
+$arr[5-2 - -1 ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index 5fad75e99b..642a2cc260 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -45,6 +45,15 @@ $bar[ /*comment*/ ] = 10; // Bad.
 // Integer keys.
 $arr[0]; // Good.
 $arr[-1]; // Good.
+$arr[+1]; // Good.
 
 $arr[0]; // Bad.
 $arr[-1]; // Bad.
+$arr[+1]; // Bad.
+
+// Verify key calculations are handled correctly.
+$arr[ 10 + 5 ]; // Good.
+$arr[ 5-2 - -1 ]; // Good.
+
+$arr[ 10 + 5 ]; // Bad.
+$arr[ 5-2 - -1 ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 83308934ac..688c30c270 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -48,8 +48,11 @@ public function getErrorList() {
 			45 => 1,
 			46 => 1,
 			51 => 1,
-			57 => 1,
 			58 => 1,
+			59 => 1,
+			60 => 1,
+			66 => 1,
+			67 => 1,
 		);
 	}
 

From 8dd890cd8c00b8ba9b20a8914363be45014d8b2c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 05:28:54 +0200
Subject: [PATCH 171/822] Arrays/ArrayKeySpacingRestrictions: add tests with
 non-decimal integers

.. to safeguard these are handled the same as decimal integers.
---
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc | 9 +++++++++
 .../Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed | 9 +++++++++
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php | 3 +++
 3 files changed, 21 insertions(+)

diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index 5b1b60e8cd..d1673e3a49 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -65,3 +65,12 @@ $arr[ 5-2 - -1 ]; // Good.
 
 $arr[ 10 + 5]; // Bad.
 $arr[5-2 - -1 ]; // Bad.
+
+// Verify non-decimal integer keys are handled correctly.
+$arr[012]; // Good.
+$arr[0b01]; // Good.
+$arr[0xCAFE]; // Good.
+
+$arr[ 012 ]; // Bad.
+$arr[ 0b01 ]; // Bad.
+$arr[ 0xCAFE ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index 642a2cc260..0d918b12ac 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -57,3 +57,12 @@ $arr[ 5-2 - -1 ]; // Good.
 
 $arr[ 10 + 5 ]; // Bad.
 $arr[ 5-2 - -1 ]; // Bad.
+
+// Verify non-decimal integer keys are handled correctly.
+$arr[012]; // Good.
+$arr[0b01]; // Good.
+$arr[0xCAFE]; // Good.
+
+$arr[012]; // Bad.
+$arr[0b01]; // Bad.
+$arr[0xCAFE]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 688c30c270..3dde744720 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -53,6 +53,9 @@ public function getErrorList() {
 			60 => 1,
 			66 => 1,
 			67 => 1,
+			74 => 1,
+			75 => 1,
+			76 => 1,
 		);
 	}
 

From 4a9148cf5228d90c42f0bc3d609218878f19e0fb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 05:46:41 +0200
Subject: [PATCH 172/822] Arrays/ArrayKeySpacingRestrictions: minor
 simplifications

Simplify the fixer code for the "Array keys must [NOT] be surrounded by spaces" errors.
---
 .../Arrays/ArrayKeySpacingRestrictionsSniff.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index db55b91ef9..9ff4ede631 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -93,17 +93,18 @@ public function process_token( $stackPtr ) {
 		$has_space_after_opener = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] );
 		$has_space_before_close = ( \T_WHITESPACE === $this->tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
 
-		// It should have spaces unless if it only has strings or numbers as the key.
+		// The array key should be surrounded by spaces unless the key only consists of a string or an integer.
 		if ( true === $needs_spaces
 			&& ( false === $has_space_after_opener || false === $has_space_before_close )
 		) {
 			$error = 'Array keys must be surrounded by spaces unless they contain a string or an integer.';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpacesAroundArrayKeys' );
 			if ( true === $fix ) {
-				if ( ! $has_space_after_opener ) {
-					$this->phpcsFile->fixer->addContentBefore( ( $stackPtr + 1 ), ' ' );
+				if ( false === $has_space_after_opener ) {
+					$this->phpcsFile->fixer->addContent( $stackPtr, ' ' );
 				}
-				if ( ! $has_space_before_close ) {
+
+				if ( false === $has_space_before_close ) {
 					$this->phpcsFile->fixer->addContentBefore( $token['bracket_closer'], ' ' );
 				}
 			}
@@ -113,9 +114,8 @@ public function process_token( $stackPtr ) {
 			if ( true === $fix ) {
 				if ( $has_space_after_opener ) {
 					$this->phpcsFile->fixer->beginChangeset();
-					$this->phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
 
-					for ( $i = ( $stackPtr + 2 ); $i < $token['bracket_closer']; $i++ ) {
+					for ( $i = ( $stackPtr + 1 ); $i < $token['bracket_closer']; $i++ ) {
 						if ( \T_WHITESPACE !== $this->tokens[ $i ]['code'] ) {
 							break;
 						}
@@ -125,11 +125,11 @@ public function process_token( $stackPtr ) {
 
 					$this->phpcsFile->fixer->endChangeset();
 				}
+
 				if ( $has_space_before_close ) {
 					$this->phpcsFile->fixer->beginChangeset();
-					$this->phpcsFile->fixer->replaceToken( ( $token['bracket_closer'] - 1 ), '' );
 
-					for ( $i = ( $token['bracket_closer'] - 2 ); $i > $stackPtr; $i-- ) {
+					for ( $i = ( $token['bracket_closer'] - 1 ); $i > $stackPtr; $i-- ) {
 						if ( \T_WHITESPACE !== $this->tokens[ $i ]['code'] ) {
 							break;
 						}

From 6922761716f425ae40de66d56c0266f584a88c6c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 13:27:25 +0200
Subject: [PATCH 173/822] Arrays/ArrayKeySpacingRestrictions: implement the
 PHPCSUtils SpacesFixer

This implements use of the PHPCSUtils `SpacesFixer` class for checking and fixing the width of the whitespace inside the brackets.

While this doesn't change the effective behaviour of the sniff, it simplifies the code and improves the clarity of the error messages.
Note: the error _codes_ do not change.

Old error messages:
```
 33 | ERROR | [x] There should be exactly one space before the array key. Found: 5
 33 | ERROR | [x] There should be exactly one space after the array key. Found: 4
 34 | ERROR | [x] There should be exactly one space before the array key. Found: newline
 35 | ERROR | [x] There should be exactly one space after the array key. Found: newline
```

New error messages:
```
 33 | ERROR | [x] There should be exactly 1 space before the array key. Found: 5 spaces
 33 | ERROR | [x] There should be exactly 1 space after the array key. Found: 4 spaces
 34 | ERROR | [x] There should be exactly 1 space before the array key. Found: a new line
 35 | ERROR | [x] There should be exactly 1 space after the array key. Found: multiple new lines
```
---
 .../ArrayKeySpacingRestrictionsSniff.php      | 89 +++++--------------
 1 file changed, 20 insertions(+), 69 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 9ff4ede631..9afc5ed542 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -9,7 +9,6 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
-use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Fixers\SpacesFixer;
 use WordPressCS\WordPress\Sniff;
 
@@ -143,78 +142,30 @@ public function process_token( $stackPtr ) {
 		}
 
 		// If spaces are needed, check that there is only one space.
-		if ( true === $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
+		if ( true === $needs_spaces ) {
 			if ( $has_space_after_opener ) {
-				$ptr    = ( $stackPtr + 1 );
-				$length = 0;
-				if ( $this->tokens[ $ptr ]['line'] !== $this->tokens[ ( $ptr + 1 ) ]['line'] ) {
-					$length = 'newline';
-				} else {
-					$length = $this->tokens[ $ptr ]['length'];
-				}
-
-				if ( 1 !== $length ) {
-					$error = 'There should be exactly one space before the array key. Found: %s';
-					$data  = array( $length );
-					$fix   = $this->phpcsFile->addFixableError(
-						$error,
-						$ptr,
-						'TooMuchSpaceBeforeKey',
-						$data
-					);
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->beginChangeset();
-						$this->phpcsFile->fixer->replaceToken( $ptr, ' ' );
-
-						for ( $i = ( $ptr + 1 ); $i < $token['bracket_closer']; $i++ ) {
-							if ( \T_WHITESPACE !== $this->tokens[ $i ]['code'] ) {
-								break;
-							}
-
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-						}
-
-						$this->phpcsFile->fixer->endChangeset();
-					}
-				}
+				$error = 'There should be exactly %1$s before the array key. Found: %2$s';
+				SpacesFixer::checkAndFix(
+					$this->phpcsFile,
+					$stackPtr,
+					$first_non_ws,
+					1,
+					$error,
+					'TooMuchSpaceBeforeKey'
+				);
 			}
 
 			if ( $has_space_before_close ) {
-				$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $token['bracket_closer'] - 1 ), null, true );
-				$ptr            = ( $prev_non_empty + 1 );
-				$length         = 0;
-				if ( $this->tokens[ $ptr ]['line'] !== $this->tokens[ $token['bracket_closer'] ]['line'] ) {
-					$length = 'newline';
-				} else {
-					$length = $this->tokens[ $ptr ]['length'];
-				}
-
-				if ( 1 !== $length ) {
-					$error = 'There should be exactly one space after the array key. Found: %s';
-					$data  = array( $length );
-					$fix   = $this->phpcsFile->addFixableError(
-						$error,
-						$ptr,
-						'TooMuchSpaceAfterKey',
-						$data
-					);
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->beginChangeset();
-						$this->phpcsFile->fixer->replaceToken( $ptr, ' ' );
-
-						for ( $i = ( $ptr + 1 ); $i < $token['bracket_closer']; $i++ ) {
-							if ( \T_WHITESPACE !== $this->tokens[ $i ]['code'] ) {
-								break;
-							}
-
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-						}
-
-						$this->phpcsFile->fixer->endChangeset();
-					}
-				}
+				$last_non_ws = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $token['bracket_closer'] - 1 ), null, true );
+				$error       = 'There should be exactly %1$s after the array key. Found: %2$s';
+				SpacesFixer::checkAndFix(
+					$this->phpcsFile,
+					$last_non_ws,
+					$token['bracket_closer'],
+					1,
+					$error,
+					'TooMuchSpaceAfterKey'
+				);
 			}
 		}
 	}

From aae019c626427f60d5e02935fd0e8805d57ad464 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 05:30:13 +0200
Subject: [PATCH 174/822] PHP 7.4 | Arrays/ArrayKeySpacingRestrictions: add
 tests with numeric literals with underscores

.. to safeguard these are handled correctly.
---
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc   | 7 +++++++
 .../Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed   | 7 +++++++
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php   | 2 ++
 3 files changed, 16 insertions(+)

diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index d1673e3a49..e5f261dab5 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -74,3 +74,10 @@ $arr[0xCAFE]; // Good.
 $arr[ 012 ]; // Bad.
 $arr[ 0b01 ]; // Bad.
 $arr[ 0xCAFE ]; // Bad.
+
+// Ensure correct handling of PHP 7.4+ numeric literals with underscores.
+$arr[1_000_000]; // Good.
+$arr[0xCAFE_F00D]; // Good.
+
+$arr[ 1_000_000 ]; // Bad.
+$arr[ 0xCAFE_F00D ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index 0d918b12ac..a770c668f4 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -66,3 +66,10 @@ $arr[0xCAFE]; // Good.
 $arr[012]; // Bad.
 $arr[0b01]; // Bad.
 $arr[0xCAFE]; // Bad.
+
+// Ensure correct handling of PHP 7.4+ numeric literals with underscores.
+$arr[1_000_000]; // Good.
+$arr[0xCAFE_F00D]; // Good.
+
+$arr[1_000_000]; // Bad.
+$arr[0xCAFE_F00D]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 3dde744720..57085acdec 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -56,6 +56,8 @@ public function getErrorList() {
 			74 => 1,
 			75 => 1,
 			76 => 1,
+			82 => 1,
+			83 => 1,
 		);
 	}
 

From 52d70f1ec22bdb9b6e6bdb7e105659c104371d29 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Jul 2022 05:30:41 +0200
Subject: [PATCH 175/822] PHP 8.1 | Arrays/ArrayKeySpacingRestrictions: add
 tests with octal numeric literals

.. to safeguard these are handled correctly.
---
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc      | 4 ++++
 .../Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed      | 4 ++++
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php      | 1 +
 3 files changed, 9 insertions(+)

diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
index e5f261dab5..171f53b6cc 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc
@@ -81,3 +81,7 @@ $arr[0xCAFE_F00D]; // Good.
 
 $arr[ 1_000_000 ]; // Bad.
 $arr[ 0xCAFE_F00D ]; // Bad.
+
+// Ensure correct handling of PHP 8.1+ octal literals.
+$arr[0o137]; // Good.
+$arr[ 0o137 ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
index a770c668f4..2996b3d39a 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.inc.fixed
@@ -73,3 +73,7 @@ $arr[0xCAFE_F00D]; // Good.
 
 $arr[1_000_000]; // Bad.
 $arr[0xCAFE_F00D]; // Bad.
+
+// Ensure correct handling of PHP 8.1+ octal literals.
+$arr[0o137]; // Good.
+$arr[0o137]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 57085acdec..08cb83eb77 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -58,6 +58,7 @@ public function getErrorList() {
 			76 => 1,
 			82 => 1,
 			83 => 1,
+			87 => 1,
 		);
 	}
 

From 1b512610a3d4f54543108008a49d5497fb95f191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:58:52 +0200
Subject: [PATCH 176/822] Reorganize core ruleset to match the reorganized
 chapters in the WPCS docs

---
 WordPress-Core/ruleset.xml | 442 +++++++++++++++++++------------------
 1 file changed, 225 insertions(+), 217 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index e9f604805e..789098c094 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -15,196 +15,98 @@
 	-->
 	<rule ref="PHPCSUtils"/>
 
-	<!--
-	#############################################################################
-	Handbook: PHP - Single and Double Quotes.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#single-and-double-quotes
-	#############################################################################
-	-->
-	<!-- Covers rule: Use single and double quotes when appropriate.
-		 If you're not evaluating anything in the string, use single quotes. -->
-	<rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
-
-	<!-- Rule: Text that goes into attributes should be run through esc_attr().
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/527 -->
-
-
-	<!--
+<!--
 	#############################################################################
-	Handbook: PHP - Indentation.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+	Handbook: PHP - Opening and Closing PHP Tags.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#opening-and-closing-php-tags
 	#############################################################################
 	-->
-	<!-- Covers rule: Your indentation should always reflect logical structure. -->
-	<rule ref="Generic.WhiteSpace.ScopeIndent">
-		<properties>
-			<property name="exact" value="false"/>
-			<property name="indent" value="4"/>
-			<property name="tabIndent" value="true"/>
-			<property name="ignoreIndentationTokens" type="array">
-				<element value="T_HEREDOC"/>
-				<element value="T_NOWDOC"/>
-				<element value="T_INLINE_HTML"/>
-			</property>
-		</properties>
-	</rule>
-	<rule ref="WordPress.Arrays.ArrayIndentation"/>
-
-	<!-- Covers rule: Use real tabs and not spaces. -->
-	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
-	<rule ref="WordPress.WhiteSpace.PrecisionAlignment"/>
-
-	<!-- Generic array layout check. -->
-	<!-- Covers rule: For associative arrays, each item should start on a new line
-		 when the array contains more than one item.
-		 Also covers various single-line array whitespace issues. -->
-	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing"/>
-
-	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
-	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
-
-	<!-- Covers rule: For switch structures case should indent one tab from the
-		 switch statement and break one tab from the case statement. -->
-	<rule ref="PSR2.ControlStructures.SwitchDeclaration"/>
-	<!-- Prevent duplicate messages for the same issue. Covered by other sniffs. -->
-	<rule ref="PSR2.ControlStructures.SwitchDeclaration.NotLower">
+	<!-- Covers rule: When embedding multi-line PHP snippets within a HTML block, the
+		 PHP open and close tags must be on a line by themselves. -->
+	<rule ref="Squiz.PHP.EmbeddedPhp"/>
+	<rule ref="Squiz.PHP.EmbeddedPhp.SpacingBefore">
 		<severity>0</severity>
 	</rule>
-	<rule ref="PSR2.ControlStructures.SwitchDeclaration.BreakNotNewLine">
+	<rule ref="Squiz.PHP.EmbeddedPhp.Indent">
 		<severity>0</severity>
 	</rule>
-	<rule ref="PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLine">
+	<rule ref="Squiz.PHP.EmbeddedPhp.OpenTagIndent">
 		<severity>0</severity>
 	</rule>
-
-	<!-- Covers rule: ... while spaces can be used mid-line for alignment. -->
-	<rule ref="Universal.WhiteSpace.DisallowInlineTabs"/>
-
-	<!-- Implied through the examples: align the assignment operator in a block of assignments. -->
-	<rule ref="Generic.Formatting.MultipleStatementAlignment">
-		<properties>
-			<property name="maxPadding" value="40"/>
-		</properties>
-	</rule>
-
-	<!-- Implied through the examples: align the double arrows. -->
-	<rule ref="WordPress.Arrays.MultipleStatementAlignment">
-		<properties>
-			<property name="maxColumn" value="60"/>
-		</properties>
+	<rule ref="Squiz.PHP.EmbeddedPhp.SpacingAfter">
+		<severity>0</severity>
 	</rule>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Brace Style.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#brace-style
+	Handbook: PHP - No Shorthand PHP Tags.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#no-shorthand-php-tags
 	#############################################################################
 	-->
-	<!-- Covers rule: Braces shall be used for all blocks. -->
-	<rule ref="Squiz.ControlStructures.ControlSignature"/>
-
-	<!-- Covers rule: Braces should always be used, even when they are not required. -->
-	<rule ref="Generic.ControlStructures.InlineControlStructure"/>
+	<!-- Covers rule: Never use shorthand PHP start tags. Always use full PHP tags. -->
+	<rule ref="Generic.PHP.DisallowShortOpenTag"/>
+	<rule ref="Generic.PHP.DisallowAlternativePHPTags"/>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Declaring Arrays.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#declaring-arrays
+	Handbook: PHP - Single and Double Quotes.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#single-and-double-quotes
 	#############################################################################
 	-->
-	<!-- Covers rule: Arrays must be declared using long array syntax. -->
-	<rule ref="Universal.Arrays.DisallowShortArraySyntax"/>
-
+	<!-- Covers rule: Use single and double quotes when appropriate.
+		 If you're not evaluating anything in the string, use single quotes. -->
+	<rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
 
-	<!--
-	#############################################################################
-	Handbook: PHP - Use elseif, not else if.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#use-elseif-not-else-if
-	#############################################################################
-	-->
-	<!-- Covers rule: ... use elseif for conditionals. -->
-	<rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
+	<!-- Rule: Text that goes into attributes should be run through esc_attr().
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/527 -->
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Multiline Function Calls.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#multiline-function-calls
+	Handbook: PHP - Naming Conventions.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
 	#############################################################################
 	-->
-	<!-- Rule: When splitting a function call over multiple lines, each parameter must be on a separate line.
-		 Covered via PEAR.Functions.FunctionCallSignature in Space Usage section. -->
-
-	<!-- Rule: Single line inline comments can take up their own line. -->
-	<!-- Rule: Each parameter must take up no more than a single line. Multi-line parameter
-		 values must be assigned to a variable and then that variable should be passed to the function call.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1330 -->
-
+	<!-- Covers rule: Use lowercase letters in variable, action/filter, and function names.
+		 Separate words via underscores. -->
+	<rule ref="WordPress.NamingConventions.ValidFunctionName"/>
+	<rule ref="WordPress.NamingConventions.ValidHookName"/>
+	<rule ref="WordPress.NamingConventions.ValidVariableName"/>
 
-	<!--
-	#############################################################################
-	Handbook: PHP - Regular Expressions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#regular-expressions
-	#############################################################################
-	-->
-	<!-- Covers rule: Perl compatible regular expressions should be used in preference
-		 to their POSIX counterparts. -->
-	<rule ref="WordPress.PHP.POSIXFunctions"/>
+	<!-- Covers rule: Class names should use capitalized words separated by underscores. -->
+	<rule ref="PEAR.NamingConventions.ValidClassName"/>
 
-	<!-- Rule: Never use the /e switch, use preg_replace_callback instead.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/632 -->
+	<!-- Covers rule: Constants should be in all upper-case with underscores separating words. -->
+	<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
 
-	<!-- Rule: It's most convenient to use single-quoted strings for regular expressions.
-		 Already covered by Squiz.Strings.DoubleQuoteUsage -->
+	<!-- Covers rule: Files should be named descriptively using lowercase letters.
+		 Hyphens should separate words. -->
+	<!-- Covers rule: Class file names should be based on the class name with "class-"
+		 prepended and the underscores in the class name replaced with hyphens.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
+	<!-- Covers rule: Files containing template tags in wp-includes should have "-template"
+		 appended to the end of the name.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
+	<rule ref="WordPress.Files.FileName"/>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Opening and Closing PHP Tags.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#opening-and-closing-php-tags
-	#############################################################################
-	-->
-	<!-- Covers rule: When embedding multi-line PHP snippets within a HTML block, the
-		 PHP open and close tags must be on a line by themselves. -->
-	<rule ref="Squiz.PHP.EmbeddedPhp"/>
-	<rule ref="Squiz.PHP.EmbeddedPhp.SpacingBefore">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Squiz.PHP.EmbeddedPhp.Indent">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Squiz.PHP.EmbeddedPhp.OpenTagIndent">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Squiz.PHP.EmbeddedPhp.SpacingAfter">
-		<severity>0</severity>
-	</rule>
-
+	Handbook: PHP - Interpolation for Naming Dynamic Hooks.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#interpolation-for-naming-dynamic-hooks
 
-	<!--
-	#############################################################################
-	Handbook: PHP - No Shorthand PHP Tags.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#no-shorthand-php-tags
+	https://github.com/WordPress/WordPress-Coding-Standards/issues/751
 	#############################################################################
 	-->
-	<!-- Covers rule: Never use shorthand PHP start tags. Always use full PHP tags. -->
-	<rule ref="Generic.PHP.DisallowShortOpenTag"/>
-	<rule ref="Generic.PHP.DisallowAlternativePHPTags"/>
-
+	<!-- Rule: Dynamic hooks should be named using interpolation rather than concatenation. -->
 
-	<!--
-	#############################################################################
-	Handbook: PHP - Remove Trailing Spaces.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#remove-trailing-spaces
-	#############################################################################
-	-->
-	<!-- Covers rule: Remove trailing whitespace at the end of each line of code. -->
-	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+	<!-- Rule: Variables used in hook tags should be wrapped in curly braces { and },
+		 with the complete outer tag name wrapped in double quotes. -->
 
-	<!-- Covers rule: Omitting the closing PHP tag at the end of a file is preferred. -->
-	<rule ref="PSR2.Files.ClosingTag"/>
+	<!-- Rule: Where possible, dynamic values in tag names should also be as succinct
+		 and to the point as possible. -->
 
 
 	<!--
@@ -290,90 +192,155 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Formatting SQL statements.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#formatting-sql-statements
+	Handbook: PHP - Indentation.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
 	#############################################################################
 	-->
-	<!-- Rule: Always capitalize the SQL parts of the statement like UPDATE or WHERE.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/639 -->
+	<!-- Covers rule: Your indentation should always reflect logical structure. -->
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="exact" value="false"/>
+			<property name="indent" value="4"/>
+			<property name="tabIndent" value="true"/>
+			<property name="ignoreIndentationTokens" type="array">
+				<element value="T_HEREDOC"/>
+				<element value="T_NOWDOC"/>
+				<element value="T_INLINE_HTML"/>
+			</property>
+		</properties>
+	</rule>
+	<rule ref="WordPress.Arrays.ArrayIndentation"/>
 
-	<!-- Rule: Functions that update the database should expect their parameters to lack
-		 SQL slash escaping when passed.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/640 -->
+	<!-- Covers rule: Use real tabs and not spaces. -->
+	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+	<rule ref="WordPress.WhiteSpace.PrecisionAlignment"/>
 
-	<!-- Rule: in $wpdb->prepare - %s is used for string placeholders and %d is used for integer
-		 placeholders. Note that they are not 'quoted'! -->
-	<rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
+	<!-- Generic array layout check. -->
+	<!-- Covers rule: For associative arrays, each item should start on a new line
+		 when the array contains more than one item.
+		 Also covers various single-line array whitespace issues. -->
+	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing"/>
 
-	<!-- Covers rule:  $wpdb->prepare()... The benefit of this is that we don't have to remember
-		 to manually use esc_sql(), and also that it is easy to see at a glance whether something
-		 has been escaped or not, because it happens right when the query happens. -->
-	<rule ref="WordPress.DB.PreparedSQL"/>
+	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
+	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
+
+	<!-- Covers rule: For switch structures case should indent one tab from the
+		 switch statement and break one tab from the case statement. -->
+	<rule ref="PSR2.ControlStructures.SwitchDeclaration"/>
+	<!-- Prevent duplicate messages for the same issue. Covered by other sniffs. -->
+	<rule ref="PSR2.ControlStructures.SwitchDeclaration.NotLower">
+		<severity>0</severity>
+	</rule>
+	<rule ref="PSR2.ControlStructures.SwitchDeclaration.BreakNotNewLine">
+		<severity>0</severity>
+	</rule>
+	<rule ref="PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLine">
+		<severity>0</severity>
+	</rule>
+
+	<!-- Covers rule: ... while spaces can be used mid-line for alignment. -->
+	<rule ref="Universal.WhiteSpace.DisallowInlineTabs"/>
+
+	<!-- Implied through the examples: align the assignment operator in a block of assignments. -->
+	<rule ref="Generic.Formatting.MultipleStatementAlignment">
+		<properties>
+			<property name="maxPadding" value="40"/>
+		</properties>
+	</rule>
+
+	<!-- Implied through the examples: align the double arrows. -->
+	<rule ref="WordPress.Arrays.MultipleStatementAlignment">
+		<properties>
+			<property name="maxColumn" value="60"/>
+		</properties>
+	</rule>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Database Queries.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#database-queries
+	Handbook: PHP - Remove Trailing Spaces.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#remove-trailing-spaces
 	#############################################################################
 	-->
-	<!-- Covers rule: Avoid touching the database directly. -->
-	<rule ref="WordPress.DB.RestrictedFunctions"/>
-	<rule ref="WordPress.DB.RestrictedClasses"/>
+	<!-- Covers rule: Remove trailing whitespace at the end of each line of code. -->
+	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
 
+	<!-- Covers rule: Omitting the closing PHP tag at the end of a file is preferred. -->
+	<rule ref="PSR2.Files.ClosingTag"/>
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Naming Conventions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+	Handbook: PHP - Brace Style.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#brace-style
 	#############################################################################
 	-->
-	<!-- Covers rule: Use lowercase letters in variable, action/filter, and function names.
-		 Separate words via underscores. -->
-	<rule ref="WordPress.NamingConventions.ValidFunctionName"/>
-	<rule ref="WordPress.NamingConventions.ValidHookName"/>
-	<rule ref="WordPress.NamingConventions.ValidVariableName"/>
+	<!-- Covers rule: Braces shall be used for all blocks. -->
+	<rule ref="Squiz.ControlStructures.ControlSignature"/>
 
-	<!-- Covers rule: Class names should use capitalized words separated by underscores. -->
-	<rule ref="PEAR.NamingConventions.ValidClassName"/>
+	<!-- Covers rule: Braces should always be used, even when they are not required. -->
+	<rule ref="Generic.ControlStructures.InlineControlStructure"/>
 
-	<!-- Covers rule: Constants should be in all upper-case with underscores separating words. -->
-	<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
 
-	<!-- Covers rule: Files should be named descriptively using lowercase letters.
-		 Hyphens should separate words. -->
-	<!-- Covers rule: Class file names should be based on the class name with "class-"
-		 prepended and the underscores in the class name replaced with hyphens.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
-	<!-- Covers rule: Files containing template tags in wp-includes should have "-template"
-		 appended to the end of the name.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
-	<rule ref="WordPress.Files.FileName"/>
+	<!--
+	#############################################################################
+	Handbook: PHP - Declaring Arrays.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#declaring-arrays
+	#############################################################################
+	-->
+	<!-- Covers rule: Arrays must be declared using long array syntax. -->
+	<rule ref="Universal.Arrays.DisallowShortArraySyntax"/>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Self-Explanatory Flag Values for Function Arguments.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#self-explanatory-flag-values-for-function-arguments
+	Handbook: PHP - Multiline Function Calls.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#multiline-function-calls
 	#############################################################################
 	-->
+	<!-- Rule: When splitting a function call over multiple lines, each parameter must be on a separate line.
+		 Covered via PEAR.Functions.FunctionCallSignature in Space Usage section. -->
+
+	<!-- Rule: Single line inline comments can take up their own line. -->
+	<!-- Rule: Each parameter must take up no more than a single line. Multi-line parameter
+		 values must be assigned to a variable and then that variable should be passed to the function call.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1330 -->
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Interpolation for Naming Dynamic Hooks.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#interpolation-for-naming-dynamic-hooks
+	Handbook: PHP - Only One Object Structure (Class/Interface/Trait) per File.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#only-one-object-structure-class-interface-trait-per-file
+	#############################################################################
+	-->
+	<!-- Encourage having only one class/interface/trait per file.
+		 Moved from Extra to Core after discussion on Slack. -->
+	<rule ref="Generic.Files.OneObjectStructurePerFile">
+		<message>Best practices: Declare only one class/interface/trait in a file.</message>
+	</rule>
 
-	https://github.com/WordPress/WordPress-Coding-Standards/issues/751
+
+	<!--
+	#############################################################################
+	Handbook: PHP - Use elseif, not else if.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#use-elseif-not-else-if
 	#############################################################################
 	-->
-	<!-- Rule: Dynamic hooks should be named using interpolation rather than concatenation. -->
+	<!-- Covers rule: ... use elseif for conditionals. -->
+	<rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
 
-	<!-- Rule: Variables used in hook tags should be wrapped in curly braces { and },
-		 with the complete outer tag name wrapped in double quotes. -->
 
-	<!-- Rule: Where possible, dynamic values in tag names should also be as succinct
-		 and to the point as possible. -->
+	<!--
+	#############################################################################
+	Handbook: PHP - Yoda Conditions.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
+	#############################################################################
+	-->
+	<!-- Covers rule: When doing logical comparisons, always put the variable on the right side,
+		 constants or literals on the left. -->
+	<rule ref="WordPress.PHP.YodaConditions"/>
+
+	<!-- Rule: Yoda conditions for <, >, <= or >= are significantly more difficult to read
+		 and are best avoided. -->
 
 
 	<!--
@@ -389,18 +356,59 @@
 	<!-- Rule: The short ternary operator must not be used. -->
 	<rule ref="Universal.Operators.DisallowShortTernary"/>
 
+
 	<!--
 	#############################################################################
-	Handbook: PHP - Yoda Conditions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
+	Handbook: PHP - (No) Error Control Operator @.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#error-control-operator
+	#############################################################################
+	-->
+	<!-- Covers rule: This operator is often used lazily instead of doing proper error checking.
+		 Its use is highly discouraged. -->
+	<rule ref="WordPress.PHP.NoSilencedErrors"/>
+
+
+	<!--
+	#############################################################################
+	Handbook: PHP - Database Queries.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#database-queries
+	#############################################################################
+	-->
+	<!-- Covers rule: Avoid touching the database directly. -->
+	<rule ref="WordPress.DB.RestrictedFunctions"/>
+	<rule ref="WordPress.DB.RestrictedClasses"/>
+
+
+	<!--
+	#############################################################################
+	Handbook: PHP - Formatting SQL statements.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#formatting-sql-statements
+	#############################################################################
+	-->
+	<!-- Rule: Always capitalize the SQL parts of the statement like UPDATE or WHERE.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/639 -->
+
+	<!-- Rule: Functions that update the database should expect their parameters to lack
+		 SQL slash escaping when passed.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/640 -->
+
+	<!-- Rule: in $wpdb->prepare - %s is used for string placeholders and %d is used for integer
+		 placeholders. Note that they are not 'quoted'! -->
+	<rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
+
+	<!-- Covers rule:  $wpdb->prepare()... The benefit of this is that we don't have to remember
+		 to manually use esc_sql(), and also that it is easy to see at a glance whether something
+		 has been escaped or not, because it happens right when the query happens. -->
+	<rule ref="WordPress.DB.PreparedSQL"/>
+
+
+	<!--
+	#############################################################################
+	Handbook: PHP - Self-Explanatory Flag Values for Function Arguments.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#self-explanatory-flag-values-for-function-arguments
 	#############################################################################
 	-->
-	<!-- Covers rule: When doing logical comparisons, always put the variable on the right side,
-		 constants or literals on the left. -->
-	<rule ref="WordPress.PHP.YodaConditions"/>
 
-	<!-- Rule: Yoda conditions for <, >, <= or >= are significantly more difficult to read
-		 and are best avoided. -->
 
 	<!--
 	#############################################################################
@@ -420,7 +428,7 @@
 	</rule>
 	<rule ref="WordPress.PHP.StrictInArray"/>
 
-	<!-- Rule: Assignments must not be placed in placed in conditionals.
+	<!-- Rule: Assignments must not be placed in conditionals.
 		 Note: sniff is a duplicate of upstream. Can be removed once minimum PHPCS requirement has gone up.
 		 https://github.com/squizlabs/PHP_CodeSniffer/pull/1594
 		 Update: the "assignment in ternary" part of the sniff is currently not yet covered in
@@ -450,13 +458,19 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - (No) Error Control Operator @.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#error-control-operator
+	Handbook: PHP - Regular Expressions.
+	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#regular-expressions
 	#############################################################################
 	-->
-	<!-- Covers rule: This operator is often used lazily instead of doing proper error checking.
-		 Its use is highly discouraged. -->
-	<rule ref="WordPress.PHP.NoSilencedErrors"/>
+	<!-- Covers rule: Perl compatible regular expressions should be used in preference
+		 to their POSIX counterparts. -->
+	<rule ref="WordPress.PHP.POSIXFunctions"/>
+
+	<!-- Rule: Never use the /e switch, use preg_replace_callback instead.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/632 -->
+
+	<!-- Rule: It's most convenient to use single-quoted strings for regular expressions.
+		 Already covered by Squiz.Strings.DoubleQuoteUsage -->
 
 
 	<!--
@@ -517,12 +531,6 @@
 		<severity>0</severity>
 	</rule>
 
-	<!-- Encourage having only one class/interface/trait per file.
-		 Moved from Extra to Core after discussion on Slack. -->
-	<rule ref="Generic.Files.OneObjectStructurePerFile">
-		<message>Best practices: Declare only one class/interface/trait in a file.</message>
-	</rule>
-
 	<!-- Error on merge conflict markers. -->
 	<rule ref="Generic.VersionControl.GitMergeConflict"/>
 

From 650eb4764147b40c03719369b52cde3be3b8bc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:04:41 +0200
Subject: [PATCH 177/822] Update the handbook links

---
 WordPress-Core/ruleset.xml | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 789098c094..6f225e417a 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -18,7 +18,7 @@
 <!--
 	#############################################################################
 	Handbook: PHP - Opening and Closing PHP Tags.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#opening-and-closing-php-tags
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#opening-and-closing-php-tags
 	#############################################################################
 	-->
 	<!-- Covers rule: When embedding multi-line PHP snippets within a HTML block, the
@@ -41,7 +41,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - No Shorthand PHP Tags.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#no-shorthand-php-tags
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#no-shorthand-php-tags
 	#############################################################################
 	-->
 	<!-- Covers rule: Never use shorthand PHP start tags. Always use full PHP tags. -->
@@ -52,7 +52,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Single and Double Quotes.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#single-and-double-quotes
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#single-and-double-quotes
 	#############################################################################
 	-->
 	<!-- Covers rule: Use single and double quotes when appropriate.
@@ -66,7 +66,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Naming Conventions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
 	#############################################################################
 	-->
 	<!-- Covers rule: Use lowercase letters in variable, action/filter, and function names.
@@ -95,7 +95,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Interpolation for Naming Dynamic Hooks.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#interpolation-for-naming-dynamic-hooks
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#interpolation-for-naming-dynamic-hooks
 
 	https://github.com/WordPress/WordPress-Coding-Standards/issues/751
 	#############################################################################
@@ -112,7 +112,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Space Usage.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#space-usage
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
 	#############################################################################
 	-->
 	<!-- Covers rule: Always put spaces after commas, and on both sides of logical,
@@ -193,7 +193,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Indentation.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
 	#############################################################################
 	-->
 	<!-- Covers rule: Your indentation should always reflect logical structure. -->
@@ -259,7 +259,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Remove Trailing Spaces.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#remove-trailing-spaces
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#remove-trailing-spaces
 	#############################################################################
 	-->
 	<!-- Covers rule: Remove trailing whitespace at the end of each line of code. -->
@@ -271,7 +271,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Brace Style.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#brace-style
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#brace-style
 	#############################################################################
 	-->
 	<!-- Covers rule: Braces shall be used for all blocks. -->
@@ -284,7 +284,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Declaring Arrays.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#declaring-arrays
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#declaring-arrays
 	#############################################################################
 	-->
 	<!-- Covers rule: Arrays must be declared using long array syntax. -->
@@ -294,7 +294,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Multiline Function Calls.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#multiline-function-calls
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#multiline-function-calls
 	#############################################################################
 	-->
 	<!-- Rule: When splitting a function call over multiple lines, each parameter must be on a separate line.
@@ -322,7 +322,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Use elseif, not else if.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#use-elseif-not-else-if
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#use-elseif-not-else-if
 	#############################################################################
 	-->
 	<!-- Covers rule: ... use elseif for conditionals. -->
@@ -332,7 +332,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Yoda Conditions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#yoda-conditions
 	#############################################################################
 	-->
 	<!-- Covers rule: When doing logical comparisons, always put the variable on the right side,
@@ -346,7 +346,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Ternary Operator.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#ternary-operator
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#ternary-operator
 	#############################################################################
 	-->
 	<!-- Rule: Always have Ternaries test if the statement is true, not false.
@@ -360,7 +360,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - (No) Error Control Operator @.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#error-control-operator
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#error-control-operator
 	#############################################################################
 	-->
 	<!-- Covers rule: This operator is often used lazily instead of doing proper error checking.
@@ -371,7 +371,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Database Queries.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#database-queries
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
 	#############################################################################
 	-->
 	<!-- Covers rule: Avoid touching the database directly. -->
@@ -382,7 +382,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Formatting SQL statements.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#formatting-sql-statements
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#formatting-sql-statements
 	#############################################################################
 	-->
 	<!-- Rule: Always capitalize the SQL parts of the statement like UPDATE or WHERE.
@@ -405,7 +405,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Self-Explanatory Flag Values for Function Arguments.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#self-explanatory-flag-values-for-function-arguments
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#self-explanatory-flag-values-for-function-arguments
 	#############################################################################
 	-->
 
@@ -413,7 +413,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Clever Code.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#clever-code
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#clever-code
 	#############################################################################
 	-->
 	<!-- Rule: In general, readability is more important than cleverness or brevity.
@@ -459,7 +459,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Regular Expressions.
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#regular-expressions
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#regular-expressions
 	#############################################################################
 	-->
 	<!-- Covers rule: Perl compatible regular expressions should be used in preference
@@ -476,7 +476,7 @@
 	<!--
 	#############################################################################
 	Handbook: PHP - Don't extract().
-	Ref: https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#dont-extract
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#dont-extract
 	#############################################################################
 	-->
 	<rule ref="WordPress.PHP.DontExtract"/>
@@ -507,7 +507,7 @@
 	<rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
 
 	<!-- Lowercase PHP constants, like true, false and null. -->
-	<!-- https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions -->
+	<!-- https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions -->
 	<rule ref="Generic.PHP.LowerCaseConstant"/>
 
 	<!-- Lowercase PHP keywords, like class, function and case. -->

From e9614730e79a4101e299f0bb9c2ee37c1e280d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 12 Aug 2022 17:15:41 +0200
Subject: [PATCH 178/822] Fix the indentation in the core ruleset

---
 WordPress-Core/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 6f225e417a..af2272c193 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -15,7 +15,7 @@
 	-->
 	<rule ref="PHPCSUtils"/>
 
-<!--
+	<!--
 	#############################################################################
 	Handbook: PHP - Opening and Closing PHP Tags.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#opening-and-closing-php-tags

From 96641e6d356ae9772746f5961fad85cb2182611d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:40:14 +0200
Subject: [PATCH 179/822] Update WordPress-Core/ruleset.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Core/ruleset.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index af2272c193..345ddf684e 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -59,7 +59,8 @@
 		 If you're not evaluating anything in the string, use single quotes. -->
 	<rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
 
-	<!-- Rule: Text that goes into attributes should be run through esc_attr().
+	<!-- Rule: Text that goes into HTML or XML attributes should be escaped so that
+		 single or double quotes do not end the attribute value.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/527 -->
 
 

From 3373a49bcd4b4ad91796be5a1de63bca322b4695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:40:18 +0200
Subject: [PATCH 180/822] Update WordPress-Core/ruleset.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Core/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 345ddf684e..5a869dce4f 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -17,7 +17,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Opening and Closing PHP Tags.
+	Handbook: General - Opening and Closing PHP Tags.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#opening-and-closing-php-tags
 	#############################################################################
 	-->

From 7f3ebd2e1b96b693975fa8fcc6c885149b80c0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:40:25 +0200
Subject: [PATCH 181/822] Update WordPress-Core/ruleset.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Core/ruleset.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 5a869dce4f..9510e37413 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -225,8 +225,9 @@
 	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
 	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
 
-	<!-- Covers rule: For switch structures case should indent one tab from the
-		 switch statement and break one tab from the case statement. -->
+	<!-- Covers rule: For switch control structures, case statements should be indented one tab
+		 from the switch statement and the contents of the case should be indented one tab
+		 from the case condition statement. -->
 	<rule ref="PSR2.ControlStructures.SwitchDeclaration"/>
 	<!-- Prevent duplicate messages for the same issue. Covered by other sniffs. -->
 	<rule ref="PSR2.ControlStructures.SwitchDeclaration.NotLower">

From 3b85df228743edcc29a7837f60f287adbd1815fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:40:29 +0200
Subject: [PATCH 182/822] Update WordPress-Core/ruleset.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Core/ruleset.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 9510e37413..e290a22580 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -314,8 +314,7 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#only-one-object-structure-class-interface-trait-per-file
 	#############################################################################
 	-->
-	<!-- Encourage having only one class/interface/trait per file.
-		 Moved from Extra to Core after discussion on Slack. -->
+	<!-- Covers rule: Only One Object Structure (Class/Interface/Trait) per file. -->
 	<rule ref="Generic.Files.OneObjectStructurePerFile">
 		<message>Best practices: Declare only one class/interface/trait in a file.</message>
 	</rule>

From 0676c32bd380ec3c1f3f8419d99d3207093d5832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:40:41 +0200
Subject: [PATCH 183/822] Update WordPress-Core/ruleset.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Core/ruleset.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index e290a22580..14c3ac0234 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -397,9 +397,8 @@
 		 placeholders. Note that they are not 'quoted'! -->
 	<rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
 
-	<!-- Covers rule:  $wpdb->prepare()... The benefit of this is that we don't have to remember
-		 to manually use esc_sql(), and also that it is easy to see at a glance whether something
-		 has been escaped or not, because it happens right when the query happens. -->
+	<!-- Covers rule:  Escaping should be done as close to the time of the query
+		 as possible, preferably by using $wpdb->prepare(). -->
 	<rule ref="WordPress.DB.PreparedSQL"/>
 
 

From 61d782576c5e1a25861ebf392370f071374295d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 14 Aug 2022 11:24:57 +0200
Subject: [PATCH 184/822] Apply suggestions from the PR and update the covers
 rule texts

---
 WordPress-Core/ruleset.xml | 77 +++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 14c3ac0234..eee861589b 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -40,7 +40,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - No Shorthand PHP Tags.
+	Handbook: General - No Shorthand PHP Tags.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#no-shorthand-php-tags
 	#############################################################################
 	-->
@@ -51,7 +51,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Single and Double Quotes.
+	Handbook: General - Single and Double Quotes.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#single-and-double-quotes
 	#############################################################################
 	-->
@@ -66,7 +66,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Naming Conventions.
+	Handbook: Naming - Naming Conventions.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
 	#############################################################################
 	-->
@@ -95,7 +95,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Interpolation for Naming Dynamic Hooks.
+	Handbook: Naming - Interpolation for Naming Dynamic Hooks.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#interpolation-for-naming-dynamic-hooks
 
 	https://github.com/WordPress/WordPress-Coding-Standards/issues/751
@@ -112,7 +112,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Space Usage.
+	Handbook: Whitespace - Space Usage.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
 	#############################################################################
 	-->
@@ -126,8 +126,7 @@
 		</properties>
 	</rule>
 
-	<!-- Covers rule: Put spaces on both sides of the opening and closing parenthesis of
-		 if, elseif, foreach, for, and switch blocks. -->
+	<!-- Covers rule: Put spaces on both sides of the opening and closing parentheses of control structure blocks. -->
 	<rule ref="WordPress.WhiteSpace.ControlStructureSpacing"/>
 
 	<!-- Covers rule: Define a function like so: function my_function( $param1 = 'foo', $param2 = 'bar' ) { -->
@@ -165,7 +164,7 @@
 
 	<!-- Covers rule: Type casts must be lowercase. Always prefer the short form
 		 of type casts, (int) instead of (integer) and (bool) rather than (boolean).
-		 For float casts use (float). -->
+		 For float casts use (float), not (real) which is deprecated in PHP 7.4, and removed in PHP 8. -->
 	<rule ref="Generic.Formatting.SpaceAfterCast"/>
 	<rule ref="Squiz.WhiteSpace.CastSpacing"/>
 	<rule ref="WordPress.WhiteSpace.CastStructureSpacing"/>
@@ -177,12 +176,12 @@
 	<!-- Covers rule: ... array items, only include a space around the index if it is a variable. -->
 	<rule ref="WordPress.Arrays.ArrayKeySpacingRestrictions"/>
 
-	<!-- Rule: In a switch block, there must be no space before the colon for a case statement. -->
+	<!-- Rule: In a switch block, there must be no space between the case condition and the colon. -->
 	<!-- Covered by the PSR2.ControlStructures.SwitchDeclaration sniff. -->
 
 	<!-- Rule: Similarly, there should be no space before the colon on return type declarations. -->
 
-	<!-- Covers rule: Unless otherwise specified, parentheses should have spaces inside of them. -->
+	<!-- Covers rule: Unless otherwise specified, parentheses should have spaces inside them. -->
 	<rule ref="Generic.WhiteSpace.ArbitraryParenthesesSpacing">
 		<properties>
 			<property name="spacing" value="1"/>
@@ -193,7 +192,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Indentation.
+	Handbook: Whitespace - Indentation.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
 	#############################################################################
 	-->
@@ -260,7 +259,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Remove Trailing Spaces.
+	Handbook: Whitespace - Remove Trailing Spaces.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#remove-trailing-spaces
 	#############################################################################
 	-->
@@ -272,7 +271,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Brace Style.
+	Handbook: Formatting - Brace Style.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#brace-style
 	#############################################################################
 	-->
@@ -285,7 +284,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Declaring Arrays.
+	Handbook: Formatting - Declaring Arrays.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#declaring-arrays
 	#############################################################################
 	-->
@@ -295,7 +294,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Multiline Function Calls.
+	Handbook: Formatting - Multiline Function Calls.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#multiline-function-calls
 	#############################################################################
 	-->
@@ -310,7 +309,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Only One Object Structure (Class/Interface/Trait) per File.
+	Handbook: Object-Oriented Programming - Only One Object Structure (Class/Interface/Trait) per File.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#only-one-object-structure-class-interface-trait-per-file
 	#############################################################################
 	-->
@@ -322,7 +321,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Use elseif, not else if.
+	Handbook: Control Structures - Use elseif, not else if.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#use-elseif-not-else-if
 	#############################################################################
 	-->
@@ -332,12 +331,12 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Yoda Conditions.
+	Handbook: Control Structures - Yoda Conditions.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#yoda-conditions
 	#############################################################################
 	-->
-	<!-- Covers rule: When doing logical comparisons, always put the variable on the right side,
-		 constants or literals on the left. -->
+	<!-- Covers rule: When doing logical comparisons involving variables, always put the variable on the right side
+		 and put constants, literals, or function calls on the left side. -->
 	<rule ref="WordPress.PHP.YodaConditions"/>
 
 	<!-- Rule: Yoda conditions for <, >, <= or >= are significantly more difficult to read
@@ -346,11 +345,11 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Ternary Operator.
+	Handbook: Operators - Ternary Operator.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#ternary-operator
 	#############################################################################
 	-->
-	<!-- Rule: Always have Ternaries test if the statement is true, not false.
+	<!-- Rule: Always have ternaries test if the statement is true, not false.
 		 An exception would be using ! empty(), as testing for false here is generally more intuitive.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/643 -->
 
@@ -360,7 +359,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - (No) Error Control Operator @.
+	Handbook: Operators - (No) Error Control Operator @.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#error-control-operator
 	#############################################################################
 	-->
@@ -371,7 +370,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Database Queries.
+	Handbook: Database - Database Queries.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
 	#############################################################################
 	-->
@@ -382,7 +381,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Formatting SQL statements.
+	Handbook: Database - Formatting SQL statements.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#formatting-sql-statements
 	#############################################################################
 	-->
@@ -393,18 +392,18 @@
 		 SQL slash escaping when passed.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/640 -->
 
+	<!-- Covers rule: Escaping should be done as close to the time of the query
+		 as possible, preferably by using $wpdb->prepare(). -->
+	<rule ref="WordPress.DB.PreparedSQL"/>
+
 	<!-- Rule: in $wpdb->prepare - %s is used for string placeholders and %d is used for integer
 		 placeholders. Note that they are not 'quoted'! -->
 	<rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
 
-	<!-- Covers rule:  Escaping should be done as close to the time of the query
-		 as possible, preferably by using $wpdb->prepare(). -->
-	<rule ref="WordPress.DB.PreparedSQL"/>
-
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Self-Explanatory Flag Values for Function Arguments.
+	Handbook: Recommendations - Self-Explanatory Flag Values for Function Arguments.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#self-explanatory-flag-values-for-function-arguments
 	#############################################################################
 	-->
@@ -412,7 +411,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Clever Code.
+	Handbook: Recommendations - Clever Code.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#clever-code
 	#############################################################################
 	-->
@@ -452,13 +451,23 @@
 	</rule>
 
 	<!-- Rule: create_function() function, which internally performs an eval(),
-		 is deprecated in PHP 7.2. ... these must not be used. -->
+		 is deprecated in PHP 7.2 and has been removed in PHP 8.0. ... these must not be used. -->
 	<rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
 
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Regular Expressions.
+	Handbook: Recommendations - Closures.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#closures-anonymous-functions
+	#############################################################################
+	-->
+	<!-- Rule: Closures should not be passed as filter or action callbacks.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1486 -->
+
+
+	<!--
+	#############################################################################
+	Handbook: Recommendations - Regular Expressions.
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#regular-expressions
 	#############################################################################
 	-->
@@ -475,7 +484,7 @@
 
 	<!--
 	#############################################################################
-	Handbook: PHP - Don't extract().
+	Handbook: Recommendations - Don't extract().
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#dont-extract
 	#############################################################################
 	-->

From afeca3dc7094b77fe18864c083f0428f418afb90 Mon Sep 17 00:00:00 2001
From: Gary Jones <github@garyjones.io>
Date: Wed, 24 Aug 2022 17:20:10 +0100
Subject: [PATCH 185/822] Update composer.json keywords

As per getcomposer.org/doc/04-schema.md#keywords by including "static analysis", then later versions of Composer will prompt users if the package is installed with `composer require` instead of `composer require-dev`.
---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 74b01ea39b..8f397a4e3d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
 	"keywords": [
 		"phpcs",
 		"standards",
+		"static analysis",
 		"WordPress"
 	],
 	"license": "MIT",

From 16d1af9a8cdcf4161f62d4593bd17b4b81f831bf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:36:23 +0200
Subject: [PATCH 186/822] Composer/GH Actions: start using PHPCSDevTools 1.2.0

PHPCSDevTools 1.2.0 introduces an XSD for the XML docs which can accompany sniffs.

This commit:
* Updates the PHPCSDevTools to version 1.2.0.
* Adds a new check against the XSD for all sniff XML Docs files.

Ref: https://github.com/PHPCSStandards/PHPCSDevTools/releases/tag/1.2.0
---
 .github/workflows/ruleset-checks-sniffs.yml | 6 +++++-
 composer.json                               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index fddc940360..8d18a6d4ba 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Show PHPCS results in PR
         run: cs2pr ./phpcs-report.xml --graceful-warnings
 
-      # Validate the XML files.
+      # Validate the Ruleset XML files.
       # @link http://xmlsoft.org/xmllint.html
       - name: Validate the WordPress rulesets
         run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./*/ruleset.xml
@@ -80,6 +80,10 @@ jobs:
       - name: Validate the sample ruleset
         run: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd ./phpcs.xml.dist.sample
 
+      # Validate the Documentation XML files.
+      - name: Validate documentation against schema
+        run: xmllint --noout --schema vendor/phpcsstandards/phpcsdevtools/DocsXsd/phpcsdocs.xsd ./WordPress/Docs/*/*Standard.xml
+
       - name: Check the code-style consistency of the xml files
         run: |
           diff -B --tabsize=4 ./WordPress/ruleset.xml <(xmllint --format "./WordPress/ruleset.xml")
diff --git a/composer.json b/composer.json
index 8f397a4e3d..6444787229 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
 	"require-dev": {
 		"phpcompatibility/php-compatibility": "^9.0",
 		"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-		"phpcsstandards/phpcsdevtools": "^1.0",
+		"phpcsstandards/phpcsdevtools": "^1.2.0",
 		"php-parallel-lint/php-parallel-lint": "^1.3.2",
 		"php-parallel-lint/php-console-highlighter": "^1.0.0"
 	},

From 49ef41141ed6f1db190aa311bb31f8f265ca4607 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:44:38 +0200
Subject: [PATCH 187/822] Sniff XML docs: add schema to docs

Includes minor tweaks to some of the titles.
Includes adding the `<?xml..?>` header if it didn't exist in the file.
---
 WordPress/Docs/Arrays/ArrayIndentationStandard.xml          | 6 +++++-
 .../Docs/Arrays/ArrayKeySpacingRestrictionsStandard.xml     | 6 +++++-
 WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml       | 6 +++++-
 .../Docs/Arrays/MultipleStatementAlignmentStandard.xml      | 6 +++++-
 WordPress/Docs/Classes/ClassInstantiationStandard.xml       | 6 +++++-
 .../Docs/CodeAnalysis/EscapedNotTranslatedStandard.xml      | 6 +++++-
 WordPress/Docs/DateTime/CurrentTimeTimestampStandard.xml    | 6 +++++-
 WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml     | 6 +++++-
 .../Docs/NamingConventions/PrefixAllGlobalsStandard.xml     | 6 +++++-
 WordPress/Docs/NamingConventions/ValidHookNameStandard.xml  | 5 ++++-
 .../Docs/NamingConventions/ValidPostTypeSlugStandard.xml    | 6 +++++-
 WordPress/Docs/PHP/IniSetStandard.xml                       | 6 +++++-
 WordPress/Docs/PHP/StrictInArrayStandard.xml                | 6 +++++-
 WordPress/Docs/PHP/YodaConditionsStandard.xml               | 6 +++++-
 WordPress/Docs/Security/SafeRedirectStandard.xml            | 6 +++++-
 WordPress/Docs/WP/CapitalPDangitStandard.xml                | 6 +++++-
 WordPress/Docs/WP/CronIntervalStandard.xml                  | 6 +++++-
 WordPress/Docs/WP/DeprecatedClassesStandard.xml             | 6 +++++-
 WordPress/Docs/WP/DeprecatedFunctionsStandard.xml           | 6 +++++-
 WordPress/Docs/WP/DeprecatedParameterValuesStandard.xml     | 6 +++++-
 WordPress/Docs/WP/DeprecatedParametersStandard.xml          | 6 +++++-
 WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml    | 6 +++++-
 WordPress/Docs/WP/EnqueuedResourcesStandard.xml             | 6 +++++-
 WordPress/Docs/WP/PostsPerPageStandard.xml                  | 6 +++++-
 WordPress/Docs/WhiteSpace/CastStructureSpacingStandard.xml  | 6 +++++-
 WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml       | 6 +++++-
 WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml    | 6 +++++-
 27 files changed, 134 insertions(+), 27 deletions(-)

diff --git a/WordPress/Docs/Arrays/ArrayIndentationStandard.xml b/WordPress/Docs/Arrays/ArrayIndentationStandard.xml
index 5b9a1deea3..0833cce3bf 100644
--- a/WordPress/Docs/Arrays/ArrayIndentationStandard.xml
+++ b/WordPress/Docs/Arrays/ArrayIndentationStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Array Indentation">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Array Indentation"
+    >
     <standard>
     <![CDATA[
       The array closing bracket indentation should line up with the start of the content on the line containing the array opener.
diff --git a/WordPress/Docs/Arrays/ArrayKeySpacingRestrictionsStandard.xml b/WordPress/Docs/Arrays/ArrayKeySpacingRestrictionsStandard.xml
index c1e27a1324..b42ca4cfec 100644
--- a/WordPress/Docs/Arrays/ArrayKeySpacingRestrictionsStandard.xml
+++ b/WordPress/Docs/Arrays/ArrayKeySpacingRestrictionsStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Array Key Spacing Restrictions">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Array Key Spacing Restrictions"
+    >
     <standard>
     <![CDATA[
       When referring to array items, only include a space around the index if it is a variable or the key is concatenated.
diff --git a/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml b/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
index a42d39771c..0eef18d812 100644
--- a/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
+++ b/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Comma After Array Item">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Comma After Array Item"
+    >
     <standard>
     <![CDATA[
     There should be no space between an array item and the comma following it.
diff --git a/WordPress/Docs/Arrays/MultipleStatementAlignmentStandard.xml b/WordPress/Docs/Arrays/MultipleStatementAlignmentStandard.xml
index b3f87cbbe5..e5c856769c 100644
--- a/WordPress/Docs/Arrays/MultipleStatementAlignmentStandard.xml
+++ b/WordPress/Docs/Arrays/MultipleStatementAlignmentStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Multiple Statement Alignment">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Array Multiple Statement Alignment"
+    >
     <standard>
     <![CDATA[
         When declaring arrays, there should be one space on either side of a double arrow operator used to assign a value to a key.
diff --git a/WordPress/Docs/Classes/ClassInstantiationStandard.xml b/WordPress/Docs/Classes/ClassInstantiationStandard.xml
index cdd749ecdd..d016df9b23 100644
--- a/WordPress/Docs/Classes/ClassInstantiationStandard.xml
+++ b/WordPress/Docs/Classes/ClassInstantiationStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Class Instantiation">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Class Instantiation"
+    >
     <standard>
     <![CDATA[
     Instantiation of an object should be done with parenthesis.
diff --git a/WordPress/Docs/CodeAnalysis/EscapedNotTranslatedStandard.xml b/WordPress/Docs/CodeAnalysis/EscapedNotTranslatedStandard.xml
index 3755a3c96a..43950a0925 100644
--- a/WordPress/Docs/CodeAnalysis/EscapedNotTranslatedStandard.xml
+++ b/WordPress/Docs/CodeAnalysis/EscapedNotTranslatedStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Escaped Not Translated Text">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Escaped Not Translated"
+    >
     <standard>
     <![CDATA[
     Text intended for translation needs to be wrapped in a localization function call.
diff --git a/WordPress/Docs/DateTime/CurrentTimeTimestampStandard.xml b/WordPress/Docs/DateTime/CurrentTimeTimestampStandard.xml
index add8ed2378..e5a2c1bcb7 100644
--- a/WordPress/Docs/DateTime/CurrentTimeTimestampStandard.xml
+++ b/WordPress/Docs/DateTime/CurrentTimeTimestampStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Current Time Timestamp">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Current Time Timestamp"
+    >
     <standard>
     <![CDATA[
     Don't use current_time() to get a timestamp as it doesn't produce a Unix (UTC) timestamp, but a "WordPress timestamp", i.e. a Unix timestamp with current timezone offset.
diff --git a/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml b/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml
index c8cc932cc9..845869d00b 100644
--- a/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml
+++ b/WordPress/Docs/DateTime/RestrictedFunctionsStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Restricted Date and Time Functions">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Restricted Date and Time Functions"
+    >
     <standard>
     <![CDATA[
     The restricted functions date_default_timezone_set() and date() should not be used.
diff --git a/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
index 855dba8e6c..0776d7f51c 100644
--- a/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
+++ b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Prefix All Globals">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Prefix All Globals"
+    >
     <standard>
     <![CDATA[
     All globals terms must be prefixed with a theme/plugin specific term. Global terms include Namespace names, Class/Interface/Trait names (when not namespaced), Functions (when not namespaced or in an OO structure), Constants/Variable names declared in the global namespace, and Hook names.
diff --git a/WordPress/Docs/NamingConventions/ValidHookNameStandard.xml b/WordPress/Docs/NamingConventions/ValidHookNameStandard.xml
index 479dbd9ba5..387769d91f 100644
--- a/WordPress/Docs/NamingConventions/ValidHookNameStandard.xml
+++ b/WordPress/Docs/NamingConventions/ValidHookNameStandard.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<documentation title="Valid Hook Name">
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Valid Hook Name"
+    >
     <standard>
     <![CDATA[
     Use lowercase letters in action and filter names. Separate words using underscores.
diff --git a/WordPress/Docs/NamingConventions/ValidPostTypeSlugStandard.xml b/WordPress/Docs/NamingConventions/ValidPostTypeSlugStandard.xml
index 86be1bbeeb..fe88dfd6e7 100644
--- a/WordPress/Docs/NamingConventions/ValidPostTypeSlugStandard.xml
+++ b/WordPress/Docs/NamingConventions/ValidPostTypeSlugStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Validate post type slugs">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Valid Post Type Slug"
+    >
     <standard>
     <![CDATA[
     The post type slug used in register_post_type() must be between 1 and 20 characters.
diff --git a/WordPress/Docs/PHP/IniSetStandard.xml b/WordPress/Docs/PHP/IniSetStandard.xml
index dfc74e912c..91c73c584c 100644
--- a/WordPress/Docs/PHP/IniSetStandard.xml
+++ b/WordPress/Docs/PHP/IniSetStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Detect use of `ini_set()`">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Detect Use Of `ini_set()"
+    >
     <standard>
     <![CDATA[
       Using ini_set() and similar functions for altering PHP settings at runtime is discouraged. Changing runtime configuration might break other plugins and themes, and even WordPress itself.
diff --git a/WordPress/Docs/PHP/StrictInArrayStandard.xml b/WordPress/Docs/PHP/StrictInArrayStandard.xml
index ccd8a0f752..744ec9ed97 100644
--- a/WordPress/Docs/PHP/StrictInArrayStandard.xml
+++ b/WordPress/Docs/PHP/StrictInArrayStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Strict In Array Syntax">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Strict In Array Syntax"
+    >
     <standard>
     <![CDATA[
     When using functions which compare a value to a range of values in an array, make sure a strict comparison is executed.
diff --git a/WordPress/Docs/PHP/YodaConditionsStandard.xml b/WordPress/Docs/PHP/YodaConditionsStandard.xml
index 169cbcc368..36d1633692 100644
--- a/WordPress/Docs/PHP/YodaConditionsStandard.xml
+++ b/WordPress/Docs/PHP/YodaConditionsStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Yoda Conditions">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Yoda Conditions"
+    >
     <standard>
     <![CDATA[
     When doing logical comparisons involving variables, the variable must be placed on the right side. All constants, literals, and function calls must be placed on the left side. If neither side is a variable, the order is unimportant.
diff --git a/WordPress/Docs/Security/SafeRedirectStandard.xml b/WordPress/Docs/Security/SafeRedirectStandard.xml
index c2bcf5b8b7..aee63a6219 100644
--- a/WordPress/Docs/Security/SafeRedirectStandard.xml
+++ b/WordPress/Docs/Security/SafeRedirectStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Safe Redirect">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Safe Redirect"
+    >
     <standard>
     <![CDATA[
     wp_safe_redirect() should be used whenever possible to prevent open redirect vulnerabilities. One of the main uses of an open redirect vulnerability is to make phishing attacks more credible. In this case the user sees your (trusted) domain and might get redirected to an attacker controlled website aimed at stealing private information.
diff --git a/WordPress/Docs/WP/CapitalPDangitStandard.xml b/WordPress/Docs/WP/CapitalPDangitStandard.xml
index 245eb19618..8df7940f72 100644
--- a/WordPress/Docs/WP/CapitalPDangitStandard.xml
+++ b/WordPress/Docs/WP/CapitalPDangitStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Capital P Dangit">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Capital P Dangit"
+    >
     <standard>
     <![CDATA[
 The correct spelling of "WordPress" should be used in text strings, comments and object names.
diff --git a/WordPress/Docs/WP/CronIntervalStandard.xml b/WordPress/Docs/WP/CronIntervalStandard.xml
index 55a9037d47..03c75b8ab2 100644
--- a/WordPress/Docs/WP/CronIntervalStandard.xml
+++ b/WordPress/Docs/WP/CronIntervalStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Cron interval">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Cron Interval"
+    >
     <standard>
     <![CDATA[
     Cron schedules running more often than once every 15 minutes are discouraged. Crons running that frequently can negatively impact the performance of a site.
diff --git a/WordPress/Docs/WP/DeprecatedClassesStandard.xml b/WordPress/Docs/WP/DeprecatedClassesStandard.xml
index 4d06f6e35c..2de4e18e8b 100644
--- a/WordPress/Docs/WP/DeprecatedClassesStandard.xml
+++ b/WordPress/Docs/WP/DeprecatedClassesStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Deprecated Classes">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Deprecated Classes"
+    >
     <standard>
     <![CDATA[
     Please refrain from using deprecated WordPress classes. 
diff --git a/WordPress/Docs/WP/DeprecatedFunctionsStandard.xml b/WordPress/Docs/WP/DeprecatedFunctionsStandard.xml
index 7fcc9c4e5b..7bb63d8b99 100644
--- a/WordPress/Docs/WP/DeprecatedFunctionsStandard.xml
+++ b/WordPress/Docs/WP/DeprecatedFunctionsStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Deprecated Functions">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Deprecated Functions"
+    >
     <standard>
     <![CDATA[
     Please refrain from using deprecated WordPress functions. 
diff --git a/WordPress/Docs/WP/DeprecatedParameterValuesStandard.xml b/WordPress/Docs/WP/DeprecatedParameterValuesStandard.xml
index 0348fdffed..de9164c3ef 100644
--- a/WordPress/Docs/WP/DeprecatedParameterValuesStandard.xml
+++ b/WordPress/Docs/WP/DeprecatedParameterValuesStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Deprecated Function Parameter Values">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Deprecated Function Parameter Values"
+    >
     <standard>
     <![CDATA[
     Please refrain from using deprecated WordPress function parameter values.
diff --git a/WordPress/Docs/WP/DeprecatedParametersStandard.xml b/WordPress/Docs/WP/DeprecatedParametersStandard.xml
index 6399ca62fb..195e27098b 100644
--- a/WordPress/Docs/WP/DeprecatedParametersStandard.xml
+++ b/WordPress/Docs/WP/DeprecatedParametersStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Deprecated Function Parameters">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Deprecated Function Parameters"
+    >
     <standard>
     <![CDATA[
     Please refrain from passing deprecated WordPress function parameters.
diff --git a/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml b/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml
index ab81c567a7..4060d79e04 100644
--- a/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml
+++ b/WordPress/Docs/WP/EnqueuedResourceParametersStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Enqueued Resource Parameters">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Enqueued Resource Parameters"
+    >
     <standard>
     <![CDATA[
     The resource version must be set, to prevent the browser from using an outdated, cached version after the resource has been updated.
diff --git a/WordPress/Docs/WP/EnqueuedResourcesStandard.xml b/WordPress/Docs/WP/EnqueuedResourcesStandard.xml
index 3857df3d7c..1f7013068d 100644
--- a/WordPress/Docs/WP/EnqueuedResourcesStandard.xml
+++ b/WordPress/Docs/WP/EnqueuedResourcesStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Enqueued Resources">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Enqueued Resources"
+    >
     <standard>
     <![CDATA[
     Scripts must be registered/enqueued via wp_enqueue_script().
diff --git a/WordPress/Docs/WP/PostsPerPageStandard.xml b/WordPress/Docs/WP/PostsPerPageStandard.xml
index aa24f740d4..55715ca80d 100644
--- a/WordPress/Docs/WP/PostsPerPageStandard.xml
+++ b/WordPress/Docs/WP/PostsPerPageStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="High Posts Per Page Limit">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="High Posts Per Page Limit"
+    >
     <standard>
     <![CDATA[
 Using "posts_per_page" or "numberposts" with the value set to an high number opens up the potential for making requests slow if the query ends up querying thousands of posts.
diff --git a/WordPress/Docs/WhiteSpace/CastStructureSpacingStandard.xml b/WordPress/Docs/WhiteSpace/CastStructureSpacingStandard.xml
index 8539325b37..a087dd5417 100644
--- a/WordPress/Docs/WhiteSpace/CastStructureSpacingStandard.xml
+++ b/WordPress/Docs/WhiteSpace/CastStructureSpacingStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Cast Structure Spacing">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Cast Structure Spacing"
+    >
     <standard>
     <![CDATA[
     A type cast should be preceded by whitespace.
diff --git a/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml b/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml
index ca17e57ff5..f9e0719f1a 100644
--- a/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml
+++ b/WordPress/Docs/WhiteSpace/OperatorSpacingStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Operator Spacing">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Operator Spacing"
+    >
     <standard>
     <![CDATA[
     Always put one space on both sides of logical, comparison and concatenation operators.
diff --git a/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml b/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
index ca819ffd7d..0e68ea0a65 100644
--- a/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
+++ b/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
@@ -1,4 +1,8 @@
-<documentation title="Precision Alignment">
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Precision Alignment"
+    >
     <standard>
     <![CDATA[
     Line indentation should only use tabs. Precision alignment with spaces after the tabs is strongly discouraged.

From 70e3e8e7a34c275c0b15322c82da521730e03295 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 14 Oct 2022 22:28:21 +0200
Subject: [PATCH 188/822] GH Actions: fix use of deprecated `set-output`

GitHub has deprecated the use of `set-output` (and `set-state`) in favour of new environment files.

This commit updates workflows to use the new methodology.

Refs:
* https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
* https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#environment-files
---
 .github/workflows/quicktest.yml  | 4 ++--
 .github/workflows/unit-tests.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index f7998e2909..ab5bd3457a 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -50,9 +50,9 @@ jobs:
         id: set_ini
         run: |
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
+            echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> $GITHUB_OUTPUT
           else
-            echo '::set-output name=PHP_INI::error_reporting=-1, display_errors=On'
+            echo 'PHP_INI=error_reporting=-1, display_errors=On' >> $GITHUB_OUTPUT
           fi
 
       - name: Set up PHP
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 5020375e05..8e96b835dc 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -56,9 +56,9 @@ jobs:
         id: set_ini
         run: |
           if [ "${{ matrix.phpcs_version }}" != "dev-master" ]; then
-            echo '::set-output name=PHP_INI::error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On'
+            echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> $GITHUB_OUTPUT
           else
-            echo '::set-output name=PHP_INI::error_reporting=-1, display_errors=On'
+            echo 'PHP_INI=error_reporting=-1, display_errors=On' >> $GITHUB_OUTPUT
           fi
 
       - name: Set up PHP

From e670ed6b031b07b2a31653c50f84ee4ce34306d6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Oct 2022 11:06:01 +0200
Subject: [PATCH 189/822] GH Actions: harden the workflow against PHPCS ruleset
 errors

If there is a ruleset error, the `cs2pr` action doesn't receive an `xml` report and exits with a `0` error code, even though the PHPCS run failed (though not on CS errors, but on a ruleset error).

This changes the GH Actions workflow to allow for that situation and still fail the build in that case.
---
 .github/workflows/ruleset-checks-sniffs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 8d18a6d4ba..1607297d6f 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -66,10 +66,11 @@ jobs:
       # @link https://github.com/WordPress/WordPress-Coding-Standards
       # @link http://pear.php.net/package/PHP_CodeSniffer/
       - name: Run PHPCS ignoring warnings
-        continue-on-error: true
+        id: phpcs
         run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --report-full --report-checkstyle=./phpcs-report.xml
 
       - name: Show PHPCS results in PR
+        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
         run: cs2pr ./phpcs-report.xml --graceful-warnings
 
       # Validate the Ruleset XML files.

From a7f6cc6f0cbb223f9899ab2abd526072c8945307 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 24 Oct 2022 16:23:59 +0200
Subject: [PATCH 190/822] Composer: up the minimum PHPCS version to 3.7.1

Follow up on 2058

The minimum PHPCS version for PHPCSUtils 1.0.0 will be 3.7.1, so the minimum PHPCS version for WPCS should be in line with that.

The difference between 3.7.0 and 3.7.1 is very small. They were released just days apart with 3.7.1 fixing a pertinent bug in the retokenization of reserved keywords, which was updated in PHPCS 3.7.0.

Includes updating the GH Actions matrixes for this change.
---
 .github/CONTRIBUTING.md                     | 2 +-
 .github/workflows/quicktest.yml             | 4 ++--
 .github/workflows/ruleset-checks-sniffs.yml | 2 +-
 .github/workflows/unit-tests.yml            | 2 +-
 README.md                                   | 2 +-
 composer.json                               | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4acbf78a09..8b4acb11b9 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 
 ## Pre-requisites
 * WordPress-Coding-Standards
-* PHP_CodeSniffer 3.7.0 or higher
+* PHP_CodeSniffer 3.7.1 or higher
 * PHPUnit 4.x, 5.x, 6.x or 7.x
 
 The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index ab5bd3457a..cb23467085 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -36,9 +36,9 @@ jobs:
         phpcs_version: [ 'dev-master' ]
         include:
           - php: '7.3'
-            phpcs_version: '3.7.0'
+            phpcs_version: '3.7.1'
           - php: '5.4'
-            phpcs_version: '3.7.0'
+            phpcs_version: '3.7.1'
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 1607297d6f..f359ed9ece 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -120,7 +120,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.4' ]
-        phpcs_version: [ 'dev-master', '3.7.0' ]
+        phpcs_version: [ 'dev-master', '3.7.1' ]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 8e96b835dc..3ba3f940a0 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php: [ '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
-        phpcs_version: [ 'dev-master', '3.7.0' ]
+        phpcs_version: [ 'dev-master', '3.7.1' ]
         allowed_failure: [ false ]
         include:
           # Add extra build to test against PHPCS 4.
diff --git a/README.md b/README.md
index 4043438803..c3669ff975 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/P
 
 ### Requirements
 
-The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.0** or higher.
+The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.1** or higher.
 
 ### Composer
 
diff --git a/composer.json b/composer.json
index 6444787229..cf7705a04a 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"squizlabs/php_codesniffer": "^3.7.0",
+		"squizlabs/php_codesniffer": "^3.7.1",
 		"phpcsstandards/phpcsutils": "^1.0",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},

From 9e770788d2121c332007775fd6b2ce6e9c48b09c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:32:41 +0200
Subject: [PATCH 191/822] EnqueuedResourcesSniff: use Collections method
 instead of property

All the `Collections` class properties have been deprecated in PHPCSUtils 1.0.0-alph4 in favour of methods with the same name, due to too many new tokens being introduced in PHP itself and the properties therefor not being a viable path for the future.
---
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index b462e20c3c..c1c45379de 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -36,7 +36,7 @@ class EnqueuedResourcesSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		$targets   = Collections::$textStingStartTokens;
+		$targets   = Collections::textStringStartTokens();
 		$targets[] = \T_INLINE_HTML;
 
 		return $targets;

From ad4bab4b8662cb16fcea3d0db61cdc54d28b4a20 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 13:52:52 +0200
Subject: [PATCH 192/822] CronInterval: add the parameter name to allow for
 named parameters

PHPCSUtils 1.0.0-alpha4 supports named parameters in the `PassedParameters` class, but requires for the parameter name to be passed either as a string or an array (of multiple names in case of a renamed parameter).

The `CronInterval` sniff not passing the parameter name would cause the tests to fail - even when the tests do not contain a test for named parameters yet -, so let's fix the function call.

Note: this doesn't add proper support for named parameters to the sniff yet. That will be addressed later.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 21ee0e9b87..38fa176885 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -98,7 +98,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2 );
+		$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2, 'callback' );
 		if ( false === $callback ) {
 			return;
 		}

From 6eca312a13bd972be3e8211b90c309bde8cb60d7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:23:18 +0200
Subject: [PATCH 193/822] Sniff::addMessage(): switch over to the PHPCSUtils
 version

PHPCSUtils 1.0.0-alpha4 has a new `MessageHelper` class containing methods for the same, so we can now switch out the WPCS native methods for the PHPCSUtils ones.

Includes changing some long lines to multi-line function calls.
---
 ...stractArrayAssignmentRestrictionsSniff.php |  4 +-
 .../AbstractFunctionRestrictionsSniff.php     |  6 +-
 WordPress/Sniff.php                           | 70 -------------------
 .../PrefixAllGlobalsSniff.php                 |  6 +-
 .../Security/NonceVerificationSniff.php       |  4 +-
 .../Sniffs/WP/DeprecatedClassesSniff.php      |  4 +-
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    |  4 +-
 .../WP/DeprecatedParameterValuesSniff.php     |  4 +-
 .../Sniffs/WP/DeprecatedParametersSniff.php   |  3 +-
 WordPress/Sniffs/WP/I18nSniff.php             | 38 ++++++++--
 10 files changed, 56 insertions(+), 87 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index df9932bb7d..5dbf9562bd 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 
@@ -212,7 +213,8 @@ public function process_token( $stackPtr ) {
 						$message = $output;
 					}
 
-					$this->addMessage(
+					MessageHelper::addMessage(
+						$this->phpcsFile,
 						$message,
 						$stackPtr,
 						( 'error' === $group['type'] ),
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index af8cd10b18..1599a74b38 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Restricts usage of some functions.
@@ -310,7 +311,8 @@ public function check_for_matches( $stackPtr ) {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->addMessage(
+		MessageHelper::addMessage(
+			$this->phpcsFile,
 			$this->groups[ $group_name ]['message'],
 			$stackPtr,
 			( 'error' === $this->groups[ $group_name ]['type'] ),
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index c54d6c23c4..89d3f6e439 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -845,76 +845,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Add a PHPCS message to the output stack as either a warning or an error.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @param string $message  The message.
-	 * @param int    $stackPtr The position of the token the message relates to.
-	 * @param bool   $is_error Optional. Whether to report the message as an 'error' or 'warning'.
-	 *                         Defaults to true (error).
-	 * @param string $code     Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data     Optional input for the data replacements.
-	 * @param int    $severity Optional. Severity level. Defaults to 0 which will translate to
-	 *                         the PHPCS default severity level.
-	 * @return bool
-	 */
-	protected function addMessage( $message, $stackPtr, $is_error = true, $code = 'Found', $data = array(), $severity = 0 ) {
-		return $this->throwMessage( $message, $stackPtr, $is_error, $code, $data, $severity, false );
-	}
-
-	/**
-	 * Add a fixable PHPCS message to the output stack as either a warning or an error.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @param string $message  The message.
-	 * @param int    $stackPtr The position of the token the message relates to.
-	 * @param bool   $is_error Optional. Whether to report the message as an 'error' or 'warning'.
-	 *                         Defaults to true (error).
-	 * @param string $code     Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data     Optional input for the data replacements.
-	 * @param int    $severity Optional. Severity level. Defaults to 0 which will translate to
-	 *                         the PHPCS default severity level.
-	 * @return bool
-	 */
-	protected function addFixableMessage( $message, $stackPtr, $is_error = true, $code = 'Found', $data = array(), $severity = 0 ) {
-		return $this->throwMessage( $message, $stackPtr, $is_error, $code, $data, $severity, true );
-	}
-
-	/**
-	 * Add a PHPCS message to the output stack as either a warning or an error.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @param string $message  The message.
-	 * @param int    $stackPtr The position of the token the message relates to.
-	 * @param bool   $is_error Optional. Whether to report the message as an 'error' or 'warning'.
-	 *                         Defaults to true (error).
-	 * @param string $code     Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data     Optional input for the data replacements.
-	 * @param int    $severity Optional. Severity level. Defaults to 0 which will translate to
-	 *                         the PHPCS default severity level.
-	 * @param bool   $fixable  Optional. Whether this is a fixable error. Defaults to false.
-	 * @return bool
-	 */
-	private function throwMessage( $message, $stackPtr, $is_error = true, $code = 'Found', $data = array(), $severity = 0, $fixable = false ) {
-
-		$method = 'add';
-		if ( true === $fixable ) {
-			$method .= 'Fixable';
-		}
-
-		if ( true === $is_error ) {
-			$method .= 'Error';
-		} else {
-			$method .= 'Warning';
-		}
-
-		return \call_user_func( array( $this->phpcsFile, $method ), $message, $stackPtr, $code, $data, $severity );
-	}
-
 	/**
 	 * Convert an arbitrary string to an alphanumeric string with underscores.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 616f89a723..fd23a0c47d 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\Lists;
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
@@ -741,7 +742,8 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		}
 
 		// Still here ? In that case, the variable name should be prefixed.
-		$recorded = $this->addMessage(
+		$recorded = MessageHelper::addMessage(
+			$this->phpcsFile,
 			self::ERROR_MSG,
 			$stackPtr,
 			$is_error,
@@ -885,7 +887,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		$data[] = $raw_content;
 
-		$recorded = $this->addMessage( self::ERROR_MSG, $first_non_empty, $is_error, $error_code, $data );
+		$recorded = MessageHelper::addMessage( $this->phpcsFile, self::ERROR_MSG, $first_non_empty, $is_error, $error_code, $data );
 
 		if ( true === $recorded ) {
 			$this->record_potential_prefix_metric( $stackPtr, $raw_content );
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 934ff8004d..2784b363c9 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
+use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -127,7 +128,8 @@ public function process_token( $stackPtr ) {
 		}
 
 		// If we're still here, no nonce-verification function was found.
-		$this->addMessage(
+		MessageHelper::addMessage(
+			$this->phpcsFile,
 			'Processing form data without nonce verification.',
 			$stackPtr,
 			$this->superglobals[ $instance['content'] ],
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 25c6e8cbdd..dd7418b3b8 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\AbstractClassRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
@@ -111,7 +112,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$data[]   = $this->deprecated_classes[ $class_name ]['alt'];
 		}
 
-		$this->addMessage(
+		MessageHelper::addMessage(
+			$this->phpcsFile,
 			$message,
 			$stackPtr,
 			( version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_supported_version, '<' ) ),
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 2676c82dcb..4430d67731 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 
@@ -1413,7 +1414,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$data[]   = $this->deprecated_functions[ $function_name ]['alt'];
 		}
 
-		$this->addMessage(
+		MessageHelper::addMessage(
+			$this->phpcsFile,
 			$message,
 			$stackPtr,
 			( version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_supported_version, '<' ) ),
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 7ad4904fcb..5ac9508331 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
@@ -208,7 +209,8 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 		}
 
 		$is_error = version_compare( $parameter_args[ $matched_parameter ]['version'], $this->minimum_supported_version, '<' );
-		$this->addMessage(
+		MessageHelper::addMessage(
+			$this->phpcsFile,
 			$message,
 			$parameter_position,
 			$is_error,
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index ca6114526f..6beae0163e 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
@@ -335,7 +336,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$message .= ' Instead do not pass the parameter.';
 			}
 
-			$this->addMessage( $message, $stackPtr, $is_error, $code, $data, 0 );
+			MessageHelper::addMessage( $this->phpcsFile, $message, $stackPtr, $is_error, $code, $data, 0 );
 		}
 	}
 
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 8dd700ae0d..5b61c86c13 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use XMLReader;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
@@ -433,7 +434,7 @@ protected function check_argument_tokens( $context ) {
 		if ( empty( $tokens ) || 0 === \count( $tokens ) ) {
 			$code = $this->string_to_errorcode( 'MissingArg' . ucfirst( $arg_name ) );
 			if ( 'domain' !== $arg_name ) {
-				$this->addMessage( 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
+				MessageHelper::addMessage( $this->phpcsFile, 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
 				return false;
 			}
 
@@ -450,7 +451,7 @@ protected function check_argument_tokens( $context ) {
 					array( $arg_name )
 				);
 			} elseif ( ! empty( $this->text_domain ) ) {
-				$this->addMessage( 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
+				MessageHelper::addMessage( $this->phpcsFile, 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
 			}
 
 			return false;
@@ -462,7 +463,14 @@ protected function check_argument_tokens( $context ) {
 				$contents .= $token['content'];
 			}
 			$code = $this->string_to_errorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
-			$this->addMessage( 'The $%s arg must be a single string literal, not "%s".', $stack_ptr, $is_error, $code, array( $arg_name, $contents ) );
+			MessageHelper::addMessage(
+				$this->phpcsFile,
+				'The $%s arg must be a single string literal, not "%s".',
+				$stack_ptr,
+				$is_error,
+				$code,
+				array( $arg_name, $contents )
+			);
 			return false;
 		}
 
@@ -474,7 +482,14 @@ protected function check_argument_tokens( $context ) {
 			$interpolated_variables = TextStringHelper::get_interpolated_variables( $content );
 			foreach ( $interpolated_variables as $interpolated_variable ) {
 				$code = $this->string_to_errorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
-				$this->addMessage( 'The $%s arg must not contain interpolated variables. Found "$%s".', $stack_ptr, $is_error, $code, array( $arg_name, $interpolated_variable ) );
+				MessageHelper::addMessage(
+					$this->phpcsFile,
+					'The $%s arg must not contain interpolated variables. Found "$%s".',
+					$stack_ptr,
+					$is_error,
+					$code,
+					array( $arg_name, $interpolated_variable )
+				);
 			}
 			if ( ! empty( $interpolated_variables ) ) {
 				return false;
@@ -486,7 +501,8 @@ protected function check_argument_tokens( $context ) {
 				$stripped_content = TextStrings::stripQuotes( $content );
 
 				if ( ! \in_array( $stripped_content, $this->text_domain, true ) ) {
-					$this->addMessage(
+					MessageHelper::addMessage(
+						$this->phpcsFile,
 						'Mismatched text domain. Expected \'%s\' but got %s.',
 						$stack_ptr,
 						$is_error,
@@ -531,7 +547,14 @@ protected function check_argument_tokens( $context ) {
 		}
 
 		$code = $this->string_to_errorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
-		$this->addMessage( 'The $%s arg must be a single string literal, not "%s".', $stack_ptr, $is_error, $code, array( $arg_name, $content ) );
+		MessageHelper::addMessage(
+			$this->phpcsFile,
+			'The $%s arg must be a single string literal, not "%s".',
+			$stack_ptr,
+			$is_error,
+			$code,
+			array( $arg_name, $content )
+		);
 		return false;
 	}
 
@@ -616,7 +639,8 @@ protected function check_text( $context ) {
 				$replacements[ $i ] = str_replace( '$', '\\$', $replacements[ $i ] );
 			}
 
-			$fix = $this->addFixableMessage(
+			$fix = MessageHelper::addFixableMessage(
+				$this->phpcsFile,
 				'Multiple placeholders should be ordered. Expected \'%s\', but got %s.',
 				$stack_ptr,
 				$is_error,

From b812a91b37f6962ee55a215b376b0982c81a3dfc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 14:07:39 +0200
Subject: [PATCH 194/822] Sniff::string_to_errorcode(): switch over to the
 PHPCSUtils version

PHPCSUtils 1.0.0-alpha4 has a new `MessageHelper` class containing a method for the same, so we can now switch out the WPCS native method for the PHPCSUtils one.
---
 .../AbstractArrayAssignmentRestrictionsSniff.php  |  2 +-
 WordPress/AbstractFunctionRestrictionsSniff.php   |  2 +-
 WordPress/Sniff.php                               | 15 ---------------
 WordPress/Sniffs/PHP/IniSetSniff.php              |  3 ++-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php    |  2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php  |  2 +-
 .../Sniffs/WP/DeprecatedParameterValuesSniff.php  |  2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php |  2 +-
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php |  5 +++--
 WordPress/Sniffs/WP/I18nSniff.php                 | 12 ++++++------
 10 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 5dbf9562bd..18912c96c4 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -218,7 +218,7 @@ public function process_token( $stackPtr ) {
 						$message,
 						$stackPtr,
 						( 'error' === $group['type'] ),
-						$this->string_to_errorcode( $groupName . '_' . $key ),
+						MessageHelper::stringToErrorcode( $groupName . '_' . $key ),
 						array( $key, $val )
 					);
 				}
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 1599a74b38..67c3f80787 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -316,7 +316,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$this->groups[ $group_name ]['message'],
 			$stackPtr,
 			( 'error' === $this->groups[ $group_name ]['type'] ),
-			$this->string_to_errorcode( $group_name . '_' . $matched_content ),
+			MessageHelper::stringToErrorcode( $group_name . '_' . $matched_content ),
 			array( $matched_content )
 		);
 	}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 89d3f6e439..6f4d272c37 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -845,21 +845,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Convert an arbitrary string to an alphanumeric string with underscores.
-	 *
-	 * Pre-empt issues with arbitrary strings being used as error codes in XML and PHP.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @param string $base_string Arbitrary string.
-	 *
-	 * @return string
-	 */
-	protected function string_to_errorcode( $base_string ) {
-		return preg_replace( '`[^a-z0-9_]`i', '_', $base_string );
-	}
-
 	/**
 	 * Transform the name of a PHP construct (function, variable etc) to one in snake_case.
 	 *
diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 62ff297460..350b5ab4d4 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
@@ -156,7 +157,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$this->phpcsFile->addError(
 					'%s(%s, %s) found. %s',
 					$stackPtr,
-					$this->string_to_errorcode( $option_name . '_Disallowed' ),
+					MessageHelper::stringToErrorcode( $option_name . '_Disallowed' ),
 					array(
 						$matched_content,
 						$parameters[1]['raw'],
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index dd7418b3b8..71a2d84f40 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -117,7 +117,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$message,
 			$stackPtr,
 			( version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_supported_version, '<' ) ),
-			$this->string_to_errorcode( $class_name . 'Found' ),
+			MessageHelper::stringToErrorcode( $class_name . 'Found' ),
 			$data
 		);
 	}
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 4430d67731..edb06e26c9 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1419,7 +1419,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$message,
 			$stackPtr,
 			( version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_supported_version, '<' ) ),
-			$this->string_to_errorcode( $matched_content . 'Found' ),
+			MessageHelper::stringToErrorcode( $matched_content . 'Found' ),
 			$data
 		);
 	}
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 5ac9508331..a31ec00e2e 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -214,7 +214,7 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 			$message,
 			$parameter_position,
 			$is_error,
-			$this->string_to_errorcode( 'Found' ),
+			'Found',
 			$data
 		);
 	}
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 6beae0163e..770cb31ccd 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -320,7 +320,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			$message  = 'The parameter "%s" at position #%s of %s() has been deprecated since WordPress version %s.';
 			$is_error = version_compare( $parameter_args['version'], $this->minimum_supported_version, '<' );
-			$code     = $this->string_to_errorcode( ucfirst( $matched_content ) . 'Param' . $position . 'Found' );
+			$code     = MessageHelper::stringToErrorcode( ucfirst( $matched_content ) . 'Param' . $position . 'Found' );
 
 			$data = array(
 				$parameters[ $position ]['raw'],
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 9d4137d914..f300a2a3bc 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 
@@ -172,7 +173,7 @@ public function process_arbitrary_tstring( $stackPtr ) {
 		$this->phpcsFile->addWarning(
 			'Found usage of constant "%s". Use %s instead.',
 			$stackPtr,
-			$this->string_to_errorcode( $content . 'UsageFound' ),
+			MessageHelper::stringToErrorcode( $content . 'UsageFound' ),
 			array(
 				$content,
 				$this->discouraged_constants[ $content ],
@@ -207,7 +208,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$this->phpcsFile->addWarning(
 				'Found declaration of constant "%s". Use %s instead.',
 				$stackPtr,
-				$this->string_to_errorcode( $raw_content . 'DeclarationFound' ),
+				MessageHelper::stringToErrorcode( $raw_content . 'DeclarationFound' ),
 				array(
 					$raw_content,
 					$this->discouraged_constants[ $raw_content ],
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 5b61c86c13..1afa213427 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -432,7 +432,7 @@ protected function check_argument_tokens( $context ) {
 		$content   = isset( $tokens[0] ) ? $tokens[0]['content'] : '';
 
 		if ( empty( $tokens ) || 0 === \count( $tokens ) ) {
-			$code = $this->string_to_errorcode( 'MissingArg' . ucfirst( $arg_name ) );
+			$code = MessageHelper::stringToErrorcode( 'MissingArg' . ucfirst( $arg_name ) );
 			if ( 'domain' !== $arg_name ) {
 				MessageHelper::addMessage( $this->phpcsFile, 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
 				return false;
@@ -462,7 +462,7 @@ protected function check_argument_tokens( $context ) {
 			foreach ( $tokens as $token ) {
 				$contents .= $token['content'];
 			}
-			$code = $this->string_to_errorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
+			$code = MessageHelper::stringToErrorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
 			MessageHelper::addMessage(
 				$this->phpcsFile,
 				'The $%s arg must be a single string literal, not "%s".',
@@ -481,7 +481,7 @@ protected function check_argument_tokens( $context ) {
 		if ( \T_DOUBLE_QUOTED_STRING === $tokens[0]['code'] || \T_HEREDOC === $tokens[0]['code'] ) {
 			$interpolated_variables = TextStringHelper::get_interpolated_variables( $content );
 			foreach ( $interpolated_variables as $interpolated_variable ) {
-				$code = $this->string_to_errorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
+				$code = MessageHelper::stringToErrorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
 				MessageHelper::addMessage(
 					$this->phpcsFile,
 					'The $%s arg must not contain interpolated variables. Found "$%s".',
@@ -546,7 +546,7 @@ protected function check_argument_tokens( $context ) {
 			return true;
 		}
 
-		$code = $this->string_to_errorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
+		$code = MessageHelper::stringToErrorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
 		MessageHelper::addMessage(
 			$this->phpcsFile,
 			'The $%s arg must be a single string literal, not "%s".',
@@ -612,7 +612,7 @@ protected function check_text( $context ) {
 		$all_matches_count       = preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $content, $all_matches );
 
 		if ( $unordered_matches_count > 0 && $unordered_matches_count !== $all_matches_count && $all_matches_count > 1 ) {
-			$code = $this->string_to_errorcode( 'MixedOrderedPlaceholders' . ucfirst( $arg_name ) );
+			$code = MessageHelper::stringToErrorcode( 'MixedOrderedPlaceholders' . ucfirst( $arg_name ) );
 			$this->phpcsFile->addError(
 				'Multiple placeholders should be ordered. Mix of ordered and non-ordered placeholders found. Found: %s.',
 				$stack_ptr,
@@ -621,7 +621,7 @@ protected function check_text( $context ) {
 			);
 
 		} elseif ( $unordered_matches_count >= 2 ) {
-			$code = $this->string_to_errorcode( 'UnorderedPlaceholders' . ucfirst( $arg_name ) );
+			$code = MessageHelper::stringToErrorcode( 'UnorderedPlaceholders' . ucfirst( $arg_name ) );
 
 			$suggestions     = array();
 			$replace_regexes = array();

From 2c52e9b6ab395793e9831327a02c13461c7f2325 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Jun 2022 06:15:28 +0200
Subject: [PATCH 195/822] TextStringHelper: remove the
 strip_interpolated_variables() method

... in favour of the significantly more comprehensive PHPCSUtils `TextStrings::stripEmbeds()` method.

This improves the handling of embedded variables in double quoted strings (and consequently fixes some bugs).

Bug confirmed via the tests added to the `ValidPostTypeSlug` sniff.

Without this fix, the "text stripped of embeds" for these test cases would look like this:
```
string(24) "testing123-${(foo)}-test"
string(19) "testing123-"]}-test"
```

I.e. the embeds wouldn't be, or wouldn't be completely, stripped.

With the fix, the embeds in both texts are correctly stripped, resulting in:
```
string(16) "testing123--test"
```

As for the sniff, for the `ValidPostTypeSlug` sniff, the bug meant that the sniff would report three false positives:
```
 55 | ERROR   | register_post_type() called with invalid post type "testing123-${(foo)}-test". Post type contains invalid characters. Only lowercase
    |         | alphanumeric characters, dashes, and underscores are allowed.
 55 | ERROR   | A post type slug must not exceed 20 characters. Found: "testing123-${(foo)}-test" (24 characters).
 56 | ERROR   | register_post_type() called with invalid post type "testing123-${foo["${bar['baz']}"]}-test". Post type contains invalid characters.
    |         | Only lowercase alphanumeric characters, dashes, and underscores are allowed.
```

These are all fixed now.
---
 WordPress/Helpers/TextStringHelper.php        | 35 ++-----------------
 .../DB/PreparedSQLPlaceholdersSniff.php       |  2 +-
 .../ValidPostTypeSlugSniff.php                |  3 +-
 .../ValidPostTypeSlugUnitTest.inc             |  4 +++
 .../ValidPostTypeSlugUnitTest.php             |  2 ++
 5 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/WordPress/Helpers/TextStringHelper.php b/WordPress/Helpers/TextStringHelper.php
index 9246835280..4c701d8ffb 100644
--- a/WordPress/Helpers/TextStringHelper.php
+++ b/WordPress/Helpers/TextStringHelper.php
@@ -21,21 +21,11 @@
  * the future by functions from PHPCSUtils.}
  *
  * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The constant and methods in this class were previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class TextStringHelper {
 
-	/**
-	 * Regex to get complex variables from T_DOUBLE_QUOTED_STRING or T_HEREDOC.
-	 *
-	 * @since 0.14.0
-	 * @since 3.0.0  Moved from the Sniff class to this class.
-	 *
-	 * @var string
-	 */
-	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
-
 	/**
 	 * Get the interpolated variable names from a string.
 	 *
@@ -60,25 +50,4 @@ public static function get_interpolated_variables( $string ) {
 		}
 		return $variables;
 	}
-
-	/**
-	 * Strip variables from an arbitrary double quoted/heredoc string.
-	 *
-	 * Intended for use with the contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
-	 *
-	 * @since 0.14.0
-	 * @since 3.0.0 - Moved from the Sniff class to this class.
-	 *              - The method was made `static`.
-	 *
-	 * @param string $string The raw string.
-	 *
-	 * @return string String without variables in it.
-	 */
-	public static function strip_interpolated_variables( $string ) {
-		if ( strpos( $string, '$' ) === false ) {
-			return $string;
-		}
-
-		return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
-	}
 }
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index fde54a9ce7..d85d09e9aa 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -275,7 +275,7 @@ public function process_token( $stackPtr ) {
 				|| \T_HEREDOC === $this->tokens[ $i ]['code']
 			) {
 				// Only interested in actual query text, so strip out variables.
-				$stripped_content = TextStringHelper::strip_interpolated_variables( $content );
+				$stripped_content = TextStrings::stripEmbeds( $content );
 				if ( $stripped_content !== $content ) {
 					$interpolated_vars = TextStringHelper::get_interpolated_variables( $content );
 					$vars_without_wpdb = array_diff( $interpolated_vars, array( 'wpdb' ) );
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 0d76b5c74b..28234dc4f4 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -12,7 +12,6 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
-use WordPressCS\WordPress\Helpers\TextStringHelper;
 
 /**
  * Validates post type names.
@@ -163,7 +162,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				'PartiallyDynamic',
 				$data
 			);
-			$post_type = TextStringHelper::strip_interpolated_variables( $post_type );
+			$post_type = TextStrings::stripEmbeds( $post_type );
 		}
 
 		if ( preg_match( self::VALID_POST_TYPE_CHARACTERS, $post_type ) === 0 ) {
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc
index fa9d4dcfa8..d110c3cfbc 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc
@@ -50,3 +50,7 @@ register_post_type( "my-own-post-type-too-long-{$i}" ); // 1x Error, Too long. 1
 register_post_type( 'my/own/post/type/too/long', array() ); // Bad. Invalid chars: "/" and too long.
 
 register_post_type( 'wp_block', array() ); // Bad. Must only error on reserved keyword, not invalid prefix.
+
+// Test handling of more complex embedded variables and expressions.
+register_post_type("testing123-${(foo)}-test");
+register_post_type("testing123-${foo["${bar['baz']}"]}-test");
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index 12bdf3b9a9..e24c12ea59 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -71,6 +71,8 @@ public function getWarningList() {
 			40 => 1,
 			45 => 1,
 			49 => 1,
+			55 => 1,
+			56 => 1,
 		);
 	}
 }

From 73c09b61848120bf60935987a9eaf0eecf25392f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Apr 2022 15:11:20 +0200
Subject: [PATCH 196/822] Sniff::is_foreach_as(): switch over to the PHPCSUtils
 version

PHPCSUtils 1.0.0-alpha4 has a new `Context` class containing a more versatile method for the same, so we can now switch out the WPCS native method for the PHPCSUtils one.
---
 WordPress/Sniff.php                           | 35 -------------------
 .../PrefixAllGlobalsSniff.php                 |  3 +-
 .../WP/GlobalVariablesOverrideSniff.php       |  5 +--
 3 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 6f4d272c37..4ddd616336 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -2005,41 +2005,6 @@ public function is_use_of_global_constant( $stackPtr ) {
 		return true;
 	}
 
-	/**
-	 * Determine if a variable is in the `as $key => $value` part of a foreach condition.
-	 *
-	 * @since 1.0.0
-	 * @since 1.1.0 Moved from the PrefixAllGlobals sniff to the Sniff base class.
-	 *
-	 * @param int $stackPtr Pointer to the variable.
-	 *
-	 * @return bool True if it is. False otherwise.
-	 */
-	protected function is_foreach_as( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			return false;
-		}
-
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-		$close_parenthesis  = end( $nested_parenthesis );
-		$open_parenthesis   = key( $nested_parenthesis );
-		if ( ! isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ) ) {
-			return false;
-		}
-
-		if ( \T_FOREACH !== $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code'] ) {
-			return false;
-		}
-
-		$as_ptr = $this->phpcsFile->findNext( \T_AS, ( $open_parenthesis + 1 ), $close_parenthesis );
-		if ( false === $as_ptr ) {
-			// Should never happen.
-			return false;
-		}
-
-		return ( $stackPtr > $as_ptr );
-	}
-
 	/**
 	 * Get a list of the token pointers to the variables being assigned to in a list statement.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index fd23a0c47d..45d7749eaa 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Namespaces;
@@ -629,7 +630,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 */
 		if ( false === $in_list
 			&& false === $this->is_assignment( $stackPtr )
-			&& false === $this->is_foreach_as( $stackPtr )
+			&& Context::inForeachCondition( $this->phpcsFile, $stackPtr ) !== 'afterAs'
 		) {
 			return;
 		}
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index fb3f05f7d1..bcec93624d 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
@@ -265,7 +266,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 */
 		if ( false === $in_list
 			&& false === $this->is_assignment( $stackPtr )
-			&& false === $this->is_foreach_as( $stackPtr )
+			&& Context::inForeachCondition( $this->phpcsFile, $stackPtr ) !== 'afterAs'
 		) {
 			return;
 		}
@@ -418,7 +419,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			}
 
 			// Check if this is a variable assignment within a `foreach()` declaration.
-			if ( $this->is_foreach_as( $ptr ) === true ) {
+			if ( Context::inForeachCondition( $this->phpcsFile, $ptr ) === 'afterAs' ) {
 				$this->add_error( $ptr );
 			}
 		}

From aa0c9923aab453c2acee0f986342144b010ad6c9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Jun 2022 06:46:28 +0200
Subject: [PATCH 197/822] WP/I18n: use PHPCSUtils for checking string embeds

Switch out the use of the WPCS native `TextStringHelper::get_interpolated_variables()` method in favour of the significantly more comprehensive PHPCSUtils `TextStrings::getEmbeds()` method.

This improves the handling of embedded variables in double quoted strings (and consequently fixes some bugs).

For some samples of embedded variables/expressions, the sniff would previously correctly report on the embed, but would contain an incomplete representation of the embed in the error message:
```
 223 | ERROR   | [ ] The $text arg must not contain interpolated variables. Found "$foo".
 224 | ERROR   | [ ] The $text arg must not contain interpolated variables. Found "$foo".
 225 | ERROR   | [ ] The $text arg must not contain interpolated variables. Found "$foo".
```

For other embedded variables/expressions, the sniff would previously not throw an error (false negative).
```php
// No error, while an error should be thrown.
__( "{$foo['bar']->baz()()}", 'my-slug' );
__( "${foo->bar}", 'my-slug' );
__( "${foo["${bar['baz']}"]}", 'my-slug' );
```

With the implemented fix, all embeds will now result in the expected error and the error messages will contain a correct representation of the embed:
```
 222 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "${foo}".
 223 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "{$foo['bar']}".
 224 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "{$foo->bar()}".
 225 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "{$foo['bar']->baz()()}".
 226 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "${foo->bar}".
 227 | ERROR   | [ ] The $text arg must not contain interpolated variables or expressions. Found "${foo["${bar['baz']}"]}".
```

Includes minor improvement to the error message.
To prevent an unnecessary BC-break, I'm electing not to change the error code.
---
 WordPress/Sniffs/WP/I18nSniff.php           | 5 ++---
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 8 ++++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 8 ++++++++
 WordPress/Tests/WP/I18nUnitTest.php         | 6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 1afa213427..b072883dbc 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -15,7 +15,6 @@
 use PHPCSUtils\Utils\TextStrings;
 use XMLReader;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
-use WordPressCS\WordPress\Helpers\TextStringHelper;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -479,12 +478,12 @@ protected function check_argument_tokens( $context ) {
 		}
 
 		if ( \T_DOUBLE_QUOTED_STRING === $tokens[0]['code'] || \T_HEREDOC === $tokens[0]['code'] ) {
-			$interpolated_variables = TextStringHelper::get_interpolated_variables( $content );
+			$interpolated_variables = TextStrings::getEmbeds( $content );
 			foreach ( $interpolated_variables as $interpolated_variable ) {
 				$code = MessageHelper::stringToErrorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
 				MessageHelper::addMessage(
 					$this->phpcsFile,
-					'The $%s arg must not contain interpolated variables. Found "$%s".',
+					'The $%s arg must not contain interpolated variables or expressions. Found "%s".',
 					$stack_ptr,
 					$is_error,
 					$code,
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 9dee14b160..3ec15f1ee3 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -217,3 +217,11 @@ __( '<foo>Foo</bar>', 'my-slug' );
 
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
+
+// Test handling of more complex embedded variables and expressions.
+__( "${foo}", 'my-slug' );
+__( "{$foo['bar']}", 'my-slug' );
+__( "{$foo->bar()}", 'my-slug' );
+__( "{$foo['bar']->baz()()}", 'my-slug' );
+__( "${foo->bar}", 'my-slug' );
+__( "${foo["${bar['baz']}"]}", 'my-slug' );
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index f143370ec0..5a2cd96880 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -217,3 +217,11 @@ __( '<foo>Foo</bar>', 'my-slug' );
 
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
+
+// Test handling of more complex embedded variables and expressions.
+__( "${foo}", 'my-slug' );
+__( "{$foo['bar']}", 'my-slug' );
+__( "{$foo->bar()}", 'my-slug' );
+__( "{$foo['bar']->baz()()}", 'my-slug' );
+__( "${foo->bar}", 'my-slug' );
+__( "${foo["${bar['baz']}"]}", 'my-slug' );
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 0d81d06e30..a30ef55718 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -119,6 +119,12 @@ public function getErrorList( $testFile = '' ) {
 					178 => 1,
 					181 => 3,
 					184 => 1,
+					222 => 1,
+					223 => 1,
+					224 => 1,
+					225 => 1,
+					226 => 1,
+					227 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 22ef882f217d1814a96de24e592bec559c9f0a24 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Jun 2022 05:57:59 +0200
Subject: [PATCH 198/822] DB/PreparedSQL: use PHPCSUtils for checking string
 embeds

Switch out the use of the WPCS native `TextStringHelper::get_interpolated_variables()` method in favour of the significantly more comprehensive PHPCSUtils `TextStrings::getEmbeds()` method.

This improves the handling of embedded variables in double quoted strings (and consequently fixes some bugs).

For some samples of embedded variables/expressions, the sniff would previously correctly report on the embed, but would contain an incomplete/incorrect representation of the embed in the error message:
```php
$wpdb->query( "SELECT * FROM {$wpdb->bar()} WHERE post_title LIKE '{$title->bar()}';" );
//  106 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable $title at "SELECT * FROM {$wpdb->bar()} WHERE post_title LIKE '{$title->bar()}';"

$wpdb->query( "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$sub}}';" );
// 108 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable $sub at "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$sub}}';"
```

In other cases, the `$wpdb` variable was not correctly recognized as such (false positive):
```php
$wpdb->query( "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$sub}}';" );
//  108 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable $baz at "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$baz}}';"
```

For other embedded variables/expressions, the sniff would previously not throw an error (false negative).
```php
// No error, while an error should be thrown.
$wpdb->query( "SELECT * FROM ${wpdb->bar} WHERE post_title LIKE '${title->sub}';" ); // Bad x 1.
$wpdb->query( "SELECT * FROM ${wpdb->{${'a'}}} WHERE post_title LIKE '${title->{${'sub'}}}';" ); // Bad x 1.
```

With the implemented fix, all embeds will now result in the expected errors and the error messages will contain a correct representation of the embed:
```
 106 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable {$title->bar()} at "SELECT * FROM {$wpdb->bar()} WHERE post_title LIKE '{$title->bar()}';"
 107 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable ${title->bar} at "SELECT * FROM ${wpdb->bar} WHERE post_title LIKE '${title->bar}';"
 108 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable ${title->{$baz}} at "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$baz}}';"
 109 | ERROR | Use placeholders and $wpdb->prepare(); found interpolated variable ${title->{${'a'}}} at "SELECT * FROM ${wpdb->{${'a'}}} WHERE post_title LIKE '${title->{${'a'}}}';"
```

Note: the matching of `$wpdb` has been improved, but does not check whether a known table name is accessed or anything. This is no different than before, but may warrant further improvement in the future.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 10 +++---
 WordPress/Tests/DB/PreparedSQLUnitTest.inc |  6 ++++
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 38 ++++++++++++----------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index c15826c14c..4373ee8a5d 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -10,7 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\DB;
 
 use PHP_CodeSniffer\Util\Tokens;
-use WordPressCS\WordPress\Helpers\TextStringHelper;
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -139,15 +139,17 @@ public function process_token( $stackPtr ) {
 			) {
 
 				$bad_variables = array_filter(
-					TextStringHelper::get_interpolated_variables( $this->tokens[ $this->i ]['content'] ),
+					TextStrings::getEmbeds( $this->tokens[ $this->i ]['content'] ),
 					function ( $symbol ) {
-						return ( 'wpdb' !== $symbol );
+						return ( strpos( $symbol, '$wpdb' ) !== 0
+							&& strpos( $symbol, '{$wpdb') !== 0
+							&& strpos( $symbol, '${wpdb') !== 0 );
 					}
 				);
 
 				foreach ( $bad_variables as $bad_variable ) {
 					$this->phpcsFile->addError(
-						'Use placeholders and $wpdb->prepare(); found interpolated variable $%s at %s',
+						'Use placeholders and $wpdb->prepare(); found interpolated variable %s at %s',
 						$this->i,
 						'InterpolatedNotPrepared',
 						array(
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 3fa34f89e7..699630bd1c 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -102,5 +102,11 @@ $wpdb->query(
 	. ";"
 );
 
+// Test handling of more complex embedded variables and expressions.
+$wpdb->query( "SELECT * FROM {$wpdb->bar()} WHERE post_title LIKE '{$title->sub()}';" ); // Bad x 1.
+$wpdb->query( "SELECT * FROM ${wpdb->bar} WHERE post_title LIKE '${title->sub}';" ); // Bad x 1.
+$wpdb->query( "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$sub}}';" ); // Bad x 1.
+$wpdb->query( "SELECT * FROM ${wpdb->{${'a'}}} WHERE post_title LIKE '${title->{${'sub'}}}';" ); // Bad x 1.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 78e484a076..36c481abe2 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -31,23 +31,27 @@ class PreparedSQLUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		return array(
-			3  => 1,
-			4  => 1,
-			5  => 1,
-			7  => 1,
-			8  => 1,
-			11 => 1, // Old-style WPCS ignore comments are no longer supported.
-			12 => 1, // Old-style WPCS ignore comments are no longer supported.
-			16 => 1,
-			17 => 1,
-			18 => 1,
-			20 => 1,
-			21 => 1,
-			54 => 1,
-			64 => 1,
-			71 => 1,
-			85 => 1,
-			90 => 1,
+			3   => 1,
+			4   => 1,
+			5   => 1,
+			7   => 1,
+			8   => 1,
+			11  => 1, // Old-style WPCS ignore comments are no longer supported.
+			12  => 1, // Old-style WPCS ignore comments are no longer supported.
+			16  => 1,
+			17  => 1,
+			18  => 1,
+			20  => 1,
+			21  => 1,
+			54  => 1,
+			64  => 1,
+			71  => 1,
+			85  => 1,
+			90  => 1,
+			106 => 1,
+			107 => 1,
+			108 => 1,
+			109 => 1,
 		);
 	}
 

From 69dd8c1d9320f9c791e2b669abc52a9a46a80c9a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 27 Jun 2022 08:50:29 +0200
Subject: [PATCH 199/822] DB/PreparedSQL: improve matching of `$wpdb`

While probably still not perfect, this improves how the `$wpdb` variable is matched in embeds.

* The regex will match all possible "start of" embeds - `$wpdb`, `{$wpdb` and `${wpdb`.
* The regex requires that the `$wpdb` variable is followed by an object operator - either `->` or the PHP 8.1 `?->` - to access a table name.
    Note: I'm not sure we should actually allow `?->` as in that case, if `$wpdb` would be `null`, the result would be `null`, which would convert to an empty string in a double quoted string.
    Then again, that would just make for an invalid query and that is not the concern of this sniff (which is why I included it anyway).
* `$wpdb` on its own will no longer match as it would be invalid anyway (the `WPDB` class does not have a `__toString()` method).

Includes one extra unit test, though the principle of it is already covered by most existing tests.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 4 +---
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 5 ++++-
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 4373ee8a5d..93a3ce23de 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -141,9 +141,7 @@ public function process_token( $stackPtr ) {
 				$bad_variables = array_filter(
 					TextStrings::getEmbeds( $this->tokens[ $this->i ]['content'] ),
 					function ( $symbol ) {
-						return ( strpos( $symbol, '$wpdb' ) !== 0
-							&& strpos( $symbol, '{$wpdb') !== 0
-							&& strpos( $symbol, '${wpdb') !== 0 );
+						return preg_match( '`^\{?\$\{?wpdb\??->`', $symbol ) !== 1;
 					}
 				);
 
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 699630bd1c..ef58abc469 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -82,7 +82,7 @@ ND
 	implode( ',', array_fill( 0, count( $post_ids ), '%d' ) )
 ), $post_ids ) ); // OK.
 
-wpdb::prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
+wpdb::prepare( "SELECT * FROM $wpdb?->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
 
 $wpdb->query( // Some arbitrary comment.
 	"SELECT *
@@ -108,5 +108,8 @@ $wpdb->query( "SELECT * FROM ${wpdb->bar} WHERE post_title LIKE '${title->sub}';
 $wpdb->query( "SELECT * FROM ${wpdb->{$baz}} WHERE post_title LIKE '${title->{$sub}}';" ); // Bad x 1.
 $wpdb->query( "SELECT * FROM ${wpdb->{${'a'}}} WHERE post_title LIKE '${title->{${'sub'}}}';" ); // Bad x 1.
 
+// More defensive variable checking
+$wpdb->query( "SELECT * FROM $wpdb" ); // Bad x 1, $wpdb on its own is not valid.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 36c481abe2..0e679f0efc 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -52,6 +52,7 @@ public function getErrorList() {
 			107 => 1,
 			108 => 1,
 			109 => 1,
+			112 => 1,
 		);
 	}
 

From 90d8accc3affd8b8823d5778e634a97f981876c1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:35:45 +0200
Subject: [PATCH 200/822] DB/PreparedSQLPlaceholders: use PHPCSUtils for
 checking string embeds and improve `$wpdb` matching

This change is along the same lines as the change made for the `PreparedSQL` sniff, but as the `PreparedSQLPlaceholders` sniff only uses the embeds to prevent duplicate messages, extra unit tests which would actually fail would be pretty complex to create.

All the same, this should be considered safeguarded by the existing unit tests.
---
 .../Sniffs/DB/PreparedSQLPlaceholdersSniff.php     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index d85d09e9aa..b88750e79f 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -12,7 +12,6 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
-use WordPressCS\WordPress\Helpers\TextStringHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -277,15 +276,20 @@ public function process_token( $stackPtr ) {
 				// Only interested in actual query text, so strip out variables.
 				$stripped_content = TextStrings::stripEmbeds( $content );
 				if ( $stripped_content !== $content ) {
-					$interpolated_vars = TextStringHelper::get_interpolated_variables( $content );
-					$vars_without_wpdb = array_diff( $interpolated_vars, array( 'wpdb' ) );
-					$content           = $stripped_content;
+					$vars_without_wpdb = array_filter(
+						TextStrings::getEmbeds( $content ),
+						function ( $symbol ) {
+							return preg_match( '`^\{?\$\{?wpdb\??->`', $symbol ) !== 1;
+						}
+					);
+
+					$content = $stripped_content;
 
 					if ( ! empty( $vars_without_wpdb ) ) {
 						$variable_found = true;
 					}
 				}
-				unset( $stripped_content, $interpolated_vars, $vars_without_wpdb );
+				unset( $stripped_content, $vars_without_wpdb );
 			}
 
 			$placeholders = preg_match_all( '`' . self::PREPARE_PLACEHOLDER_REGEX . '`x', $content, $matches );

From cfe13aa4a546c7467ea3f835e62cf71597b51952 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:40:04 +0200
Subject: [PATCH 201/822] Security/ValidatedSanitizedInput: use PHPCSUtils for
 checking string embeds

Switch out the use of the WPCS native `TextStringHelper::get_interpolated_variables()` method in favour of the significantly more comprehensive PHPCSUtils `TextStrings::getEmbeds()` method.

This improves the handling of embedded variables in double quoted strings (and consequently fixes some bugs).

For various embedded variables/expressions, the sniff would previously not throw an error (false negative), for example:
```php
// No error, while an error should be thrown.
echo "{$_GET['bar']}";
echo "${_REQUEST['bar']}";
echo "${_GET["${bar}"]}";
echo "${_FILES["${bar['baz']}"]}";
```

With the implemented fix, all embedded superglobals the sniff looks for, will now result in the expected error:

Note: the "bad" comment for the heredoc is _above_ the test instead of as a trailing comment as a trailing comment would be a parse error in PHP < 7.3.
---
 .../Sniffs/Security/ValidatedSanitizedInputSniff.php   | 10 ++++++----
 .../Tests/Security/ValidatedSanitizedInputUnitTest.inc |  9 +++++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index d3810ff68e..2f17cc2c1f 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -10,7 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\Security;
 
 use PHP_CodeSniffer\Util\Tokens;
-use WordPressCS\WordPress\Helpers\TextStringHelper;
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -98,12 +98,14 @@ public function process_token( $stackPtr ) {
 		if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $stackPtr ]['code']
 			|| \T_HEREDOC === $this->tokens[ $stackPtr ]['code']
 		) {
+			// Retrieve all embeds, but use only the initial variable name part.
 			$interpolated_variables = array_map(
-				function ( $symbol ) {
-					return '$' . $symbol;
+				function( $embed ) {
+					return '$' . preg_replace( '`^(\{?\$\{?\(?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(.*)$`', '$2', $embed );
 				},
-				TextStringHelper::get_interpolated_variables( $this->tokens[ $stackPtr ]['content'] )
+				TextStrings::getEmbeds( $this->tokens[ $stackPtr ]['content'] )
 			);
+
 			foreach ( array_intersect( $interpolated_variables, $superglobals ) as $bad_variable ) {
 				$this->phpcsFile->addError( 'Detected usage of a non-sanitized, non-validated input variable %s: %s', $stackPtr, 'InputNotValidatedNotSanitized', array( $bad_variable, $this->tokens[ $stackPtr ]['content'] ) );
 			}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
index f5d5dd6e07..2ee10c881c 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
@@ -336,3 +336,12 @@ echo wp_sanitize_redirect( wp_unslash( $_GET['test'] ) ); // OK.
 
 $result = match ( $_POST['foo'] ) {}; // Ok.
 $result = match ( do_something( wp_unslash( $_POST['foo'] ) ) ) {}; // Bad.
+
+// Test handling of more complex embedded variables and expressions.
+function test_handling_embeds() {
+	echo "My ${_POST} and {$_GET['bar']} and ${_REQUEST['bar']}"; // Bad x 3.
+	// Below heredoc: bad x 3.
+	echo <<<"EOD"
+Do ${(_POST)} and ${_GET["${bar}"]} and ${_FILES["${bar['baz']}"]}
+EOD;
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index ac41f98ad2..2f51624db5 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -81,6 +81,8 @@ public function getErrorList() {
 			317 => 1,
 			323 => 1,
 			338 => 1,
+			342 => 3,
+			345 => 3,
 		);
 	}
 

From d3c0d98c109bb36d3e28784d153294d473c0754b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Jun 2022 00:00:06 +0200
Subject: [PATCH 202/822] TextStringHelper: remove the class

After the implementation of the PHPCSUtils `TextString::getEmbeds()` function in all relevant sniffs, the `TextStringHelper::get_interpolated_variables()` method is no longer used in WPCS, so this Helper class has become redundant.
---
 WordPress/Helpers/TextStringHelper.php | 53 --------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 WordPress/Helpers/TextStringHelper.php

diff --git a/WordPress/Helpers/TextStringHelper.php b/WordPress/Helpers/TextStringHelper.php
deleted file mode 100644
index 4c701d8ffb..0000000000
--- a/WordPress/Helpers/TextStringHelper.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Helpers;
-
-/**
- * Helper utilities for handling text strings.
- *
- * ---------------------------------------------------------------------------------------------
- * This class is only intended for internal use by WordPressCS and is not part of the public API.
- * This also means that it has no promise of backward compatibility. Use at your own risk.
- * ---------------------------------------------------------------------------------------------
- *
- * {@internal The functionality in this class will likely be replaced at some point in
- * the future by functions from PHPCSUtils.}
- *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
- */
-final class TextStringHelper {
-
-	/**
-	 * Get the interpolated variable names from a string.
-	 *
-	 * Check if '$' is followed by a valid variable name, and that it is not preceded by an escape sequence.
-	 *
-	 * @since 0.9.0
-	 * @since 3.0.0 - Moved from the Sniff class to this class.
-	 *              - Visibility is now `public` (was `protected`) and the method `static`.
-	 *
-	 * @param string $string The contents of a T_DOUBLE_QUOTED_STRING or T_HEREDOC token.
-	 *
-	 * @return array Variable names (without '$' sigil).
-	 */
-	public static function get_interpolated_variables( $string ) {
-		$variables = array();
-		if ( preg_match_all( '/(?P<backslashes>\\\\*)\$(?P<symbol>\w+)/', $string, $match_sets, \PREG_SET_ORDER ) ) {
-			foreach ( $match_sets as $matches ) {
-				if ( ! isset( $matches['backslashes'] ) || ( \strlen( $matches['backslashes'] ) % 2 ) === 0 ) {
-					$variables[] = $matches['symbol'];
-				}
-			}
-		}
-		return $variables;
-	}
-}

From 03b9b65585c3709781bbd52ebb2f228f567dcb85 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 12 Aug 2022 18:40:23 +0200
Subject: [PATCH 203/822] :sparkles: New
 `WordPress.WhiteSpace.ObjectOperatorSpacing` sniff

This sniff largely defers to the upstream `Squiz.WhiteSpace.ObjectOperatorSpacing` sniff, which was previously already included.

The only real difference between the two sniffs is that for class resolution using `ClassName::class`, new lines around the `::` object operator will not be ignored.

The WPCS sniff has the same default property settings as the upstream sniff and changes to the property values should be made in the ruleset.

Includes docs.
Includes unit tests covering the difference and safeguarding that the sniff doesn't overreach.
---
 WordPress-Core/ruleset.xml                    |  2 +-
 .../ObjectOperatorSpacingStandard.xml         | 19 ++++++
 .../WhiteSpace/ObjectOperatorSpacingSniff.php | 65 +++++++++++++++++++
 .../ObjectOperatorSpacingUnitTest.inc         | 55 ++++++++++++++++
 .../ObjectOperatorSpacingUnitTest.inc.fixed   | 45 +++++++++++++
 .../ObjectOperatorSpacingUnitTest.php         | 59 +++++++++++++++++
 6 files changed, 244 insertions(+), 1 deletion(-)
 create mode 100644 WordPress/Docs/WhiteSpace/ObjectOperatorSpacingStandard.xml
 create mode 100644 WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
 create mode 100644 WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
 create mode 100644 WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed
 create mode 100644 WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index eee861589b..b467c8e930 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -526,7 +526,7 @@
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>
 
 	<!-- Object operators should not have whitespace around them unless they are multi-line. -->
-	<rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">
+	<rule ref="WordPress.WhiteSpace.ObjectOperatorSpacing">
 		<properties>
 			<property name="ignoreNewlines" value="true"/>
 		</properties>
diff --git a/WordPress/Docs/WhiteSpace/ObjectOperatorSpacingStandard.xml b/WordPress/Docs/WhiteSpace/ObjectOperatorSpacingStandard.xml
new file mode 100644
index 0000000000..47ffb1e8e6
--- /dev/null
+++ b/WordPress/Docs/WhiteSpace/ObjectOperatorSpacingStandard.xml
@@ -0,0 +1,19 @@
+<documentation title="Object Operator Spacing">
+    <standard>
+    <![CDATA[
+    The object operators (->, ?->, ::) should not have any spaces around them, though new lines are allowed except for use with the `::class` constant.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No spaces around the object operator.">
+        <![CDATA[
+$foo<em></em>-><em></em>bar();
+        ]]>
+        </code>
+        <code title="Invalid: Whitespace surrounding the object operator.">
+        <![CDATA[
+$foo<em>  </em>?-><em>  </em>bar();
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
new file mode 100644
index 0000000000..2970fe927d
--- /dev/null
+++ b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff as Squiz_ObjectOperatorSpacingSniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Ensure there is no whitespace before/after an object operator.
+ *
+ * Difference with the upstream sniff:
+ * - When the `::` operator is used in `::class`, no new line(s) before or after the object operator are allowed.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since 3.0.0
+ * @link  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+ */
+class ObjectOperatorSpacingSniff extends Squiz_ObjectOperatorSpacingSniff {
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void|int Optionally returns a stack pointer. The sniff will not be
+	 *                  called again on the current file until the returned stack
+	 *                  pointer is reached.
+	 */
+	public function process( File $phpcsFile, $stackPtr ) {
+		$tokens            = $phpcsFile->getTokens();
+		$property_adjusted = false;
+
+		// Check for `::class` and don't ignore new lines in that case.
+		if ( true === $this->ignoreNewlines
+			&& \T_DOUBLE_COLON === $tokens[ $stackPtr ]['code']
+		) {
+			$next_non_empty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+			if ( \T_STRING === $tokens[ $next_non_empty ]['code']
+				&& 'class' === strtolower( $tokens[ $next_non_empty ]['content'] )
+			) {
+				$property_adjusted    = true;
+				$this->ignoreNewlines = false;
+			}
+		}
+
+		$return = parent::process( $phpcsFile, $stackPtr );
+
+		if ( true === $property_adjusted ) {
+			$this->ignoreNewlines = true;
+		}
+
+		return $return;
+	}
+}
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
new file mode 100644
index 0000000000..ec042a295f
--- /dev/null
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This test file only safeguards the bit where the sniff may behave differently from the upstream sniff.
+ */
+
+echo ObjectName::$prop;
+echo ObjectName::functionCall();
+echo ObjectName::class;
+
+echo ObjectName  ::   $prop; // Error x 2.
+echo ObjectName ::  functionCall(); // Error x 2.
+echo ObjectName   :: class; // Error x 2.
+
+echo ObjectName
+	::
+	$prop; // Error x 2.
+echo ObjectName
+	::
+	functionCall(); // Error x 2.
+echo ObjectName
+	::
+	class; // Error x 2.
+
+echo ObjectName // Comment
+	::
+	/* comment */
+	class; // Error x 2.
+
+// phpcs:set WordPress.WhiteSpace.ObjectOperatorSpacing ignoreNewlines true
+
+echo ObjectName::$prop;
+echo ObjectName::functionCall();
+echo ObjectName::class;
+
+echo ObjectName  ::   $prop; // Error x 2.
+echo ObjectName ::  functionCall(); // Error x 2.
+echo ObjectName   :: class; // Error x 2.
+
+echo ObjectName
+	::
+	$prop;
+echo ObjectName
+	::
+	functionCall();
+echo ObjectName
+	::
+	class; // Error x 2.
+
+echo ObjectName // Comment
+	::
+	/* comment */
+	class; // Error x 2.
+
+// phpcs:set WordPress.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed
new file mode 100644
index 0000000000..5062a29cd3
--- /dev/null
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This test file only safeguards the bit where the sniff may behave differently from the upstream sniff.
+ */
+
+echo ObjectName::$prop;
+echo ObjectName::functionCall();
+echo ObjectName::class;
+
+echo ObjectName::$prop; // Error x 2.
+echo ObjectName::functionCall(); // Error x 2.
+echo ObjectName::class; // Error x 2.
+
+echo ObjectName::$prop; // Error x 2.
+echo ObjectName::functionCall(); // Error x 2.
+echo ObjectName::class; // Error x 2.
+
+echo ObjectName // Comment
+::/* comment */
+	class; // Error x 2.
+
+// phpcs:set WordPress.WhiteSpace.ObjectOperatorSpacing ignoreNewlines true
+
+echo ObjectName::$prop;
+echo ObjectName::functionCall();
+echo ObjectName::class;
+
+echo ObjectName::$prop; // Error x 2.
+echo ObjectName::functionCall(); // Error x 2.
+echo ObjectName::class; // Error x 2.
+
+echo ObjectName
+	::
+	$prop;
+echo ObjectName
+	::
+	functionCall();
+echo ObjectName::class; // Error x 2.
+
+echo ObjectName // Comment
+::/* comment */
+	class; // Error x 2.
+
+// phpcs:set WordPress.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
new file mode 100644
index 0000000000..4ee31b2649
--- /dev/null
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Tests\WhiteSpace;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Unit test class for the ObjectOperatorSpacing sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since 3.0.0
+ */
+class ObjectOperatorSpacingUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList() {
+		return array(
+			11 => 2,
+			12 => 2,
+			13 => 2,
+			16 => 2,
+			19 => 2,
+			22 => 2,
+			26 => 2,
+			36 => 2,
+			37 => 2,
+			38 => 2,
+			47 => 2,
+			51 => 2,
+		);
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList() {
+		return array();
+	}
+}

From 61bcaa53abe84400a4a35884475bfb47ea6d2314 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:02:55 +0200
Subject: [PATCH 204/822] WPCS-Extra: enable the
 `Generic.CodeAnalysis.UnusedFunctionParameter` sniff

The reason why the sniff was disabled up to now was that WP uses callbacks a lot and the hooked in functions may not use all parameters passed to them.

This concern was previously raised in https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/pull/382#discussion_r29981655, also see https://github.com/WordPress/WordPress-Coding-Standards/pull/382/commits/522b35f3ebac915d6eebb92624fc703c193aee60

To this end, I've send in a [PR upstream](https://github.com/squizlabs/PHP_CodeSniffer/pull/1318) to address these concerns, which has subsequently been merged.
The adjusted version of the sniff was released in PHPCS 3.4.0, which means the sniff can now be added.

Note: the sniff has since then also been adjusted to handle arrow functions correctly, as well as constructor property promotion.

Fixes 1510
---
 WordPress-Extra/ruleset.xml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 3c33ad3111..f2616291b7 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -48,13 +48,23 @@
 	</rule>
 
 	<!-- Check correct spacing of language constructs. This also ensures that the
-	     above rule for not using brackets with require is fixed correctly.
+		 above rule for not using brackets with require is fixed correctly.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1153 -->
 	<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
 
-	<!-- Hook callbacks may not use all params -->
-	<!-- https://github.com/WordPress/WordPress-Coding-Standards/pull/382#discussion_r29981655 -->
-	<!--<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>-->
+	<!-- Check that functions use all parameters passed.
+		 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/pull/xxx -->
+	<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter">
+		<!-- Allow for callback functions which may not need all parameters passed. -->
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed"/>
+		<!-- Allow for functions in extended classes/implemented interfaces. -->
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClass"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClassBeforeLastUsed"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClassAfterLastUsed"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterface"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceAfterLastUsed"/>
+	</rule>
 
 	<!-- Verify modifier keywords for declared methods and properties in classes.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->

From e13cb6cd0099dc6bc5cc49dc5f67a7b9c1d27a9b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:39:44 +0200
Subject: [PATCH 205/822] Core: move rules related to include/require
 statements from `Extra` to `Core`

> 1. No parentheses shall be used for `include[_once]` and `require[_once]` statements.
>    As `include[_once]` and `require[_once]` are language constructs, they do not need parentheses around the path.
> 2. There should be exactly one space between the `include[_once]` and `require[_once]` keyword and the start of the path.
> 3. It is strongly recommended to use `require[_once]` for unconditional includes.
>    When using `include[_once]` PHP will throw a warning when the file is not found, but will continue execution which will almost certainly lead to other errors/warnings/notices being thrown if your application depends on the file being available, potentially leading to security leaks. For that reason, `require[_once]` is generally the better choice as it will throw a Fatal Error if the file cannot be found.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Include/Require section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#writing-include-require-statements
* WordPress/wpcs-docs 111
* WordPress/WordPress-Coding-Standards 1007
* WordPress/WordPress-Coding-Standards 1143
* WordPress/WordPress-Coding-Standards 1145
* WordPress/WordPress-Coding-Standards 1153
* WordPress/WordPress-Coding-Standards 1163

Closes 1862
---
 WordPress-Core/ruleset.xml  | 25 +++++++++++++++++++++++++
 WordPress-Extra/ruleset.xml | 17 -----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index b467c8e930..50aa707511 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -64,6 +64,31 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/527 -->
 
 
+	<!--
+	#############################################################################
+	Handbook: General - Writing include/require statements.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#single-and-double-quotes
+	#############################################################################
+	-->
+
+	<!-- Covers rule: include[_once] and require[_once] are language constructs, they do
+		 not need parentheses around the path, so those shouldn't be used. -->
+	<rule ref="PEAR.Files.IncludingFile.BracketsNotRequired"/>
+
+	<!-- Covers rule: There should only be one space between the path and the include/require keywords.
+		 Note: the sniff covers more language constructs than just include/require. While not in the handbook,
+		 WP Core already complies with this, so we may as well enforce it.  -->
+	<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
+
+	<!-- Covers rule: It is strongly recommended to use require[_once] for unconditional includes. -->
+	<rule ref="PEAR.Files.IncludingFile.UseRequire">
+		<type>warning</type>
+	</rule>
+	<rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
+		<type>warning</type>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	Handbook: Naming - Naming Conventions.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index f2616291b7..7be8e009ce 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -35,23 +35,6 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/pull/809 -->
 	<rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops"/>
 
-	<!-- And yet more best practices.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1143 -->
-	<rule ref="PEAR.Files.IncludingFile.BracketsNotRequired">
-		<type>warning</type>
-	</rule>
-	<rule ref="PEAR.Files.IncludingFile.UseRequire">
-		<type>warning</type>
-	</rule>
-	<rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
-		<type>warning</type>
-	</rule>
-
-	<!-- Check correct spacing of language constructs. This also ensures that the
-		 above rule for not using brackets with require is fixed correctly.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1153 -->
-	<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
-
 	<!-- Check that functions use all parameters passed.
 		 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/pull/xxx -->
 	<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter">

From bf049fd9dbbec52b27c2bceb938b592a03de906d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Jul 2022 14:46:07 +0200
Subject: [PATCH 206/822] Core: add sniffs to check there is no blank line
 before a function close brace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> 1. There should be no blank line between the content of a function and the function’s closing brace.

Includes removing this rule from the WPCS native ruleset in which we already enforced it (as it will now be inherited from the `WordPress` ruleset).

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Function closing brace section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#remove-trailing-spaces
* https://github.com/WordPress/wpcs-docs/pull/110

Loosely related to #1101
---
 .phpcs.xml.dist            | 2 --
 WordPress-Core/ruleset.xml | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 6a4fba088f..08c86032b1 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -30,8 +30,6 @@
 		</properties>
 	</rule>
 
-	<rule ref="PSR2.Methods.FunctionClosingBrace"/>
-
 	<!-- Check code for cross-version PHP compatibility. -->
 	<config name="testVersion" value="5.4-"/>
 	<rule ref="PHPCompatibility">
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 50aa707511..c567d7b975 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -294,6 +294,10 @@
 	<!-- Covers rule: Omitting the closing PHP tag at the end of a file is preferred. -->
 	<rule ref="PSR2.Files.ClosingTag"/>
 
+	<!-- Covers rule: There should be no trailing blank lines at the end of a function body. -->
+	<rule ref="PSR2.Methods.FunctionClosingBrace"/>
+
+
 	<!--
 	#############################################################################
 	Handbook: Formatting - Brace Style.

From b1ea9497f3e8d346545b08f18a1d372b38f74a89 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 24 Jul 2022 01:01:49 +0200
Subject: [PATCH 207/822] Core: remove custom message for
 `OneObjectStructurePerFile` sniff

As this rule is now in the handbook and has been explicitly listed in the Make post from March 2020, the error message should not look like a recommendation, but like the error which it is.

The standard message from the upstream sniff reads: "Only one object structure is allowed in a file".

Note: the upstream sniff we're using has been updated already to include PHP 8.1 `enum`s.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - One class-like definition per file section
* WordPress/WordPress-Coding-Standards 1802
* WordPress/wpcs-docs 52
---
 WordPress-Core/ruleset.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 50aa707511..97be10a9e7 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -339,9 +339,7 @@
 	#############################################################################
 	-->
 	<!-- Covers rule: Only One Object Structure (Class/Interface/Trait) per file. -->
-	<rule ref="Generic.Files.OneObjectStructurePerFile">
-		<message>Best practices: Declare only one class/interface/trait in a file.</message>
-	</rule>
+	<rule ref="Generic.Files.OneObjectStructurePerFile"/>
 
 
 	<!--

From 6b3fa55bab2e003dbe591a9ec48a6632e6bbab6e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:01:29 +0200
Subject: [PATCH 208/822] Core: add sniff to check spacing around spread
 operators

> 1. There should be one space, or a new line + appropriate indentation, before the spread operator.
> 2. There should be no space between the spread operator and the variable/function call it applies to.
> 3. When combining the spread operator with the reference operator, there should be no space between them.

Includes excluding a particular error code from the `Squiz.Functions.FunctionDeclarationArgumentSpacing` sniff to prevent duplicate messages about the same thing.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Operators section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#spread-operator
* WordPress/wpcs-docs 105
* WordPress/WordPress-Coding-Standards 1762
* squizlabs/PHP_CodeSniffer 2548

Fixes 1762

Also note: there are currently two PRs open in PHPCS upstream for the `Generic.WhiteSpace.SpreadOperatorSpacingAfter` sniff:
* The first -  squizlabs/PHP_CodeSniffer 3647 - is inconsequential as it only involves a message tweak.
* The second - squizlabs/PHP_CodeSniffer 3694 - is related to PHP 8.1 first class callables and will prevent the sniff from triggering on those.
---
 WordPress-Core/ruleset.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 8ea05288ea..9628b610a0 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -170,6 +170,9 @@
 	<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeClose">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterVariadic">
+		<severity>0</severity>
+	</rule>
 
 
 	<!-- Covers rule: Call a function, like so: my_function( $param1, func_param( $param2 ) ); -->
@@ -336,6 +339,23 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1330 -->
 
 
+	<!--
+	#############################################################################
+	Handbook: Formatting - Spread operator.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#spread-operator
+	#############################################################################
+	-->
+	<!-- Covers rule: When using the spread operator, there should be one space or a new line
+		 with the appropriate indentation before the spread operator. -->
+	<!-- Covered by a variety of sniffs which deal with function calls, function declarations, array declarations. -->
+
+	<!-- Covers rule: There should be no spaces between the spread operator and the variable/function call it applies to. -->
+	<rule ref="Generic.WhiteSpace.SpreadOperatorSpacingAfter"/>
+
+	<!-- Covers rule: When combining the spread operator with the reference operator (&), there should be no spaces between them.. -->
+	<!-- Covered by the Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterReference error code. -->
+
+
 	<!--
 	#############################################################################
 	Handbook: Object-Oriented Programming - Only One Object Structure (Class/Interface/Trait) per File.

From 0b911b225fbad63d593aa64b620b6e9fd0ce5d5e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:35:06 +0200
Subject: [PATCH 209/822] Core: move rules related to explicit property/method
 visibility from `Extra` to `Core`

> 1. For all constructs which allow it (properties, methods), visibility should be explicitly declared.
> 2. Using the var keyword for property declarations is not allowed.

The `PSR2.Classes.PropertyDeclaration` sniff contains a multitude of checks, amongst which two error codes which IMO should probably not (yet) go into the `Core` ruleset.
* `Underscore` - which warns against prefixing a property name with an underscore, advising to use visibility instead.
    While I'm 100% in favour of this, introducing this for WP Core would be problematic as renaming (`public`/`protected`) properties would be a BC-break.
* `Multiple` - which throws an error for multi-property declarations.
    I have excluded it as it is not something which is explicitly forbidden in the handbook, nor was it mentioned in the Make post. Having said that, I have scanned WP Core with this check in place and it would not yield any issues, so "silently" introducing it should not be a problem.

As these rules were previously already included in the `Extra` ruleset, those error code which are being silenced for `Core`, will be "unsilenced" again for `Extra`.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Visibility should always be declared section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-should-always-be-declared
* WordPress/wpcs-docs 107
* WordPress/WordPress-Coding-Standards 1101
* WordPress/WordPress-Coding-Standards 1103
---
 WordPress-Core/ruleset.xml  | 21 +++++++++++++++++++++
 WordPress-Extra/ruleset.xml | 14 ++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 8ea05288ea..7bc684e2a0 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -346,6 +346,27 @@
 	<rule ref="Generic.Files.OneObjectStructurePerFile"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Object-Oriented Programming - Visibility should always be declared.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-should-always-be-declared
+	#############################################################################
+	-->
+	<!-- Covers rule: For all constructs that allow it (properties, methods, class constants since PHP 7.1),
+		 visibility should be explicitly declared. -->
+	<rule ref="PSR2.Classes.PropertyDeclaration"/>
+	<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
+		<severity>0</severity>
+	</rule>
+	<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Scope.MethodScope"/>
+
+	<!-- Covers rule: Using the var keyword for property declarations is not allowed. -->
+	<!-- Covered by the PSR2.Classes.PropertyDeclaration sniff. -->
+
+
 	<!--
 	#############################################################################
 	Handbook: Control Structures - Use elseif, not else if.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 7be8e009ce..ea570d09d8 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -51,11 +51,21 @@
 
 	<!-- Verify modifier keywords for declared methods and properties in classes.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
-	<rule ref="Squiz.Scope.MethodScope"/>
-	<rule ref="PSR2.Classes.PropertyDeclaration"/>
 	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
 	<rule ref="PSR2.Methods.MethodDeclaration"/>
 
+	<!-- Do not allow leading underscores in property or method names. Visibility should be used instead.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
+	<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
+		<severity>5</severity>
+	</rule>
+
+	<!-- Do not allow multi-property declarations.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
+	<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
+		<severity>5</severity>
+	</rule>
+
 	<!-- Warn against using fully-qualified class names instead of the self keyword. -->
 	<rule ref="Squiz.Classes.SelfMemberReference.NotUsed">
 		<!-- Restore default severity of 5 which WordPress-Core sets to 0. -->

From 808c905066a0977119d336611cb893b8557eb0f3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:37:37 +0200
Subject: [PATCH 210/822] Core: move rules related to property/method modifier
 order from `Extra` to `Core`

> 1. When using multiple modifiers for a property or method declaration, the order should be as follows:
>     1. First the optional `abstract` or `final` keyword.
>     2. Next a visibility keyword.
>     3. Lastly, the optional `static` [red: or `readonly`] keyword.

For property declarations, this is already covered by the `PSR2.Classes.PropertyDeclaration` sniff.
For method declarations, the `PSR2.Methods.MethodDeclaration` sniff has now been moved from `Extra` to `Core`.

The `PSR2.Methods.MethodDeclaration` sniff contains one additional error code, which IMO should probably not (yet) go into the `Core` ruleset.
* `Underscore` - which warns against prefixing a method name with an underscore, advising to use visibility instead.
    While I'm 100% in favour of this, introducing this for WP Core would be problematic as renaming (`public`/`protected`) methods would be a BC-break.

As this rule was previously already included in the `Extra` ruleset, the error code which is being silenced for `Core`, will be "unsilenced" again for `Extra`.

The `PSR2.Classes.PropertyDeclaration` sniff does not yet account for ordering the visibility vs readonly keywords.
I have opened a PR upstream - squizlabs/PHP_CodeSniffer 3637 - proposing to add a check for this to the `PSR2.Classes.PropertyDeclaration` sniff.
* If that PR would be accepted, WPCS will automatically inherit the check and we'd be good.
* If that PR would be rejected, I propose to create a dedicated sniff in PHPCSExtra to handle property modifier keywords with configuration options for the preferred order.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Visibility should always be declared section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-and-modifier-order
* WordPress/wpcs-docs 108
* WordPress/WordPress-Coding-Standards 1101
* WordPress/WordPress-Coding-Standards 1103
* squizlabs/PHP_CodeSniffer 3637
---
 WordPress-Core/ruleset.xml  | 31 +++++++++++++++++++++++++++++++
 WordPress-Extra/ruleset.xml |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 2fc7299c89..05e4bf67d9 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -387,6 +387,37 @@
 	<!-- Covered by the PSR2.Classes.PropertyDeclaration sniff. -->
 
 
+	<!--
+	#############################################################################
+	Handbook: Object-Oriented Programming - Visibility and modifier order.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-and-modifier-order
+	#############################################################################
+	-->
+	<!-- Rule: When using multiple modifiers for a class declaration, the order should be as follows:
+		 - First the optional abstract or final modifier.
+		 - Next, the optional readonly modifier. -->
+
+	<!-- Rule: When using multiple modifiers for a constant declaration inside object-oriented structures,
+		 the order should be as follows:
+		 - First the optional final modifier.
+		 - Next, the visibility modifier. -->
+
+	<!-- Covers rule: When using multiple modifiers for a property declaration, the order should be as follows:
+		 - First a visibility modifier.
+		 - Next, the optional static or readonly modifier (these keywords are mutually exclusive).
+		 - Finally, the optional type declaration. -->
+	<!-- Covered by the PSR2.Classes.PropertyDeclaration sniff. -->
+
+	<!-- Covers rule: When using multiple modifiers for a method declaration, the order should be as follows:
+		 - First the optional abstract or final modifier.
+		 - Then, a visibility modifier.
+		 - Finally, the optional static modifier. -->
+	<rule ref="PSR2.Methods.MethodDeclaration"/>
+	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
+		<severity>0</severity>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	Handbook: Control Structures - Use elseif, not else if.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index ea570d09d8..7fe2f5874c 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -52,13 +52,15 @@
 	<!-- Verify modifier keywords for declared methods and properties in classes.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
 	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
-	<rule ref="PSR2.Methods.MethodDeclaration"/>
 
 	<!-- Do not allow leading underscores in property or method names. Visibility should be used instead.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
 	<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
 		<severity>5</severity>
 	</rule>
+	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
+		<severity>5</severity>
+	</rule>
 
 	<!-- Do not allow multi-property declarations.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->

From d4402e51bcf9f3966fd57bfadf86a87185f0c343 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 23 Jul 2022 23:32:48 +0200
Subject: [PATCH 211/822] Core: move last modifier keyword sniff from Extra to
 Core

While this was not explicitly mentioned in the Make post, it is implied that there should be exactly one space after each modifier keyword for properties and methods.

This was already being checked for in `Extra`. I'm proposing to move this sniff to the `Core` ruleset.

Note: I've checked and introducing this sniff to the `Core` ruleset does not yield any issues for WP Core as is, so it would be a silent introduction.

Refs:
* WordPress/WordPress-Coding-Standards 1101
---
 WordPress-Core/ruleset.xml  | 3 +++
 WordPress-Extra/ruleset.xml | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 05e4bf67d9..323ed05023 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -417,6 +417,9 @@
 		<severity>0</severity>
 	</rule>
 
+	<!-- Implied through the examples: Single space after each modifier keyword. -->
+	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
+
 
 	<!--
 	#############################################################################
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 7fe2f5874c..5b0f23253f 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -49,10 +49,6 @@
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceAfterLastUsed"/>
 	</rule>
 
-	<!-- Verify modifier keywords for declared methods and properties in classes.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
-	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
-
 	<!-- Do not allow leading underscores in property or method names. Visibility should be used instead.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
 	<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">

From 0121356075174d58bfd6a4aac68cbe2a32a9ddea Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:44:45 +0200
Subject: [PATCH 212/822] Core: move `BacktickOperator` sniff from `Extra` to
 `Core`

> 1. Use of the backtick operator is not allowed.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Shell Commands section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#shell-commands
* WordPress/wpcs-docs 114
* WordPress/WordPress-Coding-Standards 646
---
 WordPress-Core/ruleset.xml  | 10 ++++++++++
 WordPress-Extra/ruleset.xml |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 2fc7299c89..787e6afe07 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -559,6 +559,16 @@
 	<rule ref="WordPress.PHP.DontExtract"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Recommendations - Shell commands.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#shell-commands
+	#############################################################################
+	-->
+	<!-- Covers rule: Use of the backtick operator is not allowed. -->
+	<rule ref="Generic.PHP.BacktickOperator"/>
+
+
 	<!--
 	#############################################################################
 	Not in the handbook: Generic sniffs.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index ea570d09d8..4df1cc9ff1 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -108,9 +108,6 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1146 -->
 	<rule ref="WordPress.WP.EnqueuedResourceParameters"/>
 
-	<!-- Discourage use of the backtick operator (execution of shell commands).
-		 https://github.com/WordPress/WordPress-Coding-Standards/pull/646 -->
-	<rule ref="Generic.PHP.BacktickOperator"/>
 
 	<!-- Check for PHP Parse errors.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/522 -->

From 12c32b5593571c91276819ff8df9e72029778806 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 30 Oct 2022 20:15:06 +0100
Subject: [PATCH 213/822] Core: only allow one property declaration per
 statement

As per the discussion in 2101.
---
 WordPress-Core/ruleset.xml  | 6 ++----
 WordPress-Extra/ruleset.xml | 6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 044354e398..e85cd14a6d 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -373,14 +373,12 @@
 	#############################################################################
 	-->
 	<!-- Covers rule: For all constructs that allow it (properties, methods, class constants since PHP 7.1),
-		 visibility should be explicitly declared. -->
+		 visibility should be explicitly declared.
+		 Includes "only one property declaration per statement". -->
 	<rule ref="PSR2.Classes.PropertyDeclaration"/>
 	<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
 		<severity>0</severity>
 	</rule>
-	<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
-		<severity>0</severity>
-	</rule>
 	<rule ref="Squiz.Scope.MethodScope"/>
 
 	<!-- Covers rule: Using the var keyword for property declarations is not allowed. -->
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index aff7e94b7d..1c9efaa995 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -58,12 +58,6 @@
 		<severity>5</severity>
 	</rule>
 
-	<!-- Do not allow multi-property declarations.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1101 -->
-	<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
-		<severity>5</severity>
-	</rule>
-
 	<!-- Warn against using fully-qualified class names instead of the self keyword. -->
 	<rule ref="Squiz.Classes.SelfMemberReference.NotUsed">
 		<!-- Restore default severity of 5 which WordPress-Core sets to 0. -->

From 1bc0e35948df4e2e798df1c8a596fc9794a09122 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 4 Nov 2022 03:07:22 +0100
Subject: [PATCH 214/822] Extra: fix typo in rule

---
 WordPress-Extra/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 1c9efaa995..c7261b08fe 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -42,7 +42,7 @@
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed"/>
 		<!-- Allow for functions in extended classes/implemented interfaces. -->
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClass"/>
-		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClassBeforeLastUsed"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClassAfterLastUsed"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterface"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed"/>

From f718222920b754b050bd0d84c11bdf8cbcd8773c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 4 Nov 2022 19:41:28 +0100
Subject: [PATCH 215/822] GH Actions: bust the cache semi-regularly

Caches used in GH Actions do not get updated, they can only be replaced by a different cache with a different cache key.

Now the predefined Composer install action this repo is using already creates a pretty comprehensive cache key:

> `ramsey/composer-install` will auto-generate a cache key which is composed of
the following elements:
> * The OS image name, like `ubuntu-latest`.
> * The exact PHP version, like `8.1.11`.
> * The options passed via `composer-options`.
> * The dependency version setting as per `dependency-versions`.
> * The working directory as per `working-directory`.
> * A hash of the `composer.json` and/or `composer.lock` files.

This means that aside from other factors, the cache will always be busted when changes are made to the (committed) `composer.json` or the `composer.lock` file (if the latter exists in the repo).

For packages running on recent versions of PHP, it also means that the cache will automatically be busted once a month when a new PHP version comes out.

### The problem

For runs on older PHP versions which don't receive updates anymore, the cache will not be busted via new PHP version releases, so effectively, the cache will only be busted when a change is made to the `composer.json`/`composer.lock` file - which may not happen that frequently on low-traffic repos.

But... packages _in use_ on those older PHP versions - especially dependencies of declared dependencies - may still release new versions and those new versions will not exist in the cache and will need to be downloaded each time the action is run and over time the cache gets less and less relevant as more and more packages will need to be downloaded for each run.

### The solution

To combat this issue, a new `custom-cache-suffix` option has been added to the Composer install action in version 2.2.0.
This new option allows for providing some extra information to add to the cache key, which allows for busting the cache based on your own additional criteria.

This commit implements the use of this `custom-cache-suffix` option for all relevant workflows in this repo.

Refs:
* https://github.com/ramsey/composer-install/#custom-cache-suffix
* https://github.com/ramsey/composer-install/releases/tag/2.2.0
---
 .github/workflows/quicktest.yml             | 3 +++
 .github/workflows/ruleset-checks-sniffs.yml | 6 ++++++
 .github/workflows/unit-tests.yml            | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index cb23467085..294d964e18 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -67,6 +67,9 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM-DD.
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index f359ed9ece..325db68645 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -52,6 +52,9 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM-DD.
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
       - name: Install xmllint
         run: |
@@ -139,6 +142,9 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM-DD.
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
       - name: Test the WordPress-Core ruleset
         run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3ba3f940a0..18fa870d3d 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -82,12 +82,16 @@ jobs:
       - name: Install Composer dependencies (PHP < 8.0 )
         if: ${{ matrix.php < 8.0 }}
         uses: ramsey/composer-install@v2
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM-DD.
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
       - name: Install Composer dependencies (PHP >= 8.0)
         if: ${{ matrix.php >= 8.0 }}
         uses: ramsey/composer-install@v2
         with:
           composer-options: --ignore-platform-reqs
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}

From 67e06d0578e240c44787f955bb7841ff91f3a19f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 5 Nov 2022 18:46:20 +0100
Subject: [PATCH 216/822] Extra: fix (more) typos in rules

---
 WordPress-Extra/ruleset.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index c7261b08fe..2c469a593e 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -41,9 +41,9 @@
 		<!-- Allow for callback functions which may not need all parameters passed. -->
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed"/>
 		<!-- Allow for functions in extended classes/implemented interfaces. -->
-		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClass"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed"/>
-		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtentedClassAfterLastUsed"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterface"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed"/>
 		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceAfterLastUsed"/>

From 61dc3dd4d16a28c76b7638c6178cbb4a89dea32f Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Fri, 11 Nov 2022 19:24:44 +0530
Subject: [PATCH 217/822] Removed file_get_contents() from the list as it is
 already checked in another group

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 2366cb83a2..103249abcc 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -77,7 +77,6 @@ public function getGroups() {
 					'chown',
 					'delete',
 					'fclose',
-					'file_get_contents',
 					'file_put_contents',
 					'flock',
 					'fopen',

From e3aa034451e1e736534386099a04a6efc81d3644 Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Sat, 12 Nov 2022 13:27:33 +0530
Subject: [PATCH 218/822] Seprated WP counter function and removed updated the
 list of filesystem functions

---
 .../Sniffs/WP/AlternativeFunctionsSniff.php   | 49 ++++++++-----------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 6a3c169b83..901658c018 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -126,39 +126,29 @@ public function getGroups() {
 				),
 			),
 
+			'unlink' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged. Use wp_delete_file() for remote URLs instead.',
+				'since'     => '2.7.0',
+				'functions' => array(
+					'unlink',
+				),
+			),
+
 			'file_system_read' => array(
 				'type'      => 'warning',
 				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
 				'since'     => '2.5.0',
 				'functions' => array(
-					// 'chgrp',
-					// 'chmod',
-					// 'chown',
-					// 'delete',
-					// 'fclose',
-					// 'file_put_contents',
-					// 'flock',
-					// 'fopen',
-					// 'fputcsv',
-					// 'fputs',
-					// 'fread',
-					// 'fsockopen',
-					// 'ftruncate',
-					// 'fwrite',
-					// 'is_writable',
-					// 'is_writeable',
-					// 'lchgrp',
-					// 'lchown',
-					// 'link',
-					// 'mkdir',
-					// 'pfsockopen',
-					// 'readfile',
-					// 'rename',
-					// 'rmdir',
-					// 'symlink',
-					// 'tempnam',
-					// 'touch',
-					// 'unlink',
+					'chgrp',
+					'chmod',
+					'chown',
+					'is_writable',
+					'is_writeable',
+					'mkdir',
+					'rename',
+					'rmdir',
+					'touch',
 					'readfile',
 					'fclose',
 					'fopen',
@@ -167,6 +157,9 @@ public function getGroups() {
 					'file_put_contents',
 					'fsockopen',
 					'pfsockopen',
+					// 'fputcsv',
+					// 'fputs',
+					// 'ftruncate',
 				),
 			),
 

From 44bea02712dbb65fdd33b13a1e492afb27957359 Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Sat, 12 Nov 2022 13:32:36 +0530
Subject: [PATCH 219/822] Updated since of unlink function

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 901658c018..e5b639c24e 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -129,7 +129,7 @@ public function getGroups() {
 			'unlink' => array(
 				'type'      => 'warning',
 				'message'   => '%s() is discouraged. Use wp_delete_file() for remote URLs instead.',
-				'since'     => '2.7.0',
+				'since'     => 'x.x.x',
 				'functions' => array(
 					'unlink',
 				),

From 27cd9cb9d6a3a5c82e1ee74bb7d3d3f0911c9f8a Mon Sep 17 00:00:00 2001
From: Sandesh <sandesh2643@gmail.com>
Date: Sat, 12 Nov 2022 17:43:41 +0530
Subject: [PATCH 220/822] Removed commented code

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e5b639c24e..aaf0ffbd5c 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -157,9 +157,7 @@ public function getGroups() {
 					'file_put_contents',
 					'fsockopen',
 					'pfsockopen',
-					// 'fputcsv',
-					// 'fputs',
-					// 'ftruncate',
+					'fputs',
 				),
 			),
 

From 7c8ba9a300c15d0bf5205c9e05469d5e2e4057ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 25 Nov 2022 18:17:18 +0100
Subject: [PATCH 221/822] Fix the get_wp_version_from_cli method

The getCommandLineData didn't correctly pick up the command line parameter. This fixes that issue.
---
 WordPress/Helpers/MinimumWPVersionTrait.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index bf5c65f1f9..232fddc7cf 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -9,7 +9,6 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
-use PHP_CodeSniffer\Files\File;
 use PHPCSUtils\BackCompat\Helper;
 
 /**
@@ -81,12 +80,9 @@ trait MinimumWPVersionTrait {
 	 * @since 0.14.0
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
 	 *               - Renamed from `get_wp_version_from_cl()` to `get_wp_version_from_cli()`.
-	 *               - Now requires the $phpcsFile object to be passed in.
-	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 */
-	protected function get_wp_version_from_cli( File $phpcsFile ) {
-		$cli_supported_version = Helper::getCommandLineData( $phpcsFile, 'minimum_supported_wp_version' );
+	protected function get_wp_version_from_cli() {
+		$cli_supported_version = Helper::getConfigData( 'minimum_supported_wp_version' );
 
 		if ( empty( $cli_supported_version ) ) {
 			return;

From 2bbb31722f71f70b1899fac03beb158057644284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 25 Nov 2022 18:18:04 +0100
Subject: [PATCH 222/822] Update the sniffs with the updated
 get_wp_version_from_cli method

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php      | 2 +-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php         | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php       | 2 +-
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php | 2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 9a0e17b0d6..cad367fcc4 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -185,7 +185,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli( $this->phpcsFile );
+		$this->get_wp_version_from_cli();
 
 		/*
 		 * Deal with exceptions.
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 71a2d84f40..c1fd8e051d 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -97,7 +97,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli( $this->phpcsFile );
+		$this->get_wp_version_from_cli();
 
 		$class_name = ltrim( strtolower( $matched_content ), '\\' );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index edb06e26c9..b9379c4e54 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1399,7 +1399,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli( $this->phpcsFile );
+		$this->get_wp_version_from_cli();
 
 		$function_name = strtolower( $matched_content );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index a31ec00e2e..be90ca7075 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -155,7 +155,7 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$this->get_wp_version_from_cli( $this->phpcsFile );
+		$this->get_wp_version_from_cli();
 		$param_count = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 770cb31ccd..787da50856 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -284,7 +284,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 
-		$this->get_wp_version_from_cli( $this->phpcsFile );
+		$this->get_wp_version_from_cli();
 
 		$paramCount = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {

From dd3ef96f2b0aabc0d73e6ea24f07de97994f0876 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:05:38 +0100
Subject: [PATCH 223/822] :sparkles: New `WordPress.WP.ClassNameCase` sniff

... to check that any class name references to WP native classes use the case of the class as per the class declaration.

As class names in PHP are case-insensitive, this is a `warning`, not an `error`.

Open questions:
* Should the same by checked for classes from external dependencies, like PHPMailer, SimplePie, Requests etc ?
    We could have separate arrays for each of these.
* Is the name of the sniff correct or should it be made more generic ?
    I mean, at this time, WP only contains classes, no interfaces, traits or enums, but that may change in the future and the logic for checking this is largely the same, so it would make sense to add those checks to this sniff.

I'm proposing to add this sniff to the WP Core ruleset, so both Core as well as plugins and themes will benefit from it.
FYI: I've ran the sniff over WP Core and it triggers no issues.

This sniff was inspired by a discussion I had with aristath and SergeyBiryukov earlier today.

----

Future scope:
1. Expand the places where we check for the use of class/oo names.
    A new abstract class/oo-name sniff is expected to be added to PHPCSUtils in the foreseeable future which will also check for the use of class names in `catch` statements, type declarations etc.
    Once that class is available, we should consider switching.
2. As maintaining the list of classes will be a manual task which would need to be executed after each release, it would be good to create some tooling which can update the list automatically and/or generate the update which would need to be applied.
    Related 1803.
---
 WordPress-Core/ruleset.xml                   |   3 +
 WordPress/Docs/WP/ClassNameCaseStandard.xml  |  23 +
 WordPress/Sniffs/WP/ClassNameCaseSniff.php   | 416 +++++++++++++++++++
 WordPress/Tests/WP/ClassNameCaseUnitTest.inc |  53 +++
 WordPress/Tests/WP/ClassNameCaseUnitTest.php |  46 ++
 5 files changed, 541 insertions(+)
 create mode 100644 WordPress/Docs/WP/ClassNameCaseStandard.xml
 create mode 100644 WordPress/Sniffs/WP/ClassNameCaseSniff.php
 create mode 100644 WordPress/Tests/WP/ClassNameCaseUnitTest.inc
 create mode 100644 WordPress/Tests/WP/ClassNameCaseUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index e85cd14a6d..824543a3a3 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -673,4 +673,7 @@
 	<!-- Don't use current_time() to retrieve a timestamp. -->
 	<rule ref="WordPress.DateTime.CurrentTimeTimestamp"/>
 
+	<!-- Check that class name references use the correct case. -->
+	<rule ref="WordPress.WP.ClassNameCase"/>
+
 </ruleset>
diff --git a/WordPress/Docs/WP/ClassNameCaseStandard.xml b/WordPress/Docs/WP/ClassNameCaseStandard.xml
new file mode 100644
index 0000000000..b17ec3f955
--- /dev/null
+++ b/WordPress/Docs/WP/ClassNameCaseStandard.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Class Name Case"
+    >
+    <standard>
+    <![CDATA[
+    It is strongly recommended to refer to WP native classes by their properly cased name.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: reference to a WordPress native class name using the correct case.">
+        <![CDATA[
+$obj = new WP_Query;
+        ]]>
+        </code>
+        <code title="Invalid: reference to a WordPress native class name not using the correct case.">
+        <![CDATA[
+$obj = new wp_query;
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
new file mode 100644
index 0000000000..c7dc51cb17
--- /dev/null
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Sniffs\WP;
+
+use WordPressCS\WordPress\AbstractClassRestrictionsSniff;
+
+/**
+ * Verify whether references to WP native classes use the proper casing for the class name.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since 3.0.0
+ */
+class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
+
+	/**
+	 * List of all WP native classes.
+	 *
+	 * To be updated after every major release.
+	 *
+	 * List is sorted alphabetically and based on the WIP autoloading PR.
+	 * {@link https://github.com/WordPress/wordpress-develop/pull/3470}
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $wp_classes = array(
+		'_WP_Dependency',
+		'_WP_Editors',
+		'_WP_List_Table_Compat',
+		'Automatic_Upgrader_Skin',
+		'Bulk_Plugin_Upgrader_Skin',
+		'Bulk_Theme_Upgrader_Skin',
+		'Bulk_Upgrader_Skin',
+		'Core_Upgrader',
+		'Custom_Background',
+		'Custom_Image_Header',
+		'File_Upload_Upgrader',
+		'ftp_pure',
+		'ftp_sockets',
+		'Gettext_Translations',
+		'IXR_Base64',
+		'IXR_Client',
+		'IXR_ClientMulticall',
+		'IXR_Date',
+		'IXR_Error',
+		'IXR_IntrospectionServer',
+		'IXR_Message',
+		'IXR_Request',
+		'IXR_Server',
+		'IXR_Value',
+		'Language_Pack_Upgrader',
+		'Language_Pack_Upgrader_Skin',
+		'MO',
+		'NOOP_Translations',
+		'Plugin_Installer_Skin',
+		'Plugin_Upgrader',
+		'Plugin_Upgrader_Skin',
+		'Plural_Forms',
+		'PO',
+		'POMO_CachedFileReader',
+		'POMO_CachedIntFileReader',
+		'POMO_FileReader',
+		'POMO_Reader',
+		'POMO_StringReader',
+		'Theme_Installer_Skin',
+		'Theme_Upgrader',
+		'Theme_Upgrader_Skin',
+		'Translation_Entry',
+		'Translations',
+		'Walker',
+		'Walker_Category',
+		'Walker_Category_Checklist',
+		'Walker_CategoryDropdown',
+		'Walker_Comment',
+		'Walker_Nav_Menu',
+		'Walker_Nav_Menu_Checklist',
+		'Walker_Nav_Menu_Edit',
+		'Walker_Page',
+		'Walker_PageDropdown',
+		'WP',
+		'WP_Admin_Bar',
+		'WP_Ajax_Response',
+		'WP_Ajax_Upgrader_Skin',
+		'WP_Application_Passwords',
+		'WP_Application_Passwords_List_Table',
+		'WP_Automatic_Updater',
+		'WP_Block',
+		'WP_Block_Editor_Context',
+		'WP_Block_List',
+		'WP_Block_Parser',
+		'WP_Block_Parser_Block',
+		'WP_Block_Parser_Frame',
+		'WP_Block_Pattern_Categories_Registry',
+		'WP_Block_Patterns_Registry',
+		'WP_Block_Styles_Registry',
+		'WP_Block_Supports',
+		'WP_Block_Template',
+		'WP_Block_Type',
+		'WP_Block_Type_Registry',
+		'WP_Comment',
+		'WP_Comment_Query',
+		'WP_Comments_List_Table',
+		'WP_Community_Events',
+		'WP_Customize_Background_Image_Control',
+		'WP_Customize_Background_Image_Setting',
+		'WP_Customize_Background_Position_Control',
+		'WP_Customize_Code_Editor_Control',
+		'WP_Customize_Color_Control',
+		'WP_Customize_Control',
+		'WP_Customize_Cropped_Image_Control',
+		'WP_Customize_Custom_CSS_Setting',
+		'WP_Customize_Date_Time_Control',
+		'WP_Customize_Filter_Setting',
+		'WP_Customize_Header_Image_Control',
+		'WP_Customize_Header_Image_Setting',
+		'WP_Customize_Image_Control',
+		'WP_Customize_Manager',
+		'WP_Customize_Media_Control',
+		'WP_Customize_Nav_Menu_Auto_Add_Control',
+		'WP_Customize_Nav_Menu_Control',
+		'WP_Customize_Nav_Menu_Item_Control',
+		'WP_Customize_Nav_Menu_Item_Setting',
+		'WP_Customize_Nav_Menu_Location_Control',
+		'WP_Customize_Nav_Menu_Locations_Control',
+		'WP_Customize_Nav_Menu_Name_Control',
+		'WP_Customize_Nav_Menu_Section',
+		'WP_Customize_Nav_Menu_Setting',
+		'WP_Customize_Nav_Menus',
+		'WP_Customize_Nav_Menus_Panel',
+		'WP_Customize_New_Menu_Control',
+		'WP_Customize_New_Menu_Section',
+		'WP_Customize_Panel',
+		'WP_Customize_Partial',
+		'WP_Customize_Section',
+		'WP_Customize_Selective_Refresh',
+		'WP_Customize_Setting',
+		'WP_Customize_Sidebar_Section',
+		'WP_Customize_Site_Icon_Control',
+		'WP_Customize_Theme_Control',
+		'WP_Customize_Themes_Panel',
+		'WP_Customize_Themes_Section',
+		'WP_Customize_Upload_Control',
+		'WP_Customize_Widgets',
+		'WP_Date_Query',
+		'WP_Debug_Data',
+		'WP_Dependencies',
+		'WP_Embed',
+		'WP_Error',
+		'WP_Fatal_Error_Handler',
+		'WP_Feed_Cache',
+		'WP_Feed_Cache_Transient',
+		'WP_Filesystem_Base',
+		'WP_Filesystem_Direct',
+		'WP_Filesystem_FTPext',
+		'WP_Filesystem_ftpsockets',
+		'WP_Filesystem_SSH2',
+		'WP_Hook',
+		'WP_Http',
+		'WP_Http_Cookie',
+		'WP_Http_Curl',
+		'WP_Http_Encoding',
+		'WP_HTTP_Fsockopen',
+		'WP_HTTP_IXR_Client',
+		'WP_HTTP_Proxy',
+		'WP_HTTP_Requests_Hooks',
+		'WP_HTTP_Requests_Response',
+		'WP_HTTP_Response',
+		'WP_Http_Streams',
+		'WP_Image_Editor',
+		'WP_Image_Editor_GD',
+		'WP_Image_Editor_Imagick',
+		'WP_Importer',
+		'WP_Internal_Pointers',
+		'WP_Links_List_Table',
+		'WP_List_Table',
+		'WP_List_Util',
+		'WP_Locale',
+		'WP_Locale_Switcher',
+		'WP_MatchesMapRegex',
+		'WP_Media_List_Table',
+		'WP_Meta_Query',
+		'WP_Metadata_Lazyloader',
+		'WP_MS_Sites_List_Table',
+		'WP_MS_Themes_List_Table',
+		'WP_MS_Users_List_Table',
+		'WP_Nav_Menu_Widget',
+		'WP_Network',
+		'WP_Network_Query',
+		'WP_Object_Cache',
+		'WP_oEmbed',
+		'WP_oEmbed_Controller',
+		'WP_Paused_Extensions_Storage',
+		'WP_Plugin_Install_List_Table',
+		'WP_Plugins_List_Table',
+		'WP_Post',
+		'WP_Post_Comments_List_Table',
+		'WP_Post_Type',
+		'WP_Posts_List_Table',
+		'WP_Privacy_Data_Export_Requests_List_Table',
+		'WP_Privacy_Data_Export_Requests_Table',
+		'WP_Privacy_Data_Removal_Requests_List_Table',
+		'WP_Privacy_Data_Removal_Requests_Table',
+		'WP_Privacy_Policy_Content',
+		'WP_Privacy_Requests_Table',
+		'WP_Query',
+		'WP_Recovery_Mode',
+		'WP_Recovery_Mode_Cookie_Service',
+		'WP_Recovery_Mode_Email_Service',
+		'WP_Recovery_Mode_Key_Service',
+		'WP_Recovery_Mode_Link_Service',
+		'WP_REST_Application_Passwords_Controller',
+		'WP_REST_Attachments_Controller',
+		'WP_REST_Autosaves_Controller',
+		'WP_REST_Block_Directory_Controller',
+		'WP_REST_Block_Pattern_Categories_Controller',
+		'WP_REST_Block_Patterns_Controller',
+		'WP_REST_Block_Renderer_Controller',
+		'WP_REST_Block_Types_Controller',
+		'WP_REST_Blocks_Controller',
+		'WP_REST_Comment_Meta_Fields',
+		'WP_REST_Comments_Controller',
+		'WP_REST_Controller',
+		'WP_REST_Edit_Site_Export_Controller',
+		'WP_REST_Global_Styles_Controller',
+		'WP_REST_Menu_Items_Controller',
+		'WP_REST_Menu_Locations_Controller',
+		'WP_REST_Menus_Controller',
+		'WP_REST_Meta_Fields',
+		'WP_REST_Pattern_Directory_Controller',
+		'WP_REST_Plugins_Controller',
+		'WP_REST_Post_Format_Search_Handler',
+		'WP_REST_Post_Meta_Fields',
+		'WP_REST_Post_Search_Handler',
+		'WP_REST_Post_Statuses_Controller',
+		'WP_REST_Post_Types_Controller',
+		'WP_REST_Posts_Controller',
+		'WP_REST_Request',
+		'WP_REST_Response',
+		'WP_REST_Revisions_Controller',
+		'WP_REST_Search_Controller',
+		'WP_REST_Search_Handler',
+		'WP_REST_Server',
+		'WP_REST_Settings_Controller',
+		'WP_REST_Sidebars_Controller',
+		'WP_REST_Site_Health_Controller',
+		'WP_REST_Taxonomies_Controller',
+		'WP_REST_Templates_Controller',
+		'WP_REST_Term_Meta_Fields',
+		'WP_REST_Term_Search_Handler',
+		'WP_REST_Terms_Controller',
+		'WP_REST_Themes_Controller',
+		'WP_REST_URL_Details_Controller',
+		'WP_REST_User_Meta_Fields',
+		'WP_REST_Users_Controller',
+		'WP_REST_Widget_Types_Controller',
+		'WP_REST_Widgets_Controller',
+		'WP_Rewrite',
+		'WP_Role',
+		'WP_Roles',
+		'WP_Screen',
+		'WP_Scripts',
+		'WP_Session_Tokens',
+		'WP_Sidebar_Block_Editor_Control',
+		'WP_SimplePie_File',
+		'WP_SimplePie_Sanitize_KSES',
+		'WP_Site',
+		'WP_Site_Health',
+		'WP_Site_Health_Auto_Updates',
+		'WP_Site_Icon',
+		'WP_Site_Query',
+		'WP_Sitemaps',
+		'WP_Sitemaps_Index',
+		'WP_Sitemaps_Posts',
+		'WP_Sitemaps_Provider',
+		'WP_Sitemaps_Registry',
+		'WP_Sitemaps_Renderer',
+		'WP_Sitemaps_Stylesheet',
+		'WP_Sitemaps_Taxonomies',
+		'WP_Sitemaps_Users',
+		'WP_Style_Engine',
+		'WP_Style_Engine_CSS_Declarations',
+		'WP_Style_Engine_CSS_Rule',
+		'WP_Style_Engine_CSS_Rules_Store',
+		'WP_Style_Engine_Processor',
+		'WP_Styles',
+		'WP_Tax_Query',
+		'WP_Taxonomy',
+		'WP_Term',
+		'WP_Term_Query',
+		'WP_Terms_List_Table',
+		'WP_Text_Diff_Renderer_inline',
+		'WP_Text_Diff_Renderer_Table',
+		'WP_Textdomain_Registry',
+		'WP_Theme',
+		'WP_Theme_Install_List_Table',
+		'WP_Theme_JSON',
+		'WP_Theme_JSON_Data',
+		'WP_Theme_JSON_Resolver',
+		'WP_Theme_JSON_Schema',
+		'WP_Themes_List_Table',
+		'WP_Upgrader',
+		'WP_Upgrader_Skin',
+		'WP_User',
+		'WP_User_Meta_Session_Tokens',
+		'WP_User_Query',
+		'WP_User_Request',
+		'WP_User_Search',
+		'WP_Users_List_Table',
+		'WP_Widget',
+		'WP_Widget_Archives',
+		'WP_Widget_Area_Customize_Control',
+		'WP_Widget_Block',
+		'WP_Widget_Calendar',
+		'WP_Widget_Categories',
+		'WP_Widget_Custom_HTML',
+		'WP_Widget_Factory',
+		'WP_Widget_Form_Customize_Control',
+		'WP_Widget_Links',
+		'WP_Widget_Media',
+		'WP_Widget_Media_Audio',
+		'WP_Widget_Media_Gallery',
+		'WP_Widget_Media_Image',
+		'WP_Widget_Media_Video',
+		'WP_Widget_Meta',
+		'WP_Widget_Pages',
+		'WP_Widget_Recent_Comments',
+		'WP_Widget_Recent_Posts',
+		'WP_Widget_RSS',
+		'WP_Widget_Search',
+		'WP_Widget_Tag_Cloud',
+		'WP_Widget_Text',
+		'wp_xmlrpc_server',
+		'wpdb',
+	);
+
+	/**
+	 * List of all WP native classes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $wp_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $wp_classes_lc = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.0.0
+	 */
+	public function __construct() {
+		// Adjust the $wp_classes property to have the lowercased version of the value as a key.
+		$this->wp_classes_lc = array_map( 'strtolower', $this->wp_classes );
+		$this->wp_classes    = array_combine( $this->wp_classes_lc, $this->wp_classes );
+	}
+
+	/**
+	 * Groups of classes to restrict.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'wp_classes' => array(
+				'classes' => $this->wp_classes_lc,
+			),
+		);
+	}
+
+	/**
+	 * Process a matched token.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $group_name      The name of the group which was matched. Will
+	 *                                always be 'wp_classes'.
+	 * @param string $matched_content The token content (class name) which was matched.
+	 *
+	 * @return void
+	 */
+	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
+
+		$matched_unqualified = ltrim( $matched_content, '\\' );
+		$matched_lowercase   = strtolower( $matched_unqualified );
+		$matched_proper_case = $this->wp_classes[ $matched_lowercase ];
+
+		if ( $matched_unqualified === $matched_proper_case ) {
+			// Already using proper case, nothing to do.
+			return;
+		}
+
+		$warning = 'It is strongly recommended to refer to classes by their properly cased name. Expected: %s Found: %s';
+		$data    = array(
+			$matched_proper_case,
+			$matched_unqualified,
+		);
+
+		$this->phpcsFile->addWarning( $warning, $stackPtr, 'Incorrect', $data );
+	}
+}
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.inc b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
new file mode 100644
index 0000000000..8ae8ea507e
--- /dev/null
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * These should be disregarded by the sniff.
+ */
+class Foo {
+	function bar() {
+		$obj = new self();
+		echo static::MY_CONSTANT;
+	}
+}
+
+$obj = new Not_A_WP_Core_Class();
+
+/*
+ * These all use the class name in proper case.
+ */
+
+$obj = new WP_Importer();
+$obj = new \WP_Query;
+
+class MyList extends WP_List_Table {}
+
+echo WP_User_Search::$users_per_page;
+WP_Customize_New_Menu_Control::foo();
+
+/*
+ * These all use the class name in an unconventional case.
+ */
+$obj = new WPDB();
+$obj = new \WP_date_query;
+
+class MyList extends \WP_LIST_table {}
+
+echo wp_user_search::$users_per_page;
+WP_Customize_NEW_Menu_Control::foo();
+
+/*
+ * These will not (yet) be detected as the abstract doesn't handle these.
+ * This will be fixed in the future when the PHPCSUtils abstract will be made available.
+ */
+
+try {
+	// Do something.
+} catch ( Wp_Error ) {
+}
+
+class NotYetDetected {
+	public WalKer $property_type;
+
+	public function paramTypeDeclaration( wp_role $role ) {}
+	public function returnTypeDeclaration() : WP_TERM {}
+}
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
new file mode 100644
index 0000000000..43806ce674
--- /dev/null
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Tests\WP;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Unit test class for the ClassNameCase sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since 3.0.0
+ */
+class ClassNameCaseUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array();
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array(
+			30 => 1,
+			31 => 1,
+			33 => 1,
+			35 => 1,
+			36 => 1,
+		);
+	}
+}

From 0c2b772cba8dc2fae8f83dd9f166c268141e4fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 27 Nov 2022 09:53:16 +0100
Subject: [PATCH 224/822] Group all the checks in one place and add script
 descriptions

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
Co-authored-by: Gary Jones <github@garyjones.io>
---
 .github/workflows/quicktest.yml  |  2 +-
 .github/workflows/unit-tests.yml |  2 +-
 composer.json                    | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 294d964e18..0b2fcdea70 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
-        run: composer lint-ci
+        run: composer lint -- --checkstyle
 
       - name: Run unit tests
         run: composer run-tests
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 18fa870d3d..ad6df60843 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -95,7 +95,7 @@ jobs:
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
-        run: composer lint-ci | cs2pr
+        run: composer lint -- --checkstyle | cs2pr
 
       - name: Run the unit tests - PHP 5.4 - 8.0
         if: ${{ matrix.php < '8.1' }}
diff --git a/composer.json b/composer.json
index cf7705a04a..f9ec27028a 100644
--- a/composer.json
+++ b/composer.json
@@ -39,18 +39,12 @@
 		"lint": [
 			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
 		],
-		"lint-ci": [
-			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git --checkstyle"
-		],
 		"check-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
 		],
 		"fix-cs": [
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
 		],
-		"install-codestandards": [
-			"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
-		],
 		"run-tests": [
 			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
 		],
@@ -59,8 +53,23 @@
 		],
 		"check-complete-strict": [
 			"@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness ./WordPress"
+		],
+		"check-all": [
+			"@lint",
+			"@check-cs",
+			"@run-tests",
+			"@check-complete-strict"
 		]
 	},
+	"scripts-descriptions": {
+		"lint": "Lint PHP files against parse errors.",
+		"check-cs": "Run the PHPCS script against the entire codebase.",
+		"fix-cs": "Run the PHPCBF script to fix all the autofixable violations on the codebase.",
+		"run-tests": "Run all the unit tests for the WordPress Coding Standards sniffs.",
+		"check-complete": "Check if all the sniffs have tests.",
+		"check-complete-strict": "Check if all the sniffs have unit tests and XML documentation.",
+		"check-all": "Run all checks (lint, phpcs, feature completeness) and tests."
+	},
 	"support": {
 		"issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues",
 		"wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki",

From 7605f1a6cd23dae199fea49c7d25c19f2bf0203e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 28 Nov 2022 21:07:14 +0100
Subject: [PATCH 225/822] WP/ClassNameCase: minor documentation tweaks

---
 WordPress/Sniffs/WP/ClassNameCaseSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index c7dc51cb17..b990593636 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -23,13 +23,13 @@ class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	/**
 	 * List of all WP native classes.
 	 *
-	 * To be updated after every major release.
-	 *
 	 * List is sorted alphabetically and based on the WIP autoloading PR.
 	 * {@link https://github.com/WordPress/wordpress-develop/pull/3470}
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 *
 	 * @since 3.0.0
 	 *
 	 * @var string[] The class names in their "proper" case.

From a300c3be2e01e7df1ce557e13b4065488e7dbb8e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 29 Nov 2022 02:34:12 +0100
Subject: [PATCH 226/822] WP/ClassNameCase: add support for examining classes
 in WP external dependencies

Includes adding class lists for these external dependencies.
Includes additional unit tests.

Note: the `Sodium_Compat` dependency is explicitly not addressed as this is a polyfill for PHP Core, so to approach it, the PHP Core functions/classes should be used, not those declared within Sodium_Compat.
---
 WordPress/Sniffs/WP/ClassNameCaseSniff.php   | 276 ++++++++++++++++++-
 WordPress/Tests/WP/ClassNameCaseUnitTest.inc |  16 +-
 WordPress/Tests/WP/ClassNameCaseUnitTest.php |  14 +-
 3 files changed, 291 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index b990593636..7aa5b9d3e6 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -345,6 +345,179 @@ class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'wpdb',
 	);
 
+	/**
+	 * List of all GetID3 classes include in WP Core.
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $getid3_classes = array(
+		'AMFReader',
+		'AMFStream',
+		'AVCSequenceParameterSetReader',
+		'getID3',
+		'getid3_ac3',
+		'getid3_apetag',
+		'getid3_asf',
+		'getid3_dts',
+		'getid3_exception',
+		'getid3_flac',
+		'getid3_flv',
+		'getid3_handler',
+		'getid3_id3v1',
+		'getid3_id3v2',
+		'getid3_lib',
+		'getid3_lyrics3',
+		'getid3_matroska',
+		'getid3_mp3',
+		'getid3_ogg',
+		'getid3_quicktime',
+		'getid3_riff',
+	);
+
+	/**
+	 * List of all PHPMailer classes include in WP Core.
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $phpmailer_classes = array(
+		'PHPMailer\\PHPMailer\\Exception',
+		'PHPMailer\\PHPMailer\\PHPMailer',
+		'PHPMailer\\PHPMailer\\SMTP',
+	);
+
+	/**
+	 * List of all Requests classes included in WP Core.
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $requests_classes = array(
+		// Interfaces.
+		'Requests_Auth',
+		'Requests_Hooker',
+		'Requests_Proxy',
+		'Requests_Transport',
+
+		// Classes.
+		'Requests',
+		'Requests_Auth_Basic',
+		'Requests_Cookie',
+		'Requests_Cookie_Jar',
+		'Requests_Exception',
+		'Requests_Exception_HTTP',
+		'Requests_Exception_Transport',
+		'Requests_Exception_Transport_cURL',
+		'Requests_Exception_HTTP_304',
+		'Requests_Exception_HTTP_305',
+		'Requests_Exception_HTTP_306',
+		'Requests_Exception_HTTP_400',
+		'Requests_Exception_HTTP_401',
+		'Requests_Exception_HTTP_402',
+		'Requests_Exception_HTTP_403',
+		'Requests_Exception_HTTP_404',
+		'Requests_Exception_HTTP_405',
+		'Requests_Exception_HTTP_406',
+		'Requests_Exception_HTTP_407',
+		'Requests_Exception_HTTP_408',
+		'Requests_Exception_HTTP_409',
+		'Requests_Exception_HTTP_410',
+		'Requests_Exception_HTTP_411',
+		'Requests_Exception_HTTP_412',
+		'Requests_Exception_HTTP_413',
+		'Requests_Exception_HTTP_414',
+		'Requests_Exception_HTTP_415',
+		'Requests_Exception_HTTP_416',
+		'Requests_Exception_HTTP_417',
+		'Requests_Exception_HTTP_418',
+		'Requests_Exception_HTTP_428',
+		'Requests_Exception_HTTP_429',
+		'Requests_Exception_HTTP_431',
+		'Requests_Exception_HTTP_500',
+		'Requests_Exception_HTTP_501',
+		'Requests_Exception_HTTP_502',
+		'Requests_Exception_HTTP_503',
+		'Requests_Exception_HTTP_504',
+		'Requests_Exception_HTTP_505',
+		'Requests_Exception_HTTP_511',
+		'Requests_Exception_HTTP_Unknown',
+		'Requests_Hooks',
+		'Requests_IDNAEncoder',
+		'Requests_IPv6',
+		'Requests_IRI',
+		'Requests_Proxy_HTTP',
+		'Requests_Response',
+		'Requests_Response_Headers',
+		'Requests_Session',
+		'Requests_SSL',
+		'Requests_Transport_cURL',
+		'Requests_Transport_fsockopen',
+		'Requests_Utility_CaseInsensitiveDictionary',
+		'Requests_Utility_FilteredIterator',
+	);
+
+	/**
+	 * List of all SimplePier classes included in WP Core.
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $simplepie_classes = array(
+		'SimplePie',
+		'SimplePie_Author',
+		'SimplePie_Cache',
+		'SimplePie_Caption',
+		'SimplePie_Category',
+		'SimplePie_Copyright',
+		'SimplePie_Core',
+		'SimplePie_Credit',
+		'SimplePie_Enclosure',
+		'SimplePie_Exception',
+		'SimplePie_File',
+		'SimplePie_gzdecode',
+		'SimplePie_IRI',
+		'SimplePie_Item',
+		'SimplePie_Locator',
+		'SimplePie_Misc',
+		'SimplePie_Parser',
+		'SimplePie_Rating',
+		'SimplePie_Registry',
+		'SimplePie_Restriction',
+		'SimplePie_Sanitize',
+		'SimplePie_Source',
+		'SimplePie_Content_Type_Sniffer',
+		'SimplePie_Decode_HTML_Entities',
+		'SimplePie_HTTP_Parser',
+		'SimplePie_Net_IPv6',
+		'SimplePie_Parse_Date',
+		'SimplePie_XML_Declaration_Parser',
+	);
+
 	/**
 	 * List of all WP native classes in lowercase.
 	 *
@@ -356,15 +529,77 @@ class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 */
 	private $wp_classes_lc = array();
 
+	/**
+	 * List of all GetID3 classes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $phpmailer_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $getid3_classes_lc = array();
+
+	/**
+	 * List of all PHPMailer classes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $phpmailer_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $phpmailer_classes_lc = array();
+
+	/**
+	 * List of all Requests classes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $requests_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $requests_classes_lc = array();
+
+	/**
+	 * List of all SimplePie classes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $simplepie_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $simplepie_classes_lc = array();
+
+	/**
+	 * Groups names.
+	 *
+	 * Used to dynamically fill in some of the above properties and to generate the getGroups() array.
+	 *
+	 * @var array
+	 */
+	private $class_groups = array(
+		'wp_classes',
+		'getid3_classes',
+		'phpmailer_classes',
+		'requests_classes',
+		'simplepie_classes',
+	);
+
 	/**
 	 * Constructor.
 	 *
 	 * @since 3.0.0
 	 */
 	public function __construct() {
-		// Adjust the $wp_classes property to have the lowercased version of the value as a key.
-		$this->wp_classes_lc = array_map( 'strtolower', $this->wp_classes );
-		$this->wp_classes    = array_combine( $this->wp_classes_lc, $this->wp_classes );
+		// Adjust the class list properties to have the lowercased version of the value as a key.
+		foreach ( $this->class_groups as $name ) {
+			$name_lc        = $name . '_lc';
+			$this->$name_lc = array_map( 'strtolower', $this->$name );
+			$this->$name    = array_combine( $this->$name_lc, $this->$name );
+		}
 	}
 
 	/**
@@ -375,11 +610,15 @@ public function __construct() {
 	 * @return array
 	 */
 	public function getGroups() {
-		return array(
-			'wp_classes' => array(
-				'classes' => $this->wp_classes_lc,
-			),
-		);
+		$groups = array();
+		foreach ( $this->class_groups as $name ) {
+			$name_lc         = $name . '_lc';
+			$groups[ $name ] = array(
+				'classes' => $this->$name_lc,
+			);
+		}
+
+		return $groups;
 	}
 
 	/**
@@ -398,7 +637,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		$matched_unqualified = ltrim( $matched_content, '\\' );
 		$matched_lowercase   = strtolower( $matched_unqualified );
-		$matched_proper_case = $this->wp_classes[ $matched_lowercase ];
+		$matched_proper_case = $this->get_proper_case( $matched_lowercase );
 
 		if ( $matched_unqualified === $matched_proper_case ) {
 			// Already using proper case, nothing to do.
@@ -413,4 +652,23 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		$this->phpcsFile->addWarning( $warning, $stackPtr, 'Incorrect', $data );
 	}
+
+	/**
+	 * Match a lowercase class name to its proper cased name.
+	 *
+	 * @param string $matched_lc Lowercase class name.
+	 *
+	 * @return string
+	 */
+	private function get_proper_case( $matched_lc ) {
+		foreach ( $this->class_groups as $name ) {
+			$current = $this->$name; // Needed to prevent issues with PHP < 7.0.
+			if ( isset( $current[ $matched_lc ] ) ) {
+				return $current[ $matched_lc ];
+			}
+		}
+
+		// Shouldn't be possible.
+		return ''; // @codeCoverageIgnore
+	}
 }
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.inc b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
index 8ae8ea507e..eccde3b20a 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
@@ -12,10 +12,10 @@ class Foo {
 
 $obj = new Not_A_WP_Core_Class();
 
+
 /*
  * These all use the class name in proper case.
  */
-
 $obj = new WP_Importer();
 $obj = new \WP_Query;
 
@@ -24,6 +24,13 @@ class MyList extends WP_List_Table {}
 echo WP_User_Search::$users_per_page;
 WP_Customize_New_Menu_Control::foo();
 
+// External libraries.
+$obj = new getID3;
+class MyMailer extends PHPMailer\PHPMailer\PHPMailer {}
+$obj = new Requests_Cookie_Jar();
+$anon = class extends SimplePie_IRI {};
+
+
 /*
  * These all use the class name in an unconventional case.
  */
@@ -35,6 +42,13 @@ class MyList extends \WP_LIST_table {}
 echo wp_user_search::$users_per_page;
 WP_Customize_NEW_Menu_Control::foo();
 
+// External libraries.
+$obj = new GetID3();
+class MyMailer extends PhpMailer\PhpMailer\PhpMailer {}
+$obj = new Requests_cookie_jar();
+$anon = class extends SimplePie_Iri {};
+
+
 /*
  * These will not (yet) be detected as the abstract doesn't handle these.
  * This will be fixed in the future when the PHPCSUtils abstract will be made available.
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
index 43806ce674..862ec11761 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.php
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -36,11 +36,15 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			30 => 1,
-			31 => 1,
-			33 => 1,
-			35 => 1,
-			36 => 1,
+			37 => 1,
+			38 => 1,
+			40 => 1,
+			42 => 1,
+			43 => 1,
+			46 => 1,
+			47 => 1,
+			48 => 1,
+			49 => 1,
 		);
 	}
 }

From a9d9be35234e7f1182ebcfc9ba859679521a4657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:55:52 +0100
Subject: [PATCH 227/822] Add sniff that will check that capabilities are used
 correctly.

The sniff will check if the functions that are accepting capabilities as the argument actually use capabilities and not roles.
It was rewritten to include helper functions from PHPCSUtils, cleanup code, and add additional tests.
The list of core functions that are using capabilities as a parameter was updated with changes up to WordPress 6.1.0,
as well as the list of capabilities.
The sniff is also compatible with PHP 8 (named arguments).

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
Co-authored-by: Ulrich Pogson <grappler@users.noreply.github.com>
Co-authored-by: Kevin Haig <khacoder@users.noreply.github.com>
Co-authored-by: Gary Jones <github@garyjones.io>
---
 WordPress-Extra/ruleset.xml                   |   3 +
 WordPress/Docs/WP/CapabilitiesStandard.xml    |  69 +++
 WordPress/Sniffs/WP/CapabilitiesSniff.php     | 478 ++++++++++++++++++
 WordPress/Tests/WP/CapabilitiesUnitTest.1.inc | 117 +++++
 WordPress/Tests/WP/CapabilitiesUnitTest.2.inc |  14 +
 WordPress/Tests/WP/CapabilitiesUnitTest.3.inc |  14 +
 WordPress/Tests/WP/CapabilitiesUnitTest.php   | 130 +++++
 7 files changed, 825 insertions(+)
 create mode 100644 WordPress/Docs/WP/CapabilitiesStandard.xml
 create mode 100644 WordPress/Sniffs/WP/CapabilitiesSniff.php
 create mode 100644 WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
 create mode 100644 WordPress/Tests/WP/CapabilitiesUnitTest.2.inc
 create mode 100644 WordPress/Tests/WP/CapabilitiesUnitTest.3.inc
 create mode 100644 WordPress/Tests/WP/CapabilitiesUnitTest.php

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 2c469a593e..111d39faa5 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -84,6 +84,9 @@
 	<rule ref="WordPress.WP.DiscouragedConstants"/>
 	<rule ref="WordPress.WP.DiscouragedFunctions"/>
 
+	<!-- Verify that capabilities are being used correctly. -->
+	<rule ref="WordPress.WP.Capabilities"/>
+
 	<!-- Scripts & style should be enqueued.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/35 -->
 	<rule ref="WordPress.WP.EnqueuedResources"/>
diff --git a/WordPress/Docs/WP/CapabilitiesStandard.xml b/WordPress/Docs/WP/CapabilitiesStandard.xml
new file mode 100644
index 0000000000..a65848e8e1
--- /dev/null
+++ b/WordPress/Docs/WP/CapabilitiesStandard.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Capabilities"
+    >
+    <standard>
+    <![CDATA[
+Capabilities passed should be valid capabilities (custom capabilities can be added in the ruleset).
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: a WP native or registered custom user capability is used.">
+        <![CDATA[
+if ( author_can( $post, <em>'manage_sites'</em> ) ) { }
+        ]]>
+        </code>
+        <code title="Invalid: unknown/unsupported user capability is used.">
+        <![CDATA[
+map_meta_cap( <em>'manage_site'</em>, $user->ID );
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+Always use user capabilities instead of roles.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: user capability is used.">
+        <![CDATA[
+add_options_page(
+    esc_html__( 'Options', 'textdomain' ),
+    esc_html__( 'Options', 'textdomain' ),
+    <em>'manage_options'</em>,
+    'options_page_slug',
+    'project_options_page_cb'
+);
+        ]]>
+        </code>
+        <code title="Invalid: user role is used instead of a capability.">
+        <![CDATA[
+add_options_page(
+    esc_html__( 'Options', 'textdomain' ),
+    esc_html__( 'Options', 'textdomain' ),
+    <em>'author'</em>,
+    'options_page_slug',
+    'project_options_page_cb'
+);
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+Don't use deprecated capabilities.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: a WP native or registered custom user capability is used.">
+        <![CDATA[
+if ( author_can( $post, <em>'read'</em> ) ) { }
+        ]]>
+        </code>
+        <code title="Invalid: deprecated user capability is used.">
+        <![CDATA[
+if ( author_can( $post, <em>'level_6'</em> ) ) { }
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
new file mode 100644
index 0000000000..b980be1d54
--- /dev/null
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -0,0 +1,478 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Sniffs\WP;
+
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
+use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
+
+/**
+ * Check that capabilities are used correctly.
+ *
+ * User capabilities should be used, not roles or deprecated capabilities.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   3.0.0
+ */
+class CapabilitiesSniff extends AbstractFunctionParameterSniff {
+
+	use MinimumWPVersionTrait;
+
+	/**
+	 * List of custom capabilities.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array
+	 */
+	public $custom_capabilities = array();
+
+	/**
+	 * The group name for this group of functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string
+	 */
+	protected $group_name = 'caps_not_roles';
+
+	/**
+	 * List of functions that accept roles and capabilities as an argument.
+	 *
+	 * The functions are defined in `wp-admin/includes/plugin.php` and
+	 * `/wp-includes/capabilities.php`.
+	 * The list is sorted alphabetically.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, array> The key is the name of a function we're targetting,
+	 *                           the value is an array containing the 1-based parameter position
+	 *                           of the "capability" parameter within the function, as well as
+	 *                           the name of the parameter as declared in the function.
+	 *                           If the parameter name has been renamed since the release of PHP 8.0,
+	 *                           the parameter can be set as an array.
+	 */
+	protected $target_functions = array(
+		'add_comments_page'         => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_dashboard_page'        => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_links_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_management_page'       => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_media_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_menu_page'             => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_object_page'           => array( // Deprecated since WP 4.5.0.
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_options_page'          => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_pages_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_plugins_page'          => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_posts_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_submenu_page'          => array(
+			'position' => 4,
+			'name'     => 'capability',
+		),
+		'add_theme_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_users_page'            => array(
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'add_utility_page'          => array( // Deprecated since WP 4.5.0.
+			'position' => 3,
+			'name'     => 'capability',
+		),
+		'author_can'                => array(
+			'position' => 2,
+			'name'     => 'capability',
+		),
+		'current_user_can'          => array(
+			'position' => 1,
+			'name'     => 'capability',
+		),
+		'current_user_can_for_blog' => array(
+			'position' => 2,
+			'name'     => 'capability',
+		),
+		'map_meta_cap'              => array(
+			'position' => 1,
+			'name'     => 'cap',
+		),
+		'user_can'                  => array(
+			'position' => 2,
+			'name'     => 'capability',
+		),
+	);
+
+	/**
+	 * List of core roles which should not to be used directly.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool> Role available in WP Core.
+	 */
+	private $core_roles = array(
+		'super_admin'   => true,
+		'administrator' => true,
+		'editor'        => true,
+		'author'        => true,
+		'contributor'   => true,
+		'subscriber'    => true,
+	);
+
+	/**
+	 * List of known primitive and meta core capabilities.
+	 *
+	 * Sources:
+	 * - {@link https://wordpress.org/support/article/roles-and-capabilities/ Roles and Capabilities handbook page}
+	 * - The `map_meta_cap()` function in the `src/wp-includes/capabilities.php` file.
+	 * - The tests in the `tests/phpunit/tests/user/capabilities.php` file.
+	 *
+	 * List is sorted alphabetically.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.0.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool> All capabilities available in core.
+	 */
+	private $core_capabilities = array(
+		'activate_plugin'             => true,
+		'activate_plugins'            => true,
+		'add_comment_meta'            => true,
+		'add_post_meta'               => true,
+		'add_term_meta'               => true,
+		'add_user_meta'               => true,
+		'add_users'                   => true,
+		'assign_categories'           => true,
+		'assign_post_tags'            => true,
+		'assign_term'                 => true,
+		'create_app_password'         => true,
+		'create_sites'                => true,
+		'create_users'                => true,
+		'customize'                   => true,
+		'deactivate_plugin'           => true,
+		'deactivate_plugins'          => true,
+		'delete_app_password'         => true,
+		'delete_app_passwords'        => true,
+		'delete_block'                => true, // Only seen in tests.
+		'delete_blocks'               => true, // Alias for 'delete_posts', but supported.
+		'delete_categories'           => true,
+		'delete_comment_meta'         => true,
+		'delete_others_blocks'        => true, // Alias for 'delete_others_posts', but supported.
+		'delete_others_pages'         => true,
+		'delete_others_posts'         => true,
+		'delete_page'                 => true, // Alias, but supported.
+		'delete_pages'                => true,
+		'delete_plugins'              => true,
+		'delete_post_tags'            => true,
+		'delete_post'                 => true, // Alias, but supported.
+		'delete_post_meta'            => true,
+		'delete_posts'                => true,
+		'delete_private_blocks'       => true, // Alias for 'delete_private_posts', but supported.
+		'delete_private_pages'        => true,
+		'delete_private_posts'        => true,
+		'delete_published_blocks'     => true, // Alias for 'delete_published_posts', but supported.
+		'delete_published_pages'      => true,
+		'delete_published_posts'      => true,
+		'delete_site'                 => true,
+		'delete_sites'                => true,
+		'delete_term'                 => true,
+		'delete_term_meta'            => true,
+		'delete_themes'               => true,
+		'delete_user'                 => true, // Alias for 'delete_users', but supported.
+		'delete_user_meta'            => true,
+		'delete_users'                => true,
+		'edit_app_password'           => true,
+		'edit_categories'             => true,
+		'edit_block'                  => true, // Only seen in tests.
+		'edit_blocks'                 => true, // Alias for 'edit_posts', but supported.
+		'edit_comment'                => true, // Alias, but supported.
+		'edit_comment_meta'           => true,
+		'edit_css'                    => true,
+		'edit_dashboard'              => true,
+		'edit_files'                  => true,
+		'edit_others_blocks'          => true, // Alias for 'edit_others_posts', but supported.
+		'edit_others_pages'           => true,
+		'edit_others_posts'           => true,
+		'edit_page'                   => true, // Alias, but supported.
+		'edit_pages'                  => true,
+		'edit_plugins'                => true,
+		'edit_post_tags'              => true,
+		'edit_post'                   => true, // Alias, but supported.
+		'edit_post_meta'              => true,
+		'edit_posts'                  => true,
+		'edit_private_blocks'         => true, // Alias for 'edit_private_posts', but supported.
+		'edit_private_pages'          => true,
+		'edit_private_posts'          => true,
+		'edit_published_blocks'       => true, // Alias for 'edit_published_posts', but supported.
+		'edit_published_pages'        => true,
+		'edit_published_posts'        => true,
+		'edit_term'                   => true,
+		'edit_term_meta'              => true,
+		'edit_theme_options'          => true,
+		'edit_themes'                 => true,
+		'edit_user'                   => true, // Alias for 'edit_users', but supported.
+		'edit_user_meta'              => true,
+		'edit_users'                  => true,
+		'erase_others_personal_data'  => true,
+		'export'                      => true,
+		'export_others_personal_data' => true,
+		'import'                      => true,
+		'install_languages'           => true,
+		'install_plugins'             => true,
+		'install_themes'              => true,
+		'list_app_passwords'          => true,
+		'list_users'                  => true,
+		'manage_categories'           => true,
+		'manage_links'                => true,
+		'manage_network'              => true,
+		'manage_network_options'      => true,
+		'manage_network_plugins'      => true,
+		'manage_network_themes'       => true,
+		'manage_network_users'        => true,
+		'manage_options'              => true,
+		'manage_post_tags'            => true,
+		'manage_privacy_options'      => true,
+		'manage_sites'                => true,
+		'moderate_comments'           => true,
+		'publish_blocks'              => true, // Alias for 'publish_posts', but supported.
+		'publish_pages'               => true,
+		'publish_post'                => true, // Alias, but supported.
+		'publish_posts'               => true,
+		'promote_user'                => true,
+		'promote_users'               => true,
+		'read'                        => true,
+		'read_block'                  => true, // Only seen in tests.
+		'read_post'                   => true, // Alias, but supported.
+		'read_page'                   => true, // Alias, but supported.
+		'read_app_password'           => true,
+		'read_private_blocks'         => true, // Alias for 'read_private_posts', but supported.
+		'read_private_pages'          => true,
+		'read_private_posts'          => true,
+		'remove_user'                 => true, // Alias for 'remove_users', but supported.
+		'remove_users'                => true,
+		'resume_plugin'               => true, // Alias for 'resume_plugins', but supported.
+		'resume_plugins'              => true,
+		'resume_theme'                => true, // Alias for 'resume_themes', but supported.
+		'resume_themes'               => true,
+		'setup_network'               => true,
+		'switch_themes'               => true,
+		'unfiltered_html'             => true,
+		'unfiltered_upload'           => true,
+		'update_core'                 => true,
+		'update_https'                => true,
+		'update_languages'            => true,
+		'update_plugins'              => true,
+		'update_php'                  => true,
+		'update_themes'               => true,
+		'upgrade_network'             => true,
+		'upload_files'                => true,
+		'upload_plugins'              => true,
+		'upload_themes'               => true,
+		'view_site_health_checks'     => true,
+	);
+
+	/**
+	 * List of deprecated core capabilities.
+	 *
+	 * User Levels were deprecated in version 3.0.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.0.}
+	 *
+	 * @link https://github.com/WordPress/wordpress-develop/blob/master/tests/phpunit/tests/user/capabilities.php
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, string> All deprecated capabilities in core.
+	 */
+	private $deprecated_capabilities = array(
+		'level_10' => '3.0.0',
+		'level_9'  => '3.0.0',
+		'level_8'  => '3.0.0',
+		'level_7'  => '3.0.0',
+		'level_6'  => '3.0.0',
+		'level_5'  => '3.0.0',
+		'level_4'  => '3.0.0',
+		'level_3'  => '3.0.0',
+		'level_2'  => '3.0.0',
+		'level_1'  => '3.0.0',
+		'level_0'  => '3.0.0',
+	);
+
+	/**
+	 * Process the parameters of a matched function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param array  $group_name      The name of the group which was matched.
+	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param array  $parameters      Array with information about the parameters.
+	 *
+	 * @return void
+	 */
+	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
+		$function_name_lc = strtolower( $matched_content );
+		$function_details = $this->target_functions[ $function_name_lc ];
+
+		$parameter = PassedParameters::getParameterFromStack(
+			$parameters,
+			$function_details['position'],
+			$function_details['name']
+		);
+
+		if ( false === $parameter ) {
+			return;
+		}
+
+		// If the parameter is anything other than T_CONSTANT_ENCAPSED_STRING throw a warning and bow out.
+		$first_non_empty = null;
+		for ( $i = $parameter['start']; $i <= $parameter['end']; $i++ ) {
+			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
+				continue;
+			}
+
+			if ( \T_CONSTANT_ENCAPSED_STRING !== $this->tokens[ $i ]['code']
+				|| null !== $first_non_empty
+			) {
+				// Throw warning at low severity.
+				$this->phpcsFile->addWarning(
+					'Couldn\'t determine the value passed to the $%s parameter in function call to %s(). Please check if it matches a valid capability. Found: %s',
+					$i,
+					'Undetermined',
+					array(
+						$function_details['name'],
+						$matched_content,
+						$parameter['clean'],
+					),
+					3 // Message severity set to below default.
+				);
+				return;
+			}
+
+			$first_non_empty = $i;
+		}
+
+		if ( null === $first_non_empty ) {
+			// Parse error. Bow out.
+			return;
+		}
+
+		/*
+		 * As of this point we know that the `$capabilities` parameter only contains the one token
+		 * and that that token is a `T_CONSTANT_ENCAPSED_STRING`.
+		 */
+		$matched_parameter = TextStrings::stripQuotes( $this->tokens[ $first_non_empty ]['content'] );
+
+		if ( isset( $this->core_capabilities[ $matched_parameter ] ) ) {
+			return;
+		}
+
+		if ( empty( $matched_parameter ) ) {
+			$this->phpcsFile->addError(
+				'An empty string is not a valid capability. Empty string found as the $%s parameter in a function call to %s()"',
+				$first_non_empty,
+				'Invalid',
+				array(
+					$function_details['name'],
+					$matched_content,
+				)
+			);
+			return;
+		}
+
+		// Check if additional capabilities were registered via the ruleset and if the found capability matches any of those.
+		$custom_capabilities = $this->merge_custom_array( $this->custom_capabilities, array() );
+		if ( isset( $custom_capabilities[ $matched_parameter ] ) ) {
+			return;
+		}
+
+		if ( isset( $this->deprecated_capabilities[ $matched_parameter ] ) ) {
+			$this->get_wp_version_from_cli( $this->phpcsFile );
+			$is_error = version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_supported_version, '<' );
+
+			$data = array(
+				$matched_parameter,
+				$matched_content,
+				$this->deprecated_capabilities[ $matched_parameter ],
+			);
+
+			MessageHelper::addMessage(
+				$this->phpcsFile,
+				'The capability "%s", found in the function call to %s(), has been deprecated since WordPress version %s.',
+				$first_non_empty,
+				$is_error,
+				'Deprecated',
+				$data
+			);
+			return;
+		}
+
+		if ( isset( $this->core_roles[ $matched_parameter ] ) ) {
+			$this->phpcsFile->addError(
+				'Capabilities should be used instead of roles. Found "%s" in function call to %s()',
+				$first_non_empty,
+				'RoleFound',
+				array(
+					$matched_parameter,
+					$matched_content,
+				)
+			);
+			return;
+		}
+
+		$this->phpcsFile->addWarning(
+			'Found unknown capability "%s" in function call to %s(). Please check the spelling of the capability. If this is a custom capability, please verify the capability is registered with WordPress via a call to WP_Role(s)->add_cap().' . \PHP_EOL . 'Custom capabilities can be made known to this sniff by setting the "custom_capabilities" property in the PHPCS ruleset.',
+			$first_non_empty,
+			'Unknown',
+			array(
+				$matched_parameter,
+				$matched_content,
+			)
+		);
+	}
+
+}
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
new file mode 100644
index 0000000000..40226dcdc5
--- /dev/null
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
@@ -0,0 +1,117 @@
+<?php
+/*
+ * These shouldn't be flagged.
+ */
+if ( author_can( $post, 'read' ) ) { } // OK.
+map_meta_cap( 'edit_posts', $user->ID ); // OK.
+
+/*
+ * Low severity warnings, usually these need to be manually checked.
+ */
+add_posts_page( 'page_title', 'menu_title', 'admin' . 'istrator', 'menu_slug', 'function' ); // Low severity warning.
+if ( author_can( $post, $capability ) ) { } // Low severity warning.
+add_submenu_page(
+	'parent_slug',
+	'page_title',
+	'menu_title',
+	$variable, // Low severity warning.
+	'menu_slug',
+	'function'
+);
+add_menu_page( $pagetitle, $menu_title, $subscriber, 'handle', 'function', 'icon_url' ); // Low severity warning.
+add_plugins_page( 'page_title', 'menu_title', $cap, 'menu_slug', 'function' ); // Low severity warning.
+add_options_page( $pagetitle, $menu_title, CONSTANT, 'menu_slug', 'function' ); // Low severity warning.
+add_posts_page( 'page_title', 'menu_title', self /* comment */   ::   CAPABILITY, 'menu_slug', 'function' ); // Low severity warning.
+add_posts_page( 'page_title', 'menu_title', 'admin' /* comment */   . 'istrator', 'menu_slug', 'function' ); // Low severity warning.
+add_menu_page(
+	$p,
+	$t, // Comment.
+	$capability, // Low severity warning.
+);
+add_menu_page( $p, $t, 'admin' . 'istrator' ); // Low severity warning.
+add_menu_page($p, $t, $caps['level'] ); // Low severity warning.
+
+// Parse error, but just making sure we account for all possibilities.
+add_menu_page($p, $t, 'level_' 'level' ); // Low severity warning.
+
+/*
+ * Empty capability parameter.
+ */
+if ( author_can( $post, '' ) ) { } // Error.
+
+/*
+ * Deprecated capabilities.
+ */
+// phpcs:set WordPress.WP.Capabilities minimum_supported_version 2.9
+if ( author_can( $post, 'level_3' ) ) { } // Warning.
+
+// phpcs:set WordPress.WP.Capabilities minimum_supported_version 5.9
+if ( author_can( $post, 'level_5' ) ) { } // Error.
+add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Error.
+
+/*
+ * Unknown capabilities, could be that they need to be set in the property, but weren't.
+ */
+if ( author_can( $post, 'custom_cap' ) ) { } // Warning.
+if ( current_user_can( 'foo_bar' ) ) { } // Warning.
+if ( current_user_can_for_blog( '3', 'custom_cap' ) ) { } // Warning.
+add_users_page( 'page_title', 'menu_title', 'foo_bar', 'menu_slug', 'function' ); // Warning.
+add_management_page( 'page_title', 'menu_title', 'foo_bar', 'menu_slug', 'function' ); // Warning.
+add_menu_page( $pagetitle, 'menu_title', 'foo_bar', 'handle', 'function', 'icon_url' ); // Warning.
+
+/*
+ * Roles found instead of capabilities.
+ */
+add_posts_page( 'page_title', 'menu_title', 'administrator', 'menu_slug', 'function' ); // Error.
+add_media_page( 'page_title', 'menu_title', 'editor', 'menu_slug', 'function' ); // Error.
+add_pages_page( 'page_title', 'menu_title', 'author', 'menu_slug', 'function' ); // Error.
+add_comments_page( 'page_title', 'menu_title', 'contributor', 'menu_slug', 'function' ); // Error.
+add_theme_page( 'page_title', $menu_title, 'subscriber', 'menu_slug', 'function' ); // Error.
+add_plugins_page( 'page_title', 'menu_title', 'super_admin', 'menu_slug', 'function' ); // Error.
+add_users_page( 'page_title', 'menu_title', 'administrator', 'menu_slug', 'function' ); // Error.
+add_management_page( 'page_title', 'menu_title', 'editor', 'menu_slug', 'function' ); // Error.
+if ( current_user_can( 'super_admin' ) ) { } // Error.
+if( current_user_can_for_blog( '1', 'editor' ) ) { }  // Error.
+add_dashboard_page(
+	'page_title',
+	'menu_title',
+	'super_admin' /* Comment */, // Error.
+	'menu_slug',
+	'function'
+);
+add_utility_page(
+	'page_title'
+	,'menu_title'
+	,'super_admin' // Error.
+	,'menu_slug'
+	,'function'
+	,'icon_url'
+);
+
+// PHP 8.0 named parameters support.
+add_menu_page( capability: 'foobar', page_title: $p, menu_title: $m ); // Warning.
+
+/*
+ * Testing handling of the custom capabilities properties.
+ */
+// phpcs:set WordPress.WP.Capabilities custom_capabilities[] custom_cap,foo_bar
+if ( current_user_can( 'foo_bar' ) ) { } // OK.
+if ( author_can( $post, 'custom_cap' ) ) { } // OK.
+if ( author_can( $post, 'custom_capability' ) ) { } // Warning.
+
+// phpcs:set WordPress.WP.Capabilities custom_capabilities[]
+
+// Making sure that the warnings and errors are showing up in the case where we unset the custom capabilities.
+if ( author_can( $post, 'custom_cap' ) ) { } // Warning.
+map_meta_cap( 'editor', $user->ID ); // Error.
+
+// Another parse error, but the sniff should still handle this correctly (by bowing out).
+add_menu_page( $p, $t, /* deliberately empty */, $slug, );
+
+add_menu_page( [] ); // Should bow out because the parameter is not found.
+
+$obj->current_user_can( 'foo_bar' ); // Ok. We're not checking for method calls.
+My\NamespaceS\add_posts_page( 'page_title', 'menu_title', 'administrator', 'menu_slug', 'function' ); // Ok. We're not checking namespaced functions.
+
+// Parse error, should be handled correctly by bowing out.
+add_posts_page( 'page_title',
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.2.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.2.inc
new file mode 100644
index 0000000000..acc1d5aaf1
--- /dev/null
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.2.inc
@@ -0,0 +1,14 @@
+<?php
+
+if ( author_can( $post, 'read' ) ) { } // OK.
+
+/*
+ * Deprecated capabilities - checking if setting from the CLI will work as well.
+ *
+ * WordPress version: 2.9.0
+ */
+if ( author_can( $post, 'level_3' ) ) { } // Warning.
+
+if ( author_can( $post, 'level_5' ) ) { } // Warning.
+
+add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Warning.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.3.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.3.inc
new file mode 100644
index 0000000000..8e69751695
--- /dev/null
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.3.inc
@@ -0,0 +1,14 @@
+<?php
+
+if ( author_can( $post, 'read' ) ) { } // OK.
+
+/*
+ * Deprecated capabilities - checking if setting from the CLI will work as well.
+ *
+ * WordPress version: 6.1.0
+ */
+if ( author_can( $post, 'level_3' ) ) { } // Error.
+
+if ( author_can( $post, 'level_5' ) ) { } // Error.
+
+add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Error.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
new file mode 100644
index 0000000000..dc8326e066
--- /dev/null
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Tests\WP;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHPCSUtils\BackCompat\Helper;
+
+/**
+ * Unit test class for the Capabilities sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0
+ */
+class CapabilitiesUnitTest extends AbstractSniffUnitTest {
+	/**
+	 * Set warnings level to 3 to trigger suggestions as warnings.
+	 *
+	 * @param string                  $filename The name of the file being tested.
+	 * @param \PHP_CodeSniffer\Config $config   The config data for the run.
+	 *
+	 * @return void
+	 */
+	public function setCliValues( $filename, $config ) {
+		if ( 'CapabilitiesUnitTest.1.inc' === $filename ) {
+			$config->warningSeverity = 3;
+		} elseif ( 'CapabilitiesUnitTest.2.inc' === $filename ) {
+			Helper::setConfigData( 'minimum_supported_wp_version', '2.9', true, $config );
+		} elseif ( 'CapabilitiesUnitTest.3.inc' === $filename ) {
+			Helper::setConfigData( 'minimum_supported_wp_version', '6.1', true, $config );
+		} else {
+			// Delete for other files.
+			Helper::setConfigData( 'minimum_supported_wp_version', null, true, $config );
+		}
+	}
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'CapabilitiesUnitTest.1.inc':
+				return array(
+					40  => 1,
+					49  => 1,
+					50  => 1,
+					65  => 1,
+					66  => 1,
+					67  => 1,
+					68  => 1,
+					69  => 1,
+					70  => 1,
+					71  => 1,
+					72  => 1,
+					73  => 1,
+					74  => 1,
+					78  => 1,
+					85  => 1,
+					106 => 1,
+				);
+
+			case 'CapabilitiesUnitTest.3.inc':
+				return array(
+					10 => 1,
+					12 => 1,
+					14 => 1,
+				);
+
+			default:
+				return array();
+		}
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'CapabilitiesUnitTest.1.inc':
+				return array(
+					11  => 1,
+					12  => 1,
+					17  => 1,
+					21  => 1,
+					22  => 1,
+					23  => 1,
+					24  => 1,
+					25  => 1,
+					29  => 1,
+					31  => 1,
+					32  => 1,
+					35  => 1,
+					46  => 1,
+					55  => 1,
+					56  => 1,
+					57  => 1,
+					58  => 1,
+					59  => 1,
+					60  => 1,
+					92  => 1,
+					100 => 1,
+					105 => 1,
+				);
+
+			case 'CapabilitiesUnitTest.2.inc':
+				return array(
+					10 => 1,
+					12 => 1,
+					14 => 1,
+				);
+
+			default:
+				return array();
+		}
+	}
+}

From 8c7b230da4313472c8fe6afb421f43e9598b95c2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 26 Nov 2022 14:48:21 +0100
Subject: [PATCH 228/822] MinimumWPVersionTrait: rename minimum WP version
 property

As discussed in 2113, this changes the name for both the CLI setting as well as the property to `minimum_wp_version` in all applicable places.

Note: documentation (`phpcs.xml.dist.sample` and the Wiki) is not being updated in this PR.
The wiki should be reviewed and updated just before release.
The update to the `phpcs.xml.dist.sample` file is included in a WIP PR to update all public facing documentation just before the release.

Closes 2113
---
 WordPress/Helpers/MinimumWPVersionTrait.php   | 35 ++++++++++---------
 .../Sniffs/WP/AlternativeFunctionsSniff.php   |  6 ++--
 WordPress/Sniffs/WP/CapabilitiesSniff.php     |  4 ++-
 .../Sniffs/WP/DeprecatedClassesSniff.php      |  4 +--
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    |  4 +--
 .../WP/DeprecatedParameterValuesSniff.php     |  4 +--
 .../Sniffs/WP/DeprecatedParametersSniff.php   |  4 +--
 .../Tests/WP/AlternativeFunctionsUnitTest.inc | 10 +++---
 WordPress/Tests/WP/CapabilitiesUnitTest.1.inc |  4 +--
 WordPress/Tests/WP/CapabilitiesUnitTest.php   |  6 ++--
 10 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 232fddc7cf..96810d3578 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -19,7 +19,7 @@
  * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
  * - Call the `MinimumWPVersionTrait::get_wp_version_from_cli()` method in the `process()`/`process_token()`
  *   method.
- * - After that, the `MinimumWPVersionTrait::$minimum_supported_version` property can be freely used
+ * - After that, the `MinimumWPVersionTrait::$minimum_wp_version` property can be freely used
  *   in the sniff.
  *
  * @package WPCS\WordPressCodingStandards
@@ -32,12 +32,12 @@ trait MinimumWPVersionTrait {
 	 * Minimum supported WordPress version.
 	 *
 	 * Currently used by the `WordPress.WP.AlternativeFunctions`,
-	 * `WordPress.WP.DeprecatedClasses`, `WordPress.WP.DeprecatedFunctions`,
-	 * `WordPress.WP.DeprecatedParameter` and the `WordPress.WP.DeprecatedParameterValues` sniff.
+	 * `WordPress.WP.Capabilities`, `WordPress.WP.DeprecatedClasses`,
+	 * `WordPress.WP.DeprecatedFunctions`, `WordPress.WP.DeprecatedParameter`
+	 * and the `WordPress.WP.DeprecatedParameterValues` sniff.
 	 *
-	 * These sniffs will throw an error when usage of a deprecated class/function/parameter
-	 * is detected if the class/function/parameter was deprecated before the minimum
-	 * supported WP version; a warning otherwise.
+	 * These sniffs will adapt their behaviour based on the minimum supported WP version
+	 * indicated.
 	 * By default, it is set to presume that a project will support the current
 	 * WP version and up to three releases before.
 	 *
@@ -48,41 +48,42 @@ trait MinimumWPVersionTrait {
 	 * Example usage:
 	 * <rule ref="WordPress.WP.DeprecatedClasses">
 	 *  <properties>
-	 *   <property name="minimum_supported_version" value="4.3"/>
+	 *   <property name="minimum_wp_version" value="4.3"/>
 	 *  </properties>
 	 * </rule>
 	 *
-	 * Alternatively, the value can be passed in one go for all sniff using it via
+	 * Alternatively, the value can be passed in one go for all sniffs using it via
 	 * the command line or by setting a `<config>` value in a custom phpcs.xml ruleset.
-	 * Note: the `_wp_` in the command line property name!
 	 *
-	 * CL: `phpcs --runtime-set minimum_supported_wp_version 4.5`
-	 * Ruleset: `<config name="minimum_supported_wp_version" value="4.5"/>`
+	 * CL: `phpcs --runtime-set minimum_wp_version 4.5`
+	 * Ruleset: `<config name="minimum_wp_version" value="4.5"/>`
 	 *
 	 * @since 0.14.0 Previously the individual sniffs each contained this property.
-	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
+	 *               - The property has been renamed from `$minimum_supported_version` to `$minimum_wp_version`.
+	 *               - The CLI option has been renamed from `minimum_supported_wp_version` to `minimum_wp_version`.
 	 *
 	 * @internal When the value of this property is changed, it will also need
 	 *           to be changed in the `WP/AlternativeFunctionsUnitTest.inc` file.
 	 *
 	 * @var string WordPress version.
 	 */
-	public $minimum_supported_version = '5.1';
+	public $minimum_wp_version = '5.1';
 
 	/**
 	 * Overrule the minimum supported WordPress version with a command-line/config value.
 	 *
 	 * Handle setting the minimum supported WP version in one go for all sniffs which
 	 * expect it via the command line or via a `<config>` variable in a ruleset.
-	 * The config variable overrules the default `$minimum_supported_version` and/or a
-	 * `$minimum_supported_version` set for individual sniffs through the ruleset.
+	 * The config variable overrules the default `$minimum_wp_version` and/or a
+	 * `$minimum_wp_version` set for individual sniffs through the ruleset.
 	 *
 	 * @since 0.14.0
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
 	 *               - Renamed from `get_wp_version_from_cl()` to `get_wp_version_from_cli()`.
 	 */
 	protected function get_wp_version_from_cli() {
-		$cli_supported_version = Helper::getConfigData( 'minimum_supported_wp_version' );
+		$cli_supported_version = Helper::getConfigData( 'minimum_wp_version' );
 
 		if ( empty( $cli_supported_version ) ) {
 			return;
@@ -92,7 +93,7 @@ protected function get_wp_version_from_cli() {
 		if ( ! empty( $cli_supported_version )
 			&& filter_var( $cli_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
 		) {
-			$this->minimum_supported_version = $cli_supported_version;
+			$this->minimum_wp_version = $cli_supported_version;
 		}
 	}
 
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index cad367fcc4..cccaf5ddaf 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -24,7 +24,7 @@
  * @since   1.0.0  - Takes the minimum supported WP version into account.
  *                 - Takes exceptions based on passed parameters into account.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
@@ -210,7 +210,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 * @see https://developer.wordpress.org/reference/functions/wp_parse_url/#changelog
 				 */
 				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1
-					&& version_compare( $this->minimum_supported_version, '4.7.0', '<' )
+					&& version_compare( $this->minimum_wp_version, '4.7.0', '<' )
 				) {
 					return;
 				}
@@ -288,7 +288,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 
 		// Verify if the alternative is available in the minimum supported WP version.
-		if ( version_compare( $this->groups[ $group_name ]['since'], $this->minimum_supported_version, '<=' ) ) {
+		if ( version_compare( $this->groups[ $group_name ]['since'], $this->minimum_wp_version, '<=' ) ) {
 			return parent::process_matched_token( $stackPtr, $group_name, $matched_content );
 		}
 	}
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index b980be1d54..942b6b6b92 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -24,6 +24,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   3.0.0
+ *
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 
@@ -432,7 +434,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		if ( isset( $this->deprecated_capabilities[ $matched_parameter ] ) ) {
 			$this->get_wp_version_from_cli( $this->phpcsFile );
-			$is_error = version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_supported_version, '<' );
+			$is_error = version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_wp_version, '<' );
 
 			$data = array(
 				$matched_parameter,
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index c1fd8e051d..effc42dfab 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -30,7 +30,7 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 
@@ -116,7 +116,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$this->phpcsFile,
 			$message,
 			$stackPtr,
-			( version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_supported_version, '<' ) ),
+			( version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_wp_version, '<' ) ),
 			MessageHelper::stringToErrorcode( $class_name . 'Found' ),
 			$data
 		);
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index b9379c4e54..2e5968d083 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -30,7 +30,7 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
@@ -1418,7 +1418,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$this->phpcsFile,
 			$message,
 			$stackPtr,
-			( version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_supported_version, '<' ) ),
+			( version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_wp_version, '<' ) ),
 			MessageHelper::stringToErrorcode( $matched_content . 'Found' ),
 			$data
 		);
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index be90ca7075..c726a840ef 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -22,7 +22,7 @@
  *
  * @since   1.0.0
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 
@@ -208,7 +208,7 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 			$data[]   = $parameter_args[ $matched_parameter ]['alt'];
 		}
 
-		$is_error = version_compare( $parameter_args[ $matched_parameter ]['version'], $this->minimum_supported_version, '<' );
+		$is_error = version_compare( $parameter_args[ $matched_parameter ]['version'], $this->minimum_wp_version, '<' );
 		MessageHelper::addMessage(
 			$this->phpcsFile,
 			$message,
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 787da50856..623e5fbc7e 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -31,7 +31,7 @@
  *                 being provided via the command-line or as as <config> value
  *                 in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_supported_version
+ * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 
@@ -319,7 +319,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 
 			$message  = 'The parameter "%s" at position #%s of %s() has been deprecated since WordPress version %s.';
-			$is_error = version_compare( $parameter_args['version'], $this->minimum_supported_version, '<' );
+			$is_error = version_compare( $parameter_args['version'], $this->minimum_wp_version, '<' );
 			$code     = MessageHelper::stringToErrorcode( ucfirst( $matched_content ) . 'Param' . $position . 'Found' );
 
 			$data = array(
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index d819f25a11..c74000b6d5 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -28,17 +28,17 @@ srand(); // Warning.
 mt_srand(); // Warning.
 wp_rand(); // OK.
 
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_supported_version 4.0
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
 parse_url( 'http://example.com/' ); // OK.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_supported_version 4.6
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
 
 strip_tags( $something, '<iframe>' ); // OK.
 
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_supported_version 4.0
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
 parse_url($url, PHP_URL_QUERY); // OK.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_supported_version 4.7
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
 parse_url($url, PHP_URL_SCHEME); // Warning.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_supported_version 4.6
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
 
 file_get_contents( $local_file, true ); // OK.
 file_get_contents( $url, false ); // Warning.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
index 40226dcdc5..f0de254a73 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
@@ -42,10 +42,10 @@ if ( author_can( $post, '' ) ) { } // Error.
 /*
  * Deprecated capabilities.
  */
-// phpcs:set WordPress.WP.Capabilities minimum_supported_version 2.9
+// phpcs:set WordPress.WP.Capabilities minimum_wp_version 2.9
 if ( author_can( $post, 'level_3' ) ) { } // Warning.
 
-// phpcs:set WordPress.WP.Capabilities minimum_supported_version 5.9
+// phpcs:set WordPress.WP.Capabilities minimum_wp_version 5.9
 if ( author_can( $post, 'level_5' ) ) { } // Error.
 add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Error.
 
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index dc8326e066..34b7b50fa6 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -31,12 +31,12 @@ public function setCliValues( $filename, $config ) {
 		if ( 'CapabilitiesUnitTest.1.inc' === $filename ) {
 			$config->warningSeverity = 3;
 		} elseif ( 'CapabilitiesUnitTest.2.inc' === $filename ) {
-			Helper::setConfigData( 'minimum_supported_wp_version', '2.9', true, $config );
+			Helper::setConfigData( 'minimum_wp_version', '2.9', true, $config );
 		} elseif ( 'CapabilitiesUnitTest.3.inc' === $filename ) {
-			Helper::setConfigData( 'minimum_supported_wp_version', '6.1', true, $config );
+			Helper::setConfigData( 'minimum_wp_version', '6.1', true, $config );
 		} else {
 			// Delete for other files.
-			Helper::setConfigData( 'minimum_supported_wp_version', null, true, $config );
+			Helper::setConfigData( 'minimum_wp_version', null, true, $config );
 		}
 	}
 

From 9cd78bef94d77ce88f79c254a0524784ab84cefd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 3 Dec 2022 17:43:09 +0100
Subject: [PATCH 229/822] WP/Capabilities: tests - prevent CLI value leaking

In the `CapabilitiesUnitTest::setCliValues()` method, the config value for `'minimum_wp_version'` is set for two test case files, but as the sniff did not have a test case file which would be run _after_ that, it would never get _unset_ again, which means it could negatively influence other tests as the value will persist and the value from the CLI will overrule "ruleset" passed values (including the values passed using `phpcs:set`).

This fixes this issue by adding an extra test case file, which makes sure that the CLI value gets reset/deleted.

Notes:
* The "proper" way to do this would be to use the test `tear_down()`, but unfortunately, the `tear_down()` doesn't have access to the `$config`, so resetting the value won't work.
* This is a known bug in the test framework for which I have had a PR open in PHPCS since March 2020. squizlabs/PHP_CodeSniffer 2899
* There are a couple of other tests in WPCS in which the same should probably be applied, however, those (currently) don't negatively affect other tests.
---
 WordPress/Tests/WP/CapabilitiesUnitTest.4.inc | 12 ++++++++++++
 WordPress/Tests/WP/CapabilitiesUnitTest.php   | 16 ++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 WordPress/Tests/WP/CapabilitiesUnitTest.4.inc

diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.4.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.4.inc
new file mode 100644
index 0000000000..b90379d204
--- /dev/null
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.4.inc
@@ -0,0 +1,12 @@
+<?php
+
+if ( author_can( $post, 'read' ) ) { } // OK.
+
+/*
+ * Deprecated capabilities - just making sure the CLI option is reset to the default.
+ */
+if ( author_can( $post, 'level_3' ) ) { } // Error.
+
+if ( author_can( $post, 'level_5' ) ) { } // Error.
+
+add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Error.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index 34b7b50fa6..448916df03 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -19,8 +19,9 @@
  * @since   3.0.0
  */
 class CapabilitiesUnitTest extends AbstractSniffUnitTest {
+
 	/**
-	 * Set warnings level to 3 to trigger suggestions as warnings.
+	 * Adjust the config to allow for testing with specific CLI arguments.
 	 *
 	 * @param string                  $filename The name of the file being tested.
 	 * @param \PHP_CodeSniffer\Config $config   The config data for the run.
@@ -30,7 +31,11 @@ class CapabilitiesUnitTest extends AbstractSniffUnitTest {
 	public function setCliValues( $filename, $config ) {
 		if ( 'CapabilitiesUnitTest.1.inc' === $filename ) {
 			$config->warningSeverity = 3;
-		} elseif ( 'CapabilitiesUnitTest.2.inc' === $filename ) {
+		} else {
+			$config->warningSeverity = 5;
+		}
+
+		if ( 'CapabilitiesUnitTest.2.inc' === $filename ) {
 			Helper::setConfigData( 'minimum_wp_version', '2.9', true, $config );
 		} elseif ( 'CapabilitiesUnitTest.3.inc' === $filename ) {
 			Helper::setConfigData( 'minimum_wp_version', '6.1', true, $config );
@@ -76,6 +81,13 @@ public function getErrorList( $testFile = '' ) {
 					14 => 1,
 				);
 
+			case 'CapabilitiesUnitTest.4.inc':
+				return array(
+					8  => 1,
+					10 => 1,
+					12 => 1,
+				);
+
 			default:
 				return array();
 		}

From eba54deebfcd81bf5f3157caa084a645dd7b59d6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 26 Nov 2022 16:38:03 +0100
Subject: [PATCH 230/822] Update the minimum_wp_version to WP 5.8

The minimum version should be three versions behind the latest WP release, so what with 6.1 being out, it should now be 5.8.

Includes adding a little more variation to the example code in the property docblock in the `MinimumWPVersionTrait`.

Includes updating the list of deprecated functions in the `WP.DeprecatedFunctions` sniff based on the WP 6.1.1 release.
Input for this based on @JDGrimes's WP deprecated code scanner, though that is getting more and more difficult to run as it is no longer maintained and is throwing lots of errors.

Notes:
* The `sanitize_url()` function has been _un_deprecated in WP 5.9. See 2031.
* The replacement for the deprecated `wp_cache_reset()` function has been changed in WP Core.
    Ref: https://core.trac.wordpress.org/changeset/52705
* The `_filter_query_attachment_filenames()` function lists the wrong deprecation version in Core. WPCS now contains the correct version.
    A patch has been submitted to fix the listing in Core.
    Refs:
    - https://core.trac.wordpress.org/changeset/54524
    - https://core.trac.wordpress.org/ticket/56791#comment:10
* Other than the above, no verification has been executed on the newly added deprecated function information.

Includes minor tweak to make the generation of the test lines array a little more descriptive.

Previous: 1881

Closes 2031
---
 WordPress/Helpers/MinimumWPVersionTrait.php   |   8 +-
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    | 137 +++++++++++++++++-
 .../Tests/WP/DeprecatedClassesUnitTest.inc    |   4 -
 .../Tests/WP/DeprecatedClassesUnitTest.php    |   8 +-
 .../Tests/WP/DeprecatedFunctionsUnitTest.inc  |  47 +++++-
 .../Tests/WP/DeprecatedFunctionsUnitTest.php  |  26 +++-
 6 files changed, 202 insertions(+), 28 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 96810d3578..5b98351f72 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -48,15 +48,15 @@ trait MinimumWPVersionTrait {
 	 * Example usage:
 	 * <rule ref="WordPress.WP.DeprecatedClasses">
 	 *  <properties>
-	 *   <property name="minimum_wp_version" value="4.3"/>
+	 *   <property name="minimum_wp_version" value="4.9"/>
 	 *  </properties>
 	 * </rule>
 	 *
 	 * Alternatively, the value can be passed in one go for all sniffs using it via
 	 * the command line or by setting a `<config>` value in a custom phpcs.xml ruleset.
 	 *
-	 * CL: `phpcs --runtime-set minimum_wp_version 4.5`
-	 * Ruleset: `<config name="minimum_wp_version" value="4.5"/>`
+	 * CL:      `phpcs --runtime-set minimum_wp_version 5.7`
+	 * Ruleset: `<config name="minimum_wp_version" value="6.0"/>`
 	 *
 	 * @since 0.14.0 Previously the individual sniffs each contained this property.
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
@@ -68,7 +68,7 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @var string WordPress version.
 	 */
-	public $minimum_wp_version = '5.1';
+	public $minimum_wp_version = '5.8';
 
 	/**
 	 * Overrule the minimum supported WordPress version with a command-line/config value.
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 2e5968d083..b7aabb5a1d 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -410,10 +410,6 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 			'alt'     => 'wp_register_widget_control()',
 			'version' => '2.8.0',
 		),
-		'sanitize_url' => array(
-			'alt'     => 'esc_url_raw()',
-			'version' => '2.8.0',
-		),
 		'the_author_aim' => array(
 			'alt'     => 'the_author_meta(\'aim\')',
 			'version' => '2.8.0',
@@ -988,7 +984,7 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 			'version' => '3.5.0',
 		),
 		'wp_cache_reset' => array(
-			'alt'     => 'WP_Object_Cache::reset()',
+			'alt'     => 'wp_cache_switch_to_blog()',
 			'version' => '3.5.0',
 		),
 		'wp_create_thumbnail' => array(
@@ -1369,6 +1365,137 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 			'alt'     => 'wp_get_user_request()',
 			'version' => '5.4.0',
 		),
+
+		// WP 5.5.0.
+		'_wp_register_meta_args_whitelist' => array(
+			'alt'     => '_wp_register_meta_args_allowed_list()',
+			'version' => '5.5.0',
+		),
+		'add_option_whitelist' => array(
+			'alt'     => 'add_allowed_options()',
+			'version' => '5.5.0',
+		),
+		'remove_option_whitelist' => array(
+			'alt'     => 'remove_allowed_options()',
+			'version' => '5.5.0',
+		),
+		'wp_blacklist_check' => array(
+			'alt'     => 'wp_check_comment_disallowed_list()',
+			'version' => '5.5.0',
+		),
+		'wp_make_content_images_responsive' => array(
+			'alt'     => 'wp_filter_content_tags()',
+			'version' => '5.5.0',
+		),
+		'wp_unregister_GLOBALS' => array(
+			'alt'     => '',
+			'version' => '5.5.0',
+		),
+
+		// WP 5.7.0.
+		'noindex' => array(
+			'alt'     => 'wp_robots_noindex()',
+			'version' => '5.7.0',
+		),
+		'wp_no_robots' => array(
+			'alt'     => 'wp_robots_no_robots()',
+			'version' => '5.7.0',
+		),
+		'wp_sensitive_page_meta' => array(
+			'alt'     => 'wp_robots_sensitive_page()',
+			'version' => '5.7.0',
+		),
+
+		// WP 5.8.0.
+		'_excerpt_render_inner_columns_blocks' => array(
+			'alt'     => '_excerpt_render_inner_blocks()',
+			'version' => '5.8.0',
+		),
+
+		// WP 5.9.0.
+		'readonly' => array(
+			'alt'     => 'wp_readonly()',
+			'version' => '5.9.0',
+		),
+
+		// WP 5.9.1.
+		'wp_render_duotone_filter_preset' => array(
+			'alt'     => 'wp_get_duotone_filter_property()',
+			'version' => '5.9.1',
+		),
+
+		// WP 6.0.0.
+		'image_attachment_fields_to_save' => array(
+			'alt'     => '',
+			'version' => '6.0.0',
+		),
+		'wp_add_iframed_editor_assets_html' => array(
+			'alt'     => '',
+			'version' => '6.0.0',
+		),
+		'wp_skip_border_serialization' => array(
+			'alt'     => 'wp_should_skip_block_supports_serialization()',
+			'version' => '6.0.0',
+		),
+		'wp_skip_dimensions_serialization' => array(
+			'alt'     => 'wp_should_skip_block_supports_serialization()',
+			'version' => '6.0.0',
+		),
+		'wp_skip_spacing_serialization' => array(
+			'alt'     => 'wp_should_skip_block_supports_serialization()',
+			'version' => '6.0.0',
+		),
+
+		// WP 6.0.2.
+		'the_meta' => array(
+			'alt'     => 'get_post_meta()',
+			'version' => '6.0.2',
+		),
+
+		// WP 6.0.3.
+		// Verified; see https://core.trac.wordpress.org/ticket/56791#comment:10.
+		'_filter_query_attachment_filenames' => array(
+			'alt'     => 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )',
+			'version' => '6.0.3',
+		),
+
+		// WP 6.1.0.
+		'_get_path_to_translation' => array(
+			'alt'     => 'WP_Textdomain_Registry',
+			'version' => '6.1.0',
+		),
+		'_get_path_to_translation_from_lang_dir' => array(
+			'alt'     => 'WP_Textdomain_Registry',
+			'version' => '6.1.0',
+		),
+		'_wp_multiple_block_styles' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'global_terms' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'global_terms_enabled' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'install_global_terms' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'sync_category_tag_slugs' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'wp_get_attachment_thumb_file' => array(
+			'alt'     => '',
+			'version' => '6.1.0',
+		),
+		'wp_typography_get_css_variable_inline_style' => array(
+			'alt'     => 'wp_style_engine_get_styles()',
+			'version' => '6.1.0',
+		),
 	);
 
 	/**
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc b/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
index 02f3dad196..b9b8814f47 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
@@ -16,9 +16,5 @@ $a = (new WP_User_Search())->query();
 /* ============ WP 4.9 ============ */
 class Prefix_Menu_section extends Customize_New_Menu_Section {}
 WP_Customize_New_Menu_Control::foo();
-
-/*
- * Warning.
- */
 /* ============ WP 5.3 ============ */
 $json = new Services_JSON;
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index e5abbb46b7..2dace9a7d7 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -27,10 +27,12 @@ class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
 	 * @return array <int line number> => <int number of errors>
 	 */
 	public function getErrorList() {
-		$errors = array_fill( 9, 10, 1 );
+		$start_line = 9;
+		$end_line   = 20;
+		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
-		unset( $errors[16] );
+		unset( $errors[16], $errors[19] );
 
 		return $errors;
 	}
@@ -41,7 +43,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array_fill( 24, 1, 1 );
+		return array();
 	}
 
 }
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
index 3990ad6c4d..ee7285769c 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
@@ -99,7 +99,7 @@ get_the_author_yim();
 js_escape();
 register_sidebar_widget();
 register_widget_control();
-sanitize_url();
+sanitize_url(); // Undeprecated as of WP 5.9. See #2031.
 the_author_aim();
 the_author_description();
 the_author_email();
@@ -334,10 +334,6 @@ get_shortcut_link();
 is_user_option_local();
 wp_ajax_press_this_add_category();
 wp_ajax_press_this_save_post();
-
-/*
- * Warning.
- */
 /* ============ WP 5.1 ============ */
 insert_blog();
 install_blog();
@@ -347,3 +343,44 @@ _wp_privacy_requests_screen_options();
 update_user_status();
 /* ============ WP 5.4 ============ */
 wp_get_user_request_data();
+/* ============ WP 5.5 ============ */
+_wp_register_meta_args_whitelist();
+add_option_whitelist();
+remove_option_whitelist();
+wp_blacklist_check();
+wp_make_content_images_responsive();
+wp_unregister_GLOBALS();
+/* ============ WP 5.7 ============ */
+noindex();
+wp_no_robots();
+wp_sensitive_page_meta();
+
+/*
+ * Warning.
+ */
+/* ============ WP 5.8 ============ */
+_excerpt_render_inner_columns_blocks();
+/* ============ WP 5.9 ============ */
+readonly();
+/* ============ WP 5.9.1 ============ */
+wp_render_duotone_filter_preset();
+/* ============ WP 6.0 ============ */
+image_attachment_fields_to_save();
+wp_add_iframed_editor_assets_html();
+wp_skip_border_serialization();
+wp_skip_dimensions_serialization();
+wp_skip_spacing_serialization();
+/* ============ WP 6.0.2 ============ */
+the_meta();
+/* ============ WP 6.0.3 ============ */
+_filter_query_attachment_filenames();
+/* ============ WP 6.1 ============ */
+_get_path_to_translation();
+_get_path_to_translation_from_lang_dir();
+_wp_multiple_block_styles();
+global_terms();
+global_terms_enabled();
+install_global_terms();
+sync_category_tag_slugs();
+wp_get_attachment_thumb_file();
+wp_typography_get_css_variable_inline_style();
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 979807e3b0..16a77bee3b 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -27,8 +27,9 @@ class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
 	 * @return array <int line number> => <int number of errors>
 	 */
 	public function getErrorList() {
-
-		$errors = array_fill( 8, 329, 1 );
+		$start_line = 8;
+		$end_line   = 356;
+		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
 		unset(
@@ -43,6 +44,7 @@ public function getErrorList() {
 			$errors[73],
 			$errors[76],
 			$errors[80],
+			$errors[102], // Undeprecated function.
 			$errors[118],
 			$errors[125],
 			$errors[162],
@@ -63,7 +65,12 @@ public function getErrorList() {
 			$errors[319],
 			$errors[323],
 			$errors[330],
-			$errors[332]
+			$errors[332],
+			$errors[337],
+			$errors[340],
+			$errors[344],
+			$errors[346],
+			$errors[353]
 		);
 
 		return $errors;
@@ -75,13 +82,18 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-
-		$warnings = array_fill( 342, 8, 1 );
+		$start_line = 362;
+		$end_line   = 386;
+		$warnings   = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
 		unset(
-			$warnings[344],
-			$warnings[348]
+			$warnings[363],
+			$warnings[365],
+			$warnings[367],
+			$warnings[373],
+			$warnings[375],
+			$warnings[377]
 		);
 
 		return $warnings;

From d15462d941a2743a2bd06d2a1493aa32e7dee391 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:24:59 +0100
Subject: [PATCH 231/822] WP/DeprecatedFunctions: temporarily exclude one test
 on PHP 8.2

The logic in the PHP 8.2 Tokenizer needs to be adjusted to allow for PHP 8.2 Disjunctive Normal Types in combination with `readonly` properties.

While PHP 8.2 still allows for the `readonly` keyword being used as a function call - see: https://3v4l.org/hL5da -, the PHPCS tokenizer has not been adjusted yet to allow for this in a way which is compatible with DNT.

Also see:
* The discussion about this in squizlabs/PHP_CodeSniffer 3667
* php/php-src 9512
---
 WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 16a77bee3b..8133019ed1 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -96,6 +96,11 @@ public function getWarningList() {
 			$warnings[377]
 		);
 
+		// Temporarily until PHPCS supports PHP 8.2.
+		if ( PHP_VERSION_ID >= 80200 ) {
+			unset( $warnings[364] ); // Function call to readonly.
+		}
+
 		return $warnings;
 	}
 

From 792a2b53df57ec2aaf0353328eba837c22b09ca0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:55:15 +0100
Subject: [PATCH 232/822] CS: minor tweaks/don't allow warnings

This commit gets rid of the last two PHPCS warnings in the code base, which allows us to run the CS check without allowing for warnings anymore.
---
 .github/workflows/ruleset-checks-sniffs.yml              | 6 +++---
 WordPress/AbstractFunctionParameterSniff.php             | 5 +----
 .../Tests/WhiteSpace/ControlStructureSpacingUnitTest.php | 9 ---------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/ruleset-checks-sniffs.yml
index 325db68645..6438489c13 100644
--- a/.github/workflows/ruleset-checks-sniffs.yml
+++ b/.github/workflows/ruleset-checks-sniffs.yml
@@ -68,13 +68,13 @@ jobs:
       # WordPress Coding Standards.
       # @link https://github.com/WordPress/WordPress-Coding-Standards
       # @link http://pear.php.net/package/PHP_CodeSniffer/
-      - name: Run PHPCS ignoring warnings
+      - name: Check the code style of the PHP files
         id: phpcs
-        run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --report-full --report-checkstyle=./phpcs-report.xml
+        run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
 
       - name: Show PHPCS results in PR
         if: ${{ always() && steps.phpcs.outcome == 'failure' }}
-        run: cs2pr ./phpcs-report.xml --graceful-warnings
+        run: cs2pr ./phpcs-report.xml
 
       # Validate the Ruleset XML files.
       # @link http://xmlsoft.org/xmllint.html
diff --git a/WordPress/AbstractFunctionParameterSniff.php b/WordPress/AbstractFunctionParameterSniff.php
index b7cc1b141e..974edf116a 100644
--- a/WordPress/AbstractFunctionParameterSniff.php
+++ b/WordPress/AbstractFunctionParameterSniff.php
@@ -106,8 +106,5 @@ abstract public function process_parameters( $stackPtr, $group_name, $matched_co
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
 	 */
-	public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {
-		return;
-	}
-
+	public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {}
 }
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index d98d8417e8..91fa3f8464 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -72,15 +72,6 @@ public function getErrorList( $testFile = '' ) {
 					267 => 1,
 				);
 
-				/*
-				Uncomment when "$blank_line_check" parameter will be "true" by default.
-
-				$ret[29] += 1;
-				$ret[33]  = 1;
-				$ret[36]  = 1;
-				$ret[38]  = 1;
-				 */
-
 				return $ret;
 
 			case 'ControlStructureSpacingUnitTest.2.inc':

From 3d3862de846d5295e7ddad0288e945de17f7671f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:57:57 +0100
Subject: [PATCH 233/822] PHPCS ruleset: remove redundant exclusion

This file has been renamed to `Tests/RulesetCheck/class-ruleset-test.inc` and as the `inc` extension is not being scanned, the exclusion is no longer needed.
---
 .phpcs.xml.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 08c86032b1..8a120e0f8d 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -10,7 +10,6 @@
 	<arg name="basepath" value="."/>
 	<arg name="parallel" value="8"/>
 
-	<exclude-pattern>/bin/class-ruleset-test.php</exclude-pattern>
 	<!-- Exclude Composer vendor directory. -->
 	<exclude-pattern>*/vendor/*</exclude-pattern>
 

From 79dfeadc4a31b0fa103a0889d17ff5bd72a0200a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 18:04:43 +0100
Subject: [PATCH 234/822] PHPCS ruleset: divide the ruleset into "chapters"

... and improve the documentation.

Applies the same "chapter" headings in the `phpcs.xml.dist.sample` file.
---
 .phpcs.xml.dist       | 54 ++++++++++++++++++++++++++++++++-----------
 phpcs.xml.dist.sample | 21 +++++++++++++++++
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 8a120e0f8d..3a7e551884 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -3,15 +3,36 @@
 
 	<description>The Coding standard for the WordPress Coding Standards itself.</description>
 
+	<!--
+	#############################################################################
+	COMMAND LINE ARGUMENTS
+	https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
+	#############################################################################
+	-->
+
 	<file>.</file>
 
-	<arg value="sp"/>
+	<!-- Exclude Composer vendor directory. -->
+	<exclude-pattern>*/vendor/*</exclude-pattern>
+
+	<!-- Only check PHP files. -->
 	<arg name="extensions" value="php"/>
+
+	<!-- Show progress, show the error codes for each message (source). -->
+	<arg value="ps"/>
+
+	<!-- Strip the filepaths down to the relevant bit. -->
 	<arg name="basepath" value="."/>
+
+	<!-- Check up to 8 files simultaneously. -->
 	<arg name="parallel" value="8"/>
 
-	<!-- Exclude Composer vendor directory. -->
-	<exclude-pattern>*/vendor/*</exclude-pattern>
+
+	<!--
+	#############################################################################
+	SET UP THE RULESETS
+	#############################################################################
+	-->
 
 	<rule ref="WordPress">
 		<exclude name="WordPress.Files.FileName"/>
@@ -19,16 +40,6 @@
 		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
 	</rule>
 
-	<!-- Enforce PSR1 compatible namespaces. -->
-	<rule ref="PSR1.Classes.ClassDeclaration"/>
-
-	<rule ref="WordPress.Arrays.MultipleStatementAlignment">
-		<properties>
-			<property name="alignMultilineItems" value="!=100"/>
-			<property name="exact" value="false" phpcs-only="true"/>
-		</properties>
-	</rule>
-
 	<!-- Check code for cross-version PHP compatibility. -->
 	<config name="testVersion" value="5.4-"/>
 	<rule ref="PHPCompatibility">
@@ -44,4 +55,21 @@
 		<exclude name="PHPCompatibility.Constants.NewConstants.t_yield_fromFound"/>
 	</rule>
 
+	<!-- Enforce PSR1 compatible namespaces. -->
+	<rule ref="PSR1.Classes.ClassDeclaration"/>
+
+
+	<!--
+	#############################################################################
+	SNIFF SPECIFIC CONFIGURATION
+	#############################################################################
+	-->
+
+	<rule ref="WordPress.Arrays.MultipleStatementAlignment">
+		<properties>
+			<property name="alignMultilineItems" value="!=100"/>
+			<property name="exact" value="false" phpcs-only="true"/>
+		</properties>
+	</rule>
+
 </ruleset>
diff --git a/phpcs.xml.dist.sample b/phpcs.xml.dist.sample
index a524efd077..2a9028bd2f 100644
--- a/phpcs.xml.dist.sample
+++ b/phpcs.xml.dist.sample
@@ -3,6 +3,13 @@
 
 	<description>A custom set of rules to check for a WPized WordPress project</description>
 
+	<!--
+	#############################################################################
+	COMMAND LINE ARGUMENTS
+	https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
+	#############################################################################
+	-->
+
 	<!-- Exclude WP Core folders and files from being checked. -->
 	<exclude-pattern>/docroot/wp-admin/*</exclude-pattern>
 	<exclude-pattern>/docroot/wp-includes/*</exclude-pattern>
@@ -20,6 +27,13 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
+
+	<!--
+	#############################################################################
+	SET UP THE RULESETS
+	#############################################################################
+	-->
+
 	<!-- Include the WordPress-Extra standard. -->
 	<rule ref="WordPress-Extra">
 		<!--
@@ -61,6 +75,13 @@
 	<rule ref="PHPCompatibilityWP"/>
 	-->
 
+
+	<!--
+	#############################################################################
+	SNIFF SPECIFIC CONFIGURATION
+	#############################################################################
+	-->
+
 	<!--
 	To get the optimal benefits of using WPCS, we should add a couple of
 	custom properties.

From 679f027e51362cd6f752ad1e424044f84c064549 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 18:06:16 +0100
Subject: [PATCH 235/822] PHPCS ruleset: add a few more exclusions

... for sniffs not applicable to this package and improve the exclusion documentation.
---
 .phpcs.xml.dist | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 3a7e551884..a26fa0b778 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -35,9 +35,18 @@
 	-->
 
 	<rule ref="WordPress">
+		<!-- This project needs to comply with naming standards from PHPCS, not WP. -->
 		<exclude name="WordPress.Files.FileName"/>
 		<exclude name="WordPress.NamingConventions.ValidVariableName"/>
+
+		<!-- While conditions with assignments are a typical way to walk the token stream. -->
 		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
+
+		<!-- The code in this project is run in the context of PHPCS, not WP. -->
+		<exclude name="WordPress.DateTime"/>
+		<exclude name="WordPress.DB"/>
+		<exclude name="WordPress.Security"/>
+		<exclude name="WordPress.WP"/>
 	</rule>
 
 	<!-- Check code for cross-version PHP compatibility. -->

From b996338a60ab9d545865757aac0a0cff14eda572 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 18:05:05 +0100
Subject: [PATCH 236/822] Sample ruleset: add a few more common directives

---
 phpcs.xml.dist.sample | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpcs.xml.dist.sample b/phpcs.xml.dist.sample
index 2a9028bd2f..1365559939 100644
--- a/phpcs.xml.dist.sample
+++ b/phpcs.xml.dist.sample
@@ -10,6 +10,8 @@
 	#############################################################################
 	-->
 
+	<file>.</file>
+
 	<!-- Exclude WP Core folders and files from being checked. -->
 	<exclude-pattern>/docroot/wp-admin/*</exclude-pattern>
 	<exclude-pattern>/docroot/wp-includes/*</exclude-pattern>
@@ -27,6 +29,12 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
+	<!-- Strip the filepaths down to the relevant bit. -->
+	<arg name="basepath" value="."/>
+
+	<!-- Check up to 8 files simultaneously. -->
+	<arg name="parallel" value="8"/>
+
 
 	<!--
 	#############################################################################

From 80dc34ae11be676b18e9ca1cabd690e9ec114abf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:49:11 +0100
Subject: [PATCH 237/822] GH Actions: rename the basic QA workflow file

... to be more descriptive. The workflows in that file don't just check the rulesets, so the name as it was, was confusing.

Includes updating the links for the badge in the README.
---
 .github/workflows/{ruleset-checks-sniffs.yml => basic-qa.yml} | 0
 README.md                                                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{ruleset-checks-sniffs.yml => basic-qa.yml} (100%)

diff --git a/.github/workflows/ruleset-checks-sniffs.yml b/.github/workflows/basic-qa.yml
similarity index 100%
rename from .github/workflows/ruleset-checks-sniffs.yml
rename to .github/workflows/basic-qa.yml
diff --git a/README.md b/README.md
index c3669ff975..7f8097c16d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 [![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
 [![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
-[![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/ruleset-checks-sniffs.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/ruleset-checks-sniffs.yml)
+[![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml)
 [![Unit Tests](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 
 [![License: MIT](https://poser.pugx.org/wp-coding-standards/wpcs/license)](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/LICENSE)

From 3527bc74d1d62ef9f58dfa59917a4c224fce648c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:46:55 +0100
Subject: [PATCH 238/822] GH Actions: remove redundant documentation

All steps in the workflows have descriptive names, so re-iterating the steps in a "docblock" above each job is redundant and error-prone maintenance-wise.
---
 .github/workflows/basic-qa.yml   | 28 ++--------------------------
 .github/workflows/quicktest.yml  |  8 --------
 .github/workflows/unit-tests.yml | 11 -----------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 6438489c13..a857f2c620 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -13,21 +13,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Performs some code-style related checks.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Configures caching for Composer.
-  # - Sets up PHP.
-  # - Installs libxml2-utils.
-  # - Installs PHPCS.
-  # - Install Composer dependencies.
-  # - Runs PHPCS ignoring warnings.
-  # - Validates the WordPress rulesets.
-  # - Validates the sample ruleset.
-  # - Checks for code-style consistency.
-  # - Validates the composer.json file.
-  # - Checks that sniffs have unit tests.
+  # Check code style of sniffs, rulesets and XML documentation.
+  # Check that all sniffs are feature complete.
   sniffs:
     name: Run code sniffs
     runs-on: ubuntu-latest
@@ -65,9 +52,6 @@ jobs:
       # @link https://github.com/marketplace/actions/xmllint-problem-matcher
       - uses: korelstar/xmllint-problem-matcher@v1
 
-      # WordPress Coding Standards.
-      # @link https://github.com/WordPress/WordPress-Coding-Standards
-      # @link http://pear.php.net/package/PHP_CodeSniffer/
       - name: Check the code style of the PHP files
         id: phpcs
         run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
@@ -109,14 +93,6 @@ jobs:
   # Makes sure the rulesets don't throw unexpected errors or warnings.
   # This workflow needs to be run against a high PHP version to prevent triggering the syntax error check.
   # It also needs to be run against all PHPCS versions WPCS is tested against.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Configures caching for Composer.
-  # - Sets up PHP.
-  # - Installs PHPCS.
-  # - Installs Composer dependencies.
-  # - Checks the WordPress rulesets.
   ruleset-tests:
     name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 0b2fcdea70..3b694c9569 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -19,14 +19,6 @@ jobs:
   # Performs some quick tests.
   # This is a much quicker test suite which only runs the unit tests and linting
   # against the low/high supported PHP/PHPCS combinations.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Sets up PHP.
-  # - Installs PHPCS.
-  # - Install Composer dependencies (from cache if available).
-  # - Runs the Composer linting script (if desired).
-  # - Runs Composer run-tests script.
   quick-tests:
     name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
     runs-on: ubuntu-latest
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index ad6df60843..a14e1a8a57 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -16,18 +16,7 @@ concurrency:
 
 jobs:
   # Runs the test suite against all supported branches and combinations.
-  #
   # Linting is performed on all jobs run against PHPCS `dev-master`.
-  #
-  # Performs the following steps:
-  # - Checks out the repository.
-  # - Configures caching for Composer.
-  # - Sets up PHP.
-  # - Configures PHPCS to install from source (only when running with 4.0.x-dev).
-  # - Installs PHPCS.
-  # - Install Composer dependencies.
-  # - Runs the Composer linting script.
-  # - Runs Composer run-tests script.
   test:
     name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
     runs-on: ubuntu-latest

From 32e1db4cf733db13ac0fd3a0f62fbc0b4733820b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:13:21 +0100
Subject: [PATCH 239/822] GH Actions: move the `name` key down

... to be below the matrix so it is more intuitive to see what the variables in the `name` refer to.
---
 .github/workflows/basic-qa.yml   | 3 ++-
 .github/workflows/quicktest.yml  | 3 ++-
 .github/workflows/unit-tests.yml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index a857f2c620..eb4a7a6fb7 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -94,13 +94,14 @@ jobs:
   # This workflow needs to be run against a high PHP version to prevent triggering the syntax error check.
   # It also needs to be run against all PHPCS versions WPCS is tested against.
   ruleset-tests:
-    name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [ '7.4' ]
         phpcs_version: [ 'dev-master', '3.7.1' ]
 
+    name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 3b694c9569..e6406abecc 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -20,7 +20,6 @@ jobs:
   # This is a much quicker test suite which only runs the unit tests and linting
   # against the low/high supported PHP/PHPCS combinations.
   quick-tests:
-    name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -32,6 +31,8 @@ jobs:
           - php: '5.4'
             phpcs_version: '3.7.1'
 
+    name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a14e1a8a57..f241435ebc 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -18,7 +18,6 @@ jobs:
   # Runs the test suite against all supported branches and combinations.
   # Linting is performed on all jobs run against PHPCS `dev-master`.
   test:
-    name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
@@ -35,6 +34,8 @@ jobs:
             phpcs_version: 'dev-master'
             allowed_failure: true
 
+    name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

From 238586facec8e23cecf25b6c1f6afd347a7ac470 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:14:58 +0100
Subject: [PATCH 240/822] GH Actions: order matrix range in logical order

... instead of in reverse order.
---
 .github/workflows/basic-qa.yml   | 2 +-
 .github/workflows/quicktest.yml  | 2 +-
 .github/workflows/unit-tests.yml | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index eb4a7a6fb7..7c95c979d8 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -98,7 +98,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.4' ]
-        phpcs_version: [ 'dev-master', '3.7.1' ]
+        phpcs_version: [ '3.7.1', 'dev-master' ]
 
     name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index e6406abecc..50468a73bd 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.4', '5.4' ]
+        php: [ '5.4', '7.4' ]
         phpcs_version: [ 'dev-master' ]
         include:
           - php: '7.3'
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index f241435ebc..e5ca762de3 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -22,9 +22,8 @@ jobs:
     continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
       matrix:
-        php: [ '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
-        phpcs_version: [ 'dev-master', '3.7.1' ]
-        allowed_failure: [ false ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        phpcs_version: [ '3.7.1', 'dev-master' ]
         include:
           # Add extra build to test against PHPCS 4.
           #- php: '7.4'

From 9ab6afda2bce49b72742d19320e9881231e0618e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:45:48 +0100
Subject: [PATCH 241/822] GH Actions: use PHP `latest`

... whenever appropriate instead of PHP 7.4.

`latest` will always be the last released stable PHP version, which will be PHP 8.1 until this Thursday, when it will become PHP 8.2.

Includes a few tweaks in the `quicktest` workflow to allow for PHPUnit 7 in combination with PHP 8+.
---
 .github/workflows/basic-qa.yml  |  4 ++--
 .github/workflows/quicktest.yml | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 7c95c979d8..ad3b34b5d9 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: 'latest'
           coverage: none
           tools: cs2pr
 
@@ -97,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.4' ]
+        php: [ 'latest' ]
         phpcs_version: [ '3.7.1', 'dev-master' ]
 
     name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 50468a73bd..d041bd11d6 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '5.4', '7.4' ]
+        php: [ '5.4', 'latest' ]
         phpcs_version: [ 'dev-master' ]
         include:
           - php: '7.3'
@@ -58,15 +58,28 @@ jobs:
       - name: Set PHPCS version
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
-      - name: Install Composer dependencies
+      - name: Install Composer dependencies (PHP < 8.0 )
+        if: ${{ matrix.php < 8.0 && matrix.php != 'latest' }}
         uses: ramsey/composer-install@v2
         with:
           # Bust the cache at least once a month - output format: YYYY-MM-DD.
           custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
 
+      - name: Install Composer dependencies (PHP >= 8.0)
+        if: ${{ matrix.php >= 8.0 || matrix.php == 'latest' }}
+        uses: ramsey/composer-install@v2
+        with:
+          composer-options: --ignore-platform-reqs
+          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint -- --checkstyle
 
-      - name: Run unit tests
+      - name: Run the unit tests - PHP 5.4 - 8.0
+        if: ${{ matrix.php < '8.1' && matrix.php != 'latest' }}
         run: composer run-tests
+
+      - name: Run the unit tests - PHP >= 8.1
+        if: ${{ matrix.php >= '8.1' || matrix.php == 'latest' }}
+        run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests

From 1780891438fb1450b7d0cc531ee03b50240f3991 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:44:52 +0100
Subject: [PATCH 242/822] GH Actions/basic-qa: move a step up

Validate the `composer.json` file before making any changes to it.
---
 .github/workflows/basic-qa.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index ad3b34b5d9..c8fc3c9c90 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -33,6 +33,10 @@ jobs:
           coverage: none
           tools: cs2pr
 
+      # @link https://getcomposer.org/doc/03-cli.md#validate
+      - name: Validate the composer.json file
+        run: composer validate --no-check-all --strict
+
       # Using PHPCS `master` as an early detection system for bugs upstream.
       - name: Set PHPCS version
         run: composer require squizlabs/php_codesniffer:"dev-master" --no-update --no-scripts --no-interaction
@@ -80,10 +84,6 @@ jobs:
           diff -B --tabsize=4 ./WordPress-Extra/ruleset.xml <(xmllint --format "./WordPress-Extra/ruleset.xml")
           diff -B --tabsize=4 ./phpcs.xml.dist.sample <(xmllint --format "./phpcs.xml.dist.sample")
 
-      # @link https://getcomposer.org/doc/03-cli.md#validate
-      - name: Validate the composer.json file
-        run: composer validate --no-check-all --strict
-
       # Check that the sniffs available are feature complete.
       # For now, just check that all sniffs have unit tests.
       # At a later stage the documentation check can be activated.

From bc7c08fa9e044a325a871ae65d84de296d7aa83b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:17:30 +0100
Subject: [PATCH 243/822] GH Actions/test: remove unused step

This step is for PHPCS 4.x, but we're not testing against PHPCS 4.x at this time and when we do enable it again, this step may well no longer be needed anymore anyway, so let's remove it for now and re-evaluate what is needed when we re-enable testing against PHPCS 4.x.
---
 .github/workflows/unit-tests.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index e5ca762de3..04dc0a2ac4 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -58,13 +58,6 @@ jobs:
           coverage: none
           tools: cs2pr
 
-      # Set Composer up to download only PHPCS from source for PHPCS 4.x.
-      # The source is needed to get the base testcase from PHPCS.
-      # All other jobs can use `auto`, which is Composer's default value.
-      - name: Configure PHPCS
-        if: ${{ startsWith( matrix.phpcs_version, '4' ) }}
-        run: composer config preferred-install.squizlabs/php_codesniffer source
-
       - name: Set PHPCS version
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 

From 2a6c1d8e60339badd21eefbc8f1b6c17f0925baf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:18:33 +0100
Subject: [PATCH 244/822] GH Actions/test: no longer allow build failures
 against PHP 8.2

Includes removing the redundant `allowed_failure` matrix key, as we can use a comparison in `continue-on-error` if needed.
---
 .github/workflows/unit-tests.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 04dc0a2ac4..cf388d548a 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -19,19 +19,14 @@ jobs:
   # Linting is performed on all jobs run against PHPCS `dev-master`.
   test:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         phpcs_version: [ '3.7.1', 'dev-master' ]
-        include:
+        #include:
           # Add extra build to test against PHPCS 4.
           #- php: '7.4'
           #  phpcs_version: '4.0.x-dev as 3.9.99'
-          #  allowed_failure: true
-          - php: '8.2'
-            phpcs_version: 'dev-master'
-            allowed_failure: true
 
     name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
 
@@ -83,6 +78,6 @@ jobs:
         if: ${{ matrix.php < '8.1' }}
         run: composer run-tests
 
-      - name: Run the unit tests - PHP 8.1
+      - name: Run the unit tests - PHP >= 8.1
         if: ${{ matrix.php >= '8.1' }}
         run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests

From 8e43e8d60df3c14ae96121c34b1e7c9d00984972 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 5 Dec 2022 20:29:06 +0100
Subject: [PATCH 245/822] Remove outdated `bin/pre-commit` file

Just noticed the repo (still) contains a `bin/pre-commit` file. I believe this file was at one time intended to be used by contributors to run the tests before each commit by copying the file to their `.git/hooks` directory.

I'm proposing to remove the file for the following reasons:
1. As far as I know nobody of the regular contributors use it.
2. The script contains a presumption of WPCS being installed on a *nix system which supports `which` (Windows does not).
3.  There is no reference to this file or how to use it in the `CONTRIBUTING` docs.
4. The `composer.json` scripts included offer more modular and more comprehensive checks which contributors can run to verfiy their commits are up to scratch.
---
 bin/pre-commit | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100755 bin/pre-commit

diff --git a/bin/pre-commit b/bin/pre-commit
deleted file mode 100755
index 859d550ad9..0000000000
--- a/bin/pre-commit
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-cd "$(git rev-parse --show-toplevel)"
-
-phpcs_root="$(dirname $(dirname $(which phpcs)))"
-
-if [ -z "$phpcs_root" ] || [ ! -d "$phpcs_root" ] || [ ! -e "$phpcs_root/tests/AllTests.php" ]; then
-	echo "Unable to locate phpcs on path to locate the root of the PHP_CodeSniffer project" 1>&2
-	exit 1
-fi
-
-find . \( -name '*.php' \) -exec php -lf {} \;
-
-PHPCS_DIR=$phpcs_root phpunit --filter WordPress --bootstrap="$phpcs_root/tests/bootstrap.php" "$phpcs_root/tests/AllTests.php"

From 1c6dd3dfa2f8d23e33a06b7ca3c8719909dab090 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 04:27:07 +0100
Subject: [PATCH 246/822] GH Actions: automate some label management

This is a quite straight-forward workflow to just remove some labels which should only be on open issues/open PRs and which should be removed once an issue or PR has been closed/merged.

Just attempting to reduce yet some more manual labour.
---
 .github/workflows/manage-labels.yml | 57 +++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 .github/workflows/manage-labels.yml

diff --git a/.github/workflows/manage-labels.yml b/.github/workflows/manage-labels.yml
new file mode 100644
index 0000000000..abe1aa6563
--- /dev/null
+++ b/.github/workflows/manage-labels.yml
@@ -0,0 +1,57 @@
+name: Remove outdated labels
+
+on:
+  # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target
+  pull_request_target:
+    types:
+      - closed
+  issues:
+    types:
+      - closed
+
+jobs:
+  on-pr-merge:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'WordPress' && github.event.pull_request.merged == true
+
+    name: Clean up labels on PR merge
+
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            "Status: Awaiting Feedback"
+            "Status: Review Ready"
+
+  on-pr-close:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'WordPress' && github.event_name == 'pull_request_target' && github.event.pull_request.merged == false
+
+    name: Clean up labels on PR close
+
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            "Status: Awaiting Feedback"
+            "Status: close candidate"
+            "Status: Review Ready"
+
+  on-issue-close:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'WordPress' && github.event.issue.state == 'closed'
+
+    name: Clean up labels on issue close
+
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            "Status: Awaiting Feedback"
+            "Status: close candidate"
+            "Status: help wanted"
+            "Status: good first issue"
+            "Status: PR Exists"

From 77de577604a52be8b22f4a90fc73639dea0db245 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 30 Oct 2022 12:15:21 +0100
Subject: [PATCH 247/822] Core: add sniffs to check class/constant modifier
 keyword order

Follow up on 2102

This adds two new sniffs to the Core ruleset to cover the keyword modifier order rules for class declarations and OO constant declarations.

Refs:
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-and-modifier-order
* WordPress/wpcs-docs 108
* PHPCSStandards/PHPCSExtra 142
* PHPCSStandards/PHPCSExtra 143
---
 WordPress-Core/ruleset.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 824543a3a3..1ccb3196a3 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -391,14 +391,16 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#visibility-and-modifier-order
 	#############################################################################
 	-->
-	<!-- Rule: When using multiple modifiers for a class declaration, the order should be as follows:
+	<!-- Covers rule: When using multiple modifiers for a class declaration, the order should be as follows:
 		 - First the optional abstract or final modifier.
 		 - Next, the optional readonly modifier. -->
+	<rule ref="Universal.Classes.ModifierKeywordOrder"/>
 
-	<!-- Rule: When using multiple modifiers for a constant declaration inside object-oriented structures,
+	<!-- Covers rule: When using multiple modifiers for a constant declaration inside object-oriented structures,
 		 the order should be as follows:
 		 - First the optional final modifier.
 		 - Next, the visibility modifier. -->
+	<rule ref="Universal.Constants.ModifierKeywordOrder"/>
 
 	<!-- Covers rule: When using multiple modifiers for a property declaration, the order should be as follows:
 		 - First a visibility modifier.

From a6ab33f904be4b5ad4fa0f238c226d3655c951c1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 20 Jul 2022 02:34:11 +0200
Subject: [PATCH 248/822] Replace the `WordPress.WhiteSpace.PrecisionAlignment`
 sniff

... with a similar sniff as merged upstream in PHPCSExtra as `Universal.WhiteSpace.PrecisionAlignment`.

The upstream sniff has various improvements, including:
* Detecting precision alignment in the leading whitespace for PHP 7.3 flexible heredoc/nowdoc closing identifiers (was false negative).
* Improved handling of (trailing) whitespace on otherwise blank lines, both in code as well as in comments and HTML. This will now be ignored by default. (was false positive).
* An additional option to report on precision alignment for whitespace found on otherwise blank lines (not relevant for WP as the `Squiz.WhiteSpace.SuperfluousWhitespace` is used).
* And it also includes a fixer.
    Note: the fixer works based on "best guess" and may not always result in the desired indentation.

Ref:
* PHPCSStandards/PHPCSExtra 119
* PHPCSStandards/PHPCSExtra 122
* PHPCSStandards/PHPCSExtra 123
* PHPCSStandards/PHPCSExtra 124
---
 WordPress-Core/ruleset.xml                    |   2 +-
 .../WhiteSpace/PrecisionAlignmentStandard.xml |  35 ---
 .../WhiteSpace/PrecisionAlignmentSniff.php    | 199 ------------------
 .../PrecisionAlignmentUnitTest.1.inc          |  68 ------
 .../PrecisionAlignmentUnitTest.2.inc          |  44 ----
 .../PrecisionAlignmentUnitTest.3.inc          |  14 --
 .../PrecisionAlignmentUnitTest.4.inc          |   5 -
 .../PrecisionAlignmentUnitTest.5.inc          |  58 -----
 .../PrecisionAlignmentUnitTest.6.inc          |   5 -
 .../PrecisionAlignmentUnitTest.7a.inc         |  15 --
 .../PrecisionAlignmentUnitTest.7b.inc         |  15 --
 .../PrecisionAlignmentUnitTest.7c.inc         |  17 --
 .../WhiteSpace/PrecisionAlignmentUnitTest.css |   5 -
 .../WhiteSpace/PrecisionAlignmentUnitTest.js  |   7 -
 .../WhiteSpace/PrecisionAlignmentUnitTest.php | 129 ------------
 15 files changed, 1 insertion(+), 617 deletions(-)
 delete mode 100644 WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
 delete mode 100644 WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.3.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.4.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.5.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.6.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.css
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.js
 delete mode 100644 WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 824543a3a3..a44f4d7e12 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -241,7 +241,7 @@
 
 	<!-- Covers rule: Use real tabs and not spaces. -->
 	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
-	<rule ref="WordPress.WhiteSpace.PrecisionAlignment"/>
+	<rule ref="Universal.WhiteSpace.PrecisionAlignment"/>
 
 	<!-- Generic array layout check. -->
 	<!-- Covers rule: For associative arrays, each item should start on a new line
diff --git a/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml b/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
deleted file mode 100644
index 0e68ea0a65..0000000000
--- a/WordPress/Docs/WhiteSpace/PrecisionAlignmentStandard.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
-    title="Precision Alignment"
-    >
-    <standard>
-    <![CDATA[
-    Line indentation should only use tabs. Precision alignment with spaces after the tabs is strongly discouraged.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: only tabstops used for indentation.">
-        <![CDATA[
-<em>[tab]</em>$var = true;
-        ]]>
-        </code>
-        <code title="Invalid: precision alignment of 2 spaces.">
-        <![CDATA[
-<em>[space][space]</em>$var = true;
-        ]]>
-        </code>
-    </code_comparison>
-    <code_comparison>
-        <code title="Valid: four spaces counts as a tab, the replacement of these will be handled by another sniff.">
-        <![CDATA[
-<em>[tab][space][space][space][space]</em>$var = true;
-        ]]>
-        </code>
-        <code title="Invalid: precision alignment of 3 spaces.">
-        <![CDATA[
-<em>[tab][space][space][space]</em>$var = true;
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>
diff --git a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php b/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
deleted file mode 100644
index 1d2d0e8afd..0000000000
--- a/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
-
-use WordPressCS\WordPress\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\BackCompat\Helper;
-
-/**
- * Warn on line indentation ending with spaces for precision alignment.
- *
- * WP demands tabs for indentation. In rare cases, spaces for precision alignment can be
- * intentional and acceptable, but more often than not, this is a typo.
- *
- * The `Generic.WhiteSpace.DisallowSpaceIndent` sniff already checks for space indentation
- * and auto-fixes to tabs.
- *
- * This sniff only checks for precision alignments which can not be corrected by the
- * `Generic.WhiteSpace.DisallowSpaceIndent` sniff.
- *
- * As this may be intentional, this sniff explicitly does *NOT* contain a fixer.
- *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
- */
-class PrecisionAlignmentSniff extends Sniff {
-
-	/**
-	 * A list of tokenizers this sniff supports.
-	 *
-	 * @var array
-	 */
-	public $supportedTokenizers = array(
-		'PHP',
-		'JS',
-		'CSS',
-	);
-
-	/**
-	 * Allow for providing a list of tokens for which (preceding) precision alignment should be ignored.
-	 *
-	 * <rule ref="WordPress.WhiteSpace.PrecisionAlignment">
-	 *    <properties>
-	 *        <property name="ignoreAlignmentTokens" type="array">
-	 *            <element value="T_COMMENT"/>
-	 *            <element value="T_INLINE_HTML"/>
-	 *        </property>
-	 *    </properties>
-	 * </rule>
-	 *
-	 * @var array
-	 */
-	public $ignoreAlignmentTokens = array();
-
-	/**
-	 * The --tab-width CLI value that is being used.
-	 *
-	 * @var int
-	 */
-	private $tab_width;
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return array(
-			\T_OPEN_TAG,
-			\T_OPEN_TAG_WITH_ECHO,
-		);
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return int Integer stack pointer to skip the rest of the file.
-	 */
-	public function process_token( $stackPtr ) {
-		if ( ! isset( $this->tab_width ) ) {
-			$this->tab_width = Helper::getTabWidth( $this->phpcsFile );
-		}
-
-		// Handle any custom ignore tokens received from a ruleset.
-		$ignoreAlignmentTokens = $this->merge_custom_array( $this->ignoreAlignmentTokens );
-
-		$check_tokens  = array(
-			\T_WHITESPACE             => true,
-			\T_INLINE_HTML            => true,
-			\T_DOC_COMMENT_WHITESPACE => true,
-			\T_COMMENT                => true,
-		);
-		$check_tokens += Tokens::$phpcsCommentTokens;
-
-		for ( $i = 0; $i < $this->phpcsFile->numTokens; $i++ ) {
-
-			if ( 1 !== $this->tokens[ $i ]['column'] ) {
-				continue;
-			} elseif ( isset( $check_tokens[ $this->tokens[ $i ]['code'] ] ) === false
-				|| ( isset( $this->tokens[ ( $i + 1 ) ] )
-					&& \T_WHITESPACE === $this->tokens[ ( $i + 1 ) ]['code'] )
-				|| $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar
-				|| isset( $ignoreAlignmentTokens[ $this->tokens[ $i ]['type'] ] )
-				|| ( isset( $this->tokens[ ( $i + 1 ) ] )
-					&& isset( $ignoreAlignmentTokens[ $this->tokens[ ( $i + 1 ) ]['type'] ] ) )
-			) {
-				continue;
-			}
-
-			$spaces = 0;
-			switch ( $this->tokens[ $i ]['type'] ) {
-				case 'T_WHITESPACE':
-					$spaces = ( $this->tokens[ $i ]['length'] % $this->tab_width );
-					break;
-
-				case 'T_DOC_COMMENT_WHITESPACE':
-					$length = $this->tokens[ $i ]['length'];
-					$spaces = ( $length % $this->tab_width );
-
-					if ( isset( $this->tokens[ ( $i + 1 ) ] )
-						&& ( \T_DOC_COMMENT_STAR === $this->tokens[ ( $i + 1 ) ]['code']
-							|| \T_DOC_COMMENT_CLOSE_TAG === $this->tokens[ ( $i + 1 ) ]['code'] )
-						&& 0 !== $spaces
-					) {
-						// One alignment space expected before the *.
-						--$spaces;
-					}
-					break;
-
-				case 'T_COMMENT':
-				case 'T_PHPCS_ENABLE':
-				case 'T_PHPCS_DISABLE':
-				case 'T_PHPCS_SET':
-				case 'T_PHPCS_IGNORE':
-				case 'T_PHPCS_IGNORE_FILE':
-					/*
-					 * Indentation whitespace for subsequent lines of multi-line comments
-					 * are tokenized as part of the comment.
-					 */
-					$comment    = ltrim( $this->tokens[ $i ]['content'] );
-					$whitespace = str_replace( $comment, '', $this->tokens[ $i ]['content'] );
-					$length     = \strlen( $whitespace );
-					$spaces     = ( $length % $this->tab_width );
-
-					if ( isset( $comment[0] ) && '*' === $comment[0] && 0 !== $spaces ) {
-						--$spaces;
-					}
-					break;
-
-				case 'T_INLINE_HTML':
-					if ( $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar ) {
-						$spaces = 0;
-					} else {
-						/*
-						 * Indentation whitespace for inline HTML is part of the T_INLINE_HTML token.
-						 */
-						$content    = ltrim( $this->tokens[ $i ]['content'] );
-						$whitespace = str_replace( $content, '', $this->tokens[ $i ]['content'] );
-						$spaces     = ( \strlen( $whitespace ) % $this->tab_width );
-					}
-
-					/*
-					 * Prevent triggering on multi-line /*-style inline javascript comments.
-					 * This may cause false negatives as there is no check for being in a
-					 * <script> tag, but that will be rare.
-					 */
-					if ( isset( $content[0] ) && '*' === $content[0] && 0 !== $spaces ) {
-						--$spaces;
-					}
-					break;
-			}
-
-			if ( $spaces > 0 ) {
-				$this->phpcsFile->addWarning(
-					'Found precision alignment of %s spaces.',
-					$i,
-					'Found',
-					array( $spaces )
-				);
-			}
-		}
-
-		// Ignore the rest of the file.
-		return ( $this->phpcsFile->numTokens + 1 );
-	}
-
-}
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
deleted file mode 100644
index f7b840b0c4..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.1.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-	function exampleFunctionA() {} // OK: [tab].
-
-/*
- * OK: [tab][space][space][space][space].
- * The four spaces will be replaced by a tab by the upstream sniff.
- */
-	    function exampleFunctionB() {}
-
-/*
- * OK: [tab][space][space][tab][space][tab].
- * The space replacement here will be handled by the upstream sniff.
- */
-	  	 	function exampleFunctionC() {}
-
-	/**
-	 * OK: Doc comments are indented with tabs and one space.
-	 *
-	  * @var string  <= Bad.
-	 * @access private
-	 */
-
-	/*
-	 * OK: Multi-line comments are indented with tabs and one space.
-	 *
-	   * <= Bad.
-	 */
-
-	 function exampleFunctionD() {} // Bad: [tab][space].
-	  function exampleFunctionE() {} // Bad: [tab][space][space].
-	   function exampleFunctionF() {} // Bad: [tab][space][space][space].
-
-	 function exampleFunctionG() {} // Bad old-style ignore comment: WPCS: precision alignment ok.
-
-?>
-
-	<p>
-	  Bad: Some text with precision alignment.
-	</p>
-
-<?php
-
-// Testing empty line within a comment.
-/*
-
-*/
-
-// Testing that incorrectly aligned docblocks and multi-line inline comments do not trigger errors.
-	/**
-	* Provision some options
-	*/
-
-	/*
-	* Provision some options
-	*/
-
-?>
-
-<script type="text/javascript">
-	/*
-	 * Multi-line javascript comment should not trigger this sniff.
-	 */
-	alert('OK');
-	  alert('bad');
-</script>
-
-<?php
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
deleted file mode 100644
index 3997fb51dc..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.2.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[] T_COMMENT,T_DOC_COMMENT_WHITESPACE,T_INLINE_HTML,T_FUNCTION
-
-<?php
-
-	function exampleFunctionA() {} // OK: [tab].
-
-/*
- * OK: [tab][space][space][space][space].
- * The four spaces will be replaced by a tab by the upstream sniff.
- */
-	    function exampleFunctionB() {}
-
-/*
- * OK: [tab][space][space][tab][space][tab].
- * The space replacement here will be handled by the upstream sniff.
- */
-	  	 	function exampleFunctionC() {}
-
-	/**
-	 * OK: Doc comments are indented with tabs and one space.
-	 *
-	  * @var string  <= Bad, but not reported as token type is ignored.
-	 * @access private
-	 */
-
-	/*
-	 * OK: Multi-line comments are indented with tabs and one space.
-	 *
-	   * <= Bad, but not reported as token type is ignored
-	 */
-
-	 function exampleFunctionD() {} // Bad, but not reported as token type is ignored.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is ignored.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is ignored.
-
-?>
-
-	<p>
-	  Bad: Some text with precision alignment, but not reported as token type is ignored.
-	</p>
-
-<?php
-
-// phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[]
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.3.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.3.inc
deleted file mode 100644
index 8d6287f77a..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.3.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
-Plugin Name: Hello Dolly
-Plugin URI: http://wordpress.org/#
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
-Author: Matt Mullenweg
-Version: 1.5.1
-Author URI: http://ma.tt/
-Text Domain: hello-dolly
-
-*/
-
-// Test for 
-?>
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.4.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.4.inc
deleted file mode 100644
index a7c5b5deff..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.4.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-  <div><!-- Bad.-->
-	  <p><a href="http://url/"><!-- Bad.-->
-		  <?= 'print this string' ?><!-- Bad.-->
-	  </a/></p><!-- Bad.-->
-  </div><!-- Bad.-->
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.5.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.5.inc
deleted file mode 100644
index 4fb786f100..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.5.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Test that various combinations of the PHPCS 3.2+ annotations are being respected.
- */
-
-// phpcs:disable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress.WhiteSpace
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress.WhiteSpace
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable WordPress
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:disable
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable
-  echo 'this line has precision alignment and should be reported again';
-
-// phpcs:ignore WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment but shouldn\'t be reported';
-
-  echo 'this line has precision alignment but shouldn\'t be reported'; // phpcs:ignore WordPress.WhiteSpace.PrecisionAlignment
-
-// phpcs:disable WordPress.WhiteSpace
-  echo 'this line has precision alignment but shouldn\'t be reported';
-// phpcs:enable WordPress.WhiteSpace.PrecisionAlignment
-  echo 'this line has precision alignment and should be reported again';
-// phpcs:enable WordPress.WhiteSpace.SomeThingElse
-  echo 'this line has precision alignment and should be reported again';
-// phpcs:enable WordPress
-  echo 'this line has precision alignment and should be reported again';
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.6.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.6.inc
deleted file mode 100644
index 6fd2e94fc4..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.6.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-	/*
-	   * phpcs:disable Standard.Category.Sniff -- Bad, but will only be reported with --ignore-annotations.
-	 */
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
deleted file mode 100644
index a616c84b55..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7a.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[] T_COMMENT,T_FUNCTION
-
-<?php
-/**
- * Testing issue as reported upstream in
- * https://github.com/squizlabs/PHP_CodeSniffer/issues/2179#issuecomment-437634372.
- *
- * This is an issue concerning property handling across multiple files, so the
- * 7a, 7b and 7c test files together test (against) the issue.
- */
-
-  // Bad, but not reported as token type is ignored.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is ignored.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is ignored.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is ignored.
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
deleted file mode 100644
index 6dfa0d90e9..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7b.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Testing issue as reported upstream in
- * https://github.com/squizlabs/PHP_CodeSniffer/issues/2179#issuecomment-437634372.
- *
- * This is an issue concerning property handling across multiple files, so the
- * 7a, 7b and 7c test files together test (against) the issue.
- *
- * This file should inherit the property settings from the 7a test case file.
- */
-
-  // Bad, but not reported as token type is ignored.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) ignored.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) ignored.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) ignored.
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
deleted file mode 100644
index f6a8caa2b2..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.7c.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Testing issue as reported upstream in
- * https://github.com/squizlabs/PHP_CodeSniffer/issues/2179#issuecomment-437634372.
- *
- * This is an issue concerning property handling across multiple files, so the
- * 7a, 7b and 7c test files together test (against) the issue.
- *
- * This file should inherit the property settings from the 7a test case file.
- */
-
-  // Bad, but not reported as token type is ignored.
-	 function exampleFunctionD() {} // Bad, but not reported as token type is (still) ignored.
-	  function exampleFunctionE() {} // Bad, but not reported as token type is (still) ignored.
-	   function exampleFunctionF() {} // Bad, but not reported as token type is (still) ignored.
-
-// phpcs:set WordPress.WhiteSpace.PrecisionAlignment ignoreAlignmentTokens[]
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.css b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.css
deleted file mode 100644
index a4cf5166f4..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.css
+++ /dev/null
@@ -1,5 +0,0 @@
-#login-container {
-    margin-left: -225px;
-	width: 450px;
-	 height: 450px; /* Bad. */
-}
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.js b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.js
deleted file mode 100644
index 986fb2f7ce..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var x = {
-	abc: 1,
-    zyz: 2,
-	 mno: {
-	   abc: 4
-	 },
-}
diff --git a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php b/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
deleted file mode 100644
index 2fd310af84..0000000000
--- a/WordPress/Tests/WhiteSpace/PrecisionAlignmentUnitTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\WhiteSpace;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-use PHPCSUtils\BackCompat\Helper;
-
-/**
- * Unit test class for the PrecisionAlignment sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
- */
-class PrecisionAlignmentUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * The tab width to use during testing.
-	 *
-	 * @var int
-	 */
-	private $tab_width = 4;
-
-	/**
-	 * Set CLI values before the file is tested.
-	 *
-	 * @param string                  $testFile The name of the file being tested.
-	 * @param \PHP_CodeSniffer\Config $config   The config data for the test run.
-	 *
-	 * @return void
-	 */
-	public function setCliValues( $testFile, $config ) {
-		$config->tabWidth = $this->tab_width;
-
-		// Testing a file with "--ignore-annotations".
-		if ( 'PrecisionAlignmentUnitTest.6.inc' === $testFile ) {
-			$config->annotations = false;
-		}
-	}
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array();
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @param string $testFile The name of the file being tested.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList( $testFile = '' ) {
-		$phpcs_version = Helper::getVersion();
-		$is_phpcs_4    = version_compare( $phpcs_version, '3.99.99', '>' );
-
-		switch ( $testFile ) {
-			case 'PrecisionAlignmentUnitTest.1.inc':
-				return array(
-					20 => 1,
-					27 => 1,
-					30 => 1,
-					31 => 1,
-					32 => 1,
-					34 => 1, // Old-style WPCS ignore comments are no longer supported.
-					39 => 1,
-					65 => 1,
-				);
-
-			case 'PrecisionAlignmentUnitTest.4.inc':
-				return array(
-					1 => 1,
-					2 => 1,
-					3 => 1,
-					4 => 1,
-					5 => 1,
-				);
-
-			case 'PrecisionAlignmentUnitTest.5.inc':
-				return array(
-					9  => 1,
-					14 => 1,
-					19 => 1,
-					24 => 1,
-					29 => 1,
-					34 => 1,
-					39 => 1,
-					44 => 1,
-					54 => 1,
-					56 => 1,
-					58 => 1,
-				);
-
-			case 'PrecisionAlignmentUnitTest.6.inc':
-				return array(
-					4 => 1,
-				);
-
-			case 'PrecisionAlignmentUnitTest.css':
-				return array(
-					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
-				);
-
-			case 'PrecisionAlignmentUnitTest.js':
-				return array(
-					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
-					5 => ( true === $is_phpcs_4 ? 0 : 1 ),
-					6 => ( true === $is_phpcs_4 ? 0 : 1 ),
-				);
-
-			case 'PrecisionAlignmentUnitTest.2.inc':
-			case 'PrecisionAlignmentUnitTest.3.inc':
-			default:
-				return array();
-		}
-	}
-
-}

From 76cb0db8618b4833f43a80e37954a41021b51181 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Jul 2022 14:46:07 +0200
Subject: [PATCH 249/822] Core: add sniffs to check formatting of
 increment/decrement operators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> 1. There should be no space between an increment/decrement operator and the variable it applies to.
> 2. Pre-increment/decrement should be favoured over post-increment/decrement for stand-alone statements.
>    “Pre” will in/decrement and then return, “post” will return and then in/decrement.
>    Using the “pre” version is slightly more performant and can prevent future bugs when code gets moved around.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Increment/decrement operators section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#increment-decrement-operators
* WordPress/wpcs-docs 112
* WordPress/WordPress-Coding-Standards 1511
* squizlabs/PHP_CodeSniffer 2172
* squizlabs/PHP_CodeSniffer 2174
* PHPCSStandards/PHPCSExtra 65

Closes 1511
---
 WordPress-Core/ruleset.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 824543a3a3..7ff142c322 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -217,6 +217,10 @@
 		</properties>
 	</rule>
 
+	<!-- Covers rule: When using increment or decrement operators, there should be
+		 no spaces between the operator and the variable it applies to. -->
+	<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
+
 
 	<!--
 	#############################################################################
@@ -468,6 +472,19 @@
 	<rule ref="WordPress.PHP.NoSilencedErrors"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Operators - Increment/decrement operators.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#increment-decrement-operators
+	#############################################################################
+	-->
+	<!-- Covers rule: Pre-increment/decrement should be favoured over post-increment/decrement
+		 for stand-alone statements. -->
+	<rule ref="Universal.Operators.DisallowStandalonePostIncrementDecrement">
+		<type>warning</type>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	Handbook: Database - Database Queries.

From fdea3795ab09feaffe5aa7655b95c00a0c2a2dc0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 17 Jun 2022 18:56:27 +0200
Subject: [PATCH 250/822] CS: clean up codebase for new rules / pre-increment

---
 WordPress/Sniff.php                                    |  2 +-
 .../Sniffs/Arrays/ArrayDeclarationSpacingSniff.php     |  2 +-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php   |  2 +-
 .../Sniffs/Arrays/MultipleStatementAlignmentSniff.php  |  6 +++---
 .../Sniffs/NamingConventions/ValidHookNameSniff.php    | 10 +++++-----
 WordPress/Sniffs/Security/EscapeOutputSniff.php        |  4 ++--
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php   |  2 +-
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 4ddd616336..49567885d3 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -928,7 +928,7 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 		$nextPtr     = ( $stackPtr + 1 );
 
 		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ]['line'] === $currentLine ) {
-			$nextPtr++;
+			++$nextPtr;
 			// Do nothing, we just want the last token of the line.
 		}
 
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 8abe4f20b0..f641dc5907 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -405,7 +405,7 @@ protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
 						&& substr( rtrim( $this->tokens[ $end_of_comment ]['content'] ), -2 ) !== '*/'
 						&& ( $end_of_comment + 1 ) < $end_of_this_item
 					) {
-						$end_of_comment++;
+						++$end_of_comment;
 					}
 
 					if ( $this->tokens[ $end_of_comment ]['line'] !== $this->tokens[ $end_of_last_item ]['line'] ) {
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index b1b1893fef..4bb0c5dd14 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -188,7 +188,7 @@ public function process_token( $stackPtr ) {
 
 					if ( \T_WHITESPACE === $this->tokens[ $i ]['code'] ) {
 						if ( $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar ) {
-							$newlines++;
+							++$newlines;
 						} else {
 							$spaces += $this->tokens[ $i ]['length'];
 						}
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 7a851507ee..893ec05bf3 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -358,7 +358,7 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 				$items[ $key ]['single_line'] = true;
 			} else {
 				$items[ $key ]['single_line'] = false;
-				$multi_line_count++;
+				++$multi_line_count;
 			}
 
 			if ( ( $index_end_position + 2 ) <= $this->maxColumn ) {
@@ -368,7 +368,7 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 			if ( ! isset( $double_arrow_cols[ $this->tokens[ $double_arrow ]['column'] ] ) ) {
 				$double_arrow_cols[ $this->tokens[ $double_arrow ]['column'] ] = 1;
 			} else {
-				$double_arrow_cols[ $this->tokens[ $double_arrow ]['column'] ]++;
+				++$double_arrow_cols[ $this->tokens[ $double_arrow ]['column'] ];
 			}
 		}
 		unset( $key, $item, $double_arrow, $has_array_opener, $last_index_token );
@@ -413,7 +413,7 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 				if ( ! isset( $double_arrow_cols[ $this->tokens[ $item['operatorPtr'] ]['column'] ] ) ) {
 					$double_arrow_cols[ $this->tokens[ $item['operatorPtr'] ]['column'] ] = 1;
 				} else {
-					$double_arrow_cols[ $this->tokens[ $item['operatorPtr'] ]['column'] ]++;
+					++$double_arrow_cols[ $this->tokens[ $item['operatorPtr'] ]['column'] ];
 				}
 			}
 		}
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index 7ce5f8f916..b1515ed558 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -178,10 +178,10 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 
 			if ( $string !== $case_transform ) {
-				$case_errors++;
+				++$case_errors;
 			}
 			if ( $string !== $punct_transform ) {
-				$underscores++;
+				++$underscores;
 			}
 		}
 
@@ -270,7 +270,7 @@ protected function transform_complex_string( $string, $regex, $transform_type =
 				$is_variable = true;
 				if ( '{' === $part ) {
 					$has_braces = true;
-					$braces++;
+					++$braces;
 				}
 				continue;
 			}
@@ -278,10 +278,10 @@ protected function transform_complex_string( $string, $regex, $transform_type =
 			if ( true === $is_variable ) {
 				if ( '[' === $part ) {
 					$has_braces = true;
-					$braces++;
+					++$braces;
 				}
 				if ( \in_array( $part, array( '}', ']' ), true ) ) {
-					$braces--;
+					--$braces;
 				}
 				if ( false === $has_braces && ' ' === $part ) {
 					$is_variable  = false;
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index ce686ac05d..1760b273f5 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -263,7 +263,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		// Ignore the function itself.
-		$stackPtr++;
+		++$stackPtr;
 
 		$in_cast = false;
 
@@ -315,7 +315,7 @@ public function process_token( $stackPtr ) {
 
 			// Handle arrays for those functions that accept them.
 			if ( \T_ARRAY === $this->tokens[ $i ]['code'] ) {
-				$i++; // Skip the opening parenthesis.
+				++$i; // Skip the opening parenthesis.
 				continue;
 			}
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index bcec93624d..4ab6b47754 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -332,7 +332,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				}
 			}
 
-			$ptr++;
+			++$ptr;
 		}
 		unset( $var );
 
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 0cdaf84396..7ab0230b80 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -561,7 +561,7 @@ public function process_token( $stackPtr ) {
 					$i = ( $scopeCloser + 1 );
 					while ( $this->tokens[ $i ]['line'] !== $this->tokens[ $trailingContent ]['line'] ) {
 						$this->phpcsFile->fixer->replaceToken( $i, '' );
-						$i++;
+						++$i;
 					}
 
 					// TODO: Instead a separate error should be triggered when content comes right after closing brace.

From 72bc7b5e7e2723ed7fcc738175cd1e5e900c7b8f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 20:47:46 +0100
Subject: [PATCH 251/822] GH Actions: tweak label management workflow

Let's try this without the quotes around the labels.
The example in the action runners' readme didn't contain quotes, I added them as the labels we use have a `:` in it, which has special meaning in YAML workflows, but clearly that's not working.

If this doesn't work either, I may need to report it as a bug to the action runner (or find another action runner for the same).
---
 .github/workflows/manage-labels.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/manage-labels.yml b/.github/workflows/manage-labels.yml
index abe1aa6563..6e4a1f4f12 100644
--- a/.github/workflows/manage-labels.yml
+++ b/.github/workflows/manage-labels.yml
@@ -21,8 +21,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            "Status: Awaiting Feedback"
-            "Status: Review Ready"
+            Status: Awaiting Feedback
+            Status: Review Ready
 
   on-pr-close:
     runs-on: ubuntu-latest
@@ -35,9 +35,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            "Status: Awaiting Feedback"
-            "Status: close candidate"
-            "Status: Review Ready"
+            Status: Awaiting Feedback
+            Status: close candidate
+            Status: Review Ready
 
   on-issue-close:
     runs-on: ubuntu-latest
@@ -50,8 +50,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            "Status: Awaiting Feedback"
-            "Status: close candidate"
-            "Status: help wanted"
-            "Status: good first issue"
-            "Status: PR Exists"
+            Status: Awaiting Feedback
+            Status: close candidate
+            Status: help wanted
+            Status: good first issue
+            Status: PR Exists

From cbde80c8a4083bc15be0ac8ca07513fe6bdcd9b3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 08:58:14 +0200
Subject: [PATCH 252/822] Core: add sniffs to check formatting for type
 declarations

> 1. Type declarations must have exactly one space before and after the type.
>    In case of a multi-line function declaration, a new line + appropriate indentation should be used before the type declaration.
> 2. The nullability operator is regarded as part of the type declaration and there should be no space between this operator and the actual type.
> 3. Keyword-based type declarations should use lowercase.
> 4. Class/interface name based type declarations should use the case of the class/interface name as declared.
>
> And specifically for return type declarations:
> 5. There should be no space between the closing parenthesis of the function declaration and the colon starting a return type.
>
> These rules apply to all structures allowing for type declarations: functions, closures, catch conditions as well as the PHP 7.4 arrow functions and typed properties.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Type declarations
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#type-declarations
* WordPress/wpcs-docs 102
* WordPress/wpcs-docs 119

Refs regarding return type spacing:
* WordPress/WordPress-Coding-Standards 547
* WordPress/WordPress-Coding-Standards 1084
* WordPress/WordPress-Coding-Standards 1420
* WordPress/WordPress-Coding-Standards 1421

Closes 547
---
 WordPress-Core/ruleset.xml | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 32f1bd0e11..782bc41ca9 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -207,8 +207,6 @@
 	<!-- Rule: In a switch block, there must be no space between the case condition and the colon. -->
 	<!-- Covered by the PSR2.ControlStructures.SwitchDeclaration sniff. -->
 
-	<!-- Rule: Similarly, there should be no space before the colon on return type declarations. -->
-
 	<!-- Covers rule: Unless otherwise specified, parentheses should have spaces inside them. -->
 	<rule ref="Generic.WhiteSpace.ArbitraryParenthesesSpacing">
 		<properties>
@@ -343,6 +341,35 @@
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1330 -->
 
 
+	<!--
+	#############################################################################
+	Handbook: Formatting - Type declarations.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#type-declarations
+	#############################################################################
+	-->
+	<!-- Covers rule: Type declarations must have exactly one space before and after the type. -->
+	<!-- Covered by the Squiz.Functions.FunctionDeclarationArgumentSpacing sniff. -->
+
+	<!-- Covers rule: There should be no space between the nullability operator and the actual type. -->
+	<rule ref="PSR12.Functions.NullableTypeDeclaration"/>
+
+	<!-- Rule: Class/interface/enum name based type declarations should use the case of the
+		 class/interface/enum name as declared... -->
+	<!-- Not sniffable except for PHP native names and known WP class names (this last part via
+		 the WordPress.WP.ClassNameCase sniff once switched to the (upcoming/future)
+		 PHPCSUtils AbstractClassUseSniff. -->
+
+	<!-- Covers rule: ... while the keyword-based type declarations should be lowercased. -->
+	<!-- Covered by the Generic.PHP.LowerCaseType sniff. -->
+
+	<!-- Covers rule: Return type declarations should have no space between the closing parenthesis
+		 of the function declaration and the colon starting a return type. -->
+	<rule ref="PSR12.Functions.ReturnTypeDeclaration"/>
+
+	<!-- Implied through the examples: There should no space around the union or intersection type operators. -->
+	<rule ref="Universal.Operators.TypeSeparatorSpacing"/>
+
+
 	<!--
 	#############################################################################
 	Handbook: Formatting - Spread operator.

From 4a053666c63fdb5b4be170016ddeec94ec61cd54 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:39:25 +0200
Subject: [PATCH 253/822] Core: move rules related to object instantiations
 from `Extra` to `Core`

> 1.  When instantiating a new instance of an object, parenthesis must always be used, even when not strictly necessary.
> 2. There should be no space between the name of the class being instantiated and the opening parenthesis.

Note: the spacing inside the parentheses when instantiating anonymous classes will not (yet) be checked by the `PEAR.Functions.FunctionCallSignature` sniff. A PR is open upstream to add support for this: squizlabs/PHP_CodeSniffer 3636
Once the upstream PR has been merged, WPCS will automatically inherit the support as this sniff is already included in WPCS.

The following will no longer be checked by WPCS:
> 3. Assigning the return value of an object instantiation by reference is not allowed.

This is a parse error since PHP 7.0, so should not be the concern of WPCS (and hasn't been added to the handbook for the same reason). See: https://3v4l.org/W2Qj6

---
As discussed in 1884, this means that JS support for checking object instantiations will be dropped, but as WPCS is generally not used for checking JS code, this should not be a problem.
---

Refs and related issues:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Object instantiation section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#object-instantiation
* WordPress/wpcs-docs 109
* WordPress/WordPress-Coding-Standards 919
* WordPress/WordPress-Coding-Standards 1033
* WordPress/WordPress-Coding-Standards 1721
* squizlabs/PHP_CodeSniffer 3200
* squizlabs/PHP_CodeSniffer 3636 (not yet merged)
* PHPCSStandards/PHPCSExtra 76
* PHPCSStandards/PHPCSExtra 120

Fixes 1884
Fixes 2033
---
 WordPress-Core/ruleset.xml  | 19 +++++++++++++++++++
 WordPress-Extra/ruleset.xml | 11 -----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 32f1bd0e11..73d712ed0d 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -425,6 +425,25 @@
 	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Object-Oriented Programming - Object Instantiation.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#object-instantiation
+	#############################################################################
+	-->
+	<!-- Covers rule: When instantiating a new object instance, parenthesis must always be used, even when not strictly necessary. -->
+	<rule ref="PSR12.Classes.ClassInstantiation"/>
+	<rule ref="Universal.Classes.RequireAnonClassParentheses"/>
+
+	<!-- Covers rule: There should be no space between the name of the class being instantiated and the opening parenthesis. -->
+	<!-- Covered by the PEAR.Functions.FunctionCallSignature sniff for non-anonymous classes. -->
+	<rule ref="Universal.WhiteSpace.AnonClassKeywordSpacing">
+		<properties>
+			<property name="spacing" value="0"/>
+		</properties>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	Handbook: Control Structures - Use elseif, not else if.
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 111d39faa5..4be8def0ff 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -122,17 +122,6 @@
 	<!-- Validates post type slugs for valid characters, length and reserved keywords. -->
 	<rule ref="WordPress.NamingConventions.ValidPostTypeSlug"/>
 
-	<!-- Check that object instantiations always have braces & are not assigned by reference.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/919
-		 Note: there is a similar upstream sniff `PSR12.Classes.ClassInstantiation`, however
-		 that sniff:
-		 - does not cover JS files;
-		 - does not demand parentheses for PHP anonymous classes;
-		 - does not check the whitespace between the class name and the parentheses;
-		 - does not check for PHP new by reference.
-		 For those reasons, the WPCS version should remain. -->
-	<rule ref="WordPress.Classes.ClassInstantiation"/>
-
 	<!-- https://github.com/WordPress/WordPress-Coding-Standards/issues/1157 -->
 	<rule ref="WordPress.Security.PluginMenuSlug"/>
 	<rule ref="WordPress.WP.CronInterval"/>

From 47d93c01bade641c3590b4605bdbd117682640d6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 23 Jul 2022 16:17:28 +0200
Subject: [PATCH 254/822] Remove the Classes/ClassInstantiation sniff

... as it is now no longer used.
---
 .../Classes/ClassInstantiationSniff.php       | 205 ------------------
 .../Classes/ClassInstantiationUnitTest.inc    | 106 ---------
 .../ClassInstantiationUnitTest.inc.fixed      | 106 ---------
 .../Classes/ClassInstantiationUnitTest.js     |   4 -
 .../ClassInstantiationUnitTest.js.fixed       |   4 -
 .../Classes/ClassInstantiationUnitTest.php    |  87 --------
 6 files changed, 512 deletions(-)
 delete mode 100644 WordPress/Sniffs/Classes/ClassInstantiationSniff.php
 delete mode 100644 WordPress/Tests/Classes/ClassInstantiationUnitTest.inc
 delete mode 100644 WordPress/Tests/Classes/ClassInstantiationUnitTest.inc.fixed
 delete mode 100644 WordPress/Tests/Classes/ClassInstantiationUnitTest.js
 delete mode 100644 WordPress/Tests/Classes/ClassInstantiationUnitTest.js.fixed
 delete mode 100644 WordPress/Tests/Classes/ClassInstantiationUnitTest.php

diff --git a/WordPress/Sniffs/Classes/ClassInstantiationSniff.php b/WordPress/Sniffs/Classes/ClassInstantiationSniff.php
deleted file mode 100644
index d426685c1e..0000000000
--- a/WordPress/Sniffs/Classes/ClassInstantiationSniff.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\Classes;
-
-use WordPressCS\WordPress\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Verifies object instantiation statements.
- *
- * - Demand the use of parenthesis.
- * - Demand no space between the class name and the parenthesis.
- * - Forbid assigning new by reference.
- *
- * {@internal Note: This sniff currently does not examine the parenthesis of new object
- * instantiations where the class name is held in a variable variable.}}
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class ClassInstantiationSniff extends Sniff {
-
-	/**
-	 * A list of tokenizers this sniff supports.
-	 *
-	 * @var array
-	 */
-	public $supportedTokenizers = array(
-		'PHP',
-		'JS',
-	);
-
-	/**
-	 * Tokens which can be part of a "classname".
-	 *
-	 * Set from within the register() method.
-	 *
-	 * @var array
-	 */
-	protected $classname_tokens = array();
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		/*
-		 * Set the $classname_tokens property.
-		 *
-		 * Currently does not account for classnames passed as a variable variable.
-		 */
-		$this->classname_tokens                    = Tokens::$emptyTokens;
-		$this->classname_tokens[ \T_NS_SEPARATOR ] = \T_NS_SEPARATOR;
-		$this->classname_tokens[ \T_STRING ]       = \T_STRING;
-		$this->classname_tokens[ \T_SELF ]         = \T_SELF;
-		$this->classname_tokens[ \T_STATIC ]       = \T_STATIC;
-		$this->classname_tokens[ \T_PARENT ]       = \T_PARENT;
-		$this->classname_tokens[ \T_ANON_CLASS ]   = \T_ANON_CLASS;
-
-		// Classname in a variable.
-		$this->classname_tokens[ \T_VARIABLE ]                 = \T_VARIABLE;
-		$this->classname_tokens[ \T_DOUBLE_COLON ]             = \T_DOUBLE_COLON;
-		$this->classname_tokens[ \T_OBJECT_OPERATOR ]          = \T_OBJECT_OPERATOR;
-		$this->classname_tokens[ \T_OPEN_SQUARE_BRACKET ]      = \T_OPEN_SQUARE_BRACKET;
-		$this->classname_tokens[ \T_CLOSE_SQUARE_BRACKET ]     = \T_CLOSE_SQUARE_BRACKET;
-		$this->classname_tokens[ \T_CONSTANT_ENCAPSED_STRING ] = \T_CONSTANT_ENCAPSED_STRING;
-		$this->classname_tokens[ \T_LNUMBER ]                  = \T_LNUMBER;
-
-		return array(
-			\T_NEW,
-			\T_STRING, // JS.
-		);
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return void
-	 */
-	public function process_token( $stackPtr ) {
-		// Make sure we have the right token, JS vs PHP.
-		if ( ( ( isset( $this->phpcsFile->tokenizerType ) === false || 'PHP' === $this->phpcsFile->tokenizerType )
-				&& \T_NEW !== $this->tokens[ $stackPtr ]['code'] )
-			|| ( ( isset( $this->phpcsFile->tokenizerType ) && 'JS' === $this->phpcsFile->tokenizerType )
-				&& ( \T_STRING !== $this->tokens[ $stackPtr ]['code']
-				|| 'new' !== strtolower( $this->tokens[ $stackPtr ]['content'] ) ) )
-		) {
-			return;
-		}
-
-		/*
-		 * Check for new by reference used in PHP files.
-		 */
-		if ( isset( $this->phpcsFile->tokenizerType ) === false || 'PHP' === $this->phpcsFile->tokenizerType ) {
-			$prev_non_empty = $this->phpcsFile->findPrevious(
-				Tokens::$emptyTokens,
-				( $stackPtr - 1 ),
-				null,
-				true
-			);
-
-			if ( false !== $prev_non_empty && 'T_BITWISE_AND' === $this->tokens[ $prev_non_empty ]['type'] ) {
-				$this->phpcsFile->recordMetric( $stackPtr, 'Assigning new by reference', 'yes' );
-
-				$this->phpcsFile->addError(
-					'Assigning the return value of new by reference is no longer supported by PHP.',
-					$stackPtr,
-					'NewByReferenceFound'
-				);
-			} else {
-				$this->phpcsFile->recordMetric( $stackPtr, 'Assigning new by reference', 'no' );
-			}
-		}
-
-		/*
-		 * Check for parenthesis & correct placement thereof.
-		 */
-		$next_non_empty_after_class_name = $this->phpcsFile->findNext(
-			$this->classname_tokens,
-			( $stackPtr + 1 ),
-			null,
-			true,
-			null,
-			true
-		);
-
-		if ( false === $next_non_empty_after_class_name ) {
-			// Live coding.
-			return;
-		}
-
-		// Walk back to the last part of the class name.
-		$has_comment = false;
-		for ( $classname_ptr = ( $next_non_empty_after_class_name - 1 ); $classname_ptr >= $stackPtr; $classname_ptr-- ) {
-			if ( ! isset( Tokens::$emptyTokens[ $this->tokens[ $classname_ptr ]['code'] ] ) ) {
-				// Prevent a false positive on variable variables, disregard them for now.
-				if ( $stackPtr === $classname_ptr ) {
-					return;
-				}
-
-				break;
-			}
-
-			if ( \T_WHITESPACE !== $this->tokens[ $classname_ptr ]['code'] ) {
-				$has_comment = true;
-			}
-		}
-
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty_after_class_name ]['code'] ) {
-			$this->phpcsFile->recordMetric( $stackPtr, 'Object instantiation with parenthesis', 'no' );
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Parenthesis should always be used when instantiating a new object.',
-				$classname_ptr,
-				'MissingParenthesis'
-			);
-
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->addContent( $classname_ptr, '()' );
-			}
-		} else {
-			$this->phpcsFile->recordMetric( $stackPtr, 'Object instantiation with parenthesis', 'yes' );
-
-			if ( ( $next_non_empty_after_class_name - 1 ) !== $classname_ptr ) {
-				$this->phpcsFile->recordMetric(
-					$stackPtr,
-					'Space between classname and parenthesis',
-					( $next_non_empty_after_class_name - $classname_ptr )
-				);
-
-				$error      = 'There must be no spaces between the class name and the open parenthesis when instantiating a new object.';
-				$error_code = 'SpaceBeforeParenthesis';
-
-				if ( false === $has_comment ) {
-					$fix = $this->phpcsFile->addFixableError( $error, $next_non_empty_after_class_name, $error_code );
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->beginChangeset();
-						for ( $i = ( $next_non_empty_after_class_name - 1 ); $i > $classname_ptr; $i-- ) {
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-						}
-						$this->phpcsFile->fixer->endChangeset();
-					}
-				} else {
-					$this->phpcsFile->addError( $error, $next_non_empty_after_class_name, $error_code );
-				}
-			} else {
-				$this->phpcsFile->recordMetric( $stackPtr, 'Space between classname and parenthesis', 0 );
-			}
-		}
-	}
-
-}
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc b/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc
deleted file mode 100644
index d0a9ae7afa..0000000000
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
- * All OK.
- */
-$a = new MyClass();
-$a = new MyClass( $something );
-$a = new $varHoldingClassName();
-$a = new self::$transport[$cap_string]();
-$renderer = new $this->inline_diff_renderer();
-$b = ( new MyClass() )->my_function();
-$b = ( new MyClass() )::$property;
-
-class ClassA {
-	public static function get_instance() {
-		return new self();
-	}
-
-	public static function get_other_instance() {
-		return new static();
-	}
-}
-
-class ClassB extends ClassA {
-	public function get_parent_instance() {
-		return new parent();
-	}
-}
-
-// PHP 7: Anonymous classes.
-$util->setLogger( new class() {} );
-$b = new class( 10 ) extends SomeClass implements SomeInterface {};
-
-
-/*
- * Bad.
- */
-$a = new MyClass;
-$a = new $varHoldingClassName;
-$a = new self::$transport[$cap_string];
-$renderer = new $this->inline_diff_renderer;
-$b = ( new MyClass )->my_function();
-$b = ( new MyClass )::$property;
-
-class ClassAA {
-	public static function get_instance() {
-		return new self;
-	}
-
-	public static function get_other_instance() {
-		return new static;
-	}
-}
-
-class ClassBB extends ClassA {
-	public function get_parent_instance() {
-		return new parent;
-	}
-}
-
-// PHP 7: Anonymous classes.
-$util->setLogger( new class {} );
-$b = new class extends SomeClass implements SomeInterface {};
-
-
-// Test some non-typical spacing.
-$renderer = new $this->
-					inline_diff_renderer  ();
-$renderer = new $this-> // There can be a comment here.
-					inline_diff_renderer  ();
-$renderer = new $this->
-					inline_diff_renderer /* or here */ ();
-$a = new self :: $transport [ $cap_string ] ();
-
-$renderer = new $this->
-					inline_diff_renderer;
-$renderer = new $this-> // There can be a comment here.
-					inline_diff_renderer;
-$renderer = new $this->
-					inline_diff_renderer /* or here */ ;
-$a = new self :: $transport [ $cap_string ];
-
-
-// Assigning new by reference.
-$b = &new Foobar();
-$b = & new Foobar();
-
-
-// Currently not accounted for by the sniff, i.e. false negatives.
-$a = new $$varHoldingClassName;
-$a = new ${$varHoldingClassName};
-
-// Namespaced classes: OK.
-$a = new \MyClass();
-$a = new \MyNamespace\MyClass();
-
-// Namespaced classes: Bad.
-$a = new \MyClass;
-$a = new \MyNamespace\MyClass;
-
-// Non-variable keys: OK.
-$a = new $array['key']();
-$a = new $array[0]();
-
-// Non-variable keys: Bad.
-$a = new $array['key'];
-$a = new $array[0];
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc.fixed b/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc.fixed
deleted file mode 100644
index d906b2d4eb..0000000000
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.inc.fixed
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
- * All OK.
- */
-$a = new MyClass();
-$a = new MyClass( $something );
-$a = new $varHoldingClassName();
-$a = new self::$transport[$cap_string]();
-$renderer = new $this->inline_diff_renderer();
-$b = ( new MyClass() )->my_function();
-$b = ( new MyClass() )::$property;
-
-class ClassA {
-	public static function get_instance() {
-		return new self();
-	}
-
-	public static function get_other_instance() {
-		return new static();
-	}
-}
-
-class ClassB extends ClassA {
-	public function get_parent_instance() {
-		return new parent();
-	}
-}
-
-// PHP 7: Anonymous classes.
-$util->setLogger( new class() {} );
-$b = new class( 10 ) extends SomeClass implements SomeInterface {};
-
-
-/*
- * Bad.
- */
-$a = new MyClass();
-$a = new $varHoldingClassName();
-$a = new self::$transport[$cap_string]();
-$renderer = new $this->inline_diff_renderer();
-$b = ( new MyClass() )->my_function();
-$b = ( new MyClass() )::$property;
-
-class ClassAA {
-	public static function get_instance() {
-		return new self();
-	}
-
-	public static function get_other_instance() {
-		return new static();
-	}
-}
-
-class ClassBB extends ClassA {
-	public function get_parent_instance() {
-		return new parent();
-	}
-}
-
-// PHP 7: Anonymous classes.
-$util->setLogger( new class() {} );
-$b = new class() extends SomeClass implements SomeInterface {};
-
-
-// Test some non-typical spacing.
-$renderer = new $this->
-					inline_diff_renderer();
-$renderer = new $this-> // There can be a comment here.
-					inline_diff_renderer();
-$renderer = new $this->
-					inline_diff_renderer /* or here */ ();
-$a = new self :: $transport [ $cap_string ]();
-
-$renderer = new $this->
-					inline_diff_renderer();
-$renderer = new $this-> // There can be a comment here.
-					inline_diff_renderer();
-$renderer = new $this->
-					inline_diff_renderer() /* or here */ ;
-$a = new self :: $transport [ $cap_string ]();
-
-
-// Assigning new by reference.
-$b = &new Foobar();
-$b = & new Foobar();
-
-
-// Currently not accounted for by the sniff, i.e. false negatives.
-$a = new $$varHoldingClassName;
-$a = new ${$varHoldingClassName};
-
-// Namespaced classes: OK.
-$a = new \MyClass();
-$a = new \MyNamespace\MyClass();
-
-// Namespaced classes: Bad.
-$a = new \MyClass();
-$a = new \MyNamespace\MyClass();
-
-// Non-variable keys: OK.
-$a = new $array['key']();
-$a = new $array[0]();
-
-// Non-variable keys: Bad.
-$a = new $array['key']();
-$a = new $array[0]();
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.js b/WordPress/Tests/Classes/ClassInstantiationUnitTest.js
deleted file mode 100644
index 4800633f98..0000000000
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var firstBook  = new Book(); // OK.
-var secondBook = new Book; // Bad.
-var thirdBook  = new Book    (); // Bad.
-var fourthBook = new Book    ( 'title' ); // Bad.
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.js.fixed b/WordPress/Tests/Classes/ClassInstantiationUnitTest.js.fixed
deleted file mode 100644
index 73116a47a9..0000000000
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.js.fixed
+++ /dev/null
@@ -1,4 +0,0 @@
-var firstBook  = new Book(); // OK.
-var secondBook = new Book(); // Bad.
-var thirdBook  = new Book(); // Bad.
-var fourthBook = new Book( 'title' ); // Bad.
diff --git a/WordPress/Tests/Classes/ClassInstantiationUnitTest.php b/WordPress/Tests/Classes/ClassInstantiationUnitTest.php
deleted file mode 100644
index 42253fdbfb..0000000000
--- a/WordPress/Tests/Classes/ClassInstantiationUnitTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\Classes;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-use PHPCSUtils\BackCompat\Helper;
-
-/**
- * Unit test class for the ClassInstantiation sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-class ClassInstantiationUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList( $testFile = '' ) {
-
-		$phpcs_version = Helper::getVersion();
-		$is_phpcs_4    = version_compare( $phpcs_version, '3.99.99', '>' );
-
-		switch ( $testFile ) {
-			case 'ClassInstantiationUnitTest.inc':
-				return array(
-					37  => 1,
-					38  => 1,
-					39  => 1,
-					40  => 1,
-					41  => 1,
-					42  => 1,
-					46  => 1,
-					50  => 1,
-					56  => 1,
-					61  => 1,
-					62  => 1,
-					67  => 1,
-					69  => 1,
-					71  => 1,
-					72  => 1,
-					75  => 1,
-					77  => 1,
-					79  => 1,
-					80  => 1,
-					84  => 1,
-					85  => 1,
-					97  => 1,
-					98  => 1,
-					105 => 1,
-					106 => 1,
-				);
-
-			case 'ClassInstantiationUnitTest.js':
-				return array(
-					2 => ( true === $is_phpcs_4 ? 0 : 1 ),
-					3 => ( true === $is_phpcs_4 ? 0 : 1 ),
-					4 => ( true === $is_phpcs_4 ? 0 : 1 ),
-				);
-
-			default:
-				return array();
-		}
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array();
-	}
-
-}

From 239268f82aee9a34880cdf546cfc71f252788e32 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 12:51:18 +0200
Subject: [PATCH 255/822] Core: add sniff to discourage using reserved keywords
 as param names

The sniff in PHPCSExtra throws a `warning`. This is in line with the wording now used in the WP Core CS handbook.

All the same, as warnings for the `src` directory are currently ignored in CI for WP Core, we could consider making this an `error` once all known instances have been fixed, which should be soon as the fixes are all lined up to be committed, and we _really_ don't want new ones being introduced (as renaming the parameter after introduction would be a BC-break).
For `Extra` we could then choose to make this less opinionated and revert it to a `warning`.

Refs:
* WordPress/wpcs-docs 120
* PHPCSStandards/PHPCSExtra 80

Related to WP Core tickets:
* https://core.trac.wordpress.org/ticket/51553
* https://core.trac.wordpress.org/ticket/55327
* https://core.trac.wordpress.org/ticket/55650
* https://core.trac.wordpress.org/ticket/56788
---
 WordPress-Core/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 32f1bd0e11..826c8a05cf 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -101,6 +101,9 @@
 	<rule ref="WordPress.NamingConventions.ValidHookName"/>
 	<rule ref="WordPress.NamingConventions.ValidVariableName"/>
 
+	<!-- Covers rule: It is _strongly recommended_ to avoid reserved keywords as function parameter names. -->
+	<rule ref="Universal.NamingConventions.NoReservedKeywordParameterNames"/>
+
 	<!-- Covers rule: Class names should use capitalized words separated by underscores. -->
 	<rule ref="PEAR.NamingConventions.ValidClassName"/>
 

From 511f4e5c6b92b8ace14d3423dc4ecd9937c725a5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:27:41 +0100
Subject: [PATCH 256/822] CS/QA: rename parameters matching reserved keywords

.... in this codebase.
---
 WordPress/AbstractFunctionRestrictionsSniff.php  | 12 ++++++------
 WordPress/Sniff.php                              |  6 +++---
 .../NamingConventions/ValidHookNameSniff.php     | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 67c3f80787..a5cba4f912 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -330,15 +330,15 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @since 0.10.0
 	 *
-	 * @param string $function Function name.
+	 * @param string $function_name Function name.
 	 * @return string Regex escaped function name.
 	 */
-	protected function prepare_name_for_regex( $function ) {
-		$function = str_replace( array( '.*', '*' ), '@@', $function ); // Replace wildcards with placeholder.
-		$function = preg_quote( $function, '`' );
-		$function = str_replace( '@@', '.*', $function ); // Replace placeholder with regex wildcard.
+	protected function prepare_name_for_regex( $function_name ) {
+		$function_name = str_replace( array( '.*', '*' ), '@@', $function_name ); // Replace wildcards with placeholder.
+		$function_name = preg_quote( $function_name, '`' );
+		$function_name = str_replace( '@@', '.*', $function_name ); // Replace placeholder with regex wildcard.
 
-		return $function;
+		return $function_name;
 	}
 
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 49567885d3..276c7456a4 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1256,7 +1256,7 @@ protected function is_token_namespaced( $stackPtr ) {
 	 * @param array $valid_functions List of valid function names.
 	 *                               Note: The keys to this array should be the function names
 	 *                               in lowercase. Values are irrelevant.
-	 * @param bool  $global          Optional. Whether to make sure that the function call is
+	 * @param bool  $global_function Optional. Whether to make sure that the function call is
 	 *                               to a global function. If `false`, calls to methods, be it static
 	 *                               `Class::method()` or via an object `$obj->method()`, and
 	 *                               namespaced function calls, like `MyNS\function_name()` will
@@ -1271,7 +1271,7 @@ protected function is_token_namespaced( $stackPtr ) {
 	 *
 	 * @return int|bool Stack pointer to the function call T_STRING token or false otherwise.
 	 */
-	protected function is_in_function_call( $stackPtr, $valid_functions, $global = true, $allow_nested = false ) {
+	protected function is_in_function_call( $stackPtr, $valid_functions, $global_function = true, $allow_nested = false ) {
 		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
 			return false;
 		}
@@ -1297,7 +1297,7 @@ protected function is_in_function_call( $stackPtr, $valid_functions, $global = t
 				continue;
 			}
 
-			if ( false === $global ) {
+			if ( false === $global_function ) {
 				return $prev_non_empty;
 			}
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index b1515ed558..dfc9d290d3 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -228,38 +228,38 @@ protected function prepare_regex() {
 	/**
 	 * Transform an arbitrary string to lowercase and replace punctuation and spaces with underscores.
 	 *
-	 * @param string $string         The target string.
+	 * @param string $text_string    The target string.
 	 * @param string $regex          The punctuation regular expression to use.
 	 * @param string $transform_type Whether to a partial or complete transform.
 	 *                               Valid values are: 'full', 'case', 'punctuation'.
 	 * @return string
 	 */
-	protected function transform( $string, $regex, $transform_type = 'full' ) {
+	protected function transform( $text_string, $regex, $transform_type = 'full' ) {
 
 		switch ( $transform_type ) {
 			case 'case':
-				return strtolower( $string );
+				return strtolower( $text_string );
 
 			case 'punctuation':
-				return preg_replace( $regex, '_', $string );
+				return preg_replace( $regex, '_', $text_string );
 
 			case 'full':
 			default:
-				return preg_replace( $regex, '_', strtolower( $string ) );
+				return preg_replace( $regex, '_', strtolower( $text_string ) );
 		}
 	}
 
 	/**
 	 * Transform a complex string which may contain variable extrapolation.
 	 *
-	 * @param string $string         The target string.
+	 * @param string $text_string    The target string.
 	 * @param string $regex          The punctuation regular expression to use.
 	 * @param string $transform_type Whether to a partial or complete transform.
 	 *                               Valid values are: 'full', 'case', 'punctuation'.
 	 * @return string
 	 */
-	protected function transform_complex_string( $string, $regex, $transform_type = 'full' ) {
-		$output = preg_split( '`([\{\}\$\[\] ])`', $string, -1, \PREG_SPLIT_DELIM_CAPTURE );
+	protected function transform_complex_string( $text_string, $regex, $transform_type = 'full' ) {
+		$output = preg_split( '`([\{\}\$\[\] ])`', $text_string, -1, \PREG_SPLIT_DELIM_CAPTURE );
 
 		$is_variable = false;
 		$has_braces  = false;

From 1311f8f628333dbda6fcc8678f53abd18c651ea2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 08:59:47 +0200
Subject: [PATCH 257/822] Core: add sniff to check magic constants are in
 uppercase

> 1. The PHP native `__...__` magic constants should be in uppercase when used.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Magic Constants section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#magic-constants
* WordPress/wpcs-docs 113
* PHPCSStandards/PHPCSExtra 64
---
 WordPress-Core/ruleset.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 9081db3871..f106b210e8 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -373,6 +373,20 @@
 	<rule ref="Universal.Operators.TypeSeparatorSpacing"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Formatting - Magic constants.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#magic-constants
+	#############################################################################
+	-->
+	<!-- Covers rule: The PHP native __*__ magic constants should be written in uppercase. -->
+	<rule ref="Universal.Constants.UppercaseMagicConstants"/>
+
+	<!-- Rule: When using the ::class constant for class name resolution, the class keyword should be in lowercase... -->
+
+	<!-- Rule: ... and there should be no spaces around the :: operator. -->
+
+
 	<!--
 	#############################################################################
 	Handbook: Formatting - Spread operator.

From d36941542bb4b6fe8c1d213c8c6e64936ca77745 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 2 Nov 2022 22:18:13 +0100
Subject: [PATCH 258/822] Core: ensure more keywords are lowercase

The `function` and `const` keywords when used in import `use` statements are tokenized as `T_STRING`, not their keyword token, which means that the `Generic.PHP.LowerCaseKeyword` overlooks these.

This adds an additional sniff, which specifically checks that the `function` and `const` keywords in import `use` statements are in lowercase.
---
 WordPress-Core/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 9081db3871..8282dfbc26 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -699,6 +699,7 @@
 
 	<!-- Lowercase PHP keywords, like class, function and case. -->
 	<rule ref="Generic.PHP.LowerCaseKeyword"/>
+	<rule ref="Universal.UseStatements.LowercaseFunctionConst"/>
 
 	<!-- Class opening braces should be on the same line as the statement. -->
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>

From 90025517ac75c716f85131b0a51106ce541ed429 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 21:56:28 +0100
Subject: [PATCH 259/822] WP/DeprecatedParameters: add support for PHP 8.0+
 named parameters

1. Adjusted the way the correct parameter is retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter name used is in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries.... _sigh_.
    It also looks like in the past, deprecated parameters were being renamed to `$deprecated` on deprecation. This practice should be strongly discouraged in the context of named parameters, but that's a different discussion and outside of the scope of this commit.
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.
3. Adjusted the error message/data determination to take named parameters into account.

Name verification notes:
* Removed the `comments_link()` function.
    Per [the changelog](https://developer.wordpress.org/reference/functions/comments_number/#changelog), the previously deprecated fourth parameter is now being used for something else since WP 5.4.0....
    Far from best practice, but it is what it is, so I've removed the listing for that function.

What has **not** been done: a scan of the WP Core codebase to find newly deprecated parameters.

Includes additional unit tests and updating one existing test to ensure the code logic is properly covered.

Note: I thought of updating the error message to no longer refer to the position of the parameter, but to use the parameter name instead (with a "Found: %s" for displaying value), as in:
```bash
# Current:
The parameter "$variable" at position #2 of wp_new_user_notification() has been deprecated since WordPress version 4.3.1. Instead do not pass the parameter.

# Variation:
The $deprecated parameter of the wp_new_user_notification() function has been deprecated since WordPress version 4.3.1. Instead do not pass the parameter. Found: $variable
```
... but as WP renamed all deprecated parameters to `$deprecated`, this wouldn't necessarily be more descriptive than it is now.

Along the same lines, I considered updating the error code to refer to the param name instead of the position, but aside from it not making things more descriptive as things are, that would also constitute a BC-break which I don't think is warranted.

Opinions appreciated.
---
 .../Sniffs/WP/DeprecatedParametersSniff.php   | 74 +++++++++++++------
 .../Tests/WP/DeprecatedParametersUnitTest.inc | 18 ++++-
 .../Tests/WP/DeprecatedParametersUnitTest.php | 12 ++-
 3 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 623e5fbc7e..e35c2d90a8 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
@@ -58,15 +59,14 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 *    $target_functions = array(
 	 *        (string) Function name. => array(
 	 *            (int) Target parameter position, 1-based. => array(
-	 *                'value'   => (mixed) Expected default value for the
-	 *                              deprecated parameter. Currently the default
-	 *                              values: true, false, null, empty arrays and
-	 *                              both empty and non-empty strings can be
-	 *                              handled correctly by the process_parameters()
-	 *                              method. When an additional default value is
-	 *                              added, the relevant code in the
-	 *                              process_parameters() method will need to be
-	 *                              adjusted.
+	 *                'name'    => (string|array) Parameter name or list of names if the parameter
+	 *                             was renamed since the release of PHP 8.0.
+	 *                'value'   => (mixed) Expected default value for the deprecated parameter.
+	 *                             Currently the default values: true, false, null, empty arrays
+	 *                             and both empty and non-empty strings can be handled correctly
+	 *                             by the process_parameters() method.
+	 *                             When an additional default value is added, the relevant code
+	 *                             in the process_parameters() method will need to be adjusted.
 	 *                'version' => (int) The WordPress version when deprecated.
 	 *            )
 	 *         )
@@ -76,194 +76,220 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 
 		'add_option' => array(
 			3 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.3.0',
 			),
 		),
 		'comments_link' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '0.72',
 			),
 			2 => array(
-				'value'   => '',
-				'version' => '1.3.0',
-			),
-		),
-		'comments_number' => array(
-			4 => array(
+				'name'    => 'deprecated_2',
 				'value'   => '',
 				'version' => '1.3.0',
 			),
 		),
 		'convert_chars' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '0.71',
 			),
 		),
 		'discover_pingback_server_uri' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.7.0',
 			),
 		),
 		'get_category_parents' => array(
 			5 => array(
+				'name'    => 'deprecated',
 				'value'   => array(),
 				'version' => '4.8.0',
 			),
 		),
 		'get_delete_post_link' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '3.0.0',
 			),
 		),
 		'get_last_updated' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '3.0.0', // Was previously part of MU.
 			),
 		),
 		'get_the_author' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.1.0',
 			),
 		),
 		'get_user_option' => array(
 			3 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.3.0',
 			),
 		),
 		'get_wp_title_rss' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '&#8211;',
 				'version' => '4.4.0',
 			),
 		),
 		'is_email' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => false,
 				'version' => '3.0.0',
 			),
 		),
 		'load_plugin_textdomain' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => false,
 				'version' => '2.7.0',
 			),
 		),
 		'safecss_filter_attr' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.8.1',
 			),
 		),
 		'the_attachment_link' => array(
 			3 => array(
+				'name'    => 'deprecated',
 				'value'   => false,
 				'version' => '2.5.0',
 			),
 		),
 		'the_author' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.1.0',
 			),
 			2 => array(
+				'name'    => 'deprecated_echo',
 				'value'   => true,
 				'version' => '1.5.0',
 			),
 		),
 		'the_author_posts_link' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.1.0',
 			),
 		),
 		'trackback_rdf' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.5.0',
 			),
 		),
 		'trackback_url' => array(
 			1 => array(
+				'name'    => 'deprecated_echo',
 				'value'   => true,
 				'version' => '2.5.0',
 			),
 		),
 		'update_blog_option' => array(
 			4 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '3.1.0',
 			),
 		),
 		'update_blog_status' => array(
 			4 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '3.1.0',
 			),
 		),
 		'update_user_status' => array(
 			4 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '3.0.2',
 			),
 		),
 		'unregister_setting' => array(
 			4 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '4.7.0',
 			),
 		),
 		'wp_get_http_headers' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => false,
 				'version' => '2.7.0',
 			),
 		),
 		'wp_get_sidebars_widgets' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => true,
 				'version' => '2.8.1',
 			),
 		),
 		'wp_install' => array(
 			5 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.6.0',
 			),
 		),
 		'wp_new_user_notification' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '4.3.1',
 			),
 		),
 		'wp_notify_postauthor' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '3.8.0',
 			),
 		),
 		'wp_title_rss' => array(
 			1 => array(
+				'name'    => 'deprecated',
 				'value'   => '&#8211;',
 				'version' => '4.4.0',
 			),
 		),
 		'wp_upload_bits' => array(
 			2 => array(
+				'name'    => 'deprecated',
 				'value'   => null,
 				'version' => '2.0.0',
 			),
 		),
 		'xfn_check' => array(
 			3 => array(
+				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '2.5.0',
 			),
@@ -289,13 +315,13 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$paramCount = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
 
-			// Check that number of parameters defined is not less than the position to check.
-			if ( $position > $paramCount ) {
-				break;
+			$found_param = PassedParameters::getParameterFromStack( $parameters, $position, $parameter_args['name'] );
+			if ( false === $found_param ) {
+				continue;
 			}
 
 			// The list will need to updated if the default value is not supported.
-			switch ( $parameters[ $position ]['raw'] ) {
+			switch ( $found_param['raw'] ) {
 				case 'true':
 					$matched_parameter = true;
 					break;
@@ -310,7 +336,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 					$matched_parameter = array();
 					break;
 				default:
-					$matched_parameter = TextStrings::stripQuotes( $parameters[ $position ]['raw'] );
+					$matched_parameter = TextStrings::stripQuotes( $found_param['raw'] );
 					break;
 			}
 
@@ -323,13 +349,16 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$code     = MessageHelper::stringToErrorcode( ucfirst( $matched_content ) . 'Param' . $position . 'Found' );
 
 			$data = array(
-				$parameters[ $position ]['raw'],
+				$found_param['raw'],
 				$position,
 				$matched_content,
 				$parameter_args['version'],
 			);
 
-			if ( isset( $parameter_args['value'] ) && $position < $paramCount ) {
+			if ( isset( $parameter_args['value'] )
+				&& isset( $found_param['name'] ) === false
+				&& $position < $paramCount
+			) {
 				$message .= ' Use "%s" instead.';
 				$data[]   = (string) $parameter_args['value'];
 			} else {
@@ -339,5 +368,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			MessageHelper::addMessage( $this->phpcsFile, $message, $stackPtr, $is_error, $code, $data, 0 );
 		}
 	}
-
 }
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
index 3ada338c90..498cd164d6 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
@@ -23,6 +23,20 @@ wp_new_user_notification( '', $variable );
 wp_new_user_notification( '', function_name() );
 wp_new_user_notification( '', $this->method_name() );
 
+/*
+ * Test support for named parameters.
+ */
+// OK: Parameter is not passed.
+wp_install( blog_title: '', user_name: '', user_email: '', is_public: '' );
+// OK: Another (optional) parameter is passed as the 5th param.
+wp_install( blog_title: '', user_name: '', user_email: '', is_public: '', language: '' );
+// OK: Parameter is passed with correct default, mixed positional and named params, unconventional order.
+wp_install( '', '', deprecated: '', user_email: '', is_public: '' );
+// OK: Parameter is passed with correct default, all named params, unconventional order.
+wp_install( user_name: '', deprecated: '', user_email: '', blog_title: '', is_public: '' );
+// Error: Parameter is passed with incorrect default, unconventional order.
+wp_install( is_public: '', user_name: '', user_email: '', deprecated: 'should be empty', blog_title: '' );
+
 // All will give an ERROR. The functions are ordered alphabetically.
 
 add_option( '', '', [] );
@@ -31,7 +45,6 @@ add_option( '', '', 10 );
 add_option( '', '', false );
 add_option( '', '', 'deprecated' );
 comments_link( 'deprecated', 'deprecated' );
-comments_number( '', '', '', 'deprecated' );
 convert_chars( '', 'deprecated' );
 discover_pingback_server_uri( '', 'deprecated' );
 get_category_parents( '', '', '', '', array( 'deprecated') );
@@ -54,7 +67,7 @@ update_blog_option( '', '', '', 'deprecated' );
 update_user_status( '', '', '', 'deprecated' );
 wp_get_http_headers( '', 'deprecated' );
 wp_get_sidebars_widgets( 'deprecated' );
-wp_install( '', '', '', '', 'deprecated' );
+wp_install( '', '', '', '', 'deprecated', 'password', 'language' );
 wp_new_user_notification( '', 'deprecated' );
 wp_notify_postauthor( '', 'deprecated' );
 wp_notify_postauthor( '', 'null' ); // Null as a string not null.
@@ -63,3 +76,4 @@ wp_upload_bits( '', 'deprecated' );
 xfn_check( '', '', 'deprecated' );
 
 // All will give an WARNING as they have been deprecated after WP 4.9.
+// Nothing yet.
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index e91ad712cf..55ff64ae89 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -27,15 +27,20 @@ class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 	 * @return array <int line number> => <int number of errors>
 	 */
 	public function getErrorList() {
-		$errors = array_fill( 28, 36, 1 );
+		$start_line = 42;
+		$end_line   = 76;
+		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		$errors[22] = 1;
 		$errors[23] = 1;
 		$errors[24] = 1;
 
+		// Named param.
+		$errors[38] = 1;
+
 		// Override number of errors.
-		$errors[33] = 2;
-		$errors[48] = 2;
+		$errors[47] = 2;
+		$errors[61] = 2;
 
 		return $errors;
 	}
@@ -48,5 +53,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }

From fc47d59439045ac157c5c3d35f4b5ccfeb419044 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:39:10 +0100
Subject: [PATCH 260/822] PHP/PregQuoteDelimiter: add support for PHP 8.0+
 named parameters

1. Adjusted the way the correct parameter is retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter name used is in line with the name as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.

Includes minor tweak to the warning message to remove mention of the parameter position.

Includes additional unit tests.
---
 WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php   | 8 +++++---
 WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.inc | 6 ++++++
 WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php | 7 ++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index a67e11732e..f492ffaa54 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
@@ -55,15 +56,16 @@ class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		if ( \count( $parameters ) > 1 ) {
+
+		$delimiter = PassedParameters::getParameterFromStack( $parameters, 2, 'delimiter' );
+		if ( false !== $delimiter ) {
 			return;
 		}
 
 		$this->phpcsFile->addWarning(
-			'Passing the $delimiter as the second parameter to preg_quote() is strongly recommended.',
+			'Passing the $delimiter to preg_quote() is strongly recommended.',
 			$stackPtr,
 			'Missing'
 		);
 	}
-
 }
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.inc b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.inc
index 6a5acc4697..1942b2b07f 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.inc
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.inc
@@ -7,3 +7,9 @@ preg_quote($keywords); // Warning.
 $textbody = preg_replace ( "/" . preg_quote($word) . "/", // Warning
                           "<i>" . $word . "</i>",
                           $textbody );
+
+// Safeguard support for PHP 8.0+ named parameters.
+preg_quote(delimiter: '#', str: $keywords); // OK.
+preg_quote(str: $keywords); // Warning.
+preg_quote(str: $keywords, delimitter: '#'); // Warning (typo in param name).
+preg_quote(delimiter: '#'); // OK. Invalid function call, but that's not the concern of this sniff.
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
index a4b4ac6160..28818b106b 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
@@ -36,9 +36,10 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			6 => 1,
-			7 => 1,
+			6  => 1,
+			7  => 1,
+			13 => 1,
+			14 => 1,
 		);
 	}
-
 }

From 73e9605b64197b61be738e8df816491e83e6b0a4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 29 Nov 2022 19:47:45 +0100
Subject: [PATCH 261/822] Core: add sniff to enforce the use of __DIR__ instead
 of dirname(__FILE__)

Related to previous efforts which already fixed all instances of this in WP Core.

The sniff from PHPCSExtra includes an auto-fixer for the issue.

Note: the sniff from PHPCSExtra also contains a check for nested `dirname()` function calls. This check is not (yet) enabled as the fix for this requires PHP 7.0+.

Fixes 1954

Refs:
* PHPCSStandards/PHPCSExtra 172
* PHPCSStandards/PHPCSExtra 187

Related to WP Core tickets:
* https://core.trac.wordpress.org/ticket/48082
* https://core.trac.wordpress.org/changeset/47198
---
 WordPress-Core/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 9081db3871..da68457a8d 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -744,4 +744,8 @@
 	<!-- Check that class name references use the correct case. -->
 	<rule ref="WordPress.WP.ClassNameCase"/>
 
+	<!-- Check that __DIR__ is favoured over dirname(__FILE__).
+		 See: https://core.trac.wordpress.org/ticket/48082 -->
+	<rule ref="Modernize.FunctionCalls.Dirname.FileConstant"/>
+
 </ruleset>

From a22878f4775b01110133021ba64e0263796719b5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 12 Aug 2022 18:47:38 +0200
Subject: [PATCH 262/822] Core: add sniffs to check the formatting of `::class`
 class resolution

> 1. There should be no space between `::class` and the preceding class name it applies to.
> 2. There should be no space between the double colon and the `class` keyword.
> 3. The `class` keyword should be in lowercase.

The first two rules are covered via the new `WordPress.WhiteSpace.ObjectOperatorSpacing` sniff.
The last rule via a new sniff from PHPCSExtra.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - `::class` constant section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#magic-constants
* WordPress/wpcs-docs 113
* WordPress/WordPress-Coding-Standards 1115
* WordPress/WordPress-Coding-Standards 1116
* WordPress/WordPress-Coding-Standards 2095
* PHPCSStandards/PHPCSExtra 72
---
 WordPress-Core/ruleset.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 86c2ba0846..0cc36250a6 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -222,6 +222,13 @@
 		 no spaces between the operator and the variable it applies to. -->
 	<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
 
+	<!-- Implied through the examples: Object operators should not have whitespace around them unless they are multi-line. -->
+	<rule ref="WordPress.WhiteSpace.ObjectOperatorSpacing">
+		<properties>
+			<property name="ignoreNewlines" value="true"/>
+		</properties>
+	</rule>
+
 
 	<!--
 	#############################################################################
@@ -382,9 +389,11 @@
 	<!-- Covers rule: The PHP native __*__ magic constants should be written in uppercase. -->
 	<rule ref="Universal.Constants.UppercaseMagicConstants"/>
 
-	<!-- Rule: When using the ::class constant for class name resolution, the class keyword should be in lowercase... -->
+	<!-- Covers rule: When using the ::class constant for class name resolution, the class keyword should be in lowercase... -->
+	<rule ref="Universal.Constants.LowercaseClassResolutionKeyword"/>
 
-	<!-- Rule: ... and there should be no spaces around the :: operator. -->
+	<!-- Covers rule: ... and there should be no spaces around the :: operator. -->
+	<!-- Covered by the WordPress.WhiteSpace.ObjectOperatorSpacing sniff. -->
 
 
 	<!--
@@ -718,13 +727,6 @@
 	<!-- Class opening braces should be on the same line as the statement. -->
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>
 
-	<!-- Object operators should not have whitespace around them unless they are multi-line. -->
-	<rule ref="WordPress.WhiteSpace.ObjectOperatorSpacing">
-		<properties>
-			<property name="ignoreNewlines" value="true"/>
-		</properties>
-	</rule>
-
 	<!-- References to self in a class should be lower-case and not have extraneous spaces,
 		 per implicit conventions in the core codebase; the NotUsed code refers to using the
 		 fully-qualified class name instead of self, for which there are instances in core. -->

From d14927a8a2b4a909b5f24a938eee3f6133ef1d93 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 8 Dec 2022 00:58:02 +0100
Subject: [PATCH 263/822] PHP/StrictInArray: add support for PHP 8.0+ named
 parameters

1. Changed the `$target_functions` property to not only contain information about "always needed", but also about the target parameter name and position.
2. Adjusted the logic in the sniff to allow for named parameters using the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method..
3. The parameter names used are in line with the name as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Also see: https://github.com/php/doc-en/pull/2044

Includes additional unit tests.
---
 WordPress/Sniffs/PHP/StrictInArraySniff.php   | 56 +++++++++++++------
 WordPress/Tests/PHP/StrictInArrayUnitTest.inc | 11 +++-
 WordPress/Tests/PHP/StrictInArrayUnitTest.php |  4 +-
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 4973e9bb84..99527617b2 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
@@ -40,10 +41,8 @@ class StrictInArraySniff extends AbstractFunctionParameterSniff {
 	/**
 	 * List of array functions to which a $strict parameter can be passed.
 	 *
-	 * The $strict parameter is the third and last parameter for each of these functions.
-	 *
 	 * The array_keys() function only requires the $strict parameter when the optional
-	 * second parameter $search has been set.
+	 * second parameter $filter_value has been set.
 	 *
 	 * @link http://php.net/in-array
 	 * @link http://php.net/array-search
@@ -51,13 +50,26 @@ class StrictInArraySniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 0.10.0
 	 * @since 0.11.0 Renamed from $array_functions to $target_functions.
+	 * @since 3.0.0  The format of the array value has changed from boolean to array.
 	 *
-	 * @var array <string function_name> => <bool always needed ?>
+	 * @var array<string, array{param_position: int, param_name: string, always_needed: bool}> Key is the function name.
 	 */
 	protected $target_functions = array(
-		'in_array'     => true,
-		'array_search' => true,
-		'array_keys'   => false,
+		'in_array'     => array(
+			'param_position' => 3,
+			'param_name'     => 'strict',
+			'always_needed'  => true,
+		),
+		'array_search' => array(
+			'param_position' => 3,
+			'param_name'     => 'strict',
+			'always_needed'  => true,
+		),
+		'array_keys'   => array(
+			'param_position' => 3,
+			'param_name'     => 'strict',
+			'always_needed'  => false,
+		),
 	);
 
 	/**
@@ -73,33 +85,41 @@ class StrictInArraySniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		// Check if the strict check is actually needed.
-		if ( false === $this->target_functions[ $matched_content ] ) {
-			if ( \count( $parameters ) === 1 ) {
+		$param_info = $this->target_functions[ $matched_content ];
+
+		/*
+		 * Check if the strict check is actually needed.
+		 *
+		 * Important! This check only applies to array_keys() in the current form of the sniff
+		 * and has been written to be specific to that function.
+		 * If more functions would be added with 'always_needed' set to `false`,
+		 * this code will need to be adjusted to handle those.
+		 */
+		if ( false === $param_info['always_needed'] ) {
+			$has_search = PassedParameters::getParameterFromStack( $parameters, 2, 'filter_value' );
+			if ( false === $has_search ) {
 				return;
 			}
 		}
 
-		// We're only interested in the third parameter.
-		if ( false === isset( $parameters[3] ) || 'true' !== strtolower( $parameters[3]['raw'] ) ) {
+		$found_parameter = PassedParameters::getParameterFromStack( $parameters, $param_info['param_position'], $param_info['param_name'] );
+		if ( false === $found_parameter || 'true' !== strtolower( $found_parameter['raw'] ) ) {
 			$errorcode = 'MissingTrueStrict';
 
 			/*
 			 * Use a different error code when `false` is found to allow for excluding
 			 * the warning as this will be a conscious choice made by the dev.
 			 */
-			if ( isset( $parameters[3] ) && 'false' === strtolower( $parameters[3]['raw'] ) ) {
+			if ( is_array( $found_parameter ) && 'false' === strtolower( $found_parameter['raw'] ) ) {
 				$errorcode = 'FoundNonStrictFalse';
 			}
 
 			$this->phpcsFile->addWarning(
-				'Not using strict comparison for %s; supply true for third argument.',
-				( isset( $parameters[3]['start'] ) ? $parameters[3]['start'] : $parameters[1]['start'] ),
+				'Not using strict comparison for %s; supply true for $%s argument.',
+				( isset( $found_parameter['start'] ) ? $found_parameter['start'] : $stackPtr ),
 				$errorcode,
-				array( $matched_content )
+				array( $matched_content, $param_info['param_name'] )
 			);
-			return;
 		}
 	}
-
 }
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.inc b/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
index 8cff2c06c3..492914e647 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
@@ -14,7 +14,7 @@ $bar->in_array( 1, array( '1', 1, true ) ); // Ok.
 $bar->
 	in_array( 1, array( '1', 1, true ) ); // Ok.
 
-in_array(); // Error.
+in_array(); // Warning.
 
 
 array_search( 1, $array, true ); // Ok.
@@ -38,3 +38,12 @@ array_keys( array( '1', 1, true ), 'my_key', false ); // Warning
 in_array( 1, array( '1', 1 ), TRUE ); // Ok.
 
 use function in_array; // OK.
+
+// Safeguard support for PHP 8.0+ named parameters.
+in_array( strict: true, haystack: $haystack1, needle: 1, ); // Ok.
+in_array( needle: 1, haystack: $haystack ); // Warning.
+
+array_keys( array: $testing ); // Ok.
+array_keys( strict: false, array: $testing ); // Ok, will cause fatal error, but that's not the concern of this sniff.
+array_keys( $testing, filter_value: 'my_key' ); // Warning.
+array_keys( $testing, strict: false, filter_value: 'my_key' ); // Warning.
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index 7394afeda5..90f47d788f 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -48,7 +48,9 @@ public function getWarningList() {
 			35 => 1,
 			36 => 1,
 			37 => 1,
+			44 => 1,
+			48 => 1,
+			49 => 1,
 		);
 	}
-
 }

From 4247e70f7821918c15ab96505884a2383416b93f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 02:01:48 +0100
Subject: [PATCH 264/822] GH Actions: minor simplification

... of the bash `date` command in the earlier pulled cache busting.
---
 .github/workflows/basic-qa.yml   | 8 ++++----
 .github/workflows/quicktest.yml  | 6 +++---
 .github/workflows/unit-tests.yml | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index c8fc3c9c90..c08e613dcb 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -44,8 +44,8 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
-          # Bust the cache at least once a month - output format: YYYY-MM-DD.
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Install xmllint
         run: |
@@ -120,8 +120,8 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
-          # Bust the cache at least once a month - output format: YYYY-MM-DD.
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Test the WordPress-Core ruleset
         run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index d041bd11d6..e738d3971a 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -62,15 +62,15 @@ jobs:
         if: ${{ matrix.php < 8.0 && matrix.php != 'latest' }}
         uses: ramsey/composer-install@v2
         with:
-          # Bust the cache at least once a month - output format: YYYY-MM-DD.
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Install Composer dependencies (PHP >= 8.0)
         if: ${{ matrix.php >= 8.0 || matrix.php == 'latest' }}
         uses: ramsey/composer-install@v2
         with:
           composer-options: --ignore-platform-reqs
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index cf388d548a..9df45a1ba8 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -60,15 +60,15 @@ jobs:
         if: ${{ matrix.php < 8.0 }}
         uses: ramsey/composer-install@v2
         with:
-          # Bust the cache at least once a month - output format: YYYY-MM-DD.
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Install Composer dependencies (PHP >= 8.0)
         if: ${{ matrix.php >= 8.0 }}
         uses: ramsey/composer-install@v2
         with:
           composer-options: --ignore-platform-reqs
-          custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
+          custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}

From a12ac780aab8df6d87b62cb2d3d9cdd9f3e8a2d1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 02:02:17 +0100
Subject: [PATCH 265/822] GH Actions: update PHP versions in workflows

PHP 8.2 has been released today :tada: and the `setup-php` action has announced support for PHP 8.3, so adding PHP 8.3 to the matrix.

Note: PHPCS does not (yet) have full syntax support for PHP 8.2, but it does have runtime support (for the most part, see squizlabs/PHP_CodeSniffer 3629).

Builds against PHP 8.3 are still allowed to fail for now.
---
 .github/workflows/unit-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 9df45a1ba8..06469666b3 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       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' ]
         phpcs_version: [ '3.7.1', 'dev-master' ]
         #include:
           # Add extra build to test against PHPCS 4.
@@ -30,6 +30,8 @@ jobs:
 
     name: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
 
+    continue-on-error: ${{ matrix.php == '8.3' }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

From 2b19dc26a823953f2d1b832b729bc98c285b8535 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 11:42:02 +0100
Subject: [PATCH 266/822] QA: ensure URLs mentioned use https

... whenever possible.

Includes replacing some URLs with alternatives if the original URL no longer contained the relevant information, though only the URLs prefixed with `http:` have been verified, not all URLs.

Includes removing/replacing a few URLs if the page referenced either doesn't exist anymore or no longer contains the relevant information.

Including making sure that links to the PHP manual use language agnostic links.

Also, URLs used in test case files have not been verified, though some have been changed to `https`. Some have been left as `http` though to make sure that if a sniff is checking the contents of text/docs and looking for URLs, both `http` as well as `https` URLs are recognized and tested.
---
 .gitattributes                                       |  2 +-
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php |  2 +-
 .../Sniffs/PHP/DiscouragedPHPFunctionsSniff.php      |  2 +-
 WordPress/Sniffs/PHP/POSIXFunctionsSniff.php         |  4 ++--
 WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php     |  2 +-
 WordPress/Sniffs/PHP/StrictInArraySniff.php          |  8 +++-----
 WordPress/Sniffs/Security/EscapeOutputSniff.php      |  2 +-
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php    |  6 +++---
 WordPress/Sniffs/WP/I18nSniff.php                    |  2 +-
 .../Tests/Arrays/ArrayIndentationUnitTest.1.inc      |  2 +-
 .../Arrays/ArrayIndentationUnitTest.1.inc.fixed      |  2 +-
 .../Tests/Arrays/ArrayIndentationUnitTest.2.inc      |  2 +-
 .../Arrays/ArrayIndentationUnitTest.2.inc.fixed      |  2 +-
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc     |  2 +-
 .../Tests/Utils/I18nTextDomainFixerUnitTest.3.inc    |  8 ++++----
 .../Utils/I18nTextDomainFixerUnitTest.3.inc.fixed    |  8 ++++----
 .../Tests/Utils/I18nTextDomainFixerUnitTest.css      | 10 +++++-----
 .../Utils/I18nTextDomainFixerUnitTest.css.fixed      | 10 +++++-----
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc  |  2 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc        |  4 ++--
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed  |  4 ++--
 WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc     | 12 ++++++------
 WordPress/Tests/WP/I18nUnitTest.1.inc                |  2 +-
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed          |  2 +-
 24 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index e5aefdd938..1fb51b494d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,7 +15,7 @@
 
 #
 # Auto detect text files and perform LF normalization
-# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
+# https://pablorsk.medium.com/be-a-git-ninja-the-gitattributes-file-e58c07c9e915
 #
 * text=auto
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index b88750e79f..f6ecdb18d3 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -44,7 +44,7 @@
 class PreparedSQLPlaceholdersSniff extends Sniff {
 
 	/**
-	 * These regexes copied from http://php.net/manual/en/function.sprintf.php#93552
+	 * These regexes were originally copied from https://www.php.net/function.sprintf#93552
 	 * and adjusted for limitations in `$wpdb->prepare()`.
 	 *
 	 * Near duplicate of the one used in the WP.I18n sniff, but with fewer types allowed.
diff --git a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
index 39f87c098d..82ba2a5ab3 100644
--- a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
@@ -48,7 +48,7 @@ public function getGroups() {
 
 			'urlencode' => array(
 				'type'      => 'warning',
-				'message'   => '%s() should only be used when dealing with legacy applications rawurlencode() should now be used instead. See http://php.net/manual/en/function.rawurlencode.php and http://www.faqs.org/rfcs/rfc3986.html',
+				'message'   => '%s() should only be used when dealing with legacy applications rawurlencode() should now be used instead. See https://www.php.net/function.rawurlencode and http://www.faqs.org/rfcs/rfc3986.html',
 				'functions' => array(
 					'urlencode',
 				),
diff --git a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
index 9fb1cdcbeb..4a0281ad28 100644
--- a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
@@ -15,8 +15,8 @@
  * Perl compatible regular expressions (PCRE, preg_ functions) should be used in preference
  * to their POSIX counterparts.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#regular-expressions
- * @link    http://php.net/manual/en/ref.regex.php
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#regular-expressions
+ * @link    https://php-legacy-docs.zend.com/manual/php5/en/ref.regex
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index f492ffaa54..909579d00e 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -33,7 +33,7 @@ class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * List of functions this sniff should examine.
 	 *
-	 * @link http://php.net/preg_quote
+	 * @link https://www.php.net/preg_quote
 	 *
 	 * @since 1.0.0
 	 *
diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 99527617b2..1ab7866f29 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -15,8 +15,6 @@
 /**
  * Flag calling in_array(), array_search() and array_keys() without true as the third parameter.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#using-in_array-without-strict-parameter
- *
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.9.0
@@ -44,9 +42,9 @@ class StrictInArraySniff extends AbstractFunctionParameterSniff {
 	 * The array_keys() function only requires the $strict parameter when the optional
 	 * second parameter $filter_value has been set.
 	 *
-	 * @link http://php.net/in-array
-	 * @link http://php.net/array-search
-	 * @link http://php.net/array-keys
+	 * @link https://www.php.net/in-array
+	 * @link https://www.php.net/array-search
+	 * @link https://www.php.net/array-keys
 	 *
 	 * @since 0.10.0
 	 * @since 0.11.0 Renamed from $array_functions to $target_functions.
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 1760b273f5..29e6b25113 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -18,7 +18,7 @@
 /**
  * Verifies that all outputted strings are escaped.
  *
- * @link    http://codex.wordpress.org/Data_Validation Data Validation on WordPress Codex
+ * @link    https://developer.wordpress.org/apis/security/data-validation/ WordPress Developer Docs on Data Validation.
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index cccaf5ddaf..babf69e7d3 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -33,7 +33,7 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	/**
 	 * Local input streams which should not be flagged for the file system function checks.
 	 *
-	 * @link http://php.net/manual/en/wrappers.php.php
+	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @var array
 	 */
@@ -49,7 +49,7 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * Local input streams which should not be flagged for the file system function checks if
 	 * the $filename starts with them.
 	 *
-	 * @link http://php.net/manual/en/wrappers.php.php
+	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @var array
 	 */
@@ -61,7 +61,7 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	/**
 	 * Local input stream constants which should not be flagged for the file system function checks.
 	 *
-	 * @link http://php.net/manual/en/wrappers.php.php
+	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @var array
 	 */
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index b072883dbc..f745827620 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -38,7 +38,7 @@
 class I18nSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
-	 * These Regexes copied from http://php.net/manual/en/function.sprintf.php#93552
+	 * These Regexes were originally copied from https://www.php.net/function.sprintf#93552
 	 * and adjusted for better precision and updated specs.
 	 */
 	const SPRINTF_PLACEHOLDER_REGEX = '/(?:
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
index 43dd3d5e1f..85216b112d 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
@@ -388,7 +388,7 @@ else {
 	'notes3'         => array(
 		'<p>Please note: On some PHP versions <code>filter_var( $x, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE )</code> where <code>$x = false</code> will incorrectly return <code>null</code>.<br />
 		Also: with the same parameters filter_var() will return <code>false</code> instead of <code>null</code> for most objects.</p>',
-		'<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="http://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
+		'<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="https://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
 	),
 );
 
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
index b9c9097827..fc4d940a95 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
@@ -388,7 +388,7 @@ else {
 	'notes3'         => array(
 		'<p>Please note: On some PHP versions <code>filter_var( $x, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE )</code> where <code>$x = false</code> will incorrectly return <code>null</code>.<br />
 		Also: with the same parameters filter_var() will return <code>false</code> instead of <code>null</code> for most objects.</p>',
-		'<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="http://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
+		'<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="https://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
 	),
 );
 
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
index 2556e7938e..ee02374aa9 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc
@@ -388,7 +388,7 @@ else {
     'notes3'         => array(
         '<p>Please note: On some PHP versions <code>filter_var( $x, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE )</code> where <code>$x = false</code> will incorrectly return <code>null</code>.<br />
         Also: with the same parameters filter_var() will return <code>false</code> instead of <code>null</code> for most objects.</p>',
-        '<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="http://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
+        '<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="https://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
     ),
 );
 
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
index b6b6647ee8..bc629afe5a 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.2.inc.fixed
@@ -388,7 +388,7 @@ else {
     'notes3'         => array(
         '<p>Please note: On some PHP versions <code>filter_var( $x, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE )</code> where <code>$x = false</code> will incorrectly return <code>null</code>.<br />
         Also: with the same parameters filter_var() will return <code>false</code> instead of <code>null</code> for most objects.</p>',
-        '<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="http://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
+        '<p>The code snippet is simplified for brevity. Please refer to the source of this file on <a href="https://github.com/jrfnl/PHP-cheat-sheet-extended" target="_blank">GitHub</a> for full details on how to use filter_var_array().</p>',
     ),
 );
 
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
index cc846d2dec..5004405de2 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
@@ -16,7 +16,7 @@ if ( @&file_exists( $filename ) && @ /*comment*/ is_readable( $filename ) ) {
 	$file = @ \file( $filename );
 }
 
-$fp = @fopen('http://www.example.com', 'r', false);
+$fp = @fopen('https://www.example.com', 'r', false);
 @fpassthru($fp); // Bad.
 @fclose($fp); // Bad.
 
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc
index adf61b3332..2082c75b15 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc
@@ -71,7 +71,7 @@ class Debug_Bar {
  * @version     2.0.0
  *
  * @copyright   2013-2018 Juliette Reinders Folmer
- * @license     http://creativecommons.org/licenses/GPL/2.0/ GNU General Public License, version 2 or higher
+ * @license     https://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License, version 2 or higher
  *
  * @wordpress-plugin
  * Plugin Name	:	Debug Bar Constants
@@ -79,7 +79,7 @@ class Debug_Bar {
  * Description	:	Debug Bar Constants adds new panels to Debug Bar that display all the defined constants for the current request. Requires "Debug Bar" plugin.
  * Version		:	2.0.0
  * Author		:	Juliette Reinders Folmer
- * Author URI	:	http://www.adviesenzo.nl/
+ * Author URI	:	https://www.adviesenzo.nl/
  * Depends		:	Debug Bar
  * Text Domain	:	debug-bar-constants
  * Domain Path	:	/languages
@@ -102,11 +102,11 @@ class Debug_Bar {
 
 /**
  * Plugin Name: Missing text domain, docblock format.
- * Plugin URI: http://www.bigvoodoo.com
+ * Plugin URI: https://www.bigvoodoo.com/
  * Description: Ensures the Git repositories are kept current and up to date with uploads made within WordPress.
  * Author: Big Voodoo Interactive
  * Version: 0.1.0
- * Author URI: http://www.bigvoodoo.com
+ * Author URI: https://www.bigvoodoo.com/
  * @author Big Voodoo Interactive
  * @TODO error reporting
  */
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc.fixed
index d4a95a9735..bb8bfcfcb9 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.3.inc.fixed
@@ -71,7 +71,7 @@ class Debug_Bar {
  * @version     2.0.0
  *
  * @copyright   2013-2018 Juliette Reinders Folmer
- * @license     http://creativecommons.org/licenses/GPL/2.0/ GNU General Public License, version 2 or higher
+ * @license     https://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License, version 2 or higher
  *
  * @wordpress-plugin
  * Plugin Name	:	Debug Bar Constants
@@ -79,7 +79,7 @@ class Debug_Bar {
  * Description	:	Debug Bar Constants adds new panels to Debug Bar that display all the defined constants for the current request. Requires "Debug Bar" plugin.
  * Version		:	2.0.0
  * Author		:	Juliette Reinders Folmer
- * Author URI	:	http://www.adviesenzo.nl/
+ * Author URI	:	https://www.adviesenzo.nl/
  * Depends		:	Debug Bar
  * Text Domain	:	something-else
  * Domain Path	:	/languages
@@ -102,11 +102,11 @@ class Debug_Bar {
 
 /**
  * Plugin Name: Missing text domain, docblock format.
- * Plugin URI: http://www.bigvoodoo.com
+ * Plugin URI: https://www.bigvoodoo.com/
  * Description: Ensures the Git repositories are kept current and up to date with uploads made within WordPress.
  * Author: Big Voodoo Interactive
  * Version: 0.1.0
- * Author URI: http://www.bigvoodoo.com
+ * Author URI: https://www.bigvoodoo.com/
  * Text Domain: something-else
  * @author Big Voodoo Interactive
  * @TODO error reporting
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css
index ac32dccabd..77f57f7a35 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css
@@ -9,7 +9,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Version: 2.5
 License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, two-columns, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header, featured-images, footer-widgets, featured-image-header
 Text Domain: twentyten
 */
@@ -88,7 +88,7 @@ Author URI: https://wordpress.org/
 Description: Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
 Version: 1.6
 License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
 
 This theme, like WordPress, is licensed under the GPL.
@@ -103,7 +103,7 @@ Use it to make something cool, have fun, and share what you've learned with othe
  * Description	:	Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
  * Version		:	1.6
  * License		:	GNU General Public License v2 or later
- * License URI	:	http://www.gnu.org/licenses/gpl-2.0.html
+ * License URI	:	https://www.gnu.org/licenses/gpl-2.0.html
  * Tags			:	one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
  *
  * This theme, like WordPress, is licensed under the GPL.
@@ -128,12 +128,12 @@ Description: http://thisshouldntbeaurl
   Description:      A Ghost-like WordPress theme. Casper (for WordPress) is a simple yet beautiful theme for bloggers. Inspired by the Ghost blogging platform, Casper is a WordPress port of the default theme by the same name. The goal of this project is to emulate the gorgeous theme while taking advantage of features exclusive to the WordPress framework. There are plenty of customization options included, accessible through the WordPress Customizer. Already included are hooks to serve responsive images appropriately and media queries to provide a fast and seamless experience from desktop to mobile. For questions, support, development instructions, or to contribute to the project visit [https://github.com/lacymorrow/casper]
   Version:          1.1.5
   License:          GNU General Public License v2.0
-  License URI:      http://www.gnu.org/licenses/gpl-2.0.html
+  License URI:      https://www.gnu.org/licenses/gpl-2.0.html
   Domain Path:      /languages/
   Tags:             responsive-layout, black, white, one-column, fluid-layout, custom-header, custom-menu, editor-style
   GitHub Theme URI: https://github.com/protected
   GitHub Branch:    master
-  Casper is based on Underscores http://underscores.me/, (C) 2012-2014 Automattic, Inc.
+  Casper is based on Underscores https://underscores.me/, (C) 2012-2014 Automattic, Inc.
 */
 
 /**
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css.fixed
index d651db7d09..d011e752e0 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.css.fixed
@@ -9,7 +9,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Version: 2.5
 License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, two-columns, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header, featured-images, footer-widgets, featured-image-header
 Text Domain: twentyten
 */
@@ -88,7 +88,7 @@ Author URI: https://wordpress.org/
 Description: Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
 Version: 1.6
 License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
 Text Domain: twentyseventeen
 
@@ -104,7 +104,7 @@ Use it to make something cool, have fun, and share what you've learned with othe
  * Description	:	Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
  * Version		:	1.6
  * License		:	GNU General Public License v2 or later
- * License URI	:	http://www.gnu.org/licenses/gpl-2.0.html
+ * License URI	:	https://www.gnu.org/licenses/gpl-2.0.html
  * Tags			:	one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
  * Text Domain			:	twentyseventeen
  *
@@ -131,13 +131,13 @@ Text Domain: twentyseventeen
   Description:      A Ghost-like WordPress theme. Casper (for WordPress) is a simple yet beautiful theme for bloggers. Inspired by the Ghost blogging platform, Casper is a WordPress port of the default theme by the same name. The goal of this project is to emulate the gorgeous theme while taking advantage of features exclusive to the WordPress framework. There are plenty of customization options included, accessible through the WordPress Customizer. Already included are hooks to serve responsive images appropriately and media queries to provide a fast and seamless experience from desktop to mobile. For questions, support, development instructions, or to contribute to the project visit [https://github.com/lacymorrow/casper]
   Version:          1.1.5
   License:          GNU General Public License v2.0
-  License URI:      http://www.gnu.org/licenses/gpl-2.0.html
+  License URI:      https://www.gnu.org/licenses/gpl-2.0.html
   Domain Path:      /languages/
   Tags:             responsive-layout, black, white, one-column, fluid-layout, custom-header, custom-menu, editor-style
   Text Domain:             twentyseventeen
   GitHub Theme URI: https://github.com/protected
   GitHub Branch:    master
-  Casper is based on Underscores http://underscores.me/, (C) 2012-2014 Automattic, Inc.
+  Casper is based on Underscores https://underscores.me/, (C) 2012-2014 Automattic, Inc.
 */
 
 /**
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index c74000b6d5..6723050a83 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -7,7 +7,7 @@ curl_close( $ch ); // Warning.
 CURL_getinfo(); // Warning.
 curlyhair(); // Ok.
 
-parse_url( 'http://example.com/' ); // Warning.
+parse_url( 'https://example.com/' ); // Warning.
 
 $json = json_encode( $thing ); // Warning, use wp_json_encode instead.
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 06fae87cbc..0945bb966e 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -45,7 +45,7 @@ echo <<<EOD
 This is an {$explanation} about wordpress.
 EOD;
 
-echo 'http://wordpress.org/something'; // OK - part of a URL.
+echo 'https://wordpress.org/something'; // OK - part of a URL.
 ?>
 
 <div class="copyright"><?php printf( wp_kses_post( __( 'Powered by <a href="%s">WordPress</a>', 'theme-slug' ) ), 'https://wordpress.org/' ); ?></div><!-- OK. -->
@@ -127,7 +127,7 @@ $default_editor_settings = [
 			array(
 				'section' 		=> 'arouse_theme_info',
 				'label' 		=> __( 'Arouse Documentation', 'arouse' ),
-				'content' 		=> __( '<a class="button" href="http://themezhut.com/arouse-wordpress-theme-documentation/" target="_blank">Read the documentation.</a>', 'arouse' ), // OK.
+				'content' 		=> __( '<a class="button" href="https://themezhut.com/arouse-wordpress-theme-documentation/" target="_blank">Read the documentation.</a>', 'arouse' ), // OK.
 			)
 		) 
 	);	
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index cfc811bd54..357c2a1b68 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -45,7 +45,7 @@ echo <<<EOD
 This is an {$explanation} about WordPress.
 EOD;
 
-echo 'http://wordpress.org/something'; // OK - part of a URL.
+echo 'https://wordpress.org/something'; // OK - part of a URL.
 ?>
 
 <div class="copyright"><?php printf( wp_kses_post( __( 'Powered by <a href="%s">WordPress</a>', 'theme-slug' ) ), 'https://wordpress.org/' ); ?></div><!-- OK. -->
@@ -127,7 +127,7 @@ $default_editor_settings = [
 			array(
 				'section' 		=> 'arouse_theme_info',
 				'label' 		=> __( 'Arouse Documentation', 'arouse' ),
-				'content' 		=> __( '<a class="button" href="http://themezhut.com/arouse-wordpress-theme-documentation/" target="_blank">Read the documentation.</a>', 'arouse' ), // OK.
+				'content' 		=> __( '<a class="button" href="https://themezhut.com/arouse-wordpress-theme-documentation/" target="_blank">Read the documentation.</a>', 'arouse' ), // OK.
 			)
 		) 
 	);	
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
index f505e43615..153dd290a3 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
@@ -3,8 +3,8 @@
 
 <?php
 
-?><link rel="stylesheet" href="http://someurl/somefile.css"><?php
-?><script src="http://someurl/somefile.js"></script><?php
+?><link rel="stylesheet" href="https://someurl/somefile.css"><?php
+?><script src="https://someurl/somefile.js"></script><?php
 
 
 echo '<script src="' . SOMESCRIPT . '">';
@@ -22,8 +22,8 @@ $head = <<<EOT
 EOT;
 
 $head = <<<"EOT"
-<link rel="stylesheet" href="http://someurl/somefile.css">
-<script src="http://someurl/somefile.js"></script>
+<link rel="stylesheet" href="https://someurl/somefile.css">
+<script src="https://someurl/somefile.js"></script>
 EOT;
 
 $head = <<<'EOD'
@@ -51,5 +51,5 @@ echo '<script type="text/javascript"
 	';
 
 // Test multi-line text string with multiple issues.
-echo '<link rel="stylesheet" href="http://someurl/somefile1.css"/>
-	<link rel="stylesheet" href="http://someurl/somefile2.css"/>';
+echo '<link rel="stylesheet" href="https://someurl/somefile1.css"/>
+	<link rel="stylesheet" href="https://someurl/somefile2.css"/>';
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 3ec15f1ee3..14641c6d2e 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -194,7 +194,7 @@ __( '<b><i>Foo</i></b>', 'my-slug' ); // Bad
 __( '<foo>Foo</foo>', 'my-slug' ); // Good
 
 // Strings wrapped in `<a href="...">...</a>` aren't flagged, since the link target might require localization.
-__( '<a href="http://wordpress.org">WordPress</a>', 'my-slug' ); // Good
+__( '<a href="https://wordpress.org">WordPress</a>', 'my-slug' ); // Good
 __( '<a id="anchor">translatable text</a>', 'my-slug' ) // Bad, since no href
 __( '<a>translatable text</a>', 'my-slug' ) // Bad, since no href
 __( '<a href="%s">translatable text</a>', 'my-slug' ) // Good
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 5a2cd96880..cb5170a640 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -194,7 +194,7 @@ __( '<b><i>Foo</i></b>', 'my-slug' ); // Bad
 __( '<foo>Foo</foo>', 'my-slug' ); // Good
 
 // Strings wrapped in `<a href="...">...</a>` aren't flagged, since the link target might require localization.
-__( '<a href="http://wordpress.org">WordPress</a>', 'my-slug' ); // Good
+__( '<a href="https://wordpress.org">WordPress</a>', 'my-slug' ); // Good
 __( '<a id="anchor">translatable text</a>', 'my-slug' ) // Bad, since no href
 __( '<a>translatable text</a>', 'my-slug' ) // Bad, since no href
 __( '<a href="%s">translatable text</a>', 'my-slug' ) // Good

From 1726860902895fd6ef93452f316992c5cfd6090c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 12:34:37 +0100
Subject: [PATCH 267/822] QA: update/fix a number of URLs

Based on a search for `https://make.wordpress.org/`, verified all found URLs and fixed those which needed fixing.
---
 CHANGELOG.md                                                | 4 ++--
 README.md                                                   | 6 +++---
 WordPress-Docs/ruleset.xml                                  | 2 +-
 WordPress/Docs/PHP/YodaConditionsStandard.xml               | 3 ---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php    | 2 +-
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php           | 2 +-
 .../Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php      | 2 +-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php        | 2 +-
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php | 2 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php                    | 2 +-
 WordPress/Sniffs/DB/RestrictedClassesSniff.php              | 2 +-
 WordPress/Sniffs/DB/RestrictedFunctionsSniff.php            | 2 +-
 WordPress/Sniffs/Files/FileNameSniff.php                    | 2 +-
 .../Sniffs/NamingConventions/ValidFunctionNameSniff.php     | 2 +-
 WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php   | 2 +-
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 +-
 WordPress/Sniffs/PHP/DontExtractSniff.php                   | 2 +-
 WordPress/Sniffs/PHP/TypeCastsSniff.php                     | 2 +-
 WordPress/Sniffs/PHP/YodaConditionsSniff.php                | 2 +-
 WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php   | 2 +-
 WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php        | 2 +-
 21 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4e3c08345..21beb5be8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -406,7 +406,7 @@ Note: This will be the last release supporting PHP_CodeSniffer 2.x.
 ### Changed
 - The `Sniff::valid_direct_scope()` method will now return the `$stackPtr` to the valid scope if a valid direct scope has been detected. Previously, it would return `true`.
 - Minor hardening and efficiency improvements to the `WordPress.NamingConventions.PrefixAllGlobals` sniff.
-- The inline documentation of the `WordPress-Core` ruleset has been updated to be in line again with [the handbook](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/).
+- The inline documentation of the `WordPress-Core` ruleset has been updated to be in line again with [the handbook](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/).
 - The inline links to documentation about the VIP requirements have been updated.
 - Updated the [custom ruleset example](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/phpcs.xml.dist.sample) to recommend using `PHPCompatibilityWP` rather than `PHPCompatibility`.
 - All sniffs are now also being tested against PHP 7.3 for consistent sniff results.
@@ -846,7 +846,7 @@ You are also encouraged to check the file history of any WPCS classes you extend
 - `WordPress.WP.DeprecatedFunctions` sniff to the `WordPress-Extra` ruleset to check for usage of deprecated WP version and show errors/warnings depending on a `minimum_supported_version` which [can be passed to the sniff from a custom ruleset](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#minimum-wp-version-to-check-for-usage-of-deprecated-functions-classes-and-function-parameters). The default value for the `minimum_supported_version` property is three versions before the current WP version.
 - `WordPress.WP.I18n`: ability to check for missing _translators comments_ when a I18n function call contains translatable text strings containing placeholders. This check will also verify that the _translators comment_ is correctly placed in the code and uses the correct comment type for optimal compatibility with the various tools available to create `.pot` files.
 - `WordPress.WP.I18n`: ability to pass the `text_domain` to check for [from the command line](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#setting-text_domain-from-the-command-line-wpcs-0110).
-- `WordPress.Arrays.ArrayDeclarationSpacing`: check + fixer for single line associative arrays. The [handbook](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation) states that these should always be multi-line.
+- `WordPress.Arrays.ArrayDeclarationSpacing`: check + fixer for single line associative arrays. The [handbook](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation) states that these should always be multi-line.
 - `WordPress.Files.FileName`: verification that files containing a class reflect this in the file name as per the core guidelines. This particular check can be disabled in a custom ruleset by setting the new [`strict_class_file_names` property](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#disregard-class-file-name-rules).
 - `WordPress.Files.FileName`: verification that files in `/wp-includes/` containing template tags - annotated with `@subpackage Template` in the file header - use the `-template` suffix.
 - `WordPress.Files.FileName`: [`is_theme` property](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#themes-allow-filename-exceptions) which can be set in a custom ruleset. This property can be used to indicate that the project being checked is a theme and will allow for a predefined theme hierarchy based set of exceptions to the file name rules.
diff --git a/README.md b/README.md
index 7f8097c16d..95bf532ee0 100644
--- a/README.md
+++ b/README.md
@@ -127,13 +127,13 @@ The project encompasses a super-set of the sniffs that the WordPress community m
 You can use the following as standard names when invoking `phpcs` to select sniffs, fitting your needs:
 
 * `WordPress` - complete set with all of the sniffs in the project
-  - `WordPress-Core` - main ruleset for [WordPress core coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/)
-  - `WordPress-Docs` - additional ruleset for [WordPress inline documentation standards](https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/)
+  - `WordPress-Core` - main ruleset for [WordPress core coding standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/)
+  - `WordPress-Docs` - additional ruleset for [WordPress inline documentation standards](https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/)
   - `WordPress-Extra` - extended ruleset for recommended best practices, not sufficiently covered in the WordPress core coding standards
     - includes `WordPress-Core`
 
 **Note:** The WPCS package used to include a `WordPress-VIP` ruleset and associated sniffs, prior to WPCS 2.0.0.
-The `WordPress-VIP` ruleset was originally intended to aid with the [WordPress.com VIP coding requirements](https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/), but has been superseded. It is recommended to use the [official VIP coding standards](https://github.com/Automattic/VIP-Coding-Standards) ruleset instead for checking code against the VIP platform requirements.
+The `WordPress-VIP` ruleset was originally intended to aid with the [WordPress.com VIP coding requirements](https://docs.wpvip.com/technical-references/code-review/), but has been superseded. It is recommended to use the [official VIP coding standards](https://github.com/Automattic/VIP-Coding-Standards) ruleset instead for checking code against the VIP platform requirements.
 
 ### Using a custom ruleset
 
diff --git a/WordPress-Docs/ruleset.xml b/WordPress-Docs/ruleset.xml
index e16001ed73..b351118584 100644
--- a/WordPress-Docs/ruleset.xml
+++ b/WordPress-Docs/ruleset.xml
@@ -5,7 +5,7 @@
 
 	<!--
 		Handbook: PHP Documentation Standards
-		Ref: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/php/
+		Ref: https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/
 	-->
 
 	<rule ref="Squiz.Commenting">
diff --git a/WordPress/Docs/PHP/YodaConditionsStandard.xml b/WordPress/Docs/PHP/YodaConditionsStandard.xml
index 36d1633692..cb2aa366db 100644
--- a/WordPress/Docs/PHP/YodaConditionsStandard.xml
+++ b/WordPress/Docs/PHP/YodaConditionsStandard.xml
@@ -6,9 +6,6 @@
     <standard>
     <![CDATA[
     When doing logical comparisons involving variables, the variable must be placed on the right side. All constants, literals, and function calls must be placed on the left side. If neither side is a variable, the order is unimportant.
-
-    For more information:
-    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
     ]]>
     </standard>
     <code_comparison>
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f641dc5907..b2f0efed5f 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -24,7 +24,7 @@
  * - Checks that each array item in a multi-line array starts on a new line.
  * - Checks that the array closer in a multi-line array is on a new line.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index d9ba594588..11049c41f5 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -18,7 +18,7 @@
 /**
  * Enforces WordPress array indentation for multi-line arrays.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 9afc5ed542..5a6b18d38d 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -15,7 +15,7 @@
 /**
  * Check for proper spacing in array key references.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#space-usage
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index 4bb0c5dd14..e887323da2 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -24,7 +24,7 @@
  * - There should be exactly one space between the comma and the start of the
  *   next array item for single-line items.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 893ec05bf3..b419f0ce3f 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -21,7 +21,7 @@
  * - Allows for new line(s) before a double arrow (configurable).
  * - Allows for handling multi-line array items differently if so desired (configurable).
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#indentation
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 93a3ce23de..5fa48a0be8 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -18,7 +18,7 @@
  *
  * Makes sure that variables aren't directly interpolated into SQL statements.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#formatting-sql-statements
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#formatting-sql-statements
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/DB/RestrictedClassesSniff.php b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
index 5ae13ee57b..e4c12da09d 100644
--- a/WordPress/Sniffs/DB/RestrictedClassesSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
@@ -19,7 +19,7 @@
  *  helps keep your code forward-compatible and, in cases where results are cached in memory,
  *  it can be many times faster."
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#database-queries
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
index 83d3d92ce6..e7a24fe8a0 100644
--- a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
@@ -19,7 +19,7 @@
  *  helps keep your code forward-compatible and, in cases where results are cached in memory,
  *  it can be many times faster."
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#database-queries
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index cba85fd4c1..dab670a35c 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -16,7 +16,7 @@
 /**
  * Ensures filenames do not contain underscores.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 034613b72a..9ff9e31c76 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -19,7 +19,7 @@
 /**
  * Enforces WordPress function name and method name format, based upon Squiz code.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index dfc9d290d3..c4c4fe58fe 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -21,7 +21,7 @@
  *
  * Hook names invoked with `do_action_deprecated()` and `apply_filters_deprecated()` are ignored.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 91aeec617c..290684aaa0 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -17,7 +17,7 @@
 /**
  * Checks the naming of variables and member variables.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#naming-conventions
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/PHP/DontExtractSniff.php b/WordPress/Sniffs/PHP/DontExtractSniff.php
index af2233bbe1..9f837696a7 100644
--- a/WordPress/Sniffs/PHP/DontExtractSniff.php
+++ b/WordPress/Sniffs/PHP/DontExtractSniff.php
@@ -14,7 +14,7 @@
 /**
  * Restricts the usage of extract().
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#dont-extract
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#dont-extract
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 9b69b51cb0..448c859278 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -19,7 +19,7 @@
  *
  * Additionally, the use of the (unset) and (binary) casts is discouraged.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/....
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index 9f3f3d10d3..3f0ad17975 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -15,7 +15,7 @@
 /**
  * Enforces Yoda conditional statements.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#yoda-conditions
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#yoda-conditions
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index 496a2bf11f..6322409951 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -15,7 +15,7 @@
 /**
  * Ensure cast statements are preceded by whitespace.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#space-usage
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
  * @package WPCS\WordPressCodingStandards
  *
diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index f3291222be..fe8f02d63e 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -18,7 +18,7 @@
  *
  * "Always put spaces after commas, and on both sides of logical, comparison, string and assignment operators."
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#space-usage
+ * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
  * @package WPCS\WordPressCodingStandards
  *

From 4f5e0a53b7149f869a0f28076f6204cbd0e07700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 9 Dec 2022 11:51:58 +0100
Subject: [PATCH 268/822] Add additional rules to the extra ruleset

Cleaned up failing code and minor cleanup on the Extra ruleset (empty lines and spaces).

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 WordPress-Extra/ruleset.xml                   | 22 +++++++++++++++++--
 .../MultipleStatementAlignmentSniff.php       |  8 +++----
 .../Sniffs/Security/EscapeOutputSniff.php     | 10 ++++-----
 .../WP/EnqueuedResourceParametersSniff.php    | 18 +++++++--------
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 4be8def0ff..4232c26092 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -147,11 +147,29 @@
 		</properties>
 	</rule>
 
-
 	<!-- Prevent some typical mistakes people make accidentally.
-	     https://github.com/WordPress/WordPress-Coding-Standards/pull/1777 -->
+		 https://github.com/WordPress/WordPress-Coding-Standards/pull/1777 -->
 	<rule ref="WordPress.CodeAnalysis.EscapedNotTranslated"/>
 
+	<!-- Detects duplicate array keys in array declarations. -->
+	<rule ref="Universal.Arrays.DuplicateArrayKey"/>
+
+	<!-- Disallows return type declarations on constructor/destructor methods,
+		and constructor/destructor methods returning a value. -->
+	<rule ref="Universal.CodeAnalysis.ConstructorDestructorReturn"/>
+
+	<!-- Detects foreach control structures using the same variable for both key and value. -->
+	<rule ref="Universal.CodeAnalysis.ForeachUniqueAssignment"/>
+
+	<!-- Detects using static instead of self in object-oriented constructs which are final. -->
+	<rule ref="Universal.CodeAnalysis.StaticInFinalClass"/>
+
+	<!-- Disallow if statements, if they are the only statement in an else block. -->
+	<rule ref="Universal.ControlStructures.DisallowLonelyIf"/>
+
+	<!-- Enforce for a file to either declare (global/namespaced) functions
+		or declare object-oriented structures, but not both. -->
+	<rule ref="Universal.Files.SeparateFunctionsFromOO"/>
 
 	<!--
 	#############################################################################
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 893ec05bf3..776eb7fa72 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -465,12 +465,10 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 
 			if ( \T_WHITESPACE !== $this->tokens[ ( $item['operatorPtr'] - 1 ) ]['code'] ) {
 				$before = 0;
+			} elseif ( $this->tokens[ $item['last_index_token'] ]['line'] !== $this->tokens[ $item['operatorPtr'] ]['line'] ) {
+				$before = 'newline';
 			} else {
-				if ( $this->tokens[ $item['last_index_token'] ]['line'] !== $this->tokens[ $item['operatorPtr'] ]['line'] ) {
-					$before = 'newline';
-				} else {
-					$before = $this->tokens[ ( $item['operatorPtr'] - 1 ) ]['length'];
-				}
+				$before = $this->tokens[ ( $item['operatorPtr'] - 1 ) ]['length'];
 			}
 
 			/*
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 1760b273f5..dde4b58f2a 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -425,13 +425,11 @@ public function process_token( $stackPtr ) {
 					if ( $is_formatting_function ) {
 						$i     = ( $function_opener + 1 );
 						$watch = true;
+					} elseif ( isset( $this->tokens[ $function_opener ]['parenthesis_closer'] ) ) {
+						$i = $this->tokens[ $function_opener ]['parenthesis_closer'];
 					} else {
-						if ( isset( $this->tokens[ $function_opener ]['parenthesis_closer'] ) ) {
-							$i = $this->tokens[ $function_opener ]['parenthesis_closer'];
-						} else {
-							// Live coding or parse error.
-							break;
-						}
+						// Live coding or parse error.
+						break;
 					}
 				}
 
diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 9c1f5f1e9e..3bed810539 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -140,17 +140,15 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				'MissingVersion',
 				array( $matched_content, $type )
 			);
-		} else {
 			// The version argument should have a non-false value.
-			if ( $this->is_falsy( $parameters[4]['start'], $parameters[4]['end'] ) ) {
-				$this->phpcsFile->addError(
-					'Version parameter is not explicitly set or has been set to an equivalent of "false" for %s; ' .
-					'This means that the WordPress core version will be used which is not recommended for plugin or theme development.',
-					$stackPtr,
-					'NoExplicitVersion',
-					array( $matched_content )
-				);
-			}
+		} elseif ( $this->is_falsy( $parameters[4]['start'], $parameters[4]['end'] ) ) {
+			$this->phpcsFile->addError(
+				'Version parameter is not explicitly set or has been set to an equivalent of "false" for %s; ' .
+				'This means that the WordPress core version will be used which is not recommended for plugin or theme development.',
+				$stackPtr,
+				'NoExplicitVersion',
+				array( $matched_content )
+			);
 		}
 
 		/*

From 9d0091561e6b5bdb251f47ab470627e91e2264ee Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 14:38:10 +0100
Subject: [PATCH 269/822] Sniff::$formattingFunctions: add `antispambot()` to
 the list

Fixes 1246

Includes unit tests.
---
 WordPress/Sniff.php                             | 17 +++++++++--------
 .../Tests/Security/EscapeOutputUnitTest.inc     |  5 +++++
 .../Tests/Security/EscapeOutputUnitTest.php     |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 276c7456a4..58ebd3c7d8 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -358,14 +358,15 @@ abstract class Sniff implements PHPCS_Sniff {
 	 * @var array
 	 */
 	protected $formattingFunctions = array(
-		'array_fill' => true,
-		'ent2ncr'    => true,
-		'implode'    => true,
-		'join'       => true,
-		'nl2br'      => true,
-		'sprintf'    => true,
-		'vsprintf'   => true,
-		'wp_sprintf' => true,
+		'antispambot' => true,
+		'array_fill'  => true,
+		'ent2ncr'     => true,
+		'implode'     => true,
+		'join'        => true,
+		'nl2br'       => true,
+		'sprintf'     => true,
+		'vsprintf'    => true,
+		'wp_sprintf'  => true,
 	);
 
 	/**
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index e5a3422869..9698ce56b7 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -300,3 +300,8 @@ trigger_error(); // Ignore.
 _deprecated_file(); // Ignore.
 
 \_deprecated_file( \basename( __FILE__ ), '1.3.0' ); // Ok.
+
+// Issue #1246.
+echo antispambot( 'john.doe@mysite.com' ); // OK.
+echo antispambot( esc_html( $email ) ); // OK.
+echo antispambot( $email ); // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5ae98881da..571cd24b1b 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -89,6 +89,7 @@ public function getErrorList() {
 			289 => 1,
 			294 => 1,
 			297 => 1,
+			307 => 1,
 		);
 	}
 

From 4861af077a6da6fc2a5b3ebc9094357d3d3c4108 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 9 Dec 2022 16:42:22 +0100
Subject: [PATCH 270/822] WP/EnqueuedResourceParameters: change
 `MissingVersion` to a warning

Fixes 1472

Includes updated unit tests.
---
 .../Sniffs/WP/EnqueuedResourceParametersSniff.php    |  4 ++--
 .../Tests/WP/EnqueuedResourceParametersUnitTest.inc  |  8 ++++----
 .../Tests/WP/EnqueuedResourceParametersUnitTest.php  | 12 +++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 3bed810539..e5b0dd1d3f 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -134,8 +134,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$type = 'style';
 			}
 
-			$this->phpcsFile->addError(
-				'Resource version not set in call to %s(). This means new versions of the %s will not always be loaded due to browser caching.',
+			$this->phpcsFile->addWarning(
+				'Resource version not set in call to %s(). This means new versions of the %s may not always be loaded due to browser caching.',
 				$stackPtr,
 				'MissingVersion',
 				array( $matched_content, $type )
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
index 6e5cd7e36f..098d40de95 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
@@ -1,6 +1,6 @@
 <?php
 
-wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ) ); // Error - missing $ver, Warning - In Footer is set to a falsy (default) value.
+wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ) ); // Warning - missing $ver, Warning - In Footer is set to a falsy (default) value.
 
 wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ), /* comment */ '1.1.1', true ); // OK.
 wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ), /* comment */ '0' /* another comment */, true ); // Error - 0, false or NULL are not allowed.
@@ -36,13 +36,13 @@ wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array
 wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ), '1.1.0', $in_footer ); // OK.
 
 wp_enqueue_script( 'script-name', 'https://example.com/someScript.js', false, '1.0.0', true ); // OK.
-wp_enqueue_script( 'script-name', 'https://example.com/someScript.js' ); // Error - missing $ver, Warning - missing $in_footer.
+wp_enqueue_script( 'script-name', 'https://example.com/someScript.js' ); // Warning - missing $ver, Warning - missing $in_footer.
 
 wp_register_style( 'script-name', 'https://example.com/someScript.js', false, '1.0.0' ); // OK.
-wp_register_style( 'script-name', 'https://example.com/someScript.js' ); // Error - missing $ver.
+wp_register_style( 'script-name', 'https://example.com/someScript.js' ); // Warning - missing $ver.
 
 wp_enqueue_style( 'script-name', 'https://example.com/someScript.js', false, '1.0.0'); // OK.
-wp_enqueue_style( 'script-name', 'https://example.com/someScript.js' ); // Error - missing $ver.
+wp_enqueue_style( 'script-name', 'https://example.com/someScript.js' ); // Warning - missing $ver.
 
 wp_register_script( 'someScript-js' ); // OK.
 wp_enqueue_script( 'someScript-js' ); // OK.
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index 5fa96cd25c..b916b68b45 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -27,18 +27,13 @@ class EnqueuedResourceParametersUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		return array(
-			3  => 1,
 			6  => 1,
 			9  => 1,
 			10 => 1,
-			11 => 1,
 			12 => 1,
 			13 => 1,
 			14 => 1,
 			22 => 1,
-			39 => 1,
-			42 => 1,
-			45 => 1,
 			54 => 1,
 			57 => 1,
 		);
@@ -51,9 +46,12 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			3  => 1,
+			3  => 2,
+			11 => 1,
 			32 => 1,
-			39 => 1,
+			39 => 2,
+			42 => 1,
+			45 => 1,
 		);
 	}
 

From 8349f909e82155c2e3ff06ed5699f5f1e3e72130 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:25:16 +0100
Subject: [PATCH 271/822] Sniff: remove the `$hookFunctions` property

... as it is not currently used anywhere in the WPCS codebase.
---
 WordPress/Sniff.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 58ebd3c7d8..9cd7a877b2 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -487,29 +487,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'apply_filters_deprecated' => true,
 	);
 
-	/**
-	 * A list of functions that are used to interact with the WP plugins API.
-	 *
-	 * @since 0.10.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array <string function name> => <int position of the hook name argument in function signature>
-	 */
-	protected $hookFunctions = array(
-		'has_filter'         => 1,
-		'add_filter'         => 1,
-		'remove_filter'      => 1,
-		'remove_all_filters' => 1,
-		'doing_filter'       => 1, // Hook name optional.
-		'has_action'         => 1,
-		'add_action'         => 1,
-		'doing_action'       => 1, // Hook name optional.
-		'did_action'         => 1,
-		'remove_action'      => 1,
-		'remove_all_actions' => 1,
-		'current_filter'     => 0, // No hook name argument.
-	);
-
 	/**
 	 * List of global WP variables.
 	 *

From 610d371587f4b6ae0853368953936fa4723306f1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:49:46 +0100
Subject: [PATCH 272/822] Move "hook" related utilities to dedicated
 `WPHookHelper`

The "hook" related property is only used by a small set of sniffs, so are better placed in a dedicated class.

This commit moves the `$hookInvokeFunctions` property to a new `WordPressCS\WordPress\Helpers\WPHookHelper` class and starts using that class in the relevant sniffs.

Note:
* The property is now `private` (and `static`).
* Access to the property can be obtained via the new `WPHookHelper::get_functions()` method.
* This new method can also pre-filter the list to only return thos functions which are not specifically to invoke deprecated hooks.

Related to 1465
---
 WordPress/Helpers/WPHookHelper.php            | 63 +++++++++++++++++++
 WordPress/Sniff.php                           | 17 -----
 .../PrefixAllGlobalsSniff.php                 |  9 +--
 .../NamingConventions/ValidHookNameSniff.php  | 12 ++--
 4 files changed, 70 insertions(+), 31 deletions(-)
 create mode 100644 WordPress/Helpers/WPHookHelper.php

diff --git a/WordPress/Helpers/WPHookHelper.php b/WordPress/Helpers/WPHookHelper.php
new file mode 100644
index 0000000000..5686e48cc1
--- /dev/null
+++ b/WordPress/Helpers/WPHookHelper.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper utilities for recognizing functions related to the WP Hook mechanism.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class WPHookHelper {
+
+	/**
+	 * A list of functions that invoke WP hooks (filters/actions).
+	 *
+	 * @since 0.10.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  - Moved from the Sniff class to this class.
+	 *               - The property visibility has changed from `protected` to `private static`.
+	 *                 Use the `get_function_names()` method for access.
+	 *
+	 * @var array<string, bool>
+	 */
+	private static $hookInvokeFunctions = array(
+		'do_action'                => true,
+		'do_action_ref_array'      => true,
+		'do_action_deprecated'     => true,
+		'apply_filters'            => true,
+		'apply_filters_ref_array'  => true,
+		'apply_filters_deprecated' => true,
+	);
+
+	/**
+	 * Retrieve a list of the WordPress functions which invoke hooks.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param bool $include_deprecated Whether to include the names of functions
+	 *                                 which are used to invoke deprecated hooks.
+	 *                                 Defaults to `true`.
+	 *
+	 * @return array<string, bool> Array with the function names as keys. The value is irrelevant.
+	 */
+	public static function get_functions( $include_deprecated = true ) {
+		$hooks = self::$hookInvokeFunctions;
+		if ( false === $include_deprecated ) {
+			unset(
+				$hooks['do_action_deprecated'],
+				$hooks['apply_filters_deprecated']
+			);
+		}
+
+		return $hooks;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 9cd7a877b2..f2595de926 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -470,23 +470,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'clean_user_cache'        => true,
 	);
 
-	/**
-	 * A list of functions that invoke WP hooks (filters/actions).
-	 *
-	 * @since 0.10.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $hookInvokeFunctions = array(
-		'do_action'                => true,
-		'do_action_ref_array'      => true,
-		'do_action_deprecated'     => true,
-		'apply_filters'            => true,
-		'apply_filters_ref_array'  => true,
-		'apply_filters_deprecated' => true,
-	);
-
 	/**
 	 * List of global WP variables.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 45d7749eaa..1faf338b06 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -20,6 +20,7 @@
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Helpers\WPHookHelper;
 
 /**
  * Verify that everything defined in the global namespace is prefixed with a theme/plugin specific prefix.
@@ -254,12 +255,8 @@ public function register() {
 	 * @return array
 	 */
 	public function getGroups() {
-		$this->target_functions = $this->hookInvokeFunctions;
-		unset(
-			$this->target_functions['do_action_deprecated'],
-			$this->target_functions['apply_filters_deprecated']
-		);
-
+		// Only retrieve functions which are not used for deprecated hooks.
+		$this->target_functions           = WPHookHelper::get_functions( false );
 		$this->target_functions['define'] = true;
 
 		return parent::getGroups();
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index c4c4fe58fe..d72d64651b 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\WPHookHelper;
 
 /**
  * Use lowercase letters in action and filter names. Separate words via underscores.
@@ -73,13 +74,8 @@ class ValidHookNameSniff extends AbstractFunctionParameterSniff {
 	 * @return array
 	 */
 	public function getGroups() {
-		$this->target_functions = $this->hookInvokeFunctions;
-
-		// No need to examine the names of deprecated hooks.
-		unset(
-			$this->target_functions['do_action_deprecated'],
-			$this->target_functions['apply_filters_deprecated']
-		);
+		// Only retrieve functions which are not used for deprecated hooks.
+		$this->target_functions = WPHookHelper::get_functions( false );
 
 		return parent::getGroups();
 	}

From 73ea966e47336fd270af094e289b88c5e6fb998c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:18:22 +0100
Subject: [PATCH 273/822] WPHookHelper: add new `get_hook_name_param()` method

... to support retrieving the hook name parameters from a stack of parameters, while supporting PHP 8.0+ function calls using named arguments.

This new method will be tested via the implementations in the `ValidHookName` and the `PrefixAllGlobals` sniffs.
---
 WordPress/Helpers/WPHookHelper.php | 67 ++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/WordPress/Helpers/WPHookHelper.php b/WordPress/Helpers/WPHookHelper.php
index 5686e48cc1..625712d4c1 100644
--- a/WordPress/Helpers/WPHookHelper.php
+++ b/WordPress/Helpers/WPHookHelper.php
@@ -9,6 +9,8 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
+use PHPCSUtils\Utils\PassedParameters;
+
 /**
  * Helper utilities for recognizing functions related to the WP Hook mechanism.
  *
@@ -26,16 +28,37 @@ final class WPHookHelper {
 	 * @since 3.0.0  - Moved from the Sniff class to this class.
 	 *               - The property visibility has changed from `protected` to `private static`.
 	 *                 Use the `get_function_names()` method for access.
+	 *               - The format of the value has changed from a non-relevant boolean to
+	 *                 an array with the parameter position and name(s) for the hook name parameter.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, <string, int|string|array>> Function name as key, array with target
+	 *                                                parameter position and name(s) as value.
 	 */
 	private static $hookInvokeFunctions = array(
-		'do_action'                => true,
-		'do_action_ref_array'      => true,
-		'do_action_deprecated'     => true,
-		'apply_filters'            => true,
-		'apply_filters_ref_array'  => true,
-		'apply_filters_deprecated' => true,
+		'do_action' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
+		'do_action_ref_array' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
+		'do_action_deprecated' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
+		'apply_filters' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
+		'apply_filters_ref_array' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
+		'apply_filters_deprecated' => array(
+			'position' => 1,
+			'name'     => 'hook_name',
+		),
 	);
 
 	/**
@@ -50,7 +73,7 @@ final class WPHookHelper {
 	 * @return array<string, bool> Array with the function names as keys. The value is irrelevant.
 	 */
 	public static function get_functions( $include_deprecated = true ) {
-		$hooks = self::$hookInvokeFunctions;
+		$hooks = array_fill_keys( array_keys( self::$hookInvokeFunctions ), true );
 		if ( false === $include_deprecated ) {
 			unset(
 				$hooks['do_action_deprecated'],
@@ -60,4 +83,32 @@ public static function get_functions( $include_deprecated = true ) {
 
 		return $hooks;
 	}
+
+	/**
+	 * Retrieve the parameter information for the hook name parameter from a stack of parameters
+	 * passed to one of the WP hook functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $function_name The name of the WP hook function which the parameters were passed to.
+	 * @param array  $parameters    The output of a previous call to PassedParameters::getParameters().
+	 *
+	 * @return array|false Array with information on the parameter at the specified offset,
+	 *                     or with the specified name.
+	 *                     Or `FALSE` if the specified parameter is not found.
+	 *                     See the PHPCSUtils PassedParameters::getParameters() documentation
+	 *                     for the format of the returned (single-dimensional) array.
+	 */
+	public static function get_hook_name_param( $function_name, array $parameters ) {
+		$function_lc = strtolower( $function_name );
+		if ( isset( self::$hookInvokeFunctions[ $function_lc ] ) === false ) {
+			return false;
+		}
+
+		return PassedParameters::getParameterFromStack(
+			$parameters,
+			self::$hookInvokeFunctions[ $function_lc ]['position'],
+			self::$hookInvokeFunctions[ $function_lc ]['name']
+		);
+	}
 }

From 6f42dbae36956221a5dc13436d68252f67ccb46c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 22:42:42 +0100
Subject: [PATCH 274/822] MinimumWPVersionTrait: add new `wp_version_compare()`
 method (bug fix)

... and implement it in the relevant places.

The PHP native `version_compare()` function expects two "PHP-standardized" version number strings and has some quirks if the numbers are not "PHP-standardized", i.e. one of the two numbers is a `#.#`-style version number, while the other is a `#.#.#`-style version number.
See: https://3v4l.org/OUMWE

This helper method works round those quirks and will ensure that the version comparisons done with the `$this->minimum_wp_version` are correct.

This fixes some subtle (and unreported) bugs with the version comparisons.
---
 WordPress/Helpers/MinimumWPVersionTrait.php   | 23 +++++++++++++++++++
 .../Sniffs/WP/AlternativeFunctionsSniff.php   |  4 ++--
 WordPress/Sniffs/WP/CapabilitiesSniff.php     |  2 +-
 .../Sniffs/WP/DeprecatedClassesSniff.php      |  2 +-
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    |  2 +-
 .../WP/DeprecatedParameterValuesSniff.php     |  2 +-
 .../Sniffs/WP/DeprecatedParametersSniff.php   |  2 +-
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 5b98351f72..22eb5ab3a2 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -97,4 +97,27 @@ protected function get_wp_version_from_cli() {
 		}
 	}
 
+	/**
+	 * Compares two version numbers.
+	 *
+	 * Ensures that the version numbers are comparable via the PHP version_compare() function
+	 * by making sure they comply with the minimum "PHP-standardized" version number requirements.
+	 *
+	 * @param string $version1 First version number.
+	 * @param string $version2 Second version number.
+	 * @param string $operator Comparison operator.
+	 *
+	 * @return bool
+	 */
+	protected function wp_version_compare( $version1, $version2, $operator ) {
+		if ( preg_match( '`^\d+\.\d+$`', $version1 ) ) {
+			$version1 .= '.0';
+		}
+
+		if ( preg_match( '`^\d+\.\d+$`', $version2 ) ) {
+			$version2 .= '.0';
+		}
+
+		return version_compare( $version1, $version2, $operator );
+	}
 }
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index babf69e7d3..e47aa3fbcf 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -210,7 +210,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 * @see https://developer.wordpress.org/reference/functions/wp_parse_url/#changelog
 				 */
 				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1
-					&& version_compare( $this->minimum_wp_version, '4.7.0', '<' )
+					&& $this->wp_version_compare( $this->minimum_wp_version, '4.7.0', '<' )
 				) {
 					return;
 				}
@@ -288,7 +288,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 
 		// Verify if the alternative is available in the minimum supported WP version.
-		if ( version_compare( $this->groups[ $group_name ]['since'], $this->minimum_wp_version, '<=' ) ) {
+		if ( $this->wp_version_compare( $this->groups[ $group_name ]['since'], $this->minimum_wp_version, '<=' ) ) {
 			return parent::process_matched_token( $stackPtr, $group_name, $matched_content );
 		}
 	}
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 942b6b6b92..2ba8c514ab 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -434,7 +434,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		if ( isset( $this->deprecated_capabilities[ $matched_parameter ] ) ) {
 			$this->get_wp_version_from_cli( $this->phpcsFile );
-			$is_error = version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_wp_version, '<' );
+			$is_error = $this->wp_version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_wp_version, '<' );
 
 			$data = array(
 				$matched_parameter,
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index effc42dfab..6fedb05913 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -116,7 +116,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$this->phpcsFile,
 			$message,
 			$stackPtr,
-			( version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_wp_version, '<' ) ),
+			( $this->wp_version_compare( $this->deprecated_classes[ $class_name ]['version'], $this->minimum_wp_version, '<' ) ),
 			MessageHelper::stringToErrorcode( $class_name . 'Found' ),
 			$data
 		);
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index b7aabb5a1d..129ce3b2d7 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1545,7 +1545,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$this->phpcsFile,
 			$message,
 			$stackPtr,
-			( version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_wp_version, '<' ) ),
+			( $this->wp_version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_wp_version, '<' ) ),
 			MessageHelper::stringToErrorcode( $matched_content . 'Found' ),
 			$data
 		);
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index c726a840ef..1f7c052ccc 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -208,7 +208,7 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 			$data[]   = $parameter_args[ $matched_parameter ]['alt'];
 		}
 
-		$is_error = version_compare( $parameter_args[ $matched_parameter ]['version'], $this->minimum_wp_version, '<' );
+		$is_error = $this->wp_version_compare( $parameter_args[ $matched_parameter ]['version'], $this->minimum_wp_version, '<' );
 		MessageHelper::addMessage(
 			$this->phpcsFile,
 			$message,
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index e35c2d90a8..9500977df5 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -345,7 +345,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 
 			$message  = 'The parameter "%s" at position #%s of %s() has been deprecated since WordPress version %s.';
-			$is_error = version_compare( $parameter_args['version'], $this->minimum_wp_version, '<' );
+			$is_error = $this->wp_version_compare( $parameter_args['version'], $this->minimum_wp_version, '<' );
 			$code     = MessageHelper::stringToErrorcode( ucfirst( $matched_content ) . 'Param' . $position . 'Found' );
 
 			$data = array(

From 081177c9bfe65e613c59011b30014caed723a76d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 12:07:27 +0100
Subject: [PATCH 275/822] Arrays/ArrayKeySpacingRestrictions: small bug fix

If an auto-fix contains more than one instruction, it should be wrapped in `beginChangeset()`/`endChangeset()` function calls.

This auto-fix code could potentially touch two tokens, so should included the changeset wrapper function calls.

FYI: the wrapper calls are used to potentially revert changes if they would conflict with changes made by another sniff in the same fixer loop.
In that case, the changes are attempted again in the next fixer loop, with the fixer trying up to 50 loops before giving up.
---
 WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 5a6b18d38d..dec890ed4b 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -99,6 +99,8 @@ public function process_token( $stackPtr ) {
 			$error = 'Array keys must be surrounded by spaces unless they contain a string or an integer.';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpacesAroundArrayKeys' );
 			if ( true === $fix ) {
+				$this->phpcsFile->fixer->beginChangeset();
+
 				if ( false === $has_space_after_opener ) {
 					$this->phpcsFile->fixer->addContent( $stackPtr, ' ' );
 				}
@@ -106,6 +108,8 @@ public function process_token( $stackPtr ) {
 				if ( false === $has_space_before_close ) {
 					$this->phpcsFile->fixer->addContentBefore( $token['bracket_closer'], ' ' );
 				}
+
+				$this->phpcsFile->fixer->endChangeset();
 			}
 		} elseif ( false === $needs_spaces && ( $has_space_after_opener || $has_space_before_close ) ) {
 			$error = 'Array keys must NOT be surrounded by spaces if they only contain a string or an integer.';

From ef8b7de5c69839e18d807d9f5d0e88501572b04a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 16:37:45 +0100
Subject: [PATCH 276/822] Arrays/CommaAfterArrayItem: minor tweaks

Use the PHPCSUtils `Collections::arrayOpenTokensBC()` to future-proof the sniff for issues with the array tokenization, which keep cropping up every other PHP release.
---
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index e887323da2..9889633794 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -9,10 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces a comma after each array item and the spacing around it.
@@ -39,10 +40,7 @@ class CommaAfterArrayItemSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		return array(
-			\T_ARRAY,
-			\T_OPEN_SHORT_ARRAY,
-		);
+		return Collections::arrayOpenTokensBC();
 	}
 
 	/**
@@ -54,10 +52,10 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] )
 			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
-			// Short list, not short array.
+			// Short list or real square brackets, not short array.
 			return;
 		}
 

From 57049a922664ba9a74bd8ee41472d1097bbdcb08 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:41:15 +0200
Subject: [PATCH 277/822] PHP/YodaConditions: implement PHPCSUtils

---
 WordPress/Sniffs/PHP/YodaConditionsSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index 3f0ad17975..d4c621fb90 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 
 /**
  * Enforces Yoda conditional statements.
@@ -106,7 +107,7 @@ public function process_token( $stackPtr ) {
 			$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true );
 		}
 
-		if ( \in_array( $this->tokens[ $next_non_empty ]['code'], array( \T_SELF, \T_PARENT, \T_STATIC ), true ) ) {
+		if ( isset( Collections::ooHierarchyKeywords()[ $this->tokens[ $next_non_empty ]['code'] ] ) === true ) {
 			$next_non_empty = $this->phpcsFile->findNext(
 				( Tokens::$emptyTokens + array( \T_DOUBLE_COLON => \T_DOUBLE_COLON ) ),
 				( $next_non_empty + 1 ),

From bb8cb16d325c8cba9cd78ad5468a06751d5680ef Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 20 Jul 2022 17:53:33 +0200
Subject: [PATCH 278/822] PHP/YodaConditions: minor tweaks

I've only done a cursory review of this sniff, i.e. not a deep dive analysis as [the intention is for this sniff to be removed](https://make.wordpress.org/core/2022/06/14/upcoming-disallow-assignments-in-conditions-and-remove-the-yoda-condition-requirement-for-php) as soon as consensus is reached.

With that in mind, I can't justify spending much time on improving this seriously flawed sniff, which doesn't protect against anything.
---
 WordPress/Sniffs/PHP/YodaConditionsSniff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index d4c621fb90..4869ab68c0 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -30,10 +30,11 @@ class YodaConditionsSniff extends Sniff {
 	 * The tokens that indicate the start of a condition.
 	 *
 	 * @since 0.12.0
+	 * @since 3.0.0  This property is now `private`.
 	 *
 	 * @var array
 	 */
-	protected $condition_start_tokens;
+	private $condition_start_tokens;
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
@@ -82,7 +83,7 @@ public function process_token( $stackPtr ) {
 				continue;
 			}
 
-			// If this is a variable or array, we've seen all we need to see.
+			// If this is a variable or array assignment, we've seen all we need to see.
 			if ( \T_VARIABLE === $this->tokens[ $i ]['code']
 				|| \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $i ]['code']
 			) {

From 72b9ed72af3e382ec6df0508cf45c3595336f785 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Jul 2020 13:17:36 +0200
Subject: [PATCH 279/822] WhiteSpace/OperatorSpacing: add extra tests with PHP
 8.0+ types

PHP 8.0 introduced union types which use the `T_BITWISE_OR` - `|` - token to separate the types.
The `|` when used in a union type will be retokenized as `T_TYPE_UNION` since PHPCS 3.6.0.

PHP 8.1 introduced intersection types which use the `T_BITWISE_AND` - `&` - token to separate the types.
PHP 8.1 also changed the way the `&` is tokenized natively in PHP itself.
The PHP 8.1 tokenization change was accounted for in PHPCS 3.6.1.
The `&` when used in a intersection types will be retokenized as `T_TYPE_INTERSECTION` since PHPCS 3.7.0.

PHP 8.1 `readonly` properties necessitated an extra fix in PHPCS to retokenize the `T_BITWISE_OR` token to `T_TYPE_UNION` for property types.
This fix was included in PHPCS 3.7.0.

The union type separator and the intersection type separator are not a "normal" operators, so the "normal" spacing rules for operators (one space either side, new line allowed), do not apply.

As without the above mentioned upstream PHPCS tokenizer fixes, the `WordPress.WhiteSpace.OperatorSpacing` would try to act on these type separators, this commit adds some extra tests to the `WordPress.WhiteSpace.OperatorSpacing` sniff to ensure that type separators are **not** touched by this sniff.
---
 .../Tests/WhiteSpace/OperatorSpacingUnitTest.inc      | 11 +++++++++++
 .../WhiteSpace/OperatorSpacingUnitTest.inc.fixed      | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
index bad89cc0af..a95f1fcdc3 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -64,3 +64,14 @@ if ( $a === $b
 
 if ( $a === $b or
 	$b === $c ) {}
+
+// Safeguard that the "|" in PHP 8.0 union types is disregarded.
+function foo( int|float $param ) : string|false {}
+
+// Safeguard that the "&" in PHP 8.1 intersection types is disregarded.
+function foo( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
+
+// Safeguard handling of union type separator for readonly properties.
+class Foo {
+	public readonly int|string $prop;
+}
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
index 4a3214f57e..bf88a139da 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
@@ -64,3 +64,14 @@ if ( $a === $b
 
 if ( $a === $b or
 	$b === $c ) {}
+
+// Safeguard that the "|" in PHP 8.0 union types is disregarded.
+function foo( int|float $param ) : string|false {}
+
+// Safeguard that the "&" in PHP 8.1 intersection types is disregarded.
+function foo( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
+
+// Safeguard handling of union type separator for readonly properties.
+class Foo {
+	public readonly int|string $prop;
+}

From 844d2d40df5036a70bdb63ec1233960f02c5fe25 Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Fri, 16 Dec 2022 19:23:59 +0530
Subject: [PATCH 280/822] Updated unlink function description

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e5b639c24e..dcd964030b 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -128,8 +128,8 @@ public function getGroups() {
 
 			'unlink' => array(
 				'type'      => 'warning',
-				'message'   => '%s() is discouraged. Use wp_delete_file() for remote URLs instead.',
-				'since'     => 'x.x.x',
+				'message'   => '%s() is discouraged. Use wp_delete_file() to delete a file.',
+				'since'     => '4.2.0',
 				'functions' => array(
 					'unlink',
 				),

From 0ea5bc5a1a4c26ae9631cf5ace1bbf2054de582f Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Fri, 16 Dec 2022 19:28:52 +0530
Subject: [PATCH 281/822] Updated file_system_read to file_system_operations

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 726b738f11..593c9ff45d 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -135,7 +135,7 @@ public function getGroups() {
 				),
 			),
 
-			'file_system_read' => array(
+			'file_system_operations' => array(
 				'type'      => 'warning',
 				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
 				'since'     => '2.5.0',

From 08acd594cc2e431c57c753d7320075f9391d8452 Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Fri, 16 Dec 2022 19:51:21 +0530
Subject: [PATCH 282/822] Added rename in separate category

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 593c9ff45d..4e4141d02c 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -135,6 +135,15 @@ public function getGroups() {
 				),
 			),
 
+			'rename' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged. Use WP_Filesystem::move method to rename a file.',
+				'since'     => '2.5.0',
+				'functions' => array(
+					'rename',
+				),
+			),
+
 			'file_system_operations' => array(
 				'type'      => 'warning',
 				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
@@ -146,7 +155,6 @@ public function getGroups() {
 					'is_writable',
 					'is_writeable',
 					'mkdir',
-					'rename',
 					'rmdir',
 					'touch',
 					'readfile',

From 4a099dacc6c2af11b4170d8fb17c6c408b4d60c9 Mon Sep 17 00:00:00 2001
From: Sandesh <sandeshj@bsf.io>
Date: Fri, 16 Dec 2022 22:09:04 +0530
Subject: [PATCH 283/822] Added test cases for new functions

---
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc | 12 ++++++++++++
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.php | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index d819f25a11..d3a7b2a97a 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -78,3 +78,15 @@ function curl_version_ssl() {} // OK.
 use function curl_version; // OK.
 use function something as curl_version; // OK.
 use function curl_init as curl_version; // Bad.
+
+unlink(); // Warning.
+rename(); // Warning.
+chgrp(); // Warning
+chmod(); // Warning
+chown(); // Warning
+is_writable(); // Warning
+is_writeable(); // Warning
+mkdir(); // Warning
+rmdir(); // Warning
+touch(); // Warning
+fputs(); // Warning
\ No newline at end of file
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index ca95672572..44db0131b2 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -65,6 +65,17 @@ public function getWarningList() {
 			68 => 1,
 			73 => 1,
 			80 => 1,
+			82 => 1,
+			83 => 1,
+			84 => 1,
+			85 => 1,
+			86 => 1,
+			87 => 1,
+			88 => 1,
+			89 => 1,
+			90 => 1,
+			91 => 1,
+			92 => 1,
 		);
 	}
 

From cca86ffb6e9626f87386ee9ba3a87c676cb72d3a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 12:53:09 +0100
Subject: [PATCH 284/822] Files/FileName: remove some redundant code

... which is no longer needed now support for PHPCS < 3.7.1 has been dropped.

(check the diff ignoring whitespace differences to see the actual change)
---
 WordPress/Sniffs/Files/FileNameSniff.php | 40 +++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index dab670a35c..07f2a32c46 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -148,27 +148,25 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		// Respect phpcs:disable comments as long as they are not accompanied by an enable (PHPCS 3.2+).
-		if ( \defined( '\T_PHPCS_DISABLE' ) && \defined( '\T_PHPCS_ENABLE' ) ) {
-			$i = -1;
-			while ( $i = $this->phpcsFile->findNext( \T_PHPCS_DISABLE, ( $i + 1 ) ) ) {
-				if ( empty( $this->tokens[ $i ]['sniffCodes'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] )
-				) {
-					do {
-						$i = $this->phpcsFile->findNext( \T_PHPCS_ENABLE, ( $i + 1 ) );
-					} while ( false !== $i
-						&& ! empty( $this->tokens[ $i ]['sniffCodes'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] ) );
-
-					if ( false === $i ) {
-						// The entire (rest of the) file is disabled.
-						return;
-					}
+		// Respect phpcs:disable comments as long as they are not accompanied by an enable.
+		$i = -1;
+		while ( $i = $this->phpcsFile->findNext( \T_PHPCS_DISABLE, ( $i + 1 ) ) ) {
+			if ( empty( $this->tokens[ $i ]['sniffCodes'] )
+				|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
+				|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
+				|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] )
+			) {
+				do {
+					$i = $this->phpcsFile->findNext( \T_PHPCS_ENABLE, ( $i + 1 ) );
+				} while ( false !== $i
+					&& ! empty( $this->tokens[ $i ]['sniffCodes'] )
+					&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
+					&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
+					&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] ) );
+
+				if ( false === $i ) {
+					// The entire (rest of the) file is disabled.
+					return;
 				}
 			}
 		}

From a27ece61bc0e12f7c7bb9c0259ecd89f0fc488aa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:01:18 +0100
Subject: [PATCH 285/822] Files/FileName: split the logic off into three
 methods

... to lower the cognitive complexity and nesting levels of the code.

Includes two additional tests to ensure all code is properly covered.
---
 WordPress/Sniffs/Files/FileNameSniff.php      | 182 +++++++++++-------
 .../wp-includes/empty-subpackage.inc          |   7 +
 .../wp-includes/no-subpackage.inc             |   6 +
 3 files changed, 127 insertions(+), 68 deletions(-)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/wp-includes/empty-subpackage.inc
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/wp-includes/no-subpackage.inc

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 07f2a32c46..38262aad6e 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -141,7 +141,6 @@ public function register() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
-
 		// Usage of `stripQuotes` is to ensure `stdin_path` passed by IDEs does not include quotes.
 		$file = TextStrings::stripQuotes( $this->phpcsFile->getFileName() );
 		if ( 'STDIN' === $file ) {
@@ -171,80 +170,127 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		$fileName = basename( $file );
-		$expected = strtolower( str_replace( '_', '-', $fileName ) );
+		$file_name = basename( $file );
 
-		/*
-		 * Generic check for lowercase hyphenated file names.
-		 */
-		if ( $fileName !== $expected && ( false === $this->is_theme || 1 !== preg_match( self::THEME_EXCEPTIONS_REGEX, $fileName ) ) ) {
-			$this->phpcsFile->addError(
-				'Filenames should be all lowercase with hyphens as word separators. Expected %s, but found %s.',
-				0,
-				'NotHyphenatedLowercase',
-				array( $expected, $fileName )
-			);
-		}
-		unset( $expected );
-
-		/*
-		 * Check files containing a class for the "class-" prefix and that the rest of
-		 * the file name reflects the class name.
-		 */
-		if ( true === $this->strict_class_file_names ) {
-			$has_class = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
-			if ( false !== $has_class && false === $this->is_test_class( $this->phpcsFile, $has_class ) ) {
-				$class_name = $this->phpcsFile->getDeclarationName( $has_class );
-				$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
-
-				if ( substr( $fileName, 0, -4 ) !== $expected && ! isset( $this->class_exceptions[ $fileName ] ) ) {
-					$this->phpcsFile->addError(
-						'Class file names should be based on the class name with "class-" prepended. Expected %s, but found %s.',
-						0,
-						'InvalidClassFileName',
-						array(
-							$expected . '.php',
-							$fileName,
-						)
-					);
-				}
-				unset( $expected );
-			}
+		$this->check_filename_is_hyphenated( $file_name );
+
+		$class_ptr = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
+
+		if ( true === $this->strict_class_file_names && false !== $class_ptr ) {
+			$this->check_filename_has_class_prefix( $class_ptr, $file_name );
 		}
 
-		/*
-		 * Check non-class files in "wp-includes" with a "@subpackage Template" tag for a "-template" suffix.
-		 */
-		if ( false !== strpos( $file, \DIRECTORY_SEPARATOR . 'wp-includes' . \DIRECTORY_SEPARATOR ) ) {
-			$subpackage_tag = $this->phpcsFile->findNext( \T_DOC_COMMENT_TAG, $stackPtr, null, false, '@subpackage' );
-			if ( false !== $subpackage_tag ) {
-				$subpackage = $this->phpcsFile->findNext( \T_DOC_COMMENT_STRING, $subpackage_tag );
-				if ( false !== $subpackage ) {
-					$fileName_end = substr( $fileName, -13 );
-					$has_class    = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
-
-					if ( ( 'Template' === trim( $this->tokens[ $subpackage ]['content'] )
-						&& $this->tokens[ $subpackage_tag ]['line'] === $this->tokens[ $subpackage ]['line'] )
-						&& ( ( ! \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.php' !== $fileName_end )
-						|| ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.inc' !== $fileName_end ) )
-						&& false === $has_class
-					) {
-						$this->phpcsFile->addError(
-							'Files containing template tags should have "-template" appended to the end of the file name. Expected %s, but found %s.',
-							0,
-							'InvalidTemplateTagFileName',
-							array(
-								substr( $fileName, 0, -4 ) . '-template.php',
-								$fileName,
-							)
-						);
-					}
-				}
-			}
+		if ( false !== strpos( $file, \DIRECTORY_SEPARATOR . 'wp-includes' . \DIRECTORY_SEPARATOR )
+			&& false === $class_ptr
+		) {
+			$this->check_filename_for_template_suffix( $stackPtr, $file_name );
 		}
 
 		// Only run this sniff once per file, no need to run it again.
 		return ( $this->phpcsFile->numTokens + 1 );
 	}
 
+	/**
+	 * Generic check for lowercase hyphenated file names.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $file_name The name of the current file.
+	 *
+	 * @return void
+	 */
+	protected function check_filename_is_hyphenated( $file_name ) {
+		$expected = strtolower( str_replace( '_', '-', $file_name ) );
+		if ( $file_name === $expected ) {
+			return;
+		}
+
+		if ( true === $this->is_theme && 1 === preg_match( self::THEME_EXCEPTIONS_REGEX, $file_name ) ) {
+			return;
+		}
+
+		$this->phpcsFile->addError(
+			'Filenames should be all lowercase with hyphens as word separators. Expected %s, but found %s.',
+			0,
+			'NotHyphenatedLowercase',
+			array( $expected, $file_name )
+		);
+	}
+
+
+	/**
+	 * Check files containing a class for the "class-" prefix and that the rest of
+	 * the file name reflects the class name.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $class_ptr Stack pointer to the first T_CLASS in the file.
+	 * @param string $file_name The name of the current file.
+	 *
+	 * @return void
+	 */
+	protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
+		if ( $this->is_test_class( $this->phpcsFile, $class_ptr ) ) {
+			return;
+		}
+
+		$class_name = $this->phpcsFile->getDeclarationName( $class_ptr );
+		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
+
+		if ( substr( $file_name, 0, -4 ) === $expected
+			|| isset( $this->class_exceptions[ $file_name ] )
+		) {
+			return;
+		}
+
+		$this->phpcsFile->addError(
+			'Class file names should be based on the class name with "class-" prepended. Expected %s, but found %s.',
+			0,
+			'InvalidClassFileName',
+			array(
+				$expected . '.php',
+				$file_name,
+			)
+		);
+	}
+
+	/**
+	 * Check non-class files in "wp-includes" with a "@subpackage Template" tag for a "-template" suffix.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $stackPtr  Stack pointer to the first PHP open tag in the file.
+	 * @param string $file_name The name of the current file.
+	 *
+	 * @return void
+	 */
+	protected function check_filename_for_template_suffix( $stackPtr, $file_name ) {
+		$subpackage_tag = $this->phpcsFile->findNext( \T_DOC_COMMENT_TAG, $stackPtr, null, false, '@subpackage' );
+		if ( false === $subpackage_tag ) {
+			return;
+		}
+
+		$subpackage = $this->phpcsFile->findNext( \T_DOC_COMMENT_STRING, $subpackage_tag );
+		if ( false === $subpackage ) {
+			return;
+		}
+
+		$fileName_end = substr( $file_name, -13 );
+
+		if ( ( 'Template' === trim( $this->tokens[ $subpackage ]['content'] )
+			&& $this->tokens[ $subpackage_tag ]['line'] === $this->tokens[ $subpackage ]['line'] )
+			&& ( ( ! \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.php' !== $fileName_end )
+			|| ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.inc' !== $fileName_end ) )
+		) {
+			$this->phpcsFile->addError(
+				'Files containing template tags should have "-template" appended to the end of the file name. Expected %s, but found %s.',
+				0,
+				'InvalidTemplateTagFileName',
+				array(
+					substr( $file_name, 0, -4 ) . '-template.php',
+					$file_name,
+				)
+			);
+		}
+	}
 }
diff --git a/WordPress/Tests/Files/FileNameUnitTests/wp-includes/empty-subpackage.inc b/WordPress/Tests/Files/FileNameUnitTests/wp-includes/empty-subpackage.inc
new file mode 100644
index 0000000000..758e9b6856
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/wp-includes/empty-subpackage.inc
@@ -0,0 +1,7 @@
+<?php
+/**
+ * File with an empty subpackage tag.
+ *
+ * @package WordPress
+ * @subpackage
+ */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/wp-includes/no-subpackage.inc b/WordPress/Tests/Files/FileNameUnitTests/wp-includes/no-subpackage.inc
new file mode 100644
index 0000000000..9139f8b70d
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/wp-includes/no-subpackage.inc
@@ -0,0 +1,6 @@
+<?php
+/**
+ * File without a subpackage tag.
+ *
+ * @package WordPress
+ */

From a141dd61e9dc6fb07289215eef6e0a3bd21691da Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:05:16 +0100
Subject: [PATCH 286/822] Files/FileName: implement PHPCSUtils

---
 WordPress/Sniffs/Files/FileNameSniff.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 38262aad6e..241e2ea50d 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -9,6 +9,8 @@
 
 namespace WordPressCS\WordPress\Sniffs\Files;
 
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
@@ -126,10 +128,7 @@ public function register() {
 			$this->class_exceptions = array_merge( $this->class_exceptions, $this->unittest_class_exceptions );
 		}
 
-		return array(
-			\T_OPEN_TAG,
-			\T_OPEN_TAG_WITH_ECHO,
-		);
+		return Collections::phpOpenTags();
 	}
 
 	/**
@@ -234,7 +233,7 @@ protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
 			return;
 		}
 
-		$class_name = $this->phpcsFile->getDeclarationName( $class_ptr );
+		$class_name = ObjectDeclarations::getName( $this->phpcsFile, $class_ptr );
 		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
 
 		if ( substr( $file_name, 0, -4 ) === $expected

From fa002951909901aa6d653dfecc1008c0342d7a8f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:06:37 +0100
Subject: [PATCH 287/822] Files/FileName: minor efficiency tweak

As both arrays have unique string keys, this will do fine.
---
 WordPress/Sniffs/Files/FileNameSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 241e2ea50d..675957a845 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -125,7 +125,7 @@ class FileNameSniff extends Sniff {
 	 */
 	public function register() {
 		if ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) ) {
-			$this->class_exceptions = array_merge( $this->class_exceptions, $this->unittest_class_exceptions );
+			$this->class_exceptions += $this->unittest_class_exceptions;
 		}
 
 		return Collections::phpOpenTags();

From 82bc5f46c48604c21c7b88db73100105de25f99e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:37:49 +0100
Subject: [PATCH 288/822] Files/FileName: exclude test files altogether

As per 1995, test classes should be excluded completely from this rule to prevent issues with PHPUnit > 9.1.0.

Includes test.

Fixes 1995

Refs:
* WordPress/wpcs-docs 123
---
 WordPress/Sniffs/Files/FileNameSniff.php         | 16 ++++++++++------
 WordPress/Tests/Files/FileNameUnitTest.php       |  1 +
 .../FileNameUnitTests/TestFiles/Test_Sample.inc  |  3 +++
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/Test_Sample.inc

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 675957a845..0ca71ed0d5 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -31,6 +31,7 @@
  *                   specific exceptions if the `$is_theme` property is set to `true`.
  * @since   0.12.0 Now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since   3.0.0  Test class files are now completely exempt from this rule.
  *
  * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
@@ -146,6 +147,15 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		$class_ptr = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
+		if ( false !== $class_ptr && $this->is_test_class( $this->phpcsFile, $class_ptr ) ) {
+			/*
+			 * This rule should not be applied to test classes (at all).
+			 * @link https://github.com/WordPress/WordPress-Coding-Standards/issues/1995
+			 */
+			return;
+		}
+
 		// Respect phpcs:disable comments as long as they are not accompanied by an enable.
 		$i = -1;
 		while ( $i = $this->phpcsFile->findNext( \T_PHPCS_DISABLE, ( $i + 1 ) ) ) {
@@ -173,8 +183,6 @@ public function process_token( $stackPtr ) {
 
 		$this->check_filename_is_hyphenated( $file_name );
 
-		$class_ptr = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
-
 		if ( true === $this->strict_class_file_names && false !== $class_ptr ) {
 			$this->check_filename_has_class_prefix( $class_ptr, $file_name );
 		}
@@ -229,10 +237,6 @@ protected function check_filename_is_hyphenated( $file_name ) {
 	 * @return void
 	 */
 	protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
-		if ( $this->is_test_class( $this->phpcsFile, $class_ptr ) ) {
-			return;
-		}
-
 		$class_name = ObjectDeclarations::getName( $this->phpcsFile, $class_ptr );
 		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
 
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 3d26c76efe..cf10c9c799 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -85,6 +85,7 @@ class FileNameUnitTest extends AbstractSniffUnitTest {
 		'test-sample-namespaced-extends.3.inc'       => 1, // Namespaced vs non-namespaced.
 		'test-sample-namespaced-extends.4.inc'       => 1, // Non-namespaced vs namespaced.
 		'test-sample-namespaced-extends.5.inc'       => 0,
+		'Test_Sample.inc'                            => 0,
 
 		/*
 		 * In /FileNameUnitTests/ThemeExceptions.
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/Test_Sample.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/Test_Sample.inc
new file mode 100644
index 0000000000..ac87e0aebc
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/Test_Sample.inc
@@ -0,0 +1,3 @@
+<?php
+
+class Test_Sample extends PHPUnit_Adapter_TestCase {}

From c7192fb3ff2df6c634c6f6c97e647ea77efdb3d4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 20:15:58 +0100
Subject: [PATCH 289/822] Files/FileName: minor docs tweak

---
 WordPress/Sniffs/Files/FileNameSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 0ca71ed0d5..fd0ed414bf 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -16,7 +16,7 @@
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 
 /**
- * Ensures filenames do not contain underscores.
+ * Ensures filenames do not contain underscores and where applicable are prefixed with `class-`.
  *
  * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *

From 6e7dc7ab5dfe8e3730e8c1a17c8b56d91c4d391e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 01:18:08 +0100
Subject: [PATCH 290/822] Sniff: move the `has_nonce_check()` method to the
 `Security/NonceVerification` Sniff

The `Sniff::has_nonce_check()` method and the associated property `$nonceVerificationFunctions` are _only_ used by the `WordPress.Security.NonceVerification` sniff, so these don't belong in the generic base `Sniff` class.

A [code search](https://sourcegraph.com/search?q=context:global+has_nonce_check%28+-file:%5E%28.*/%29%3Fvendor/wp-coding-standards/.*%24&patternType=standard&case=yes&sm=0) also shows these are not used by sniffs from external standards, so I'm also making both `private`.
---
 WordPress/Sniff.php                           | 146 -----------------
 .../Security/NonceVerificationSniff.php       | 150 ++++++++++++++++++
 2 files changed, 150 insertions(+), 146 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index f2595de926..468d7874b5 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -39,20 +39,6 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	/**
-	 * List of the functions which verify nonces.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $nonceVerificationFunctions = array(
-		'wp_verify_nonce'     => true,
-		'check_admin_referer' => true,
-		'check_ajax_referer'  => true,
-	);
-
 	/**
 	 * Functions that escape values for display.
 	 *
@@ -955,138 +941,6 @@ protected function is_assignment( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check if this token has an associated nonce check.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @param int $stackPtr The position of the current token in the stack of tokens.
-	 *
-	 * @return bool
-	 */
-	protected function has_nonce_check( $stackPtr ) {
-
-		/**
-		 * A cache of the scope that we last checked for nonce verification in.
-		 *
-		 * @var array {
-		 *      @var string   $file        The name of the file.
-		 *      @var int      $start       The index of the token where the scope started.
-		 *      @var int      $end         The index of the token where the scope ended.
-		 *      @var bool|int $nonce_check The index of the token where an nonce check
-		 *                                 was found, or false if none was found.
-		 * }
-		 */
-		static $last;
-
-		$start = 0;
-		$end   = $stackPtr;
-
-		$tokens = $this->phpcsFile->getTokens();
-
-		// If we're in a function, only look inside of it.
-		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
-		if ( isset( $tokens[ $stackPtr ]['conditions'] ) === true ) {
-			$conditions = $tokens[ $stackPtr ]['conditions'];
-			$conditions = array_reverse( $conditions, true );
-			foreach ( $conditions as $tokenPtr => $condition ) {
-				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
-					$start = $tokens[ $tokenPtr ]['scope_opener'];
-					break;
-				}
-			}
-		}
-
-		$allow_nonce_after = false;
-		if ( $this->is_in_isset_or_empty( $stackPtr )
-			|| $this->is_in_type_test( $stackPtr )
-			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
-			|| $this->is_in_array_comparison( $stackPtr )
-			|| $this->is_in_function_call( $stackPtr, $this->unslashingFunctions ) !== false
-			|| $this->is_only_sanitized( $stackPtr )
-		) {
-			$allow_nonce_after = true;
-		}
-
-		// We allow for certain actions, such as an isset() check to come before the nonce check.
-		// If this superglobal is inside such a check, look for the nonce after it as well,
-		// all the way to the end of the scope.
-		if ( true === $allow_nonce_after ) {
-			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
-		}
-
-		// Check if we've looked here before.
-		$filename = $this->phpcsFile->getFilename();
-
-		if ( is_array( $last )
-			&& $filename === $last['file']
-			&& $start === $last['start']
-		) {
-
-			if ( false !== $last['nonce_check'] ) {
-				// If we have already found an nonce check in this scope, we just
-				// need to check whether it comes before this token. It is OK if the
-				// check is after the token though, if this was only a isset() check.
-				return ( true === $allow_nonce_after || $last['nonce_check'] < $stackPtr );
-			} elseif ( $end <= $last['end'] ) {
-				// If not, we can still go ahead and return false if we've already
-				// checked to the end of the search area.
-				return false;
-			}
-
-			// We haven't checked this far yet, but we can still save work by
-			// skipping over the part we've already checked.
-			$start = $last['end'];
-		} else {
-			$last = array(
-				'file'  => $filename,
-				'start' => $start,
-				'end'   => $end,
-			);
-		}
-
-		// Loop through the tokens looking for nonce verification functions.
-		for ( $i = $start; $i < $end; $i++ ) {
-			// Skip over nested closed scope constructs.
-			if ( \T_FUNCTION === $tokens[ $i ]['code']
-				|| \T_CLOSURE === $tokens[ $i ]['code']
-				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ]['code'] ] )
-			) {
-				if ( isset( $tokens[ $i ]['scope_closer'] ) ) {
-					$i = $tokens[ $i ]['scope_closer'];
-				}
-				continue;
-			}
-
-			// If this isn't a function name, skip it.
-			if ( \T_STRING !== $tokens[ $i ]['code'] ) {
-				continue;
-			}
-
-			// If this is one of the nonce verification functions, we can bail out.
-			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ]['content'] ] ) ) {
-				/*
-				 * Now, make sure it is a call to a global function.
-				 */
-				if ( $this->is_class_object_call( $i ) === true ) {
-					continue;
-				}
-
-				if ( $this->is_token_namespaced( $i ) === true ) {
-					continue;
-				}
-
-				$last['nonce_check'] = $i;
-				return true;
-			}
-		}
-
-		// We're still here, so no luck.
-		$last['nonce_check'] = false;
-
-		return false;
-	}
-
 	/**
 	 * Check if a token is inside of an isset(), empty() or array_key_exists() statement.
 	 *
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 2784b363c9..a8ef856ecf 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -9,7 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -85,6 +87,21 @@ class NonceVerificationSniff extends Sniff {
 		'unslashsanitize' => array(),
 	);
 
+	/**
+	 * List of the functions which verify nonces.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 *
+	 * @var array
+	 */
+	private $nonceVerificationFunctions = array(
+		'wp_verify_nonce'     => true,
+		'check_admin_referer' => true,
+		'check_ajax_referer'  => true,
+	);
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -137,6 +154,139 @@ public function process_token( $stackPtr ) {
 		);
 	}
 
+	/**
+	 * Check if this token has an associated nonce check.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 *
+	 * @param int $stackPtr The position of the current token in the stack of tokens.
+	 *
+	 * @return bool
+	 */
+	private function has_nonce_check( $stackPtr ) {
+
+		/**
+		 * A cache of the scope that we last checked for nonce verification in.
+		 *
+		 * @var array {
+		 *      @var string   $file        The name of the file.
+		 *      @var int      $start       The index of the token where the scope started.
+		 *      @var int      $end         The index of the token where the scope ended.
+		 *      @var bool|int $nonce_check The index of the token where an nonce check
+		 *                                 was found, or false if none was found.
+		 * }
+		 */
+		static $last;
+
+		$start = 0;
+		$end   = $stackPtr;
+
+		$tokens = $this->phpcsFile->getTokens();
+
+		// If we're in a function, only look inside of it.
+		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
+		if ( isset( $tokens[ $stackPtr ]['conditions'] ) === true ) {
+			$conditions = $tokens[ $stackPtr ]['conditions'];
+			$conditions = array_reverse( $conditions, true );
+			foreach ( $conditions as $tokenPtr => $condition ) {
+				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
+					$start = $tokens[ $tokenPtr ]['scope_opener'];
+					break;
+				}
+			}
+		}
+
+		$allow_nonce_after = false;
+		if ( $this->is_in_isset_or_empty( $stackPtr )
+			|| $this->is_in_type_test( $stackPtr )
+			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
+			|| $this->is_in_array_comparison( $stackPtr )
+			|| $this->is_in_function_call( $stackPtr, $this->unslashingFunctions ) !== false
+			|| $this->is_only_sanitized( $stackPtr )
+		) {
+			$allow_nonce_after = true;
+		}
+
+		// We allow for certain actions, such as an isset() check to come before the nonce check.
+		// If this superglobal is inside such a check, look for the nonce after it as well,
+		// all the way to the end of the scope.
+		if ( true === $allow_nonce_after ) {
+			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
+		}
+
+		// Check if we've looked here before.
+		$filename = $this->phpcsFile->getFilename();
+
+		if ( is_array( $last )
+			&& $filename === $last['file']
+			&& $start === $last['start']
+		) {
+
+			if ( false !== $last['nonce_check'] ) {
+				// If we have already found an nonce check in this scope, we just
+				// need to check whether it comes before this token. It is OK if the
+				// check is after the token though, if this was only a isset() check.
+				return ( true === $allow_nonce_after || $last['nonce_check'] < $stackPtr );
+			} elseif ( $end <= $last['end'] ) {
+				// If not, we can still go ahead and return false if we've already
+				// checked to the end of the search area.
+				return false;
+			}
+
+			// We haven't checked this far yet, but we can still save work by
+			// skipping over the part we've already checked.
+			$start = $last['end'];
+		} else {
+			$last = array(
+				'file'  => $filename,
+				'start' => $start,
+				'end'   => $end,
+			);
+		}
+
+		// Loop through the tokens looking for nonce verification functions.
+		for ( $i = $start; $i < $end; $i++ ) {
+			// Skip over nested closed scope constructs.
+			if ( \T_FUNCTION === $tokens[ $i ]['code']
+				|| \T_CLOSURE === $tokens[ $i ]['code']
+				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ]['code'] ] )
+			) {
+				if ( isset( $tokens[ $i ]['scope_closer'] ) ) {
+					$i = $tokens[ $i ]['scope_closer'];
+				}
+				continue;
+			}
+
+			// If this isn't a function name, skip it.
+			if ( \T_STRING !== $tokens[ $i ]['code'] ) {
+				continue;
+			}
+
+			// If this is one of the nonce verification functions, we can bail out.
+			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ]['content'] ] ) ) {
+				/*
+				 * Now, make sure it is a call to a global function.
+				 */
+				if ( $this->is_class_object_call( $i ) === true ) {
+					continue;
+				}
+
+				if ( $this->is_token_namespaced( $i ) === true ) {
+					continue;
+				}
+
+				$last['nonce_check'] = $i;
+				return true;
+			}
+		}
+
+		// We're still here, so no luck.
+		$last['nonce_check'] = false;
+
+		return false;
+	}
+
 	/**
 	 * Merge custom functions provided via a custom ruleset with the defaults, if we haven't already.
 	 *

From e78015bfc13b484eb06c17a04c30689a2503579d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 00:52:22 +0100
Subject: [PATCH 291/822] Sniff: move the `$cache*Functions` properties to the
 `DB/DirectDatabaseQuery` Sniff

The `Sniff::$cacheGetFunctions`, `Sniff::$cacheSetFunctions` and `Sniff::$cacheDeleteFunctions` properties are _only_ used by the `WordPress.DB.DirectDatabaseQuerySniff` sniff, so these don't belong in the generic base `Sniff` class.

A [code search](https://sourcegraph.com/search?q=context:global+-%3Ecache%28Get%7CSet%7CDelete%29Functions+-file:%5E%28.*/%29%3Fvendor/wp-coding-standards/.*%24&patternType=regexp&case=yes&sm=0) also shows these properties are not used by sniffs from external standards, so this change should have no noticeable impact.
---
 WordPress/Sniff.php                           | 48 -----------------
 .../Sniffs/DB/DirectDatabaseQuerySniff.php    | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index f2595de926..3fa2bbb6cb 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -422,54 +422,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'count' => true,
 	);
 
-	/**
-	 * A list of functions that get data from the cache.
-	 *
-	 * @since 0.6.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $cacheGetFunctions = array(
-		'wp_cache_get' => true,
-	);
-
-	/**
-	 * A list of functions that set data in the cache.
-	 *
-	 * @since 0.6.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $cacheSetFunctions = array(
-		'wp_cache_set' => true,
-		'wp_cache_add' => true,
-	);
-
-	/**
-	 * A list of functions that delete data from the cache.
-	 *
-	 * @since 0.6.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $cacheDeleteFunctions = array(
-		'wp_cache_delete'         => true,
-		'clean_attachment_cache'  => true,
-		'clean_blog_cache'        => true,
-		'clean_bookmark_cache'    => true,
-		'clean_category_cache'    => true,
-		'clean_comment_cache'     => true,
-		'clean_network_cache'     => true,
-		'clean_object_term_cache' => true,
-		'clean_page_cache'        => true,
-		'clean_post_cache'        => true,
-		'clean_term_cache'        => true,
-		'clean_user_cache'        => true,
-	);
-
 	/**
 	 * List of global WP variables.
 	 *
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 9cfeea2d09..cac5b8c911 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -70,6 +70,57 @@ class DirectDatabaseQuerySniff extends Sniff {
 		'cachedelete' => array(),
 	);
 
+	/**
+	 * A list of functions that get data from the cache.
+	 *
+	 * @since 0.6.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 *
+	 * @var array
+	 */
+	protected $cacheGetFunctions = array(
+		'wp_cache_get' => true,
+	);
+
+	/**
+	 * A list of functions that set data in the cache.
+	 *
+	 * @since 0.6.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 *
+	 * @var array
+	 */
+	protected $cacheSetFunctions = array(
+		'wp_cache_set' => true,
+		'wp_cache_add' => true,
+	);
+
+	/**
+	 * A list of functions that delete data from the cache.
+	 *
+	 * @since 0.6.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 *
+	 * @var array
+	 */
+	protected $cacheDeleteFunctions = array(
+		'wp_cache_delete'         => true,
+		'clean_attachment_cache'  => true,
+		'clean_blog_cache'        => true,
+		'clean_bookmark_cache'    => true,
+		'clean_category_cache'    => true,
+		'clean_comment_cache'     => true,
+		'clean_network_cache'     => true,
+		'clean_object_term_cache' => true,
+		'clean_page_cache'        => true,
+		'clean_post_cache'        => true,
+		'clean_term_cache'        => true,
+		'clean_user_cache'        => true,
+	);
+
 	/**
 	 * The lists of $wpdb methods.
 	 *

From c4553f20321f7445eb8b40cfe56f6311a1981da2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 00:35:31 +0100
Subject: [PATCH 292/822] Move "property handling" related utilities to
 dedicated `RulesetPropertyHelper`

The "property handling" related utilities are only used by a limited set of sniffs, so are better placed in a dedicated class.

This commit moves the `merge_custom_array()` method to a new `WordPressCS\WordPress\Helpers\RulesetPropertyHelper` and starts using that class in the relevant sniffs.

Note: the function has been moved without changes.

Related to 1465
---
 ...stractArrayAssignmentRestrictionsSniff.php |  3 +-
 WordPress/AbstractClassRestrictionsSniff.php  |  3 +-
 .../AbstractFunctionRestrictionsSniff.php     |  3 +-
 WordPress/Helpers/IsUnitTestTrait.php         |  4 +-
 WordPress/Helpers/RulesetPropertyHelper.php   | 72 +++++++++++++++++++
 WordPress/Sniff.php                           | 47 ------------
 .../Sniffs/DB/DirectDatabaseQuerySniff.php    |  9 +--
 .../PrefixAllGlobalsSniff.php                 |  3 +-
 .../ValidVariableNameSniff.php                |  5 +-
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      |  5 +-
 .../Sniffs/Security/EscapeOutputSniff.php     |  9 +--
 .../Security/NonceVerificationSniff.php       |  7 +-
 .../Security/ValidatedSanitizedInputSniff.php |  5 +-
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php |  5 +-
 WordPress/Sniffs/WP/CapabilitiesSniff.php     |  3 +-
 WordPress/Sniffs/WP/I18nSniff.php             |  3 +-
 16 files changed, 112 insertions(+), 74 deletions(-)
 create mode 100644 WordPress/Helpers/RulesetPropertyHelper.php

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 18912c96c4..82e5238db3 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -134,7 +135,7 @@ protected function setup_groups() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		$this->excluded_groups = $this->merge_custom_array( $this->exclude );
+		$this->excluded_groups = RulesetPropertyHelper::merge_custom_array( $this->exclude );
 		if ( array_diff_key( $this->groups_cache, $this->excluded_groups ) === array() ) {
 			// All groups have been excluded.
 			// Don't remove the listener as the exclude property can be changed inline.
diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 612737d91c..22a0609cd7 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Utils\Namespaces;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
  * Restricts usage of some classes.
@@ -93,7 +94,7 @@ public function process_token( $stackPtr ) {
 		// Reset the temporary storage before processing the token.
 		unset( $this->classname );
 
-		$this->excluded_groups = $this->merge_custom_array( $this->exclude );
+		$this->excluded_groups = RulesetPropertyHelper::merge_custom_array( $this->exclude );
 		if ( array_diff_key( $this->groups, $this->excluded_groups ) === array() ) {
 			// All groups have been excluded.
 			// Don't remove the listener as the exclude property can be changed inline.
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index a5cba4f912..fbde666ae0 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -183,7 +184,7 @@ protected function setup_groups( $key ) {
 	 */
 	public function process_token( $stackPtr ) {
 
-		$this->excluded_groups = $this->merge_custom_array( $this->exclude );
+		$this->excluded_groups = RulesetPropertyHelper::merge_custom_array( $this->exclude );
 		if ( array_diff_key( $this->groups, $this->excluded_groups ) === array() ) {
 			// All groups have been excluded.
 			// Don't remove the listener as the exclude property can be changed inline.
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 00c45c8717..a0636d7b26 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -13,7 +13,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\ObjectDeclarations;
-use WordPressCS\WordPress\Sniff as WPCS_Sniff;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
  * Helper utilities for sniffs which need to take into account whether the
@@ -127,7 +127,7 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 		}
 
 		// Add any potentially extra custom test classes to the known test classes list.
-		$known_test_classes = WPCS_Sniff::merge_custom_array(
+		$known_test_classes = RulesetPropertyHelper::merge_custom_array(
 			$this->custom_test_classes,
 			$this->known_test_classes
 		);
diff --git a/WordPress/Helpers/RulesetPropertyHelper.php b/WordPress/Helpers/RulesetPropertyHelper.php
new file mode 100644
index 0000000000..0411e95930
--- /dev/null
+++ b/WordPress/Helpers/RulesetPropertyHelper.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper utilities for working with user provided property values.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class RulesetPropertyHelper {
+
+	/**
+	 * Merge a pre-set array with a ruleset provided array.
+	 *
+	 * - By default flips custom lists to allow for using `isset()` instead
+	 *   of `in_array()`.
+	 * - When `$flip` is true:
+	 *   * Presumes the base array is in a `'value' => true` format.
+	 *   * Any custom items will be given the value `false` to be able to
+	 *     distinguish them from pre-set (base array) values.
+	 *   * Will filter previously added custom items out from the base array
+	 *     before merging/returning to allow for resetting to the base array.
+	 *
+	 * {@internal Function is static as it doesn't use any of the properties or others
+	 * methods anyway.}
+	 *
+	 * @since 0.11.0
+	 * @since 2.0.0  No longer supports custom array properties which were incorrectly
+	 *               passed as a string.
+	 * @since 3.0.0  Moved from the Sniff class to this class.
+	 *
+	 * @param array $custom Custom list as provided via a ruleset.
+	 * @param array $base   Optional. Base list. Defaults to an empty array.
+	 *                      Expects `value => true` format when `$flip` is true.
+	 * @param bool  $flip   Optional. Whether or not to flip the custom list.
+	 *                      Defaults to true.
+	 * @return array
+	 */
+	public static function merge_custom_array( $custom, $base = array(), $flip = true ) {
+		if ( true === $flip ) {
+			$base = array_filter( $base );
+		}
+
+		if ( empty( $custom ) || ! \is_array( $custom ) ) {
+			return $base;
+		}
+
+		if ( true === $flip ) {
+			$custom = array_fill_keys( $custom, false );
+		}
+
+		if ( empty( $base ) ) {
+			return $custom;
+		}
+
+		return array_merge( $base, $custom );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 6a79643ca0..1965ea0c15 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -763,53 +763,6 @@ public static function get_snake_case_name_suggestion( $name ) {
 		return $suggested;
 	}
 
-	/**
-	 * Merge a pre-set array with a ruleset provided array.
-	 *
-	 * - By default flips custom lists to allow for using `isset()` instead
-	 *   of `in_array()`.
-	 * - When `$flip` is true:
-	 *   * Presumes the base array is in a `'value' => true` format.
-	 *   * Any custom items will be given the value `false` to be able to
-	 *     distinguish them from pre-set (base array) values.
-	 *   * Will filter previously added custom items out from the base array
-	 *     before merging/returning to allow for resetting to the base array.
-	 *
-	 * {@internal Function is static as it doesn't use any of the properties or others
-	 * methods anyway and this way the `WordPress.NamingConventions.ValidVariableName` sniff
-	 * which extends an upstream sniff can also use it.}}
-	 *
-	 * @since 0.11.0
-	 * @since 2.0.0  No longer supports custom array properties which were incorrectly
-	 *               passed as a string.
-	 *
-	 * @param array $custom Custom list as provided via a ruleset.
-	 * @param array $base   Optional. Base list. Defaults to an empty array.
-	 *                      Expects `value => true` format when `$flip` is true.
-	 * @param bool  $flip   Optional. Whether or not to flip the custom list.
-	 *                      Defaults to true.
-	 * @return array
-	 */
-	public static function merge_custom_array( $custom, $base = array(), $flip = true ) {
-		if ( true === $flip ) {
-			$base = array_filter( $base );
-		}
-
-		if ( empty( $custom ) || ! \is_array( $custom ) ) {
-			return $base;
-		}
-
-		if ( true === $flip ) {
-			$custom = array_fill_keys( $custom, false );
-		}
-
-		if ( empty( $base ) ) {
-			return $custom;
-		}
-
-		return array_merge( $base, $custom );
-	}
-
 	/**
 	 * Get the last pointer in a line.
 	 *
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index cac5b8c911..56ca4ef699 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\DB;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Flag Database direct queries.
@@ -275,7 +276,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customCacheGetFunctions !== $this->addedCustomFunctions['cacheget'] ) {
-			$this->cacheGetFunctions = $this->merge_custom_array(
+			$this->cacheGetFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customCacheGetFunctions,
 				$this->cacheGetFunctions
 			);
@@ -284,7 +285,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customCacheSetFunctions !== $this->addedCustomFunctions['cacheset'] ) {
-			$this->cacheSetFunctions = $this->merge_custom_array(
+			$this->cacheSetFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customCacheSetFunctions,
 				$this->cacheSetFunctions
 			);
@@ -293,7 +294,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customCacheDeleteFunctions !== $this->addedCustomFunctions['cachedelete'] ) {
-			$this->cacheDeleteFunctions = $this->merge_custom_array(
+			$this->cacheDeleteFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customCacheDeleteFunctions,
 				$this->cacheDeleteFunctions
 			);
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 1faf338b06..415a8579c3 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -20,6 +20,7 @@
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\WPHookHelper;
 
 /**
@@ -283,7 +284,7 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		$this->prefixes = $this->merge_custom_array( $this->prefixes, array(), false );
+		$this->prefixes = RulesetPropertyHelper::merge_custom_array( $this->prefixes, array(), false );
 		if ( empty( $this->prefixes ) ) {
 			// No prefixes passed, nothing to do.
 			return;
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 290684aaa0..1ca6552366 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -288,9 +289,9 @@ public static function isSnakeCase( $var_name ) {
 	protected function merge_allow_lists() {
 		if ( $this->allowed_custom_properties !== $this->addedCustomProperties['properties'] ) {
 			// Fix property potentially passed as comma-delimited string.
-			$customProperties = Sniff::merge_custom_array( $this->allowed_custom_properties, array(), false );
+			$customProperties = RulesetPropertyHelper::merge_custom_array( $this->allowed_custom_properties, array(), false );
 
-			$this->allowed_mixed_case_member_var_names = Sniff::merge_custom_array(
+			$this->allowed_mixed_case_member_var_names = RulesetPropertyHelper::merge_custom_array(
 				$customProperties,
 				$this->allowed_mixed_case_member_var_names
 			);
diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 251805ab7f..f3d892ecdb 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Discourage the use of the PHP error silencing operator.
@@ -183,7 +184,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		// Handle the user-defined custom function list.
-		$this->customAllowedFunctionsList = $this->merge_custom_array( $this->customAllowedFunctionsList, array(), false );
+		$this->customAllowedFunctionsList = RulesetPropertyHelper::merge_custom_array( $this->customAllowedFunctionsList, array(), false );
 		$this->customAllowedFunctionsList = array_map( 'strtolower', $this->customAllowedFunctionsList );
 
 		/*
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 7349367d83..6db0010f24 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -478,9 +479,9 @@ public function process_token( $stackPtr ) {
 	 */
 	protected function mergeFunctionLists() {
 		if ( $this->customEscapingFunctions !== $this->addedCustomFunctions['escape'] ) {
-			$customEscapeFunctions = $this->merge_custom_array( $this->customEscapingFunctions, array(), false );
+			$customEscapeFunctions = RulesetPropertyHelper::merge_custom_array( $this->customEscapingFunctions, array(), false );
 
-			$this->escapingFunctions = $this->merge_custom_array(
+			$this->escapingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$customEscapeFunctions,
 				$this->escapingFunctions
 			);
@@ -489,7 +490,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customAutoEscapedFunctions !== $this->addedCustomFunctions['autoescape'] ) {
-			$this->autoEscapedFunctions = $this->merge_custom_array(
+			$this->autoEscapedFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customAutoEscapedFunctions,
 				$this->autoEscapedFunctions
 			);
@@ -499,7 +500,7 @@ protected function mergeFunctionLists() {
 
 		if ( $this->customPrintingFunctions !== $this->addedCustomFunctions['print'] ) {
 
-			$this->printingFunctions = $this->merge_custom_array(
+			$this->printingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customPrintingFunctions,
 				$this->printingFunctions
 			);
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index a8ef856ecf..9c64040a2a 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -296,7 +297,7 @@ private function has_nonce_check( $stackPtr ) {
 	 */
 	protected function mergeFunctionLists() {
 		if ( $this->customNonceVerificationFunctions !== $this->addedCustomFunctions['nonce'] ) {
-			$this->nonceVerificationFunctions = $this->merge_custom_array(
+			$this->nonceVerificationFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customNonceVerificationFunctions,
 				$this->nonceVerificationFunctions
 			);
@@ -305,7 +306,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customSanitizingFunctions !== $this->addedCustomFunctions['sanitize'] ) {
-			$this->sanitizingFunctions = $this->merge_custom_array(
+			$this->sanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customSanitizingFunctions,
 				$this->sanitizingFunctions
 			);
@@ -314,7 +315,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customUnslashingSanitizingFunctions !== $this->addedCustomFunctions['unslashsanitize'] ) {
-			$this->unslashingSanitizingFunctions = $this->merge_custom_array(
+			$this->unslashingSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customUnslashingSanitizingFunctions,
 				$this->unslashingSanitizingFunctions
 			);
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 2f17cc2c1f..ed3fc5045a 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -212,7 +213,7 @@ function( $embed ) {
 	 */
 	protected function mergeFunctionLists() {
 		if ( $this->customSanitizingFunctions !== $this->addedCustomFunctions['sanitize'] ) {
-			$this->sanitizingFunctions = $this->merge_custom_array(
+			$this->sanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customSanitizingFunctions,
 				$this->sanitizingFunctions
 			);
@@ -221,7 +222,7 @@ protected function mergeFunctionLists() {
 		}
 
 		if ( $this->customUnslashingSanitizingFunctions !== $this->addedCustomFunctions['unslashsanitize'] ) {
-			$this->unslashingSanitizingFunctions = $this->merge_custom_array(
+			$this->unslashingSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customUnslashingSanitizingFunctions,
 				$this->unslashingSanitizingFunctions
 			);
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index 1f3ac16cac..bdf26f1dc4 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\Utils;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
  * Comprehensive I18n text domain fixer tool.
@@ -281,7 +282,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		if ( isset( $this->old_text_domain ) ) {
-			$this->old_text_domain = $this->merge_custom_array( $this->old_text_domain, array(), false );
+			$this->old_text_domain = RulesetPropertyHelper::merge_custom_array( $this->old_text_domain, array(), false );
 
 			if ( ! is_array( $this->old_text_domain )
 				|| array() === $this->old_text_domain
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 2ba8c514ab..c246c1cf91 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -15,6 +15,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
  * Check that capabilities are used correctly.
@@ -427,7 +428,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		// Check if additional capabilities were registered via the ruleset and if the found capability matches any of those.
-		$custom_capabilities = $this->merge_custom_array( $this->custom_capabilities, array() );
+		$custom_capabilities = RulesetPropertyHelper::merge_custom_array( $this->custom_capabilities, array() );
 		if ( isset( $custom_capabilities[ $matched_parameter ] ) ) {
 			return;
 		}
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index f745827620..f9b92e735c 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -15,6 +15,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use XMLReader;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
  * Makes sure WP internationalization functions are used properly.
@@ -202,7 +203,7 @@ public function process_token( $stack_ptr ) {
 			}
 		}
 
-		$this->text_domain = $this->merge_custom_array( $this->text_domain, array(), false );
+		$this->text_domain = RulesetPropertyHelper::merge_custom_array( $this->text_domain, array(), false );
 
 		if ( ! empty( $this->text_domain ) ) {
 			if ( \in_array( 'default', $this->text_domain, true ) ) {

From dd420c9044296adbc93aa37768c3cdc4135135af Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 12:46:03 +0200
Subject: [PATCH 293/822] Move "is WPDB method call" related utilities to
 dedicated `WPDBTrait`

The "WPDB method call" related utilities are only used by a small set of sniffs, so are better placed in a dedicated trait.

This moves the `is_wpdb_method_call()` method to a new `WordPressCS\WordPress\Helpers\WPDBTrait` and starts using that trait in the relevant sniffs.

The trait has been made stand-alone, i.e. it does not presume that a sniff implementing it extends the `WordPressCS\WordPress\Sniff` class.

Note: a refactor of this method removing the presumption about properties in child classes would still be a good idea.

Related to 1465
---
 WordPress/Helpers/WPDBTrait.php               | 117 ++++++++++++++++++
 WordPress/Sniff.php                           |  87 -------------
 .../DB/PreparedSQLPlaceholdersSniff.php       |   5 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php      |   7 +-
 4 files changed, 126 insertions(+), 90 deletions(-)
 create mode 100644 WordPress/Helpers/WPDBTrait.php

diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
new file mode 100644
index 0000000000..6653d58806
--- /dev/null
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Helper utilities for sniffs which examine WPDB method calls.
+ *
+ * {@internal The method in this trait was previously contained in the
+ * `WordPressCS\WordPress\Sniff` class and has been moved here.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0
+ */
+trait WPDBTrait {
+
+	/**
+	 * Checks whether this is a call to a $wpdb method that we want to sniff.
+	 *
+	 * If available in the class using this trait, the $methodPtr, $i and $end properties
+	 * are automatically set to correspond to the start and end of the method call.
+	 * The $i property is also set if this is not a method call but rather the
+	 * use of a $wpdb property.
+	 *
+	 * @since 0.8.0
+	 * @since 0.9.0  The return value is now always boolean. The $end and $i member
+	 *               vars are automatically updated.
+	 * @since 0.14.0 Moved this method from the `PreparedSQL` sniff to the base WP sniff.
+	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
+	 *               - The $phpcsFile parameter was added.
+	 *
+	 * {@internal This method should be refactored to not exhibit "magic" behaviour
+	 *            for properties in the sniff class(es) using it.}}
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile      The file being scanned.
+	 * @param int                         $stackPtr       The index of the $wpdb variable.
+	 * @param array                       $target_methods Array of methods. Key(s) should be method name.
+	 *
+	 * @return bool Whether this is a $wpdb method call.
+	 */
+	protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
+
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for wpdb.
+		if ( ( \T_VARIABLE === $tokens[ $stackPtr ]['code'] && '$wpdb' !== $tokens[ $stackPtr ]['content'] )
+			|| ( \T_STRING === $tokens[ $stackPtr ]['code'] && 'wpdb' !== $tokens[ $stackPtr ]['content'] )
+		) {
+			return false;
+		}
+
+		// Check that this is a method call.
+		$is_object_call = $phpcsFile->findNext(
+			array( \T_OBJECT_OPERATOR, \T_DOUBLE_COLON ),
+			( $stackPtr + 1 ),
+			null,
+			false,
+			null,
+			true
+		);
+		if ( false === $is_object_call ) {
+			return false;
+		}
+
+		$methodPtr = $phpcsFile->findNext( \T_WHITESPACE, ( $is_object_call + 1 ), null, true, null, true );
+		if ( false === $methodPtr ) {
+			return false;
+		}
+
+		if ( \T_STRING === $tokens[ $methodPtr ]['code'] && property_exists( $this, 'methodPtr' ) ) {
+			$this->methodPtr = $methodPtr;
+		}
+
+		// Find the opening parenthesis.
+		$opening_paren = $phpcsFile->findNext( \T_WHITESPACE, ( $methodPtr + 1 ), null, true, null, true );
+
+		if ( false === $opening_paren ) {
+			return false;
+		}
+
+		if ( property_exists( $this, 'i' ) ) {
+			$this->i = $opening_paren;
+		}
+
+		if ( \T_OPEN_PARENTHESIS !== $tokens[ $opening_paren ]['code']
+			|| ! isset( $tokens[ $opening_paren ]['parenthesis_closer'] )
+		) {
+			return false;
+		}
+
+		// Check that this is one of the methods that we are interested in.
+		if ( ! isset( $target_methods[ $tokens[ $methodPtr ]['content'] ] ) ) {
+			return false;
+		}
+
+		// Find the end of the first parameter.
+		$end = $phpcsFile->findEndOfStatement( $opening_paren + 1 );
+
+		if ( \T_COMMA !== $tokens[ $end ]['code'] ) {
+			++$end;
+		}
+
+		if ( property_exists( $this, 'end' ) ) {
+			$this->end = $end;
+		}
+
+		return true;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 6a79643ca0..67bfb7104f 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -1582,93 +1582,6 @@ protected function is_in_array_comparison( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Checks whether this is a call to a $wpdb method that we want to sniff.
-	 *
-	 * If available in the child class, the $methodPtr, $i and $end properties are
-	 * automatically set to correspond to the start and end of the method call.
-	 * The $i property is also set if this is not a method call but rather the
-	 * use of a $wpdb property.
-	 *
-	 * @since 0.8.0
-	 * @since 0.9.0  The return value is now always boolean. The $end and $i member
-	 *               vars are automatically updated.
-	 * @since 0.14.0 Moved this method from the `PreparedSQL` sniff to the base WP sniff.
-	 *
-	 * {@internal This method should probably be refactored.}}
-	 *
-	 * @param int   $stackPtr       The index of the $wpdb variable.
-	 * @param array $target_methods Array of methods. Key(s) should be method name.
-	 *
-	 * @return bool Whether this is a $wpdb method call.
-	 */
-	protected function is_wpdb_method_call( $stackPtr, $target_methods ) {
-
-		// Check for wpdb.
-		if ( ( \T_VARIABLE === $this->tokens[ $stackPtr ]['code'] && '$wpdb' !== $this->tokens[ $stackPtr ]['content'] )
-			|| ( \T_STRING === $this->tokens[ $stackPtr ]['code'] && 'wpdb' !== $this->tokens[ $stackPtr ]['content'] )
-		) {
-			return false;
-		}
-
-		// Check that this is a method call.
-		$is_object_call = $this->phpcsFile->findNext(
-			array( \T_OBJECT_OPERATOR, \T_DOUBLE_COLON ),
-			( $stackPtr + 1 ),
-			null,
-			false,
-			null,
-			true
-		);
-		if ( false === $is_object_call ) {
-			return false;
-		}
-
-		$methodPtr = $this->phpcsFile->findNext( \T_WHITESPACE, ( $is_object_call + 1 ), null, true, null, true );
-		if ( false === $methodPtr ) {
-			return false;
-		}
-
-		if ( \T_STRING === $this->tokens[ $methodPtr ]['code'] && property_exists( $this, 'methodPtr' ) ) {
-			$this->methodPtr = $methodPtr;
-		}
-
-		// Find the opening parenthesis.
-		$opening_paren = $this->phpcsFile->findNext( \T_WHITESPACE, ( $methodPtr + 1 ), null, true, null, true );
-
-		if ( false === $opening_paren ) {
-			return false;
-		}
-
-		if ( property_exists( $this, 'i' ) ) {
-			$this->i = $opening_paren;
-		}
-
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $opening_paren ]['code']
-			|| ! isset( $this->tokens[ $opening_paren ]['parenthesis_closer'] )
-		) {
-			return false;
-		}
-
-		// Check that this is one of the methods that we are interested in.
-		if ( ! isset( $target_methods[ $this->tokens[ $methodPtr ]['content'] ] ) ) {
-			return false;
-		}
-
-		// Find the end of the first parameter.
-		$end = $this->phpcsFile->findEndOfStatement( $opening_paren + 1 );
-
-		if ( \T_COMMA !== $this->tokens[ $end ]['code'] ) {
-			++$end;
-		}
-
-		if ( property_exists( $this, 'end' ) ) {
-			$this->end = $end;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Determine whether an arbitrary T_STRING token is the use of a global constant.
 	 *
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index f6ecdb18d3..18d116a2eb 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -43,6 +44,8 @@
  */
 class PreparedSQLPlaceholdersSniff extends Sniff {
 
+	use WPDBTrait;
+
 	/**
 	 * These regexes were originally copied from https://www.php.net/function.sprintf#93552
 	 * and adjusted for limitations in `$wpdb->prepare()`.
@@ -168,7 +171,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( ! $this->is_wpdb_method_call( $stackPtr, $this->target_methods ) ) {
+		if ( ! $this->is_wpdb_method_call( $this->phpcsFile, $stackPtr, $this->target_methods ) ) {
 			return;
 		}
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 5fa48a0be8..e9bd2b5578 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -28,6 +29,8 @@
  */
 class PreparedSQLSniff extends Sniff {
 
+	use WPDBTrait;
+
 	/**
 	 * The lists of $wpdb methods.
 	 *
@@ -124,7 +127,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( ! $this->is_wpdb_method_call( $stackPtr, $this->methods ) ) {
+		if ( ! $this->is_wpdb_method_call( $this->phpcsFile, $stackPtr, $this->methods ) ) {
 			return;
 		}
 
@@ -161,7 +164,7 @@ function ( $symbol ) {
 
 			if ( \T_VARIABLE === $this->tokens[ $this->i ]['code'] ) {
 				if ( '$wpdb' === $this->tokens[ $this->i ]['content'] ) {
-					$this->is_wpdb_method_call( $this->i, $this->methods );
+					$this->is_wpdb_method_call( $this->phpcsFile, $this->i, $this->methods );
 					continue;
 				}
 

From b7a7fd69ad3c3d6e77f5a1ebe480a35bbcad2943 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 13:04:52 +0200
Subject: [PATCH 294/822] WPDBTrait::is_wpdb_method_call(): use PHPCSUtils

---
 WordPress/Helpers/WPDBTrait.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 6653d58806..66c3669307 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Helpers;
 
 use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\BackCompat\BCFile;
 
 /**
  * Helper utilities for sniffs which examine WPDB method calls.
@@ -102,7 +103,7 @@ protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_meth
 		}
 
 		// Find the end of the first parameter.
-		$end = $phpcsFile->findEndOfStatement( $opening_paren + 1 );
+		$end = BCFile::findEndOfStatement( $phpcsFile, $opening_paren + 1 );
 
 		if ( \T_COMMA !== $tokens[ $end ]['code'] ) {
 			++$end;

From 8fc7d45b65b708184bfc0d905e911e7bb02e3086 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 11 Apr 2020 12:58:29 +0200
Subject: [PATCH 295/822] WPDBTrait::is_wpdb_method_call(): improve code-style
 independence and support PHP 8.0+ nullsafe object operators

The `WPDBTrait::is_wpdb_method_call()` did not properly ignore unexpected whitespace and/or comments.

As the check for object operators is now being switched to use the `Collections::objectOperators()` token collection, this automatically also adds support for the PHP 8.0 nullsafe object operator when used with `$wpdb`.

Includes unit test via the `PreparedSQL` sniff.
---
 WordPress/Helpers/WPDBTrait.php            | 19 ++++++++-----------
 WordPress/Tests/DB/PreparedSQLUnitTest.inc |  6 ++++++
 WordPress/Tests/DB/PreparedSQLUnitTest.php |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 66c3669307..3ef0f702f2 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -10,7 +10,9 @@
 namespace WordPressCS\WordPress\Helpers;
 
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\BCFile;
+use PHPCSUtils\Tokens\Collections;
 
 /**
  * Helper utilities for sniffs which examine WPDB method calls.
@@ -59,19 +61,14 @@ protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_meth
 		}
 
 		// Check that this is a method call.
-		$is_object_call = $phpcsFile->findNext(
-			array( \T_OBJECT_OPERATOR, \T_DOUBLE_COLON ),
-			( $stackPtr + 1 ),
-			null,
-			false,
-			null,
-			true
-		);
-		if ( false === $is_object_call ) {
+		$is_object_call = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		if ( false === $is_object_call
+			|| isset( Collections::objectOperators()[ $tokens[ $is_object_call ]['code'] ] ) === false
+		) {
 			return false;
 		}
 
-		$methodPtr = $phpcsFile->findNext( \T_WHITESPACE, ( $is_object_call + 1 ), null, true, null, true );
+		$methodPtr = $phpcsFile->findNext( Tokens::$emptyTokens, ( $is_object_call + 1 ), null, true, null, true );
 		if ( false === $methodPtr ) {
 			return false;
 		}
@@ -81,7 +78,7 @@ protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_meth
 		}
 
 		// Find the opening parenthesis.
-		$opening_paren = $phpcsFile->findNext( \T_WHITESPACE, ( $methodPtr + 1 ), null, true, null, true );
+		$opening_paren = $phpcsFile->findNext( Tokens::$emptyTokens, ( $methodPtr + 1 ), null, true, null, true );
 
 		if ( false === $opening_paren ) {
 			return false;
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index ef58abc469..701e4f6262 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -111,5 +111,11 @@ $wpdb->query( "SELECT * FROM ${wpdb->{${'a'}}} WHERE post_title LIKE '${title->{
 // More defensive variable checking
 $wpdb->query( "SELECT * FROM $wpdb" ); // Bad x 1, $wpdb on its own is not valid.
 
+$wpdb
+	-> /*comment*/ query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . $_GET['title'] . "';" ); // Bad.
+
+$wpdb?->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . (int) $foo . "';" ); // OK.
+$wpdb?->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 0e679f0efc..4a7a4fd50c 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -53,6 +53,8 @@ public function getErrorList() {
 			108 => 1,
 			109 => 1,
 			112 => 1,
+			115 => 1,
+			118 => 1,
 		);
 	}
 
@@ -66,5 +68,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }

From 50e97d48370df6f6d768d5f5b903367d4aef098d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 14 Jul 2020 02:09:56 +0200
Subject: [PATCH 296/822] WPDBTrait::is_wpdb_method_call(): bug fix - check
 names case-insensitively

In PHP class and function names are treated largely case-insensitively (for ascii names), so the method should compare names case-insensitively too.

Includes unit tests via the `PreparedSQL` sniff.
---
 WordPress/Helpers/WPDBTrait.php            | 7 ++++---
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 3 +++
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 3ef0f702f2..3fb1c64947 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -45,7 +45,8 @@ trait WPDBTrait {
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile      The file being scanned.
 	 * @param int                         $stackPtr       The index of the $wpdb variable.
-	 * @param array                       $target_methods Array of methods. Key(s) should be method name.
+	 * @param array                       $target_methods Array of methods. Key(s) should be method name
+	 *                                                    in lowercase.
 	 *
 	 * @return bool Whether this is a $wpdb method call.
 	 */
@@ -55,7 +56,7 @@ protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_meth
 
 		// Check for wpdb.
 		if ( ( \T_VARIABLE === $tokens[ $stackPtr ]['code'] && '$wpdb' !== $tokens[ $stackPtr ]['content'] )
-			|| ( \T_STRING === $tokens[ $stackPtr ]['code'] && 'wpdb' !== $tokens[ $stackPtr ]['content'] )
+			|| ( \T_STRING === $tokens[ $stackPtr ]['code'] && 'wpdb' !== strtolower( $tokens[ $stackPtr ]['content'] ) )
 		) {
 			return false;
 		}
@@ -95,7 +96,7 @@ protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_meth
 		}
 
 		// Check that this is one of the methods that we are interested in.
-		if ( ! isset( $target_methods[ $tokens[ $methodPtr ]['content'] ] ) ) {
+		if ( ! isset( $target_methods[ strtolower( $tokens[ $methodPtr ]['content'] ) ] ) ) {
 			return false;
 		}
 
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 701e4f6262..01a13f4ff3 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -117,5 +117,8 @@ $wpdb
 $wpdb?->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . (int) $foo . "';" ); // OK.
 $wpdb?->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
 
+WPDB::prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
+$wpdb->Query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 4a7a4fd50c..59ca42a768 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -55,6 +55,8 @@ public function getErrorList() {
 			112 => 1,
 			115 => 1,
 			118 => 1,
+			120 => 1,
+			121 => 1,
 		);
 	}
 

From 8dcd782692bf2caeda4007d6e4c218e84802b04f Mon Sep 17 00:00:00 2001
From: Sandesh <sandesh2643@gmail.com>
Date: Mon, 19 Dec 2022 11:43:57 +0530
Subject: [PATCH 297/822] Update
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php

Co-authored-by: Gary Jones <github@garyjones.io>
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 4e4141d02c..420c110564 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -137,7 +137,7 @@ public function getGroups() {
 
 			'rename' => array(
 				'type'      => 'warning',
-				'message'   => '%s() is discouraged. Use WP_Filesystem::move method to rename a file.',
+				'message'   => '%s() is discouraged. Use WP_Filesystem::move() to rename a file.',
 				'since'     => '2.5.0',
 				'functions' => array(
 					'rename',

From 5653e70fb71baa64b9101b99b2d1d0f5f5abee76 Mon Sep 17 00:00:00 2001
From: Sandesh <sandesh2643@gmail.com>
Date: Mon, 19 Dec 2022 11:44:12 +0530
Subject: [PATCH 298/822] Update
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php

Co-authored-by: Gary Jones <github@garyjones.io>
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 420c110564..c17053543e 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -146,7 +146,7 @@ public function getGroups() {
 
 			'file_system_operations' => array(
 				'type'      => 'warning',
-				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s()',
+				'message'   => 'File operations should use WP_Filesystem methods instead of direct PHP filesystem calls. Found: %s().',
 				'since'     => '2.5.0',
 				'functions' => array(
 					'chgrp',

From 10a814dbf6a18477fc802aeedcdde77cd0ff25d9 Mon Sep 17 00:00:00 2001
From: Sandesh <sandesh2643@gmail.com>
Date: Mon, 19 Dec 2022 11:44:40 +0530
Subject: [PATCH 299/822] Update
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc

Co-authored-by: Gary Jones <github@garyjones.io>
---
 .../Tests/WP/AlternativeFunctionsUnitTest.inc  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index d3a7b2a97a..77f16a3783 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -81,12 +81,12 @@ use function curl_init as curl_version; // Bad.
 
 unlink(); // Warning.
 rename(); // Warning.
-chgrp(); // Warning
-chmod(); // Warning
-chown(); // Warning
-is_writable(); // Warning
-is_writeable(); // Warning
-mkdir(); // Warning
-rmdir(); // Warning
-touch(); // Warning
-fputs(); // Warning
\ No newline at end of file
+chgrp(); // Warning.
+chmod(); // Warning.
+chown(); // Warning.
+is_writable(); // Warning.
+is_writeable(); // Warning.
+mkdir(); // Warning.
+rmdir(); // Warning.
+touch(); // Warning.
+fputs(); // Warning.

From b9a1f38bba8c980f71453cf8dae65c5ff4f9c02a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:54:30 +0100
Subject: [PATCH 300/822] DateTime/CurrentTimeTimestamp: add support for PHP
 8.0+ named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes additional unit tests.
---
 .../DateTime/CurrentTimeTimestampSniff.php    | 20 +++++++++++++------
 .../DateTime/CurrentTimeTimestampUnitTest.inc |  7 +++++++
 .../CurrentTimeTimestampUnitTest.inc.fixed    |  7 +++++++
 .../DateTime/CurrentTimeTimestampUnitTest.php |  3 ++-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 2a7d00f0eb..92e1876533 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\DateTime;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
  * Don't use current_time() to get a (timezone corrected) "timestamp".
@@ -74,7 +75,13 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		/*
 		 * Check whether the first parameter is a timestamp format.
 		 */
-		for ( $i = $parameters[1]['start']; $i <= $parameters[1]['end']; $i++ ) {
+		$type_param = PassedParameters::getParameterFromStack( $parameters, 1, 'type' );
+		if ( false === $type_param ) {
+			// Type parameter not found. Bow out.
+			return;
+		}
+
+		for ( $i = $type_param['start']; $i <= $type_param['end']; $i++ ) {
 			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
@@ -105,14 +112,15 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		/*
 		 * Check whether the second parameter, $gmt, is a set to `true` or `1`.
 		 */
-		if ( isset( $parameters[2] ) ) {
+		$gmt_param = PassedParameters::getParameterFromStack( $parameters, 2, 'gmt' );
+		if ( is_array( $gmt_param ) ) {
 			$content_second = '';
-			if ( 'true' === $parameters[2]['raw'] || '1' === $parameters[2]['raw'] ) {
-				$content_second = $parameters[2]['raw'];
+			if ( 'true' === $gmt_param['raw'] || '1' === $gmt_param['raw'] ) {
+				$content_second = $gmt_param['raw'];
 				$gmt_true       = true;
 			} else {
 				// Do a more extensive parameter check.
-				for ( $i = $parameters[2]['start']; $i <= $parameters[2]['end']; $i++ ) {
+				for ( $i = $gmt_param['start']; $i <= $gmt_param['end']; $i++ ) {
 					if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 						continue;
 					}
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc
index ac89fb1943..07634e769a 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc
@@ -23,3 +23,10 @@ current_time( 'timestamp', $gmt ); // Warning.
 current_time( 'timestamp', false ); // Warning.
 current_time( 'U', 0 ); // Warning.
 current_time( 'U' ); // Warning.
+
+// Safeguard support for PHP 8.0+ named parameters.
+current_time( gmt: false ); // OK. Well not really (missing required $type), but not our concern.
+current_time( gmt: true, type: 'mysql', ); // OK.
+current_time( type: 'Y-m-d' ); // OK.
+current_time( gmt: true, type: 'timestamp' ); // Error.
+current_time( gmt: 0, type : 'U' ); // Warning.
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc.fixed b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc.fixed
index 6980ae95f0..5b2fa7e28a 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc.fixed
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.inc.fixed
@@ -20,3 +20,10 @@ current_time( 'timestamp', $gmt ); // Warning.
 current_time( 'timestamp', false ); // Warning.
 current_time( 'U', 0 ); // Warning.
 current_time( 'U' ); // Warning.
+
+// Safeguard support for PHP 8.0+ named parameters.
+current_time( gmt: false ); // OK. Well not really (missing required $type), but not our concern.
+current_time( gmt: true, type: 'mysql', ); // OK.
+current_time( type: 'Y-m-d' ); // OK.
+time(); // Error.
+current_time( gmt: 0, type : 'U' ); // Warning.
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
index 9825c121ae..a029fba1f8 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
@@ -30,6 +30,7 @@ public function getErrorList() {
 			9  => 1,
 			11 => 1,
 			17 => 1,
+			31 => 1,
 		);
 	}
 
@@ -44,7 +45,7 @@ public function getWarningList() {
 			23 => 1,
 			24 => 1,
 			25 => 1,
+			32 => 1,
 		);
 	}
-
 }

From 2e6d19bd71018c2a61e6c136c7fac55f46d89c64 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:02:28 +0100
Subject: [PATCH 301/822] DateTime/CurrentTimeTimestamp: minor code
 simplification

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some additional logic which was in place to prevent false negatives when the parameter contained comments can be removed.

Safeguarded by pre-existing unit test on line 17-20.
---
 .../DateTime/CurrentTimeTimestampSniff.php    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 92e1876533..946a41872d 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -115,22 +115,9 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$gmt_param = PassedParameters::getParameterFromStack( $parameters, 2, 'gmt' );
 		if ( is_array( $gmt_param ) ) {
 			$content_second = '';
-			if ( 'true' === $gmt_param['raw'] || '1' === $gmt_param['raw'] ) {
-				$content_second = $gmt_param['raw'];
+			if ( 'true' === $gmt_param['clean'] || '1' === $gmt_param['clean'] ) {
+				$content_second = $gmt_param['clean'];
 				$gmt_true       = true;
-			} else {
-				// Do a more extensive parameter check.
-				for ( $i = $gmt_param['start']; $i <= $gmt_param['end']; $i++ ) {
-					if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
-						continue;
-					}
-
-					$content_second .= $this->tokens[ $i ]['content'];
-				}
-
-				if ( 'true' === $content_second || '1' === $content_second ) {
-					$gmt_true = true;
-				}
 			}
 		}
 
@@ -163,7 +150,6 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		if ( false !== $has_comment ) {
 			// If there are comments, we don't auto-fix as it would remove those comments.
 			$this->phpcsFile->addError( $error, $stackPtr, $error_code, array( $code_snippet ) );
-
 			return;
 		}
 
@@ -179,5 +165,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$this->phpcsFile->fixer->endChangeset();
 		}
 	}
-
 }

From a20363d864591505fceb7dc1430f77c8a03a50b4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:21:04 +0100
Subject: [PATCH 302/822] PHP/IniSet: add support for PHP 8.0+ named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Ref: https://www.php.net/manual/en/function.ini-set.php

Includes additional unit tests.
---
 WordPress/Sniffs/PHP/IniSetSniff.php   | 23 ++++++++++++++++-------
 WordPress/Tests/PHP/IniSetUnitTest.inc |  8 ++++++++
 WordPress/Tests/PHP/IniSetUnitTest.php |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 350b5ab4d4..53451bfe91 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
@@ -38,7 +39,7 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 */
 	protected $target_functions = array(
 		'ini_set'   => true,
-		'ini_alter' => true,
+		'ini_alter' => true, // Alias function name.
 	);
 
 	/**
@@ -142,8 +143,16 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$option_name  = TextStrings::stripQuotes( $parameters[1]['raw'] );
-		$option_value = TextStrings::stripQuotes( $parameters[2]['raw'] );
+		$option_param = PassedParameters::getParameterFromStack( $parameters, 1, 'option' );
+		$value_param  = PassedParameters::getParameterFromStack( $parameters, 2, 'value' );
+
+		if ( false === $option_param || false === $value_param ) {
+			// Missing required param. Not the concern of this sniff. Bow out.
+			return;
+		}
+
+		$option_name  = TextStrings::stripQuotes( $option_param['raw'] );
+		$option_value = TextStrings::stripQuotes( $value_param['raw'] );
 		if ( isset( $this->safe_options[ $option_name ] ) ) {
 			$safe_option = $this->safe_options[ $option_name ];
 			if ( ! isset( $safe_option['valid_values'] ) || in_array( strtolower( $option_value ), $safe_option['valid_values'], true ) ) {
@@ -160,8 +169,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 					MessageHelper::stringToErrorcode( $option_name . '_Disallowed' ),
 					array(
 						$matched_content,
-						$parameters[1]['raw'],
-						$parameters[2]['raw'],
+						$option_param['raw'],
+						$value_param['raw'],
 						$disallowed_option['message'],
 					)
 				);
@@ -175,8 +184,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			'Risky',
 			array(
 				$matched_content,
-				$parameters[1]['raw'],
-				$parameters[2]['raw'],
+				$option_param['raw'],
+				$value_param['raw'],
 			)
 		);
 	}
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.inc b/WordPress/Tests/PHP/IniSetUnitTest.inc
index b39d3e1a3b..55c9aaf022 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.inc
+++ b/WordPress/Tests/PHP/IniSetUnitTest.inc
@@ -41,3 +41,11 @@ ini_set($test, 1230); // Warning.
 ini_alter('auto_detect_line_endings', true); // Ok.
 ini_alter('display_errors', false); // Error.
 ini_alter('report_memleaks', 1230); // Warning.
+
+// Ignore missing required parameters.
+ini_set('short_open_tag', ); // Ok. Well not really, missing value param, but that's not the concern of this sniff.
+
+// Safeguard support for PHP 8.0+ named parameters.
+ini_set(new_value: 0, option: 'short_open_tag', ); // Ok. Well not really, unrecognized param name, but that's not the concern of this sniff.
+ini_set(value: 1, option: 'short_open_tag', ); // Ok.
+ini_set(value: 0, option: 'short_open_tag', ); // Error.
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index 11c1f75218..7b0188784b 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -47,6 +47,7 @@ public function getErrorList() {
 			33 => 1,
 			34 => 1,
 			42 => 1,
+			51 => 1,
 		);
 	}
 
@@ -64,5 +65,4 @@ public function getWarningList() {
 			43 => 1,
 		);
 	}
-
 }

From 00b32da1a58d94123fe05eb0502c429d01af254b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:29:35 +0100
Subject: [PATCH 303/822] PHP/IniSet: prevent some false positives

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some false positives/incorrect error message being thrown situations get prevented.

Includes unit tests demonstrating the issue and safeguarding the fix.

Includes ensuring that the information displayed in the error message will also no longer contain comments.
---
 WordPress/Sniffs/PHP/IniSetSniff.php   | 12 ++++++------
 WordPress/Tests/PHP/IniSetUnitTest.inc |  9 +++++++++
 WordPress/Tests/PHP/IniSetUnitTest.php |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 53451bfe91..6d23b9bf77 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -151,8 +151,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$option_name  = TextStrings::stripQuotes( $option_param['raw'] );
-		$option_value = TextStrings::stripQuotes( $value_param['raw'] );
+		$option_name  = TextStrings::stripQuotes( $option_param['clean'] );
+		$option_value = TextStrings::stripQuotes( $value_param['clean'] );
 		if ( isset( $this->safe_options[ $option_name ] ) ) {
 			$safe_option = $this->safe_options[ $option_name ];
 			if ( ! isset( $safe_option['valid_values'] ) || in_array( strtolower( $option_value ), $safe_option['valid_values'], true ) ) {
@@ -169,8 +169,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 					MessageHelper::stringToErrorcode( $option_name . '_Disallowed' ),
 					array(
 						$matched_content,
-						$option_param['raw'],
-						$value_param['raw'],
+						$option_param['clean'],
+						$value_param['clean'],
 						$disallowed_option['message'],
 					)
 				);
@@ -184,8 +184,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			'Risky',
 			array(
 				$matched_content,
-				$option_param['raw'],
-				$value_param['raw'],
+				$option_param['clean'],
+				$value_param['clean'],
 			)
 		);
 	}
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.inc b/WordPress/Tests/PHP/IniSetUnitTest.inc
index 55c9aaf022..c5ef7295d1 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.inc
+++ b/WordPress/Tests/PHP/IniSetUnitTest.inc
@@ -49,3 +49,12 @@ ini_set('short_open_tag', ); // Ok. Well not really, missing value param, but th
 ini_set(new_value: 0, option: 'short_open_tag', ); // Ok. Well not really, unrecognized param name, but that's not the concern of this sniff.
 ini_set(value: 1, option: 'short_open_tag', ); // Ok.
 ini_set(value: 0, option: 'short_open_tag', ); // Error.
+
+// Safeguard that comments in the parameters are ignored.
+ini_set('short_open_tag', /* allowed*/ 'on'); // Ok.
+ini_set(
+	// This affects all function calls to the BCMath extension.
+	'bcmath.scale',
+	// Set the number of decimals.
+	0
+); // Error.
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index 7b0188784b..7f546008ac 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -48,6 +48,7 @@ public function getErrorList() {
 			34 => 1,
 			42 => 1,
 			51 => 1,
+			55 => 1,
 		);
 	}
 

From 8dd87e8e7b50666021c8139a98826235efaad483 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:32:40 +0100
Subject: [PATCH 304/822] PHP/IniSet: minor code simplification

Check using `empty()` instead `! isset()` for efficiency as it will prevent a potentially unncessary call to `in_array()`.
---
 WordPress/Sniffs/PHP/IniSetSniff.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 6d23b9bf77..371f8300cb 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -155,14 +155,16 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$option_value = TextStrings::stripQuotes( $value_param['clean'] );
 		if ( isset( $this->safe_options[ $option_name ] ) ) {
 			$safe_option = $this->safe_options[ $option_name ];
-			if ( ! isset( $safe_option['valid_values'] ) || in_array( strtolower( $option_value ), $safe_option['valid_values'], true ) ) {
+			if ( empty( $safe_option['valid_values'] ) || in_array( strtolower( $option_value ), $safe_option['valid_values'], true ) ) {
 				return;
 			}
 		}
 
 		if ( isset( $this->disallowed_options[ $option_name ] ) ) {
 			$disallowed_option = $this->disallowed_options[ $option_name ];
-			if ( ! isset( $disallowed_option['invalid_values'] ) || in_array( strtolower( $option_value ), $disallowed_option['invalid_values'], true ) ) {
+			if ( empty( $disallowed_option['invalid_values'] )
+				|| in_array( strtolower( $option_value ), $disallowed_option['invalid_values'], true )
+			) {
 				$this->phpcsFile->addError(
 					'%s(%s, %s) found. %s',
 					$stackPtr,

From 0c1adee4b04534c955e8e22b41e710ed6a9279f0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:38:50 +0100
Subject: [PATCH 305/822] PHP/IniSet: minor message tweak for clarity

---
 WordPress/Sniffs/PHP/IniSetSniff.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 371f8300cb..4af33f1724 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -101,13 +101,13 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
 			'message' => 'Changing the option value can break other plugins. Use the filter flag constants when calling the Filter functions instead.',
 		),
 		'iconv.input_encoding' => array(
-			'message' => 'PHP < 5.6 only - use `iconv_set_encoding()` instead.',
+			'message' => 'This option is not supported since PHP 5.6 - use `iconv_set_encoding()` instead.',
 		),
 		'iconv.internal_encoding' => array(
-			'message' => 'PHP < 5.6 only - use `iconv_set_encoding()` instead.',
+			'message' => 'This option is not supported since PHP 5.6 - use `iconv_set_encoding()` instead.',
 		),
 		'iconv.output_encoding' => array(
-			'message' => 'PHP < 5.6 only - use `iconv_set_encoding()` instead.',
+			'message' => 'This option is not supported since PHP 5.6 - use `iconv_set_encoding()` instead.',
 		),
 		'ignore_user_abort' => array(
 			'message' => 'Use `ignore_user_abort()` instead.',
@@ -166,7 +166,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				|| in_array( strtolower( $option_value ), $disallowed_option['invalid_values'], true )
 			) {
 				$this->phpcsFile->addError(
-					'%s(%s, %s) found. %s',
+					'Found: %s(%s, %s). %s',
 					$stackPtr,
 					MessageHelper::stringToErrorcode( $option_name . '_Disallowed' ),
 					array(
@@ -181,7 +181,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		$this->phpcsFile->addWarning(
-			'%s(%s, %s) found. Changing configuration values at runtime is strongly discouraged.',
+			'Changing configuration values at runtime is strongly discouraged. Found: %s(%s, %s)',
 			$stackPtr,
 			'Risky',
 			array(

From be65171edcc502d194344d2d9b77d63d4208166d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 01:02:53 +0100
Subject: [PATCH 306/822] PHP/NoSilencedErrors: add extra test

... to cover a previously uncovered condition (and ensure that the configurable `$context_length` parameter is handled correctly).
---
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc | 4 ++++
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
index 5004405de2..f007d150bd 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.inc
@@ -80,3 +80,7 @@ $decoded = @hex2bin( $data );
 // phpcs:set WordPress.PHP.NoSilencedErrors customAllowedFunctionsList[]
 
 // phpcs:set WordPress.PHP.NoSilencedErrors usePHPFunctionsList true
+
+// phpcs:set WordPress.PHP.NoSilencedErrors context_length 0
+echo @some_userland_function( $param ); // Bad.
+// phpcs:set WordPress.PHP.NoSilencedErrors context_length 6
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
index 5bd5ddfc84..c187b22c18 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -60,7 +60,7 @@ public function getWarningList() {
 			68 => 1,
 			71 => 1,
 			78 => 1,
+			85 => 1,
 		);
 	}
-
 }

From 2fee334325c479ddd166651928d5bffbe1ec8ed0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 01:02:53 +0100
Subject: [PATCH 307/822] PHP/NoSilencedErrors: implement PHPCSUtils methods

As the methods from `GetTokensAsString` work slightly differently from the PHPCS native `File::getTokensAsString()` method, this would result in a "one token longer" code snippet. The `-1` in the function call in line 225 has been added to prevent this change in behaviour without the need for people to update the `context_length` property value in their custom ruleset (which would be an unnecessary BC-break).

Functionally, using the `GetTokensAsString::compact()` method will result in the code snippet in the error message being "cleaner" as those will no longer contain comments found in the code. The PHPCSUtils method will also "compact" the whitespace, so no need for the `str_replace()` call anymore.

No additional tests added, the existing tests (line 58) already cover this.

Note: it is still the intention for a similar sniff to become available via PHPCSExtra, but that will be in a later release.
---
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index f3d892ecdb..c2fe61bb26 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -10,6 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\BCFile;
+use PHPCSUtils\Utils\GetTokensAsString;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -216,13 +218,12 @@ public function process_token( $stackPtr ) {
 		}
 
 		// Prepare the "Found" string to display.
-		$end_of_statement = $this->phpcsFile->findEndOfStatement( $stackPtr, \T_COMMA );
+		$end_of_statement = BCFile::findEndOfStatement( $this->phpcsFile, $stackPtr, \T_COMMA );
 		if ( ( $end_of_statement - $stackPtr ) < $context_length ) {
 			$context_length = ( $end_of_statement - $stackPtr );
 		}
-		$found = $this->phpcsFile->getTokensAsString( $stackPtr, $context_length );
-		$found = str_replace( array( "\t", "\n", "\r" ), ' ', $found ) . '...';
 
+		$found     = GetTokensAsString::compact( $this->phpcsFile, $stackPtr, ( $stackPtr + $context_length - 1 ), true ) . '...';
 		$error_msg = 'Silencing errors is strongly discouraged. Use proper error checking instead.';
 		$data      = array();
 		if ( $this->context_length > 0 ) {
@@ -243,5 +244,4 @@ public function process_token( $stackPtr ) {
 			$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', $found );
 		}
 	}
-
 }

From 4fa665e3c9ff84c27922836ae0bec1fd77a9d160 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:30:14 +0100
Subject: [PATCH 308/822] PHP/StrictInArray: prevent some false positives

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some false positives get prevented.

Includes unit tests demonstrating the issue and safeguarding the fix.
---
 WordPress/Sniffs/PHP/StrictInArraySniff.php   | 4 ++--
 WordPress/Tests/PHP/StrictInArrayUnitTest.inc | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 1ab7866f29..3d647a2b5c 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -101,14 +101,14 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		$found_parameter = PassedParameters::getParameterFromStack( $parameters, $param_info['param_position'], $param_info['param_name'] );
-		if ( false === $found_parameter || 'true' !== strtolower( $found_parameter['raw'] ) ) {
+		if ( false === $found_parameter || 'true' !== strtolower( $found_parameter['clean'] ) ) {
 			$errorcode = 'MissingTrueStrict';
 
 			/*
 			 * Use a different error code when `false` is found to allow for excluding
 			 * the warning as this will be a conscious choice made by the dev.
 			 */
-			if ( is_array( $found_parameter ) && 'false' === strtolower( $found_parameter['raw'] ) ) {
+			if ( is_array( $found_parameter ) && 'false' === strtolower( $found_parameter['clean'] ) ) {
 				$errorcode = 'FoundNonStrictFalse';
 			}
 
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.inc b/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
index 492914e647..fd1e194225 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.inc
@@ -47,3 +47,11 @@ array_keys( array: $testing ); // Ok.
 array_keys( strict: false, array: $testing ); // Ok, will cause fatal error, but that's not the concern of this sniff.
 array_keys( $testing, filter_value: 'my_key' ); // Warning.
 array_keys( $testing, strict: false, filter_value: 'my_key' ); // Warning.
+
+// Safeguard that comments in the parameter are ignored.
+in_array( 1, array( '1', 1 ), /* strict */ TRUE ); // Ok.
+array_search(
+	'needle',
+	$haystack,
+	true // Use strict typing.
+); // Ok.

From 38152a4d7c6e7a6568b07305f5bfdf74fe38e659 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 01:08:13 +0100
Subject: [PATCH 309/822] Move "global variable" related utilities to dedicated
 `WPGlobalVariablesHelper`

The "global variable" related utilities are only used by a small number of sniffs, so are better placed in a dedicated class.

This commit moves the `$wp_globals` property to a new `WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper` and starts using that class in the relevant sniffs.

Note:
* The property is now `private` (and `static`).
    This protects the property against inadvertent changes.
* Access to the property can be obtained via the new `WPGlobalVariablesHelper::get_names()` method.
* Alternatively, the new `WPGlobalVariablesHelper::is_wp_global()` method can be used to check is a given variable name is the name of a WP global variable.

Related to 1465
---
 WordPress/Helpers/WPGlobalVariablesHelper.php | 313 ++++++++++++++++++
 WordPress/Sniff.php                           | 257 --------------
 .../PrefixAllGlobalsSniff.php                 |   3 +-
 .../WP/GlobalVariablesOverrideSniff.php       |   7 +-
 4 files changed, 319 insertions(+), 261 deletions(-)
 create mode 100644 WordPress/Helpers/WPGlobalVariablesHelper.php

diff --git a/WordPress/Helpers/WPGlobalVariablesHelper.php b/WordPress/Helpers/WPGlobalVariablesHelper.php
new file mode 100644
index 0000000000..23565de1eb
--- /dev/null
+++ b/WordPress/Helpers/WPGlobalVariablesHelper.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper utilities for recognizing WP global variables.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class WPGlobalVariablesHelper {
+
+	/**
+	 * List of global WP variables.
+	 *
+	 * @since 0.3.0
+	 * @since 0.11.0 Changed visibility from public to protected.
+	 * @since 0.12.0 Renamed from `$globals` to `$wp_globals` to be more descriptive.
+	 * @since 0.12.0 Moved to the `Sniff` class from the WordPress.Variables.GlobalVariables sniff.
+	 * @since 3.0.0  - Moved from the Sniff class to this class.
+	 *               - The property visibility has changed from `protected` to `private static`.
+	 *                 Use the `get_names()` method for access or use the `is_wp_global()` method
+	 *                 to check if a name is on the list.
+	 *
+	 * @var array<string, bool> The key is the name of a WP global variable, the value is irrelevant.
+	 */
+	private static $wp_globals = array(
+		'_links_add_base'                  => true,
+		'_links_add_target'                => true,
+		'_menu_item_sort_prop'             => true,
+		'_nav_menu_placeholder'            => true,
+		'_new_bundled_files'               => true,
+		'_old_files'                       => true,
+		'_parent_pages'                    => true,
+		'_registered_pages'                => true,
+		'_updated_user_settings'           => true,
+		'_wp_additional_image_sizes'       => true,
+		'_wp_admin_css_colors'             => true,
+		'_wp_default_headers'              => true,
+		'_wp_deprecated_widgets_callbacks' => true,
+		'_wp_last_object_menu'             => true,
+		'_wp_last_utility_menu'            => true,
+		'_wp_menu_nopriv'                  => true,
+		'_wp_nav_menu_max_depth'           => true,
+		'_wp_post_type_features'           => true,
+		'_wp_real_parent_file'             => true,
+		'_wp_registered_nav_menus'         => true,
+		'_wp_sidebars_widgets'             => true,
+		'_wp_submenu_nopriv'               => true,
+		'_wp_suspend_cache_invalidation'   => true,
+		'_wp_theme_features'               => true,
+		'_wp_using_ext_object_cache'       => true,
+		'action'                           => true,
+		'active_signup'                    => true,
+		'admin_body_class'                 => true,
+		'admin_page_hooks'                 => true,
+		'all_links'                        => true,
+		'allowedentitynames'               => true,
+		'allowedposttags'                  => true,
+		'allowedtags'                      => true,
+		'auth_secure_cookie'               => true,
+		'authordata'                       => true,
+		'avail_post_mime_types'            => true,
+		'avail_post_stati'                 => true,
+		'blog_id'                          => true,
+		'blog_title'                       => true,
+		'blogname'                         => true,
+		'cat'                              => true,
+		'cat_id'                           => true,
+		'charset_collate'                  => true,
+		'comment'                          => true,
+		'comment_alt'                      => true,
+		'comment_depth'                    => true,
+		'comment_status'                   => true,
+		'comment_thread_alt'               => true,
+		'comment_type'                     => true,
+		'comments'                         => true,
+		'compress_css'                     => true,
+		'compress_scripts'                 => true,
+		'concatenate_scripts'              => true,
+		'content_width'                    => true,
+		'current_blog'                     => true,
+		'current_screen'                   => true,
+		'current_site'                     => true,
+		'current_user'                     => true,
+		'currentcat'                       => true,
+		'currentday'                       => true,
+		'currentmonth'                     => true,
+		'custom_background'                => true,
+		'custom_image_header'              => true,
+		'default_menu_order'               => true,
+		'descriptions'                     => true,
+		'domain'                           => true,
+		'editor_styles'                    => true,
+		'error'                            => true,
+		'errors'                           => true,
+		'EZSQL_ERROR'                      => true,
+		'feeds'                            => true,
+		'GETID3_ERRORARRAY'                => true,
+		'hook_suffix'                      => true,
+		'HTTP_RAW_POST_DATA'               => true,
+		'id'                               => true,
+		'in_comment_loop'                  => true,
+		'interim_login'                    => true,
+		'is_apache'                        => true,
+		'is_chrome'                        => true,
+		'is_gecko'                         => true,
+		'is_IE'                            => true,
+		'is_IIS'                           => true,
+		'is_iis7'                          => true,
+		'is_macIE'                         => true,
+		'is_NS4'                           => true,
+		'is_opera'                         => true,
+		'is_safari'                        => true,
+		'is_winIE'                         => true,
+		'l10n'                             => true,
+		'link'                             => true,
+		'link_id'                          => true,
+		'locale'                           => true,
+		'locked_post_status'               => true,
+		'lost'                             => true,
+		'm'                                => true,
+		'map'                              => true,
+		'menu'                             => true,
+		'menu_order'                       => true,
+		'merged_filters'                   => true,
+		'mode'                             => true,
+		'monthnum'                         => true,
+		'more'                             => true,
+		'mu_plugin'                        => true,
+		'multipage'                        => true,
+		'names'                            => true,
+		'nav_menu_selected_id'             => true,
+		'network_plugin'                   => true,
+		'new_whitelist_options'            => true,
+		'numpages'                         => true,
+		'one_theme_location_no_menus'      => true,
+		'opml'                             => true,
+		'order'                            => true,
+		'orderby'                          => true,
+		'overridden_cpage'                 => true,
+		'page'                             => true,
+		'paged'                            => true,
+		'pagenow'                          => true,
+		'pages'                            => true,
+		'parent_file'                      => true,
+		'pass_allowed_html'                => true,
+		'pass_allowed_protocols'           => true,
+		'path'                             => true,
+		'per_page'                         => true,
+		'PHP_SELF'                         => true,
+		'phpmailer'                        => true,
+		'plugin_page'                      => true,
+		'plugin'                           => true,
+		'plugins'                          => true,
+		'post'                             => true,
+		'post_default_category'            => true,
+		'post_default_title'               => true,
+		'post_ID'                          => true,
+		'post_id'                          => true,
+		'post_mime_types'                  => true,
+		'post_type'                        => true,
+		'post_type_object'                 => true,
+		'posts'                            => true,
+		'preview'                          => true,
+		'previouscat'                      => true,
+		'previousday'                      => true,
+		'previousweekday'                  => true,
+		'redir_tab'                        => true,
+		'required_mysql_version'           => true,
+		'required_php_version'             => true,
+		'rnd_value'                        => true,
+		'role'                             => true,
+		's'                                => true,
+		'search'                           => true,
+		'self'                             => true,
+		'shortcode_tags'                   => true,
+		'show_admin_bar'                   => true,
+		'sidebars_widgets'                 => true,
+		'status'                           => true,
+		'submenu'                          => true,
+		'submenu_file'                     => true,
+		'super_admins'                     => true,
+		'tab'                              => true,
+		'table_prefix'                     => true,
+		'tabs'                             => true,
+		'tag'                              => true,
+		'tag_ID'                           => true,
+		'targets'                          => true,
+		'tax'                              => true,
+		'taxnow'                           => true,
+		'taxonomy'                         => true,
+		'term'                             => true,
+		'text_direction'                   => true,
+		'theme_field_defaults'             => true,
+		'themes_allowedtags'               => true,
+		'timeend'                          => true,
+		'timestart'                        => true,
+		'tinymce_version'                  => true,
+		'title'                            => true,
+		'totals'                           => true,
+		'type'                             => true,
+		'typenow'                          => true,
+		'updated_timestamp'                => true,
+		'upgrading'                        => true,
+		'urls'                             => true,
+		'user_email'                       => true,
+		'user_ID'                          => true,
+		'user_identity'                    => true,
+		'user_level'                       => true,
+		'user_login'                       => true,
+		'user_url'                         => true,
+		'userdata'                         => true,
+		'usersearch'                       => true,
+		'whitelist_options'                => true,
+		'withcomments'                     => true,
+		'wp'                               => true,
+		'wp_actions'                       => true,
+		'wp_admin_bar'                     => true,
+		'wp_cockneyreplace'                => true,
+		'wp_current_db_version'            => true,
+		'wp_current_filter'                => true,
+		'wp_customize'                     => true,
+		'wp_dashboard_control_callbacks'   => true,
+		'wp_db_version'                    => true,
+		'wp_did_header'                    => true,
+		'wp_embed'                         => true,
+		'wp_file_descriptions'             => true,
+		'wp_filesystem'                    => true,
+		'wp_filter'                        => true,
+		'wp_hasher'                        => true,
+		'wp_header_to_desc'                => true,
+		'wp_importers'                     => true,
+		'wp_json'                          => true,
+		'wp_list_table'                    => true,
+		'wp_local_package'                 => true,
+		'wp_locale'                        => true,
+		'wp_meta_boxes'                    => true,
+		'wp_object_cache'                  => true,
+		'wp_plugin_paths'                  => true,
+		'wp_post_statuses'                 => true,
+		'wp_post_types'                    => true,
+		'wp_queries'                       => true,
+		'wp_query'                         => true,
+		'wp_registered_sidebars'           => true,
+		'wp_registered_widget_controls'    => true,
+		'wp_registered_widget_updates'     => true,
+		'wp_registered_widgets'            => true,
+		'wp_rewrite'                       => true,
+		'wp_rich_edit'                     => true,
+		'wp_rich_edit_exists'              => true,
+		'wp_roles'                         => true,
+		'wp_scripts'                       => true,
+		'wp_settings_errors'               => true,
+		'wp_settings_fields'               => true,
+		'wp_settings_sections'             => true,
+		'wp_smiliessearch'                 => true,
+		'wp_styles'                        => true,
+		'wp_taxonomies'                    => true,
+		'wp_the_query'                     => true,
+		'wp_theme_directories'             => true,
+		'wp_themes'                        => true,
+		'wp_user_roles'                    => true,
+		'wp_version'                       => true,
+		'wp_widget_factory'                => true,
+		'wp_xmlrpc_server'                 => true,
+		'wpcommentsjavascript'             => true,
+		'wpcommentspopupfile'              => true,
+		'wpdb'                             => true,
+		'wpsmiliestrans'                   => true,
+		'year'                             => true,
+	);
+
+	/**
+	 * Retrieve a list with the names of global WP variables.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array<string, bool> Array with the variables names as keys. The value is irrelevant.
+	 */
+	public static function get_names() {
+		return self::$wp_globals;
+	}
+
+	/**
+	 * Verify if a given variable name is the name of a WP global variable.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $name The full variable name with or without leading dollar sign.
+	 *                     This allows for passing an array key variable name, such as
+	 *                     `'_GET'` retrieved from `$GLOBALS['_GET']`.
+	 *                     > Note: when passing an array key, string quotes are expected
+	 *                     to have been stripped already.
+	 *
+	 * @return bool
+	 */
+	public static function is_wp_global( $name ) {
+		if ( strpos( $name, '$' ) === 0 ) {
+			$name = substr( $name, 1 );
+		}
+
+		return isset( self::$wp_globals[ $name ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 94bd4e26f5..481bcd2b9e 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -408,263 +408,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'count' => true,
 	);
 
-	/**
-	 * List of global WP variables.
-	 *
-	 * @since 0.3.0
-	 * @since 0.11.0 Changed visibility from public to protected.
-	 * @since 0.12.0 Renamed from `$globals` to `$wp_globals` to be more descriptive.
-	 * @since 0.12.0 Moved here from the WordPress.Variables.GlobalVariables sniff.
-	 *
-	 * @var array
-	 */
-	protected $wp_globals = array(
-		'_links_add_base'                  => true,
-		'_links_add_target'                => true,
-		'_menu_item_sort_prop'             => true,
-		'_nav_menu_placeholder'            => true,
-		'_new_bundled_files'               => true,
-		'_old_files'                       => true,
-		'_parent_pages'                    => true,
-		'_registered_pages'                => true,
-		'_updated_user_settings'           => true,
-		'_wp_additional_image_sizes'       => true,
-		'_wp_admin_css_colors'             => true,
-		'_wp_default_headers'              => true,
-		'_wp_deprecated_widgets_callbacks' => true,
-		'_wp_last_object_menu'             => true,
-		'_wp_last_utility_menu'            => true,
-		'_wp_menu_nopriv'                  => true,
-		'_wp_nav_menu_max_depth'           => true,
-		'_wp_post_type_features'           => true,
-		'_wp_real_parent_file'             => true,
-		'_wp_registered_nav_menus'         => true,
-		'_wp_sidebars_widgets'             => true,
-		'_wp_submenu_nopriv'               => true,
-		'_wp_suspend_cache_invalidation'   => true,
-		'_wp_theme_features'               => true,
-		'_wp_using_ext_object_cache'       => true,
-		'action'                           => true,
-		'active_signup'                    => true,
-		'admin_body_class'                 => true,
-		'admin_page_hooks'                 => true,
-		'all_links'                        => true,
-		'allowedentitynames'               => true,
-		'allowedposttags'                  => true,
-		'allowedtags'                      => true,
-		'auth_secure_cookie'               => true,
-		'authordata'                       => true,
-		'avail_post_mime_types'            => true,
-		'avail_post_stati'                 => true,
-		'blog_id'                          => true,
-		'blog_title'                       => true,
-		'blogname'                         => true,
-		'cat'                              => true,
-		'cat_id'                           => true,
-		'charset_collate'                  => true,
-		'comment'                          => true,
-		'comment_alt'                      => true,
-		'comment_depth'                    => true,
-		'comment_status'                   => true,
-		'comment_thread_alt'               => true,
-		'comment_type'                     => true,
-		'comments'                         => true,
-		'compress_css'                     => true,
-		'compress_scripts'                 => true,
-		'concatenate_scripts'              => true,
-		'content_width'                    => true,
-		'current_blog'                     => true,
-		'current_screen'                   => true,
-		'current_site'                     => true,
-		'current_user'                     => true,
-		'currentcat'                       => true,
-		'currentday'                       => true,
-		'currentmonth'                     => true,
-		'custom_background'                => true,
-		'custom_image_header'              => true,
-		'default_menu_order'               => true,
-		'descriptions'                     => true,
-		'domain'                           => true,
-		'editor_styles'                    => true,
-		'error'                            => true,
-		'errors'                           => true,
-		'EZSQL_ERROR'                      => true,
-		'feeds'                            => true,
-		'GETID3_ERRORARRAY'                => true,
-		'hook_suffix'                      => true,
-		'HTTP_RAW_POST_DATA'               => true,
-		'id'                               => true,
-		'in_comment_loop'                  => true,
-		'interim_login'                    => true,
-		'is_apache'                        => true,
-		'is_chrome'                        => true,
-		'is_gecko'                         => true,
-		'is_IE'                            => true,
-		'is_IIS'                           => true,
-		'is_iis7'                          => true,
-		'is_macIE'                         => true,
-		'is_NS4'                           => true,
-		'is_opera'                         => true,
-		'is_safari'                        => true,
-		'is_winIE'                         => true,
-		'l10n'                             => true,
-		'link'                             => true,
-		'link_id'                          => true,
-		'locale'                           => true,
-		'locked_post_status'               => true,
-		'lost'                             => true,
-		'm'                                => true,
-		'map'                              => true,
-		'menu'                             => true,
-		'menu_order'                       => true,
-		'merged_filters'                   => true,
-		'mode'                             => true,
-		'monthnum'                         => true,
-		'more'                             => true,
-		'mu_plugin'                        => true,
-		'multipage'                        => true,
-		'names'                            => true,
-		'nav_menu_selected_id'             => true,
-		'network_plugin'                   => true,
-		'new_whitelist_options'            => true,
-		'numpages'                         => true,
-		'one_theme_location_no_menus'      => true,
-		'opml'                             => true,
-		'order'                            => true,
-		'orderby'                          => true,
-		'overridden_cpage'                 => true,
-		'page'                             => true,
-		'paged'                            => true,
-		'pagenow'                          => true,
-		'pages'                            => true,
-		'parent_file'                      => true,
-		'pass_allowed_html'                => true,
-		'pass_allowed_protocols'           => true,
-		'path'                             => true,
-		'per_page'                         => true,
-		'PHP_SELF'                         => true,
-		'phpmailer'                        => true,
-		'plugin_page'                      => true,
-		'plugin'                           => true,
-		'plugins'                          => true,
-		'post'                             => true,
-		'post_default_category'            => true,
-		'post_default_title'               => true,
-		'post_ID'                          => true,
-		'post_id'                          => true,
-		'post_mime_types'                  => true,
-		'post_type'                        => true,
-		'post_type_object'                 => true,
-		'posts'                            => true,
-		'preview'                          => true,
-		'previouscat'                      => true,
-		'previousday'                      => true,
-		'previousweekday'                  => true,
-		'redir_tab'                        => true,
-		'required_mysql_version'           => true,
-		'required_php_version'             => true,
-		'rnd_value'                        => true,
-		'role'                             => true,
-		's'                                => true,
-		'search'                           => true,
-		'self'                             => true,
-		'shortcode_tags'                   => true,
-		'show_admin_bar'                   => true,
-		'sidebars_widgets'                 => true,
-		'status'                           => true,
-		'submenu'                          => true,
-		'submenu_file'                     => true,
-		'super_admins'                     => true,
-		'tab'                              => true,
-		'table_prefix'                     => true,
-		'tabs'                             => true,
-		'tag'                              => true,
-		'tag_ID'                           => true,
-		'targets'                          => true,
-		'tax'                              => true,
-		'taxnow'                           => true,
-		'taxonomy'                         => true,
-		'term'                             => true,
-		'text_direction'                   => true,
-		'theme_field_defaults'             => true,
-		'themes_allowedtags'               => true,
-		'timeend'                          => true,
-		'timestart'                        => true,
-		'tinymce_version'                  => true,
-		'title'                            => true,
-		'totals'                           => true,
-		'type'                             => true,
-		'typenow'                          => true,
-		'updated_timestamp'                => true,
-		'upgrading'                        => true,
-		'urls'                             => true,
-		'user_email'                       => true,
-		'user_ID'                          => true,
-		'user_identity'                    => true,
-		'user_level'                       => true,
-		'user_login'                       => true,
-		'user_url'                         => true,
-		'userdata'                         => true,
-		'usersearch'                       => true,
-		'whitelist_options'                => true,
-		'withcomments'                     => true,
-		'wp'                               => true,
-		'wp_actions'                       => true,
-		'wp_admin_bar'                     => true,
-		'wp_cockneyreplace'                => true,
-		'wp_current_db_version'            => true,
-		'wp_current_filter'                => true,
-		'wp_customize'                     => true,
-		'wp_dashboard_control_callbacks'   => true,
-		'wp_db_version'                    => true,
-		'wp_did_header'                    => true,
-		'wp_embed'                         => true,
-		'wp_file_descriptions'             => true,
-		'wp_filesystem'                    => true,
-		'wp_filter'                        => true,
-		'wp_hasher'                        => true,
-		'wp_header_to_desc'                => true,
-		'wp_importers'                     => true,
-		'wp_json'                          => true,
-		'wp_list_table'                    => true,
-		'wp_local_package'                 => true,
-		'wp_locale'                        => true,
-		'wp_meta_boxes'                    => true,
-		'wp_object_cache'                  => true,
-		'wp_plugin_paths'                  => true,
-		'wp_post_statuses'                 => true,
-		'wp_post_types'                    => true,
-		'wp_queries'                       => true,
-		'wp_query'                         => true,
-		'wp_registered_sidebars'           => true,
-		'wp_registered_widget_controls'    => true,
-		'wp_registered_widget_updates'     => true,
-		'wp_registered_widgets'            => true,
-		'wp_rewrite'                       => true,
-		'wp_rich_edit'                     => true,
-		'wp_rich_edit_exists'              => true,
-		'wp_roles'                         => true,
-		'wp_scripts'                       => true,
-		'wp_settings_errors'               => true,
-		'wp_settings_fields'               => true,
-		'wp_settings_sections'             => true,
-		'wp_smiliessearch'                 => true,
-		'wp_styles'                        => true,
-		'wp_taxonomies'                    => true,
-		'wp_the_query'                     => true,
-		'wp_theme_directories'             => true,
-		'wp_themes'                        => true,
-		'wp_user_roles'                    => true,
-		'wp_version'                       => true,
-		'wp_widget_factory'                => true,
-		'wp_xmlrpc_server'                 => true,
-		'wpcommentsjavascript'             => true,
-		'wpcommentspopupfile'              => true,
-		'wpdb'                             => true,
-		'wpsmiliestrans'                   => true,
-		'year'                             => true,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 415a8579c3..6ab0ba71fa 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -21,6 +21,7 @@
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
 use WordPressCS\WordPress\Helpers\WPHookHelper;
 
 /**
@@ -941,7 +942,7 @@ private function is_prefixed( $stackPtr, $name ) {
 	 */
 	private function variable_prefixed_or_allowed( $stackPtr, $name ) {
 		// Ignore superglobals and WP global variables.
-		if ( isset( $this->superglobals[ $name ] ) || isset( $this->wp_globals[ $name ] ) ) {
+		if ( isset( $this->superglobals[ $name ] ) || WPGlobalVariablesHelper::is_wp_global( $name ) ) {
 			return true;
 		}
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 4ab6b47754..4da35f33cd 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -16,6 +16,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
+use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -55,7 +56,7 @@ class GlobalVariablesOverrideSniff extends Sniff {
 	public $treat_files_as_scoped = false;
 
 	/**
-	 * Allow select variables from the Sniff::$wp_globals array to be overwritten.
+	 * Allow select variables from the WPGlobalVariablesHelper::$wp_globals array to be overwritten.
 	 *
 	 * A few select variables in WP Core are _intended_ to be overwritten
 	 * by themes/plugins. This sniff should not throw an error for those.
@@ -250,7 +251,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		/*
 		 * Is this one of the WP global variables ?
 		 */
-		if ( isset( $this->wp_globals[ $var_name ] ) === false ) {
+		if ( WPGlobalVariablesHelper::is_wp_global( $var_name ) === false ) {
 			return;
 		}
 
@@ -325,7 +326,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 
 			if ( \T_VARIABLE === $var['code'] ) {
 				$var_name = substr( $var['content'], 1 );
-				if ( isset( $this->wp_globals[ $var_name ] )
+				if ( WPGlobalVariablesHelper::is_wp_global( $var_name )
 					&& isset( $this->override_allowed[ $var_name ] ) === false
 				) {
 					$search[] = $var['content'];

From adc37a5a905e7877f421d07b88df6068b6fecc8f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 11:48:52 +0100
Subject: [PATCH 310/822] Move "is assignment" related utility to dedicated
 `VariableHelper`

The "is assignment" related utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

As this method also expects a `T_VARIABLE` token as input, the `VariableHelper` class seems appropriate.

This commit moves the `is_assignment()` method to the new `WordPressCS\WordPress\Helpers\VariableHelper` and starts using that class in the relevant sniffs.

Related to 1465
---
 WordPress/Helpers/VariableHelper.php          | 56 ++++++++++++++++++
 WordPress/Sniff.php                           | 57 -------------------
 .../PrefixAllGlobalsSniff.php                 |  3 +-
 .../Security/NonceVerificationSniff.php       |  2 +-
 .../Security/ValidatedSanitizedInputSniff.php |  2 +-
 .../WP/GlobalVariablesOverrideSniff.php       |  4 +-
 6 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index a1a5e46362..d1a47b8950 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -179,4 +179,60 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 
 		return false;
 	}
+
+	/**
+	 * Check if this variable is being assigned a value.
+	 *
+	 * E.g., $var = 'foo';
+	 *
+	 * Also handles array assignments to arbitrary depth:
+	 *
+	 * $array['key'][ $foo ][ something() ] = $bar;
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility is now `public` (was `protected`) and the method `static`.
+	 *              - The $phpcsFile parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *                                               This must point to either a T_VARIABLE or
+	 *                                               T_CLOSE_SQUARE_BRACKET token.
+	 *
+	 * @return bool Whether the token is a variable being assigned a value.
+	 */
+	public static function is_assignment( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+
+		static $valid = array(
+			\T_VARIABLE             => true,
+			\T_CLOSE_SQUARE_BRACKET => true,
+		);
+
+		// Must be a variable, constant or closing square bracket (see below).
+		if ( ! isset( $valid[ $tokens[ $stackPtr ]['code'] ] ) ) {
+			return false;
+		}
+
+		$next_non_empty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
+
+		// No token found.
+		if ( false === $next_non_empty ) {
+			return false;
+		}
+
+		// If the next token is an assignment, that's all we need to know.
+		if ( isset( Tokens::$assignmentTokens[ $tokens[ $next_non_empty ]['code'] ] ) ) {
+			return true;
+		}
+
+		// Check if this is an array assignment, e.g., `$var['key'] = 'val';` .
+		if ( \T_OPEN_SQUARE_BRACKET === $tokens[ $next_non_empty ]['code']
+			&& isset( $tokens[ $next_non_empty ]['bracket_closer'] )
+		) {
+			return self::is_assignment( $phpcsFile, $tokens[ $next_non_empty ]['bracket_closer'] );
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 481bcd2b9e..97d6a62eb2 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -532,63 +532,6 @@ protected function get_last_ptr_on_line( $stackPtr ) {
 		return ( $nextPtr - 1 );
 	}
 
-	/**
-	 * Check if this variable is being assigned a value.
-	 *
-	 * E.g., $var = 'foo';
-	 *
-	 * Also handles array assignments to arbitrary depth:
-	 *
-	 * $array['key'][ $foo ][ something() ] = $bar;
-	 *
-	 * @since 0.5.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack. This must point to
-	 *                      either a T_VARIABLE or T_CLOSE_SQUARE_BRACKET token.
-	 *
-	 * @return bool Whether the token is a variable being assigned a value.
-	 */
-	protected function is_assignment( $stackPtr ) {
-
-		static $valid = array(
-			\T_VARIABLE             => true,
-			\T_CLOSE_SQUARE_BRACKET => true,
-		);
-
-		// Must be a variable, constant or closing square bracket (see below).
-		if ( ! isset( $valid[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
-			return false;
-		}
-
-		$next_non_empty = $this->phpcsFile->findNext(
-			Tokens::$emptyTokens,
-			( $stackPtr + 1 ),
-			null,
-			true,
-			null,
-			true
-		);
-
-		// No token found.
-		if ( false === $next_non_empty ) {
-			return false;
-		}
-
-		// If the next token is an assignment, that's all we need to know.
-		if ( isset( Tokens::$assignmentTokens[ $this->tokens[ $next_non_empty ]['code'] ] ) ) {
-			return true;
-		}
-
-		// Check if this is an array assignment, e.g., `$var['key'] = 'val';` .
-		if ( \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_non_empty ]['code']
-			&& isset( $this->tokens[ $next_non_empty ]['bracket_closer'] )
-		) {
-			return $this->is_assignment( $this->tokens[ $next_non_empty ]['bracket_closer'] );
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if a token is inside of an isset(), empty() or array_key_exists() statement.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 6ab0ba71fa..1972ece24d 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -21,6 +21,7 @@
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
 use WordPressCS\WordPress\Helpers\WPHookHelper;
 
@@ -628,7 +629,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 * we need a separate check for that.
 		 */
 		if ( false === $in_list
-			&& false === $this->is_assignment( $stackPtr )
+			&& false === VariableHelper::is_assignment( $this->phpcsFile, $stackPtr )
 			&& Context::inForeachCondition( $this->phpcsFile, $stackPtr ) !== 'afterAs'
 		) {
 			return;
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 9c64040a2a..ed8d1fc6a5 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -130,7 +130,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->is_assignment( $stackPtr ) ) {
+		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index ed3fc5045a..8067714a43 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -120,7 +120,7 @@ function( $embed ) {
 		}
 
 		// If we're overriding a superglobal with an assignment, no need to test.
-		if ( $this->is_assignment( $stackPtr ) ) {
+		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 4da35f33cd..7381b7d8a3 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -266,7 +266,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 * Check if the variable value is being changed.
 		 */
 		if ( false === $in_list
-			&& false === $this->is_assignment( $stackPtr )
+			&& false === VariableHelper::is_assignment( $this->phpcsFile, $stackPtr )
 			&& Context::inForeachCondition( $this->phpcsFile, $stackPtr ) !== 'afterAs'
 		) {
 			return;
@@ -414,7 +414,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				continue;
 			}
 
-			if ( true === $this->is_assignment( $ptr ) ) {
+			if ( true === VariableHelper::is_assignment( $this->phpcsFile, $ptr ) ) {
 				$this->add_error( $ptr );
 				continue;
 			}

From a4d1c176d1c7a41e90b57c4ff9abab28fb2ad869 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 13:16:51 +0100
Subject: [PATCH 311/822] NamingConventions/ValidHookName: various minor code
 and comment tweaks

---
 WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index d72d64651b..365fb2ab4e 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -104,14 +104,14 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		for ( $i = $parameters[1]['start']; $i <= $parameters[1]['end']; $i++ ) {
 			// Skip past comment tokens.
-			if ( isset( Tokens::$commentTokens[ $this->tokens[ $i ]['code'] ] ) !== false ) {
+			if ( isset( Tokens::$commentTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 
 			$content[ $i ]  = $this->tokens[ $i ]['content'];
 			$expected[ $i ] = $this->tokens[ $i ]['content'];
 
-			// Skip past potential variable array access: $var['Key'].
+			// Skip past potential variable array access: `$var['key']`.
 			if ( \T_VARIABLE === $this->tokens[ $i ]['code'] ) {
 				do {
 					$open_bracket = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
@@ -119,6 +119,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 						|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ]['code']
 						|| ! isset( $this->tokens[ $open_bracket ]['bracket_closer'] )
 					) {
+						$last_non_empty = $i;
 						continue 2;
 					}
 
@@ -140,7 +141,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				continue;
 			}
 
-			// Skip past non-string tokens.
+			// Skip past non text string tokens.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) === false ) {
 				$last_non_empty = $i;
 				continue;
@@ -197,6 +198,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$error = 'Hook names should be lowercase. Expected: %s, but found: %s.';
 			$this->phpcsFile->addError( $error, $first_non_empty, 'NotLowercase', $data );
 		}
+
 		if ( $underscores > 0 ) {
 			$error = 'Words in hook names should be separated using underscores. Expected: %s, but found: %s.';
 			$this->phpcsFile->addWarning( $error, $first_non_empty, 'UseUnderscores', $data );

From 356a57b3c366158c38547920d83e97dc126867c5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:16:03 +0100
Subject: [PATCH 312/822] 
 NamingConventions/ValidHookName::transform_complex_string(): simplify with
 PHPCSUtils
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify the `transform_complex_string()` method by using the PHPCSUtils utilities to split a text string containing interpolated variables or expressions, instead of using custom logic to do this in the sniff.

Functionally this has no impact. The "old" code already handled complex expressions correctly.
Performance-wise, this could (should) have a small, positive impact as PHPCSUtils caches the results of the splitting of the text string and using the Utils functions allows for simplifying the logic in the function itself, which is called three times for each double quoted teẋt string.

Includes a few extra tests with some more complex variables/expressions.
---
 .../NamingConventions/ValidHookNameSniff.php  | 44 +++----------------
 .../ValidHookNameUnitTest.1.inc               |  5 +++
 .../ValidHookNameUnitTest.php                 |  4 +-
 3 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index 365fb2ab4e..7bf45f172e 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -257,46 +257,16 @@ protected function transform( $text_string, $regex, $transform_type = 'full' ) {
 	 * @return string
 	 */
 	protected function transform_complex_string( $text_string, $regex, $transform_type = 'full' ) {
-		$output = preg_split( '`([\{\}\$\[\] ])`', $text_string, -1, \PREG_SPLIT_DELIM_CAPTURE );
-
-		$is_variable = false;
-		$has_braces  = false;
-		$braces      = 0;
-
-		foreach ( $output as $i => $part ) {
-			if ( \in_array( $part, array( '$', '{' ), true ) ) {
-				$is_variable = true;
-				if ( '{' === $part ) {
-					$has_braces = true;
-					++$braces;
-				}
-				continue;
-			}
+		$plain_text = TextStrings::stripEmbeds( $text_string );
+		$embeds     = TextStrings::getEmbeds( $text_string );
 
-			if ( true === $is_variable ) {
-				if ( '[' === $part ) {
-					$has_braces = true;
-					++$braces;
-				}
-				if ( \in_array( $part, array( '}', ']' ), true ) ) {
-					--$braces;
-				}
-				if ( false === $has_braces && ' ' === $part ) {
-					$is_variable  = false;
-					$output[ $i ] = $this->transform( $part, $regex, $transform_type );
-				}
-
-				if ( ( true === $has_braces && 0 === $braces ) && false === \in_array( $output[ ( $i + 1 ) ], array( '{', '[' ), true ) ) {
-					$has_braces  = false;
-					$is_variable = false;
-				}
-				continue;
-			}
+		$transformed_text = $this->transform( $plain_text, $regex, $transform_type );
 
-			$output[ $i ] = $this->transform( $part, $regex, $transform_type );
+		// Inject the embeds back into the text string.
+		foreach ( $embeds as $offset => $embed ) {
+			$transformed_text = substr_replace( $transformed_text, $embed, $offset, 0 );
 		}
 
-		return implode( '', $output );
+		return $transformed_text;
 	}
-
 }
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
index 2c03bfe5fa..900b9accdf 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
@@ -108,3 +108,8 @@ $value = apply_filters(
 	$value,
 	$attributes
 );
+
+// Test handling of more complex embedded variables and expressions.
+do_action( "admin_head_${Foo->{$Baz}}_action_$Post->ID" ); // OK.
+do_action( "admin_Head_${Foo?->{$Baz}}_Action_{$Post?->ID}_Bla" ); // Error - use lowercase.
+do_action( "admin_Head_${Foo->{"${'A'}"}}-Action_$Post[A]_Bla" ); // Error - use lowercase + warning about dash.
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index b01a626282..f6bb5b30fb 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -70,6 +70,8 @@ public function getErrorList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 					81  => 1,
 					89  => 1,
 					107 => 1,
+					114 => 1,
+					115 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':
@@ -99,6 +101,7 @@ public function getWarningList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 					77  => 1,
 					95  => 1,
 					107 => 1,
+					115 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':
@@ -114,5 +117,4 @@ public function getWarningList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 				return array();
 		}
 	}
-
 }

From 21b1d95106b24aa992837aa30c7d688cc710db19 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:23:11 +0100
Subject: [PATCH 313/822] NamingConventions/ValidHookName: bug fix - disregard
 variable function calls

Iterates on previously pulled PR 2056.

As function calls via closure callbacks are getting more common, probably a good idea to make the sniff ignore parameters passed to variable function calls as well.

Includes a test which would previously result in false positives from the sniff.
---
 WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php     | 3 ++-
 WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index 7bf45f172e..91bb343419 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -133,7 +133,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			// Skip over parameters passed to function calls.
 			if ( \T_OPEN_PARENTHESIS === $this->tokens[ $i ]['code']
-				&& \T_STRING === $this->tokens[ $last_non_empty ]['code']
+				&& ( \T_STRING === $this->tokens[ $last_non_empty ]['code']
+				|| \T_VARIABLE === $this->tokens[ $last_non_empty ]['code'] )
 				&& isset( $this->tokens[ $i ]['parenthesis_closer'] )
 			) {
 				$i              = $this->tokens[ $i ]['parenthesis_closer'];
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
index 900b9accdf..e8a47016fd 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
@@ -113,3 +113,6 @@ $value = apply_filters(
 do_action( "admin_head_${Foo->{$Baz}}_action_$Post->ID" ); // OK.
 do_action( "admin_Head_${Foo?->{$Baz}}_Action_{$Post?->ID}_Bla" ); // Error - use lowercase.
 do_action( "admin_Head_${Foo->{"${'A'}"}}-Action_$Post[A]_Bla" ); // Error - use lowercase + warning about dash.
+
+// Safeguard that variable function calls are handled correctly.
+do_action( 'admin_head_' .  $fn( 'UPPERCASE', 'wrong-delimiter' ) . '_action' ); // Ok.

From ae4c26d2abbbe529bdd7d7f0875409dbc7db9b9f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:40:20 +0100
Subject: [PATCH 314/822] NamingConventions/ValidHookName: add support for PHP
 8.0+ named parameters

1. Adjusted the way the correct parameter is retrieved to use the new `WPHookHelper::get_hook_name_param()` method, which uses the PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method under the hood.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes additional unit tests.

Note: function calls with named arguments are not supported for the `do_action()` or `apply_filters()` functions as those have a parameter with a spread operator (but that's irrelevant for the sniff).
---
 .../Sniffs/NamingConventions/ValidHookNameSniff.php | 13 +++++++++----
 .../NamingConventions/ValidHookNameUnitTest.1.inc   |  5 +++++
 .../NamingConventions/ValidHookNameUnitTest.php     |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index 91bb343419..eeacc5fca9 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -94,6 +94,11 @@ public function getGroups() {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 
+		$hook_name_param = WPHookHelper::get_hook_name_param( $matched_content, $parameters );
+		if ( false === $hook_name_param ) {
+			return;
+		}
+
 		$regex = $this->prepare_regex();
 
 		$case_errors    = 0;
@@ -102,7 +107,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$expected       = array();
 		$last_non_empty = null;
 
-		for ( $i = $parameters[1]['start']; $i <= $parameters[1]['end']; $i++ ) {
+		for ( $i = $hook_name_param['start']; $i <= $hook_name_param['end']; $i++ ) {
 			// Skip past comment tokens.
 			if ( isset( Tokens::$commentTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
@@ -125,7 +130,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 					$i = $this->tokens[ $open_bracket ]['bracket_closer'];
 
-				} while ( isset( $this->tokens[ $i ] ) && $i <= $parameters[1]['end'] );
+				} while ( isset( $this->tokens[ $i ] ) && $i <= $hook_name_param['end'] );
 
 				$last_non_empty = $i;
 				continue;
@@ -185,8 +190,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 		$first_non_empty = $this->phpcsFile->findNext(
 			Tokens::$emptyTokens,
-			$parameters[1]['start'],
-			( $parameters[1]['end'] + 1 ),
+			$hook_name_param['start'],
+			( $hook_name_param['end'] + 1 ),
 			true
 		);
 
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
index e8a47016fd..830c3552d6 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.1.inc
@@ -116,3 +116,8 @@ do_action( "admin_Head_${Foo->{"${'A'}"}}-Action_$Post[A]_Bla" ); // Error - use
 
 // Safeguard that variable function calls are handled correctly.
 do_action( 'admin_head_' .  $fn( 'UPPERCASE', 'wrong-delimiter' ) . '_action' ); // Ok.
+
+// Safeguard support for PHP 8.0+ named parameters.
+do_action_ref_array( hook: 'My-Hook', args: $args ); // OK. Well, not really, but using the wrong parameter name, so not our concern.
+do_action_ref_array( args: $args, hook_name: 'my_hook', ); // OK.
+do_action_ref_array( args: $args, hook_name: 'My-Hook', ); // Error - use lowercase + warning about dash.
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index f6bb5b30fb..a327263ff1 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -72,6 +72,7 @@ public function getErrorList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 					107 => 1,
 					114 => 1,
 					115 => 1,
+					123 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':
@@ -102,6 +103,7 @@ public function getWarningList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 					95  => 1,
 					107 => 1,
 					115 => 1,
+					123 => 1,
 				);
 
 			case 'ValidHookNameUnitTest.2.inc':

From 3b82e898ad9af8c35bcf69c881d4f060c47b34b9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 13 Dec 2022 23:57:13 +0100
Subject: [PATCH 315/822] NamingConventions/ValidPostTypeSlug: minor error
 message tweak

Always put quotes around the found value, even when the value was in a heredoc/nowdoc (which doesn't natively have quotes).
---
 .../NamingConventions/ValidPostTypeSlugSniff.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 28234dc4f4..8b9c976344 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -151,13 +151,13 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		$data = array(
-			$this->tokens[ $string_pos ]['content'],
+			$post_type,
 		);
 
 		// Warn for dynamic parts in the slug parameter.
 		if ( 'T_DOUBLE_QUOTED_STRING' === $this->tokens[ $string_pos ]['type'] || ( 'T_HEREDOC' === $this->tokens[ $string_pos ]['type'] && strpos( $this->tokens[ $string_pos ]['content'], '$' ) !== false ) ) {
 			$this->phpcsFile->addWarning(
-				'The post type slug may, or may not, get too long with dynamic contents and could contain invalid characters. Found: %s.',
+				'The post type slug may, or may not, get too long with dynamic contents and could contain invalid characters. Found: "%s".',
 				$string_pos,
 				'PartiallyDynamic',
 				$data
@@ -168,7 +168,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		if ( preg_match( self::VALID_POST_TYPE_CHARACTERS, $post_type ) === 0 ) {
 			// Error for invalid characters.
 			$this->phpcsFile->addError(
-				'register_post_type() called with invalid post type %s. Post type contains invalid characters. Only lowercase alphanumeric characters, dashes, and underscores are allowed.',
+				'register_post_type() called with invalid post type "%s". Post type contains invalid characters. Only lowercase alphanumeric characters, dashes, and underscores are allowed.',
 				$string_pos,
 				'InvalidCharacters',
 				$data
@@ -178,7 +178,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		if ( isset( $this->reserved_names[ $post_type ] ) ) {
 			// Error for using reserved slug names.
 			$this->phpcsFile->addError(
-				'register_post_type() called with reserved post type %s. Reserved post types should not be used as they interfere with the functioning of WordPress itself.',
+				'register_post_type() called with reserved post type "%s". Reserved post types should not be used as they interfere with the functioning of WordPress itself.',
 				$string_pos,
 				'Reserved',
 				$data
@@ -186,7 +186,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		} elseif ( stripos( $post_type, 'wp_' ) === 0 ) {
 			// Error for using reserved slug prefix.
 			$this->phpcsFile->addError(
-				'The post type passed to register_post_type() uses a prefix reserved for WordPress itself. Found: %s.',
+				'The post type passed to register_post_type() uses a prefix reserved for WordPress itself. Found: "%s".',
 				$string_pos,
 				'ReservedPrefix',
 				$data
@@ -196,12 +196,12 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		// Error for slugs that are too long.
 		if ( strlen( $post_type ) > self::POST_TYPE_MAX_LENGTH ) {
 			$this->phpcsFile->addError(
-				'A post type slug must not exceed %d characters. Found: %s (%d characters).',
+				'A post type slug must not exceed %d characters. Found: "%s" (%d characters).',
 				$string_pos,
 				'TooLong',
 				array(
 					self::POST_TYPE_MAX_LENGTH,
-					$this->tokens[ $string_pos ]['content'],
+					$post_type,
 					strlen( $post_type ),
 				)
 			);

From 1335ee18984b0f0ce1a94d149a00c070fcaf085f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 13 Dec 2022 23:57:35 +0100
Subject: [PATCH 316/822] NamingConventions/ValidPostTypeSlug: minor code
 readability tweak

---
 .../Sniffs/NamingConventions/ValidPostTypeSlugSniff.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 8b9c976344..47cd2cf2ac 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -155,7 +155,10 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		);
 
 		// Warn for dynamic parts in the slug parameter.
-		if ( 'T_DOUBLE_QUOTED_STRING' === $this->tokens[ $string_pos ]['type'] || ( 'T_HEREDOC' === $this->tokens[ $string_pos ]['type'] && strpos( $this->tokens[ $string_pos ]['content'], '$' ) !== false ) ) {
+		if ( 'T_DOUBLE_QUOTED_STRING' === $this->tokens[ $string_pos ]['type']
+			|| ( 'T_HEREDOC' === $this->tokens[ $string_pos ]['type']
+			&& strpos( $this->tokens[ $string_pos ]['content'], '$' ) !== false )
+		) {
 			$this->phpcsFile->addWarning(
 				'The post type slug may, or may not, get too long with dynamic contents and could contain invalid characters. Found: "%s".',
 				$string_pos,

From 51b7849e80fabea6498c4a35f49ee10ff7bbdcb1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 13 Dec 2022 23:59:11 +0100
Subject: [PATCH 317/822] NamingConventions/ValidPostTypeSlug: add support for
 PHP 7.3+ flexible heredoc/nowdocs

Includes tests to safeguard these are handled correctly.

Note: the tests are in a separate file for maintainability as any code which would be placed _after_ the flexible heredoc/nowdoc would not be tokenized correctly on PHP < 7.3, making the tests maintainer error prone if the tests were in the same file.
---
 .../ValidPostTypeSlugSniff.php                | 10 +-
 ...st.inc => ValidPostTypeSlugUnitTest.1.inc} |  0
 .../ValidPostTypeSlugUnitTest.2.inc           | 19 ++++
 .../ValidPostTypeSlugUnitTest.php             | 96 +++++++++++++------
 4 files changed, 93 insertions(+), 32 deletions(-)
 rename WordPress/Tests/NamingConventions/{ValidPostTypeSlugUnitTest.inc => ValidPostTypeSlugUnitTest.1.inc} (100%)
 create mode 100644 WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.2.inc

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 47cd2cf2ac..7919769e2b 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
@@ -121,8 +122,9 @@ public function register() {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
+		$string_start = $this->phpcsFile->findNext( Collections::textStringStartTokens(), $parameters[1]['start'], ( $parameters[1]['end'] + 1 ) );
+		$string_pos   = $this->phpcsFile->findNext( Tokens::$textStringTokens, $parameters[1]['start'], ( $parameters[1]['end'] + 1 ) );
 
-		$string_pos         = $this->phpcsFile->findNext( Tokens::$textStringTokens, $parameters[1]['start'], ( $parameters[1]['end'] + 1 ) );
 		$has_invalid_tokens = $this->phpcsFile->findNext( $this->valid_tokens, $parameters[1]['start'], ( $parameters[1]['end'] + 1 ), true );
 		if ( false !== $has_invalid_tokens || false === $string_pos ) {
 			// Check for non string based slug parameter (we cannot determine if this is valid).
@@ -138,7 +140,11 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$post_type = TextStrings::stripQuotes( $this->tokens[ $string_pos ]['content'] );
+		$post_type = TextStrings::getCompleteTextString( $this->phpcsFile, $string_start );
+		if ( isset( Tokens::$heredocTokens[ $this->tokens[ $string_start ]['code'] ] ) ) {
+			// Trim off potential indentation from PHP 7.3 flexible heredoc/nowdoc content.
+			$post_type = ltrim( $post_type );
+		}
 
 		if ( strlen( $post_type ) === 0 ) {
 			// Error for using empty slug.
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.inc
rename to WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.2.inc b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.2.inc
new file mode 100644
index 0000000000..50cde0b68a
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.2.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Tests with PHP 7.3+ flexible heredoc/nowdoc.
+ */
+register_post_type( <<<EOD
+    my_{$custom}_type
+    EOD
+); // 1x Warning, post type may or may not get too long with dynamic contents in the id.
+
+register_post_type( <<<'EOD'
+		my_own_post_type
+	EOD
+); // OK.
+
+register_post_type( <<<'EOD'
+		my*own+post&type
+	EOD
+); // Bad. Invalid chars: "/".
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index e24c12ea59..de293821e1 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -35,44 +35,80 @@ public function setCliValues( $filename, $config ) {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
-		return array(
-			5  => 1,
-			6  => 1,
-			7  => 1,
-			8  => 1,
-			20 => 1,
-			36 => 1,
-			37 => 1,
-			39 => 1,
-			49 => 1,
-			50 => 2,
-			52 => 1,
-		);
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'ValidPostTypeSlugUnitTest.1.inc':
+				return array(
+					5  => 1,
+					6  => 1,
+					7  => 1,
+					8  => 1,
+					20 => 1,
+					36 => 1,
+					37 => 1,
+					39 => 1,
+					49 => 1,
+					50 => 2,
+					52 => 1,
+				);
+
+			case 'ValidPostTypeSlugUnitTest.2.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
+
+				return array(
+					17 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of warnings>
 	 */
-	public function getWarningList() {
-		return array(
-			24 => 1,
-			27 => 1,
-			28 => 1,
-			29 => 1,
-			30 => 1,
-			31 => 1,
-			33 => 1,
-			34 => 1,
-			40 => 1,
-			45 => 1,
-			49 => 1,
-			55 => 1,
-			56 => 1,
-		);
+	public function getWarningList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'ValidPostTypeSlugUnitTest.1.inc':
+				return array(
+					24 => 1,
+					27 => 1,
+					28 => 1,
+					29 => 1,
+					30 => 1,
+					31 => 1,
+					33 => 1,
+					34 => 1,
+					40 => 1,
+					45 => 1,
+					49 => 1,
+					55 => 1,
+					56 => 1,
+				);
+
+			case 'ValidPostTypeSlugUnitTest.2.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
+
+				return array(
+					7 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 }

From 5fe4cf2df760c31438a47c54a8f3450926f2e1cc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 00:10:14 +0100
Subject: [PATCH 318/822] NamingConventions/ValidPostTypeSlug: add support for
 PHP 8.0+ named parameters

1. Adjusted the way the correct parameter is retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter name used is in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes moving the `Empty` error up as the sniff contained a presumption of a correct function call passing the required parameter, while that presumption may be incorrect.

Includes additional unit tests.
---
 .../ValidPostTypeSlugSniff.php                | 30 ++++++++++---------
 .../ValidPostTypeSlugUnitTest.1.inc           |  8 +++++
 .../ValidPostTypeSlugUnitTest.php             |  4 ++-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 7919769e2b..5cde5a0724 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
@@ -122,10 +123,21 @@ public function register() {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$string_start = $this->phpcsFile->findNext( Collections::textStringStartTokens(), $parameters[1]['start'], ( $parameters[1]['end'] + 1 ) );
-		$string_pos   = $this->phpcsFile->findNext( Tokens::$textStringTokens, $parameters[1]['start'], ( $parameters[1]['end'] + 1 ) );
+		$post_type_param = PassedParameters::getParameterFromStack( $parameters, 1, 'post_type' );
+		if ( false === $post_type_param || '' === $post_type_param['clean'] ) {
+			// Error for using empty slug.
+			$this->phpcsFile->addError(
+				'register_post_type() called without a post type slug. The slug must be a non-empty string.',
+				false === $post_type_param ? $stackPtr : $post_type_param['start'],
+				'Empty'
+			);
+			return;
+		}
+
+		$string_start = $this->phpcsFile->findNext( Collections::textStringStartTokens(), $post_type_param['start'], ( $post_type_param['end'] + 1 ) );
+		$string_pos   = $this->phpcsFile->findNext( Tokens::$textStringTokens, $post_type_param['start'], ( $post_type_param['end'] + 1 ) );
 
-		$has_invalid_tokens = $this->phpcsFile->findNext( $this->valid_tokens, $parameters[1]['start'], ( $parameters[1]['end'] + 1 ), true );
+		$has_invalid_tokens = $this->phpcsFile->findNext( $this->valid_tokens, $post_type_param['start'], ( $post_type_param['end'] + 1 ), true );
 		if ( false !== $has_invalid_tokens || false === $string_pos ) {
 			// Check for non string based slug parameter (we cannot determine if this is valid).
 			$this->phpcsFile->addWarning(
@@ -133,7 +145,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$stackPtr,
 				'NotStringLiteral',
 				array(
-					$parameters[1]['raw'],
+					$post_type_param['raw'],
 				),
 				3
 			);
@@ -146,16 +158,6 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$post_type = ltrim( $post_type );
 		}
 
-		if ( strlen( $post_type ) === 0 ) {
-			// Error for using empty slug.
-			$this->phpcsFile->addError(
-				'register_post_type() called without a post type slug. The slug must be a non-empty string.',
-				$parameters[1]['start'],
-				'Empty'
-			);
-			return;
-		}
-
 		$data = array(
 			$post_type,
 		);
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
index d110c3cfbc..3854430a8a 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
@@ -54,3 +54,11 @@ register_post_type( 'wp_block', array() ); // Bad. Must only error on reserved k
 // Test handling of more complex embedded variables and expressions.
 register_post_type("testing123-${(foo)}-test");
 register_post_type("testing123-${foo["${bar['baz']}"]}-test");
+
+// Test ignoring invalid function calls/live coding.
+register_post_type(); // OK, ignore, presume live coding.
+
+// Safeguard support for PHP 8.0+ named parameters.
+register_post_type( args: array() ); // Bad. No post type slug.
+register_post_type( args: array(), post_type: 'my_own_post_type',  ); // OK.
+register_post_type( args: array(), post_type: 'my-own-post-type-too-long' ); // Bad.
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index de293821e1..e2d80e5c51 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -51,9 +51,12 @@ public function getErrorList( $testFile = '' ) {
 					36 => 1,
 					37 => 1,
 					39 => 1,
+					40 => 1,
 					49 => 1,
 					50 => 2,
 					52 => 1,
+					62 => 1,
+					64 => 1,
 				);
 
 			case 'ValidPostTypeSlugUnitTest.2.inc':
@@ -90,7 +93,6 @@ public function getWarningList( $testFile = '' ) {
 					31 => 1,
 					33 => 1,
 					34 => 1,
-					40 => 1,
 					45 => 1,
 					49 => 1,
 					55 => 1,

From ea5711c8c851cafc70c04ba1c9f0e1ea8400167b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 13 Dec 2022 22:56:19 +0100
Subject: [PATCH 319/822] NamingConventions/ValidPostTypeSlug: use "clean" info
 in error message

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, the error message displayed will be _cleaner_.

Includes unit tests demonstrating the issue.
---
 .../Sniffs/NamingConventions/ValidPostTypeSlugSniff.php     | 2 +-
 .../Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc | 6 ++++++
 .../Tests/NamingConventions/ValidPostTypeSlugUnitTest.php   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 5cde5a0724..24972bc8c4 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -145,7 +145,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$stackPtr,
 				'NotStringLiteral',
 				array(
-					$post_type_param['raw'],
+					$post_type_param['clean'],
 				),
 				3
 			);
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
index 3854430a8a..5c0ed5729a 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.1.inc
@@ -62,3 +62,9 @@ register_post_type(); // OK, ignore, presume live coding.
 register_post_type( args: array() ); // Bad. No post type slug.
 register_post_type( args: array(), post_type: 'my_own_post_type',  ); // OK.
 register_post_type( args: array(), post_type: 'my-own-post-type-too-long' ); // Bad.
+
+// Safeguard that the information displayed in the error message is cleaned of comments.
+register_post_type(
+	// Post type name.
+	$name,// Non string literal. Warning with severity: 3
+);
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index e2d80e5c51..75193d32e0 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -97,6 +97,7 @@ public function getWarningList( $testFile = '' ) {
 					49 => 1,
 					55 => 1,
 					56 => 1,
+					67 => 1,
 				);
 
 			case 'ValidPostTypeSlugUnitTest.2.inc':

From 9ec33e91f47c3ddcd4c1065d466a46ed4016f5fb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 08:55:51 +0100
Subject: [PATCH 320/822] Security/PluginMenuSlug: add support for PHP 8.0+
 named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes additional unit tests.
---
 .../Sniffs/Security/PluginMenuSlugSniff.php   | 83 ++++++++++++++-----
 .../Tests/Security/PluginMenuSlugUnitTest.inc |  8 ++
 .../Tests/Security/PluginMenuSlugUnitTest.php |  8 +-
 3 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index 08d8d58e02..c55d7dae76 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
@@ -41,25 +42,61 @@ class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 	 * @since 0.3.0
 	 * @since 0.11.0 Renamed from $add_menu_functions to $target_functions
 	 *               and changed visibility to protected.
+	 * @since 3.0.0  The format of the value has changed from a numerically indexed
+	 *               array containing parameter positions to an array with the parameter
+	 *               position as the index and the parameter name as value.
 	 *
-	 * @var array <string function name> => <array target parameter positions>
+	 * @var array<string, <int, string|array>> Key is the name of the functions being targetted.
+	 *                                         Value is an array with parameter positions as the
+	 *                                         keys and parameter names as the values
 	 */
 	protected $target_functions = array(
-		'add_menu_page'       => array( 4 ),
-		'add_object_page'     => array( 4 ),
-		'add_utility_page'    => array( 4 ),
-		'add_submenu_page'    => array( 1, 5 ),
-		'add_dashboard_page'  => array( 4 ),
-		'add_posts_page'      => array( 4 ),
-		'add_media_page'      => array( 4 ),
-		'add_links_page'      => array( 4 ),
-		'add_pages_page'      => array( 4 ),
-		'add_comments_page'   => array( 4 ),
-		'add_theme_page'      => array( 4 ),
-		'add_plugins_page'    => array( 4 ),
-		'add_users_page'      => array( 4 ),
-		'add_management_page' => array( 4 ),
-		'add_options_page'    => array( 4 ),
+		'add_menu_page'       => array(
+			4 => 'menu_slug',
+		),
+		'add_object_page'     => array(
+			4 => 'menu_slug',
+		),
+		'add_utility_page'    => array(
+			4 => 'menu_slug',
+		),
+		'add_submenu_page'    => array(
+			1 => 'parent_slug',
+			5 => 'menu_slug',
+		),
+		'add_dashboard_page'  => array(
+			4 => 'menu_slug',
+		),
+		'add_posts_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_media_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_links_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_pages_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_comments_page'   => array(
+			4 => 'menu_slug',
+		),
+		'add_theme_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_plugins_page'    => array(
+			4 => 'menu_slug',
+		),
+		'add_users_page'      => array(
+			4 => 'menu_slug',
+		),
+		'add_management_page' => array(
+			4 => 'menu_slug',
+		),
+		'add_options_page'    => array(
+			4 => 'menu_slug',
+		),
 	);
 
 	/**
@@ -75,13 +112,15 @@ class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		foreach ( $this->target_functions[ $matched_content ] as $position ) {
-			if ( isset( $parameters[ $position ] ) ) {
-				$file_constant = $this->phpcsFile->findNext( \T_FILE, $parameters[ $position ]['start'], ( $parameters[ $position ]['end'] + 1 ) );
+		foreach ( $this->target_functions[ $matched_content ] as $position => $param_name ) {
+			$found_param = PassedParameters::getParameterFromStack( $parameters, $position, $param_name );
+			if ( false === $found_param ) {
+				continue;
+			}
 
-				if ( false !== $file_constant ) {
-					$this->phpcsFile->addWarning( 'Using __FILE__ for menu slugs risks exposing filesystem structure.', $stackPtr, 'Using__FILE__' );
-				}
+			$file_constant = $this->phpcsFile->findNext( \T_FILE, $found_param['start'], ( $found_param['end'] + 1 ) );
+			if ( false !== $file_constant ) {
+				$this->phpcsFile->addWarning( 'Using __FILE__ for menu slugs risks exposing filesystem structure.', $stackPtr, 'Using__FILE__' );
 			}
 		}
 	}
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc b/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
index 265b981b91..c29db55abf 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
@@ -12,3 +12,11 @@ add_submenu_page( __FILE__ . 'parent', $page_title, $menu_title, $capability, __
 $my_class->add_dashboard_page( $page_title, $menu_title, $capability, __FILE__, $function); // Ok.
 Some_Class::add_dashboard_page( $page_title, $menu_title, $capability, __FILE__, $function); // Ok.
 \My_Namespace\add_dashboard_page( $page_title, $menu_title, $capability, __FILE__, $function); // Ok.
+
+// Safeguard support for PHP 8.0+ named parameters.
+add_submenu_page(
+	page_title: $page_title,
+	menu_title: $menu_title,
+	parent_slug: __FILE__, // Bad.
+	capability: $capability,
+);
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index 3b81976073..9d9a246128 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -38,10 +38,10 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			3 => 1,
-			5 => 1,
-			9 => 2,
+			3  => 1,
+			5  => 1,
+			9  => 2,
+			17 => 1,
 		);
 	}
-
 }

From 569c7541808fdae01fc1f8292b73491290f70ea5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 09:03:14 +0100
Subject: [PATCH 321/822] Security/PluginMenuSlug: minor test tweak

Adjust one test to use lowercase `__file__` to safeguard that the sniff correctly recognizes that these magic constants are case insensitive.
---
 WordPress/Tests/Security/PluginMenuSlugUnitTest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc b/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
index c29db55abf..2c77ee621e 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.inc
@@ -2,7 +2,7 @@
 
 add_menu_page( $page_title, $menu_title, $capability, __FILE__, $function, $icon_url, $position ); // Bad.
 
-add_dashboard_page( $page_title, $menu_title, $capability, __FILE__, $function); // Bad.
+add_dashboard_page( $page_title, $menu_title, $capability, __file__, $function); // Bad.
 
 add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, 'awesome-submenu-page', $function ); // Ok.
 

From 0b9a9fa28e2b1626b7e2815f5ff756a54ccfb012 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 09:04:37 +0100
Subject: [PATCH 322/822] Security/PluginMenuSlug: improve error position
 precision

Throw the error on the token containing the `__FILE__` magic constant instead of on the function call token.
---
 WordPress/Sniffs/Security/PluginMenuSlugSniff.php   | 2 +-
 WordPress/Tests/Security/PluginMenuSlugUnitTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index c55d7dae76..a07e04422f 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -120,7 +120,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			$file_constant = $this->phpcsFile->findNext( \T_FILE, $found_param['start'], ( $found_param['end'] + 1 ) );
 			if ( false !== $file_constant ) {
-				$this->phpcsFile->addWarning( 'Using __FILE__ for menu slugs risks exposing filesystem structure.', $stackPtr, 'Using__FILE__' );
+				$this->phpcsFile->addWarning( 'Using __FILE__ for menu slugs risks exposing filesystem structure.', $file_constant, 'Using__FILE__' );
 			}
 		}
 	}
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index 9d9a246128..39b4a6f935 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -41,7 +41,7 @@ public function getWarningList() {
 			3  => 1,
 			5  => 1,
 			9  => 2,
-			17 => 1,
+			20 => 1,
 		);
 	}
 }

From 6ac41da7a9816f1324af9f2286f68054c67dc37d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Dec 2022 22:55:45 +0100
Subject: [PATCH 323/822] WP/AlternativeFunctions: order lists alphabetically

Orders function name lists alphabetically. The group ordering, while not in alphabetic order, is left as-is for now.

This commit does not add or delete any functions from the lists.
---
 .../Sniffs/WP/AlternativeFunctionsSniff.php   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index dbca31c0a4..ad8b422eec 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -152,20 +152,20 @@ public function getGroups() {
 					'chgrp',
 					'chmod',
 					'chown',
-					'is_writable',
-					'is_writeable',
-					'mkdir',
-					'rmdir',
-					'touch',
-					'readfile',
 					'fclose',
+					'file_put_contents',
 					'fopen',
+					'fputs',
 					'fread',
-					'fwrite',
-					'file_put_contents',
 					'fsockopen',
+					'fwrite',
+					'is_writable',
+					'is_writeable',
+					'mkdir',
 					'pfsockopen',
-					'fputs',
+					'readfile',
+					'rmdir',
+					'touch',
 				),
 			),
 
@@ -183,8 +183,8 @@ public function getGroups() {
 				'message'   => '%s() is discouraged. Rand seeding is not necessary when using the wp_rand() function (as you should).',
 				'since'     => '2.6.2',
 				'functions' => array(
-					'srand',
 					'mt_srand',
+					'srand',
 				),
 			),
 
@@ -193,8 +193,8 @@ public function getGroups() {
 				'message'   => '%s() is discouraged. Use the far less predictable wp_rand() instead.',
 				'since'     => '2.6.2',
 				'functions' => array(
-					'rand',
 					'mt_rand',
+					'rand',
 				),
 			),
 		);
@@ -287,9 +287,9 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 				break;
 
-			case 'readfile':
-			case 'fopen':
 			case 'file_put_contents':
+			case 'fopen':
+			case 'readfile':
 				/*
 				 * Allow for handling raw data streams from the request body.
 				 */

From 56a8cc9c61ef3599eff88d92961acb8ae21c6518 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:33:30 +0100
Subject: [PATCH 324/822] WP/AlternativeFunctions: add missing `@since` tags

... for properties which were added to the sniff after the initial conception.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index ad8b422eec..4fa5fa0d59 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -35,6 +35,8 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @link https://www.php.net/wrappers.php
 	 *
+	 * @since 2.1.0
+	 *
 	 * @var array
 	 */
 	protected $allowed_local_streams = array(
@@ -51,6 +53,8 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @link https://www.php.net/wrappers.php
 	 *
+	 * @since 2.1.0
+	 *
 	 * @var array
 	 */
 	protected $allowed_local_stream_partials = array(
@@ -63,6 +67,8 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @link https://www.php.net/wrappers.php
 	 *
+	 * @since 2.1.0
+	 *
 	 * @var array
 	 */
 	protected $allowed_local_stream_constants = array(

From 70154e55e2473a6f3b4eb95e76232939deb5e116 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:37:32 +0100
Subject: [PATCH 325/822] WP/AlternativeFunctions: change property visibility

... from `protected` to `private` for properties which are only intended to be used by the sniff itself anyway.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 4fa5fa0d59..82bf8950a1 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -36,10 +36,11 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @since 2.1.0
+	 * @since 3.0.0 The visibility was changed from `protected` to `private`.
 	 *
 	 * @var array
 	 */
-	protected $allowed_local_streams = array(
+	private $allowed_local_streams = array(
 		'php://input'  => true,
 		'php://output' => true,
 		'php://stdin'  => true,
@@ -54,10 +55,11 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @since 2.1.0
+	 * @since 3.0.0 The visibility was changed from `protected` to `private`.
 	 *
 	 * @var array
 	 */
-	protected $allowed_local_stream_partials = array(
+	private $allowed_local_stream_partials = array(
 		'php://temp/',
 		'php://fd/',
 	);
@@ -68,10 +70,11 @@ class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * @link https://www.php.net/wrappers.php
 	 *
 	 * @since 2.1.0
+	 * @since 3.0.0 The visibility was changed from `protected` to `private`.
 	 *
 	 * @var array
 	 */
-	protected $allowed_local_stream_constants = array(
+	private $allowed_local_stream_constants = array(
 		'STDIN'  => true,
 		'STDOUT' => true,
 		'STDERR' => true,

From b503057cf88fa90c0f1b070454762a9c8f5db7a3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 07:26:45 +0100
Subject: [PATCH 326/822] WP/AlternativeFunctions: remove stray blank lines at
 top of test file

---
 .../Tests/WP/AlternativeFunctionsUnitTest.inc |  2 --
 .../Tests/WP/AlternativeFunctionsUnitTest.php | 25 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index ea9baea449..a2e8c0489b 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 curl_init(); // Warning.
 curl_close( $ch ); // Warning.
 CURL_getinfo(); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 44db0131b2..f005a40b27 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -37,12 +37,14 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
+			3  => 1,
+			4  => 1,
 			5  => 1,
-			6  => 1,
-			7  => 1,
+			8  => 1,
 			10 => 1,
 			12 => 1,
 			14 => 1,
+			15 => 1,
 			16 => 1,
 			17 => 1,
 			18 => 1,
@@ -54,17 +56,17 @@ public function getWarningList() {
 			24 => 1,
 			25 => 1,
 			26 => 1,
-			27 => 1,
-			28 => 1,
-			40 => 1,
+			38 => 1,
+			42 => 1,
 			44 => 1,
-			46 => 1,
+			45 => 1,
 			47 => 1,
-			49 => 1,
-			67 => 1,
-			68 => 1,
-			73 => 1,
+			65 => 1,
+			66 => 1,
+			71 => 1,
+			78 => 1,
 			80 => 1,
+			81 => 1,
 			82 => 1,
 			83 => 1,
 			84 => 1,
@@ -74,9 +76,6 @@ public function getWarningList() {
 			88 => 1,
 			89 => 1,
 			90 => 1,
-			91 => 1,
-			92 => 1,
 		);
 	}
-
 }

From 744e83bb363b0d46fe19b835100674d2afd424f7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 07:31:57 +0100
Subject: [PATCH 327/822] WP/AlternativeFunctions: move parse_url related tests
 down

---
 .../Tests/WP/AlternativeFunctionsUnitTest.inc | 20 ++++++------
 .../Tests/WP/AlternativeFunctionsUnitTest.php | 32 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index a2e8c0489b..dcc220034b 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -26,18 +26,8 @@ srand(); // Warning.
 mt_srand(); // Warning.
 wp_rand(); // OK.
 
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
-parse_url( 'http://example.com/' ); // OK.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
-
 strip_tags( $something, '<iframe>' ); // OK.
 
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
-parse_url($url, PHP_URL_QUERY); // OK.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
-parse_url($url, PHP_URL_SCHEME); // Warning.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
-
 file_get_contents( $local_file, true ); // OK.
 file_get_contents( $url, false ); // Warning.
 file_get_contents(); // OK - no params, so nothing to do.
@@ -88,3 +78,13 @@ mkdir(); // Warning.
 rmdir(); // Warning.
 touch(); // Warning.
 fputs(); // Warning.
+
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
+parse_url( 'http://example.com/' ); // OK.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
+
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
+parse_url($url, PHP_URL_QUERY); // OK.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
+parse_url($url, PHP_URL_SCHEME); // Warning.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index f005a40b27..f845022650 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -56,26 +56,26 @@ public function getWarningList() {
 			24 => 1,
 			25 => 1,
 			26 => 1,
-			38 => 1,
-			42 => 1,
-			44 => 1,
-			45 => 1,
-			47 => 1,
-			65 => 1,
-			66 => 1,
+			32 => 1,
+			34 => 1,
+			35 => 1,
+			37 => 1,
+			55 => 1,
+			56 => 1,
+			61 => 1,
+			68 => 1,
+			70 => 1,
 			71 => 1,
+			72 => 1,
+			73 => 1,
+			74 => 1,
+			75 => 1,
+			76 => 1,
+			77 => 1,
 			78 => 1,
+			79 => 1,
 			80 => 1,
-			81 => 1,
-			82 => 1,
-			83 => 1,
-			84 => 1,
-			85 => 1,
-			86 => 1,
-			87 => 1,
-			88 => 1,
 			89 => 1,
-			90 => 1,
 		);
 	}
 }

From 1dffa3a624be13ebf4736b5f9f71f0a05de3d3e2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 07:41:24 +0100
Subject: [PATCH 328/822] WP/AlternativeFunctions: bug fix - special casing for
 parse_url was not applied

The `wp_parse_url()` alternative to `parse_url()` was introduced in WP 4.4.0, but didn't have support for the `$component` parameter until WP 4.7.0.

For that reason, special casing was put in place in PR 1369 (WPCS 1.0.0) to examine whether the `$component` parameter was passed to `parse_url()` or not and to only advise the switch to `wp_parse_url()`:
1. If the `$component` parameter was _not_ used and the `minimum_wp_version` was `4.4` or higher.
2. If the `$component` parameter **_was_** used and the `minimum_wp_version` was `4.7` or higher.

Unfortunately, the special casing was looking for the wrong function name match, so has never worked.

The additional tests now added demonstrate the bug.

This PR, combined with the previously pulled `version_compare()` related fix from 2149, fix the bug.

---

Includes a follow up to 2121

The "final" `// phpcs:set` annotations in the test case file should always reset to the default value for the property. The default value which was being used, however, was out of date.

Fixed now.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php  |  2 +-
 .../Tests/WP/AlternativeFunctionsUnitTest.inc      | 14 +++++++++-----
 .../Tests/WP/AlternativeFunctionsUnitTest.php      |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 82bf8950a1..01e345b623 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -238,7 +238,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 				break;
 
-			case 'wp_parse_url':
+			case 'parse_url':
 				/*
 				 * Before WP 4.7.0, the function `wp_parse_url()` was only a valid alternative
 				 * if no second param was passed to `parse_url()`.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index dcc220034b..61a01eff87 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -80,11 +80,15 @@ touch(); // Warning.
 fputs(); // Warning.
 
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
-parse_url( 'http://example.com/' ); // OK.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
+parse_url( 'http://example.com/' ); // OK, alternative was not yet available.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.4
+parse_url( 'http://example.com/' ); // Warning, not using $component param, so can switch over.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
 
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
-parse_url($url, PHP_URL_QUERY); // OK.
+parse_url($url, PHP_URL_QUERY); // OK, alternative was not yet available.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.5
+parse_url($url, PHP_URL_QUERY); // OK, $component param not yet available.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
-parse_url($url, PHP_URL_SCHEME); // Warning.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.6
+parse_url($url, PHP_URL_SCHEME); // Warning, using $component param, but also using WP 4.7+, so can switch over.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index f845022650..4866937d09 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -75,7 +75,8 @@ public function getWarningList() {
 			78 => 1,
 			79 => 1,
 			80 => 1,
-			89 => 1,
+			85 => 1,
+			93 => 1,
 		);
 	}
 }

From 4f57da1bdbb76bc06a6f99cd0b93310802c09ded Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:49:33 +0100
Subject: [PATCH 329/822] WP/AlternativeFunctions: add support for PHP 8.0+
 named parameters [1] / strip_tags()

1. Adjusted the way it is determined whether the PHP native function can be replaced with the WP version of the same using the updated PHPCSUtils 1.0.0-alpha4 `PassedParameters` functionality.
2. Verified the parameter name used is in line with the name as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Ref: https://www.php.net/manual/en/function.strip-tags

Includes additional unit tests.
---
 .../Sniffs/WP/AlternativeFunctionsSniff.php   |  6 +-
 .../Tests/WP/AlternativeFunctionsUnitTest.inc |  8 ++
 .../Tests/WP/AlternativeFunctionsUnitTest.php | 81 ++++++++++---------
 3 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 01e345b623..5815c2026e 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -230,12 +230,14 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			case 'strip_tags':
 				/*
 				 * The function `wp_strip_all_tags()` is only a valid alternative when
-				 * only the first parameter is passed to `strip_tags()`.
+				 * only the first parameter, `$string`, is passed to `strip_tags()`.
 				 */
-				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1 ) {
+				$has_allowed_tags = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 2, 'allowed_tags' );
+				if ( false !== $has_allowed_tags ) {
 					return;
 				}
 
+				unset( $has_allowed_tags );
 				break;
 
 			case 'parse_url':
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index 61a01eff87..1e31fb8e7b 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -92,3 +92,11 @@ parse_url($url, PHP_URL_QUERY); // OK, $component param not yet available.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
 parse_url($url, PHP_URL_SCHEME); // Warning, using $component param, but also using WP 4.7+, so can switch over.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
+
+/*
+ * Tests for support for PHP 8.0+ named parameters.
+ */
+// Safeguard support for PHP 8.0+ named parameters for the custom logic related to strip_tags().
+strip_tags( allowed_tags: '<iframe>' ); // OK. Well not really, missing required param, but that's not the concern of this sniff.
+strip_tags( allowed_tags: '<iframe>', string: $something ); // OK.
+strip_tags( string: $something ); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 4866937d09..073495525b 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -37,46 +37,47 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			3  => 1,
-			4  => 1,
-			5  => 1,
-			8  => 1,
-			10 => 1,
-			12 => 1,
-			14 => 1,
-			15 => 1,
-			16 => 1,
-			17 => 1,
-			18 => 1,
-			19 => 1,
-			20 => 1,
-			21 => 1,
-			22 => 1,
-			23 => 1,
-			24 => 1,
-			25 => 1,
-			26 => 1,
-			32 => 1,
-			34 => 1,
-			35 => 1,
-			37 => 1,
-			55 => 1,
-			56 => 1,
-			61 => 1,
-			68 => 1,
-			70 => 1,
-			71 => 1,
-			72 => 1,
-			73 => 1,
-			74 => 1,
-			75 => 1,
-			76 => 1,
-			77 => 1,
-			78 => 1,
-			79 => 1,
-			80 => 1,
-			85 => 1,
-			93 => 1,
+			3   => 1,
+			4   => 1,
+			5   => 1,
+			8   => 1,
+			10  => 1,
+			12  => 1,
+			14  => 1,
+			15  => 1,
+			16  => 1,
+			17  => 1,
+			18  => 1,
+			19  => 1,
+			20  => 1,
+			21  => 1,
+			22  => 1,
+			23  => 1,
+			24  => 1,
+			25  => 1,
+			26  => 1,
+			32  => 1,
+			34  => 1,
+			35  => 1,
+			37  => 1,
+			55  => 1,
+			56  => 1,
+			61  => 1,
+			68  => 1,
+			70  => 1,
+			71  => 1,
+			72  => 1,
+			73  => 1,
+			74  => 1,
+			75  => 1,
+			76  => 1,
+			77  => 1,
+			78  => 1,
+			79  => 1,
+			80  => 1,
+			85  => 1,
+			93  => 1,
+			102 => 1,
 		);
 	}
 }

From 28e64e715733a0d6a91c93eb8baf9f80792212de Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Dec 2022 23:10:48 +0100
Subject: [PATCH 330/822] WP/AlternativeFunctions: add support for PHP 8.0+
 named parameters [2] / parse_url()

1. Adjusted the way it is determined whether the PHP native function can be replaced with the WP version of the same using the updated PHPCSUtils 1.0.0-alpha4 `PassedParameters` functionality.
2. Verified the parameter name used is in line with the name as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Ref: https://www.php.net/manual/en/function.parse-url

Includes additional unit tests.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php   | 6 ++++--
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc | 9 +++++++++
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.php | 2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 5815c2026e..c05e1e3378 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -243,16 +243,18 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			case 'parse_url':
 				/*
 				 * Before WP 4.7.0, the function `wp_parse_url()` was only a valid alternative
-				 * if no second param was passed to `parse_url()`.
+				 * if the second param - `$component` - was not passed to `parse_url()`.
 				 *
 				 * @see https://developer.wordpress.org/reference/functions/wp_parse_url/#changelog
 				 */
-				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1
+				$has_component = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 2, 'component' );
+				if ( false !== $has_component
 					&& $this->wp_version_compare( $this->minimum_wp_version, '4.7.0', '<' )
 				) {
 					return;
 				}
 
+				unset( $has_component );
 				break;
 
 			case 'file_get_contents':
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index 1e31fb8e7b..2b49a1691b 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -100,3 +100,12 @@ parse_url($url, PHP_URL_SCHEME); // Warning, using $component param, but also us
 strip_tags( allowed_tags: '<iframe>' ); // OK. Well not really, missing required param, but that's not the concern of this sniff.
 strip_tags( allowed_tags: '<iframe>', string: $something ); // OK.
 strip_tags( string: $something ); // Warning.
+
+// Safeguard support for PHP 8.0+ named parameters for the custom logic related to parse_url().
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.4
+parse_url(component : PHP_URL_QUERY); // OK. Well, not really, missing required parameter, but that's not the concern of this sniff.
+parse_url(component : PHP_URL_QUERY, url : $url); // OK.
+parse_url(url : $url); // Warning.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
+parse_url(component: PHP_URL_SCHEME, url: $url, ); // Warning.
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 073495525b..6f61bec960 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -78,6 +78,8 @@ public function getWarningList() {
 			85  => 1,
 			93  => 1,
 			102 => 1,
+			108 => 1,
+			110 => 1,
 		);
 	}
 }

From f3b0c1bf0672f21bcedca5516d26ea9f81e0f214 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 08:13:05 +0100
Subject: [PATCH 331/822] WP/AlternativeFunctions: add support for PHP 8.0+
 named parameters [3] / file_get_contents()

1. Adjusted the way it is determined whether the PHP native function can be replaced with the WP version of the same using the updated PHPCSUtils 1.0.0-alpha4 `PassedParameters` functionality.
2. Verified the parameter names used are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Ref: https://www.php.net/manual/en/function.file-get-contents

Includes additional unit tests.
---
 .../Sniffs/WP/AlternativeFunctionsSniff.php   | 19 ++++++++++---------
 .../Tests/WP/AlternativeFunctionsUnitTest.inc | 12 ++++++++++++
 .../Tests/WP/AlternativeFunctionsUnitTest.php |  4 ++++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index c05e1e3378..2a489aa166 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -264,40 +264,41 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 */
 				$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
-				if ( isset( $params[2] ) && 'true' === $params[2]['raw'] ) {
+				$use_include_path_param = PassedParameters::getParameterFromStack( $params, 2, 'use_include_path' );
+				if ( false !== $use_include_path_param && 'true' === $use_include_path_param['raw'] ) {
 					// Setting `$use_include_path` to `true` is only relevant for local files.
 					return;
 				}
 
-				if ( isset( $params[1] ) === false ) {
+				$filename_param = PassedParameters::getParameterFromStack( $params, 1, 'filename' );
+				if ( false === $filename_param ) {
 					// If the file to get is not set, this is a non-issue anyway.
 					return;
 				}
 
-				if ( strpos( $params[1]['raw'], 'http:' ) !== false
-					|| strpos( $params[1]['raw'], 'https:' ) !== false
+				if ( strpos( $filename_param['raw'], 'http:' ) !== false
+					|| strpos( $filename_param['raw'], 'https:' ) !== false
 				) {
 					// Definitely a URL, throw notice.
 					break;
 				}
 
-				if ( preg_match( '`\b(?:ABSPATH|WP_(?:CONTENT|PLUGIN)_DIR|WPMU_PLUGIN_DIR|TEMPLATEPATH|STYLESHEETPATH|(?:MU)?PLUGINDIR)\b`', $params[1]['raw'] ) === 1 ) {
+				if ( preg_match( '`\b(?:ABSPATH|WP_(?:CONTENT|PLUGIN)_DIR|WPMU_PLUGIN_DIR|TEMPLATEPATH|STYLESHEETPATH|(?:MU)?PLUGINDIR)\b`', $filename_param['raw'] ) === 1 ) {
 					// Using any of the constants matched in this regex is an indicator of a local file.
 					return;
 				}
 
-				if ( preg_match( '`(?:get_home_path|plugin_dir_path|get_(?:stylesheet|template)_directory|wp_upload_dir)\s*\(`i', $params[1]['raw'] ) === 1 ) {
+				if ( preg_match( '`(?:get_home_path|plugin_dir_path|get_(?:stylesheet|template)_directory|wp_upload_dir)\s*\(`i', $filename_param['raw'] ) === 1 ) {
 					// Using any of the functions matched in the regex is an indicator of a local file.
 					return;
 				}
 
-				if ( $this->is_local_data_stream( $params[1]['raw'] ) === true ) {
+				if ( $this->is_local_data_stream( $filename_param['raw'] ) === true ) {
 					// Local data stream.
 					return;
 				}
 
-				unset( $params );
-
+				unset( $params, $use_include_path_param, $filename_param );
 				break;
 
 			case 'file_put_contents':
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index 2b49a1691b..037be81838 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -109,3 +109,15 @@ parse_url(url : $url); // Warning.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
 parse_url(component: PHP_URL_SCHEME, url: $url, ); // Warning.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
+
+// Safeguard support for PHP 8.0+ named parameters for the custom logic related to file_get_contents().
+file_get_contents( use_include_path: true, filename: $local_file, ); // OK.
+file_get_contents( use_include_path: false, filename: $url, ); // Warning.
+
+file_get_contents( use_include_path: false ); // OK, well not really, missing required param, but that's not the concern of this sniff.
+
+file_get_contents( use_include_path: false, filename: 'http://remoteurl.com/file/?w=1' ); // Warning.
+file_get_contents( use_include_path: false, filename: 'https://wordpress.org' ); // Warning.
+file_get_contents( use_include_path: false, filename: ABSPATH . 'wp-admin/css/some-file.css'); // OK.
+file_get_contents( use_include_path: false, filename: 'php://input' ); // OK.
+file_get_contents(use_include_path: false, filename: MYABSPATH . 'plugin-file.json'); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 6f61bec960..13be535583 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -80,6 +80,10 @@ public function getWarningList() {
 			102 => 1,
 			108 => 1,
 			110 => 1,
+			115 => 1,
+			119 => 1,
+			120 => 1,
+			123 => 1,
 		);
 	}
 }

From 9bed8042b97aad8da13761bc4e2a03a344b20fee Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 08:33:46 +0100
Subject: [PATCH 332/822] WP/AlternativeFunctions: minor code readability
 improvements

---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 2a489aa166..e2342849fa 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -283,12 +283,20 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					break;
 				}
 
-				if ( preg_match( '`\b(?:ABSPATH|WP_(?:CONTENT|PLUGIN)_DIR|WPMU_PLUGIN_DIR|TEMPLATEPATH|STYLESHEETPATH|(?:MU)?PLUGINDIR)\b`', $filename_param['raw'] ) === 1 ) {
+				$contains_wp_path_constant = preg_match(
+					'`\b(?:ABSPATH|WP_(?:CONTENT|PLUGIN)_DIR|WPMU_PLUGIN_DIR|TEMPLATEPATH|STYLESHEETPATH|(?:MU)?PLUGINDIR)\b`',
+					$filename_param['raw']
+				);
+				if ( 1 === $contains_wp_path_constant ) {
 					// Using any of the constants matched in this regex is an indicator of a local file.
 					return;
 				}
 
-				if ( preg_match( '`(?:get_home_path|plugin_dir_path|get_(?:stylesheet|template)_directory|wp_upload_dir)\s*\(`i', $filename_param['raw'] ) === 1 ) {
+				$contains_wp_path_function_call = preg_match(
+					'`(?:get_home_path|plugin_dir_path|get_(?:stylesheet|template)_directory|wp_upload_dir)\s*\(`i',
+					$filename_param['raw']
+				);
+				if ( 1 === $contains_wp_path_function_call ) {
 					// Using any of the functions matched in the regex is an indicator of a local file.
 					return;
 				}
@@ -298,7 +306,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					return;
 				}
 
-				unset( $params, $use_include_path_param, $filename_param );
+				unset( $params, $use_include_path_param, $filename_param, $contains_wp_path_constant, $contains_wp_path_function_call );
 				break;
 
 			case 'file_put_contents':

From b58f15c28ef6835175969e28feebab76554219ae Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 10:23:57 +0100
Subject: [PATCH 333/822] WP/AlternativeFunctions: add support for PHP 8.0+
 named parameters [4] / readfile/fopen/file_put_contents()

1. Adjusted the way it is determined whether the PHP native function can be replaced with the WP version of the same using the updated PHPCSUtils 1.0.0-alpha4 `PassedParameters` functionality.
2. Verified the parameter names used are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Refs:
    * https://www.php.net/manual/en/function.readfile
    * https://www.php.net/manual/en/function.fopen
    * https://www.php.net/manual/en/function.file-put-contents

Includes additional unit tests.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php  | 14 ++++++++------
 .../Tests/WP/AlternativeFunctionsUnitTest.inc      |  8 ++++++++
 .../Tests/WP/AlternativeFunctionsUnitTest.php      |  2 ++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e2342849fa..e18f4a6d9b 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -314,21 +314,23 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			case 'readfile':
 				/*
 				 * Allow for handling raw data streams from the request body.
+				 *
+				 * Note: at this time (December 2022) these three functions use the same parameter name for their
+				 * first parameter. If this would change at any point in the future, this code will need to
+				 * be made more modular and will need to pass the parameter name based on the function call detected.
 				 */
-				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
-
-				if ( false === $first_param ) {
+				$filename_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1, 'filename' );
+				if ( false === $filename_param ) {
 					// If the file to work with is not set, local data streams don't come into play.
 					break;
 				}
 
-				if ( $this->is_local_data_stream( $first_param['raw'] ) === true ) {
+				if ( $this->is_local_data_stream( $filename_param['raw'] ) === true ) {
 					// Local data stream.
 					return;
 				}
 
-				unset( $first_param );
-
+				unset( $filename_param );
 				break;
 		}
 
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index 037be81838..918f9ae395 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -121,3 +121,11 @@ file_get_contents( use_include_path: false, filename: 'https://wordpress.org' );
 file_get_contents( use_include_path: false, filename: ABSPATH . 'wp-admin/css/some-file.css'); // OK.
 file_get_contents( use_include_path: false, filename: 'php://input' ); // OK.
 file_get_contents(use_include_path: false, filename: MYABSPATH . 'plugin-file.json'); // Warning.
+
+// Safeguard support for PHP 8.0+ named parameters for the custom logic related to fopen(), readfile() and file_put_contents().
+fopen (mode: 'w'); // Warning. Missing required param, but that's not the concern of this sniff.
+$output_stream = fopen( mode: 'w', filename: 'php://output', ); // OK.
+$output_stream = fopen( mode: 'w', context: $stream, filename: STDOUT ); // OK.
+$bytes = readfile( use_include_path: false, context: $stream, filename: 'php://fd/3' ); // OK.
+file_put_contents( data: $data, flags : LOCK_EX, filename: STDERR ); // OK.
+$output_stream = fopen( mode: 'r', filename: $url, ); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 13be535583..8f2e446b75 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -84,6 +84,8 @@ public function getWarningList() {
 			119 => 1,
 			120 => 1,
 			123 => 1,
+			126 => 1,
+			131 => 1,
 		);
 	}
 }

From de723fbe1bd91404eb0d023b3d008b1a4a10c728 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 09:13:11 +0100
Subject: [PATCH 334/822] WP/AlternativeFunctions: prevent some false positives
 / file_get_contents()

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some false negatives and false positives get fixed.

Includes unit tests demonstrating the issue and safeguarding the fix.
---
 .../Sniffs/WP/AlternativeFunctionsSniff.php    | 12 ++++++------
 .../Tests/WP/AlternativeFunctionsUnitTest.inc  | 18 ++++++++++++++++++
 .../Tests/WP/AlternativeFunctionsUnitTest.php  |  2 ++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e18f4a6d9b..810d56423e 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -265,7 +265,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
 				$use_include_path_param = PassedParameters::getParameterFromStack( $params, 2, 'use_include_path' );
-				if ( false !== $use_include_path_param && 'true' === $use_include_path_param['raw'] ) {
+				if ( false !== $use_include_path_param && 'true' === $use_include_path_param['clean'] ) {
 					// Setting `$use_include_path` to `true` is only relevant for local files.
 					return;
 				}
@@ -276,8 +276,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					return;
 				}
 
-				if ( strpos( $filename_param['raw'], 'http:' ) !== false
-					|| strpos( $filename_param['raw'], 'https:' ) !== false
+				if ( strpos( $filename_param['clean'], 'http:' ) !== false
+					|| strpos( $filename_param['clean'], 'https:' ) !== false
 				) {
 					// Definitely a URL, throw notice.
 					break;
@@ -285,7 +285,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 				$contains_wp_path_constant = preg_match(
 					'`\b(?:ABSPATH|WP_(?:CONTENT|PLUGIN)_DIR|WPMU_PLUGIN_DIR|TEMPLATEPATH|STYLESHEETPATH|(?:MU)?PLUGINDIR)\b`',
-					$filename_param['raw']
+					$filename_param['clean']
 				);
 				if ( 1 === $contains_wp_path_constant ) {
 					// Using any of the constants matched in this regex is an indicator of a local file.
@@ -294,14 +294,14 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 				$contains_wp_path_function_call = preg_match(
 					'`(?:get_home_path|plugin_dir_path|get_(?:stylesheet|template)_directory|wp_upload_dir)\s*\(`i',
-					$filename_param['raw']
+					$filename_param['clean']
 				);
 				if ( 1 === $contains_wp_path_function_call ) {
 					// Using any of the functions matched in the regex is an indicator of a local file.
 					return;
 				}
 
-				if ( $this->is_local_data_stream( $filename_param['raw'] ) === true ) {
+				if ( $this->is_local_data_stream( $filename_param['clean'] ) === true ) {
 					// Local data stream.
 					return;
 				}
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index 918f9ae395..e5212cf5e0 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -129,3 +129,21 @@ $output_stream = fopen( mode: 'w', context: $stream, filename: STDOUT ); // OK.
 $bytes = readfile( use_include_path: false, context: $stream, filename: 'php://fd/3' ); // OK.
 file_put_contents( data: $data, flags : LOCK_EX, filename: STDERR ); // OK.
 $output_stream = fopen( mode: 'r', filename: $url, ); // Warning.
+
+// Safeguard that comments in the parameters are ignored for the custom logic related to file_get_contents().
+file_get_contents(
+	$local_file,
+	true // Using local include path.
+); // OK.
+file_get_contents(
+	// Not using an https: URL for reasons.
+	ABSPATH . 'wp-admin/css/some-file.css'
+); // OK.
+file_get_contents(
+	// Not using ABSPATH for reasons.
+	$url
+); // Warning.
+file_get_contents(
+	// Not using plugin_dir_path() for reasons.
+	$url
+); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 8f2e446b75..698e63bdd7 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -86,6 +86,8 @@ public function getWarningList() {
 			123 => 1,
 			126 => 1,
 			131 => 1,
+			142 => 1,
+			146 => 1,
 		);
 	}
 }

From 56a2ef767ab441d211c9b2d6af6de664b075f56f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 10:33:53 +0100
Subject: [PATCH 335/822] WP/AlternativeFunctions: minor code tweak /
 readfile/fopen/file_put_contents()

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

While this doesn't make a difference functionally (no false positives/negatives), it may improve performance a tiny bit as there is less text for the `is_local_data_stream()` method to handle.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 810d56423e..e5d6b5893f 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -325,7 +325,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					break;
 				}
 
-				if ( $this->is_local_data_stream( $filename_param['raw'] ) === true ) {
+				if ( $this->is_local_data_stream( $filename_param['clean'] ) === true ) {
 					// Local data stream.
 					return;
 				}

From 082cb84ec085e432f222f6272a166c0cdb9e375a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:32:48 +0100
Subject: [PATCH 336/822] WP/CapitalPDangit: use PHPCSUtils

Use the `Collections::arrayOpenTokensBC()` method to retrieve the tokens which are used for arrays.

Also changes the order in which array tokens are examined to first examine long array tokens as those are the more likely token to encounter.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index f241df383e..7248386d0f 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -9,10 +9,11 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Capital P Dangit!
@@ -90,8 +91,7 @@ public function register() {
 		$targets[] = \T_NAMESPACE;
 
 		// Also sniff for array tokens to make skipping anything within those more efficient.
-		$targets[ \T_ARRAY ]            = \T_ARRAY;
-		$targets[ \T_OPEN_SHORT_ARRAY ] = \T_OPEN_SHORT_ARRAY;
+		$targets += Collections::arrayOpenTokensBC();
 
 		return $targets;
 	}
@@ -108,19 +108,21 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		/*
-		 * Ignore tokens within an array definition as this is a false positive in 80% of all cases.
+		 * Ignore tokens within array definitions as this is a false positive in 80% of all cases.
 		 *
 		 * The return values skip to the end of the array.
 		 * This prevents the sniff "hanging" on very long configuration arrays.
 		 */
+		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code']
+			&& isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] )
+		) {
+			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
+		}
+
 		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
 			&& isset( $this->tokens[ $stackPtr ]['bracket_closer'] )
 		) {
 			return $this->tokens[ $stackPtr ]['bracket_closer'];
-		} elseif ( \T_ARRAY === $this->tokens[ $stackPtr ]['code']
-			&& isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] )
-		) {
-			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
 		}
 
 		/*

From 1b6cbb9ccb213028a68ed8f806d8a7625a347bd8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:39:54 +0100
Subject: [PATCH 337/822] WP/CapitalPDangit: prevent false positives for lists

Along the same lines as keys used in arrays, keys used in lists (PHP 7.2+) would be a false positive in the majority of cases, so skip over both long as well as short lists.

Includes tests.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php         | 7 +++++--
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc       | 6 ++++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed | 6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 7248386d0f..607da9cac0 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -92,6 +92,7 @@ public function register() {
 
 		// Also sniff for array tokens to make skipping anything within those more efficient.
 		$targets += Collections::arrayOpenTokensBC();
+		$targets += Collections::listTokens();
 
 		return $targets;
 	}
@@ -108,12 +109,14 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		/*
-		 * Ignore tokens within array definitions as this is a false positive in 80% of all cases.
+		 * Ignore tokens within array and list definitions as this
+		 * is a false positive in 80% of all cases.
 		 *
 		 * The return values skip to the end of the array.
 		 * This prevents the sniff "hanging" on very long configuration arrays.
 		 */
-		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( ( \T_ARRAY === $this->tokens[ $stackPtr ]['code']
+			|| \T_LIST === $this->tokens[ $stackPtr ]['code'] )
 			&& isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] )
 		) {
 			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 0945bb966e..8502e28af5 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -203,3 +203,9 @@ namespace My_WordPress_Plugin; // OK.
 namespace Foo\Bar\Wordpress\; // Bad.
 namespace Foo\word_presss\Bar; // Bad.
 namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
+
+/*
+ * Ensure keys in list declarations are ignored
+ */
+list( 'wordpress' => $a, 'other' => $b ) = $array;
+[ 'wordpress' => $a, 'other' => $b ] = $array;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 357c2a1b68..2a88c31f76 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -203,3 +203,9 @@ namespace My_WordPress_Plugin; // OK.
 namespace Foo\Bar\Wordpress\; // Bad.
 namespace Foo\word_presss\Bar; // Bad.
 namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
+
+/*
+ * Ensure keys in list declarations are ignored
+ */
+list( 'wordpress' => $a, 'other' => $b ) = $array;
+[ 'wordpress' => $a, 'other' => $b ] = $array;

From 32da48bd330c5f7eba6ebd73360fcb4b257f8408 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:49:32 +0100
Subject: [PATCH 338/822] WP/CapitalPDangit: always skip over array access keys

There was already code in place to ignore text strings used in array access keys.

This change makes the "skipping over" more efficient by doing so on the open bracket and doing so earlier in the sniff.
This also prevents false positives if the array key is not just a plain text string.

Covered by pre-existing tests + an additional test.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php   | 29 +++++++------------
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc |  7 +++++
 .../Tests/WP/CapitalPDangitUnitTest.inc.fixed |  7 +++++
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 607da9cac0..a8afe9404a 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -86,13 +86,14 @@ public function register() {
 		// Union the arrays - keeps the array keys.
 		$this->text_and_comment_tokens = ( Tokens::$textStringTokens + $this->comment_text_tokens );
 
-		$targets   = $this->text_and_comment_tokens;
-		$targets  += Tokens::$ooScopeTokens;
-		$targets[] = \T_NAMESPACE;
+		$targets                 = $this->text_and_comment_tokens;
+		$targets                += Tokens::$ooScopeTokens;
+		$targets[ \T_NAMESPACE ] = \T_NAMESPACE;
 
 		// Also sniff for array tokens to make skipping anything within those more efficient.
-		$targets += Collections::arrayOpenTokensBC();
-		$targets += Collections::listTokens();
+		$targets                          += Collections::arrayOpenTokensBC();
+		$targets                          += Collections::listTokens();
+		$targets[ \T_OPEN_SQUARE_BRACKET ] = \T_OPEN_SQUARE_BRACKET;
 
 		return $targets;
 	}
@@ -109,8 +110,8 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 		/*
-		 * Ignore tokens within array and list definitions as this
-		 * is a false positive in 80% of all cases.
+		 * Ignore tokens within array and list definitions as well as within
+		 * array keys as this is a false positive in 80% of all cases.
 		 *
 		 * The return values skip to the end of the array.
 		 * This prevents the sniff "hanging" on very long configuration arrays.
@@ -122,7 +123,8 @@ public function process_token( $stackPtr ) {
 			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
 		}
 
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+			|| \T_OPEN_SQUARE_BRACKET === $this->tokens[ $stackPtr ]['code'] )
 			&& isset( $this->tokens[ $stackPtr ]['bracket_closer'] )
 		) {
 			return $this->tokens[ $stackPtr ]['bracket_closer'];
@@ -206,17 +208,6 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		// Ignore any text strings which are array keys `$var['key']` as this is a false positive in 80% of all cases.
-		if ( \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $stackPtr ]['code'] ) {
-			$prevToken = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-			if ( false !== $prevToken && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $prevToken ]['code'] ) {
-				$nextToken = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-				if ( false !== $nextToken && \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $nextToken ]['code'] ) {
-					return;
-				}
-			}
-		}
-
 		// Ignore constant declarations via define().
 		if ( $this->is_in_function_call( $stackPtr, array( 'define' => true ), true, true ) ) {
 			return;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 8502e28af5..54536ca37e 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -209,3 +209,10 @@ namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
  */
 list( 'wordpress' => $a, 'other' => $b ) = $array;
 [ 'wordpress' => $a, 'other' => $b ] = $array;
+
+/*
+ * Ensure that array keys which are not just and only plain text don't lead to false positives.
+ */
+$array['wordpress' . $var] = 123;
+$array[$var . 'wordpress'] = 123;
+$array[$var . 'wordpress' . $var] = 123;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 2a88c31f76..25801252d7 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -209,3 +209,10 @@ namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
  */
 list( 'wordpress' => $a, 'other' => $b ) = $array;
 [ 'wordpress' => $a, 'other' => $b ] = $array;
+
+/*
+ * Ensure that array keys which are not just and only plain text don't lead to false positives.
+ */
+$array['wordpress' . $var] = 123;
+$array[$var . 'wordpress'] = 123;
+$array[$var . 'wordpress' . $var] = 123;

From 6f5bff51b3aa4b1599589d77a8b528de3081fe96 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:56:31 +0100
Subject: [PATCH 339/822] WP/CapitalPDangit: add tests covering PHP 8.1+ enums

The `Tokens::$ooScopeTokens` array contains the `T_ENUM` token since PHPCS 3.7.0, so enums are automatically supported now, but let's safeguard this with a test anyway and update the warning message as well.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php         | 4 ++--
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc       | 6 ++++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed | 6 ++++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.php       | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index a8afe9404a..ebb1177b7a 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -161,7 +161,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		/*
-		 * Deal with misspellings in class/interface/trait names.
+		 * Deal with misspellings in class/interface/trait/enum names.
 		 * These are not auto-fixable, but need the attention of a developer.
 		 */
 		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
@@ -175,7 +175,7 @@ public function process_token( $stackPtr ) {
 
 				if ( ! empty( $misspelled ) ) {
 					$this->phpcsFile->addWarning(
-						'Please spell "WordPress" correctly. Found: "%s" as part of the class/interface/trait name.',
+						'Please spell "WordPress" correctly. Found: "%s" as part of the class/interface/trait/enum name.',
 						$stackPtr,
 						'MisspelledClassName',
 						array( implode( ', ', $misspelled ) )
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 54536ca37e..40f28e7c47 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -216,3 +216,9 @@ list( 'wordpress' => $a, 'other' => $b ) = $array;
 $array['wordpress' . $var] = 123;
 $array[$var . 'wordpress'] = 123;
 $array[$var . 'wordpress' . $var] = 123;
+
+/*
+ * Test recognizing misspellings in enum names.
+ */
+enum WordPress: string implements CMS {} // OK.
+enum My_Wordpress_Enum {} // Bad.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 25801252d7..20d5e01bf5 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -216,3 +216,9 @@ list( 'wordpress' => $a, 'other' => $b ) = $array;
 $array['wordpress' . $var] = 123;
 $array[$var . 'wordpress'] = 123;
 $array[$var . 'wordpress' . $var] = 123;
+
+/*
+ * Test recognizing misspellings in enum names.
+ */
+enum WordPress: string implements CMS {} // OK.
+enum My_Wordpress_Enum {} // Bad.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index e22b02fe1b..4d77619a80 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -65,6 +65,7 @@ public function getWarningList() {
 			203 => 1,
 			204 => 1,
 			205 => 1,
+			224 => 1,
 		);
 	}
 

From 179b6a93666e963de08c2b96a0e83d4019328615 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 13:04:40 +0100
Subject: [PATCH 340/822] WP/CapitalPDangit: add tests with namespaced names
 containing reserved keyword

... where the keyword is a token we are listening for.
---
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc       | 6 ++++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
index 40f28e7c47..221f24d39b 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc
@@ -222,3 +222,9 @@ $array[$var . 'wordpress' . $var] = 123;
  */
 enum WordPress: string implements CMS {} // OK.
 enum My_Wordpress_Enum {} // Bad.
+
+/*
+ * Safeguard that reserved keywords in namespaced names do not lead to PHP notices.
+ */
+namespace My\Class\WordPress;
+echo Some\Enum\WordPress::ENUM_CONSTANT;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
index 20d5e01bf5..eea9232474 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
@@ -222,3 +222,9 @@ $array[$var . 'wordpress' . $var] = 123;
  */
 enum WordPress: string implements CMS {} // OK.
 enum My_Wordpress_Enum {} // Bad.
+
+/*
+ * Safeguard that reserved keywords in namespaced names do not lead to PHP notices.
+ */
+namespace My\Class\WordPress;
+echo Some\Enum\WordPress::ENUM_CONSTANT;

From 6fb7c562f3c78de53afe2ec1318c93a6d48c169a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:21:21 +0100
Subject: [PATCH 341/822] WP/CapitalPDangit: add tests with PHP 7.3 flexible
 heredoc/nowdoc

Note: these are in a separate file for maintainability as any code which would be placed _after_ the flexible heredoc/nowdoc would not be tokenized correctly on PHP < 7.3, making the tests maintainer error prone if the tests were in the same file.
---
 ...tTest.inc => CapitalPDangitUnitTest.1.inc} |  0
 ...xed => CapitalPDangitUnitTest.1.inc.fixed} |  0
 .../Tests/WP/CapitalPDangitUnitTest.2.inc     | 15 ++++
 .../WP/CapitalPDangitUnitTest.2.inc.fixed     | 15 ++++
 WordPress/Tests/WP/CapitalPDangitUnitTest.php | 80 +++++++++++--------
 5 files changed, 78 insertions(+), 32 deletions(-)
 rename WordPress/Tests/WP/{CapitalPDangitUnitTest.inc => CapitalPDangitUnitTest.1.inc} (100%)
 rename WordPress/Tests/WP/{CapitalPDangitUnitTest.inc.fixed => CapitalPDangitUnitTest.1.inc.fixed} (100%)
 create mode 100644 WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc
 create mode 100644 WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc.fixed

diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/WP/CapitalPDangitUnitTest.inc
rename to WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
similarity index 100%
rename from WordPress/Tests/WP/CapitalPDangitUnitTest.inc.fixed
rename to WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc
new file mode 100644
index 0000000000..6862953ffc
--- /dev/null
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * Ensure flexible heredoc/nowdocs are handled correctly.
+ */
+
+// OK.
+$text = <<<EOD
+        This is an $explain about WordPress.
+    EOD;
+
+// Bad.
+$text = <<<'EOD'
+    This is an explanation about word-press.
+    EOD;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc.fixed
new file mode 100644
index 0000000000..7d39a37548
--- /dev/null
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.2.inc.fixed
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * Ensure flexible heredoc/nowdocs are handled correctly.
+ */
+
+// OK.
+$text = <<<EOD
+        This is an $explain about WordPress.
+    EOD;
+
+// Bad.
+$text = <<<'EOD'
+    This is an explanation about WordPress.
+    EOD;
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 4d77619a80..1f511aa39d 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -33,40 +33,56 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of warnings>
 	 */
-	public function getWarningList() {
+	public function getWarningList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'CapitalPDangitUnitTest.1.inc':
+				return array(
+					3   => 1,
+					5   => 1,
+					8   => 1,
+					26  => 1,
+					28  => 1,
+					34  => 1,
+					35  => 1,
+					36  => 1,
+					40  => 1,
+					41  => 1,
+					45  => 1,
+					53  => 1,
+					60  => 1,
+					61  => 1,
+					62  => 1,
+					65  => 1,
+					66  => 1,
+					68  => 1,
+					101 => 1,
+					139 => 1,
+					146 => 0, // False negative.
+					167 => 1, // Old-style WPCS ignore comments are no longer supported.
+					173 => 1,
+					181 => 1,
+					203 => 1,
+					204 => 1,
+					205 => 1,
+					224 => 1,
+				);
 
-		return array(
-			3   => 1,
-			5   => 1,
-			8   => 1,
-			26  => 1,
-			28  => 1,
-			34  => 1,
-			35  => 1,
-			36  => 1,
-			40  => 1,
-			41  => 1,
-			45  => 1,
-			53  => 1,
-			60  => 1,
-			61  => 1,
-			62  => 1,
-			65  => 1,
-			66  => 1,
-			68  => 1,
-			101 => 1,
-			139 => 1,
-			146 => 0, // False negative.
-			167 => 1, // Old-style WPCS ignore comments are no longer supported.
-			173 => 1,
-			181 => 1,
-			203 => 1,
-			204 => 1,
-			205 => 1,
-			224 => 1,
-		);
-	}
+			case 'CapitalPDangitUnitTest.2.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
 
+				return array(
+					14 => 1,
+				);
+
+			default:
+				return array();
+		}
+	}
 }

From 6bc1791fe1b8b8f26e7573f37fcdbc40feec79d3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:42:33 +0200
Subject: [PATCH 342/822] WP/CronInterval: implement PHPCSUtils and other minor
 tweaks

This commit contains no functional changes.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 38fa176885..c9cde2446e 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -11,6 +11,9 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Arrays;
+use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 
@@ -72,10 +75,7 @@ class CronIntervalSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		return array(
-			\T_CONSTANT_ENCAPSED_STRING,
-			\T_DOUBLE_QUOTED_STRING,
-		);
+		return Tokens::$stringTokens;
 	}
 
 	/**
@@ -92,7 +92,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		// If within add_filter.
+		// Check if the text was found within a function call to add_filter().
 		$functionPtr = $this->is_in_function_call( $stackPtr, $this->valid_functions );
 		if ( false === $functionPtr ) {
 			return;
@@ -114,7 +114,9 @@ public function process_token( $stackPtr ) {
 		// If callback is array, get second element.
 		if ( false !== $callbackArrayPtr
 			&& ( \T_ARRAY === $this->tokens[ $callbackArrayPtr ]['code']
-				|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $callbackArrayPtr ]['code'] )
+				|| ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $callbackArrayPtr ]['code'] ] )
+					&& Arrays::isShortArray( $this->phpcsFile, $callbackArrayPtr ) === true )
+				)
 		) {
 			$callback = PassedParameters::getParameter( $this->phpcsFile, $callbackArrayPtr, 2 );
 
@@ -127,7 +129,9 @@ public function process_token( $stackPtr ) {
 		unset( $functionPtr );
 
 		// Search for the function in tokens.
-		$callbackFunctionPtr = $this->phpcsFile->findNext( array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING, \T_CLOSURE ), $callback['start'], ( $callback['end'] + 1 ) );
+		$search               = Tokens::$stringTokens;
+		$search[ \T_CLOSURE ] = \T_CLOSURE;
+		$callbackFunctionPtr  = $this->phpcsFile->findNext( $search, $callback['start'], ( $callback['end'] + 1 ) );
 
 		if ( false === $callbackFunctionPtr ) {
 			$this->confused( $stackPtr );
@@ -141,7 +145,7 @@ public function process_token( $stackPtr ) {
 
 			for ( $ptr = 0; $ptr < $this->phpcsFile->numTokens; $ptr++ ) {
 				if ( \T_FUNCTION === $this->tokens[ $ptr ]['code'] ) {
-					$foundName = $this->phpcsFile->getDeclarationName( $ptr );
+					$foundName = FunctionDeclarations::getName( $this->phpcsFile, $ptr );
 					if ( $foundName === $functionName ) {
 						$functionPtr = $ptr;
 						break;
@@ -166,7 +170,7 @@ public function process_token( $stackPtr ) {
 		$closing = $this->tokens[ $functionPtr ]['scope_closer'];
 		for ( $i = $opening; $i <= $closing; $i++ ) {
 
-			if ( \in_array( $this->tokens[ $i ]['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
+			if ( isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) === true ) {
 				if ( 'interval' === TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) ) {
 					$operator = $this->phpcsFile->findNext( \T_DOUBLE_ARROW, $i, null, false, null, true );
 					if ( false === $operator ) {

From d6ab9d3313e43094d7bfd5810cb34ad9a5065d13 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 15:02:26 +0100
Subject: [PATCH 343/822] WP/CronInterval: add some tests for edge cases

... to add code coverage for some edge cases already accounted for in the code.
---
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 9 +++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 7293774019..e2cae5f5ae 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -202,3 +202,12 @@ class FQNConstants {
 		return $schedules;
 	}
 }
+
+// Test some edge case/invalid code situations.
+add_filter( 'cron_schedules', array() ); // Warning: time undetermined. Callback is an array, but can't determined method name.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_8_minutes'] = [
+		'interval',
+	];
+	return $schedules;
+} ); // Warning: time undetermined. Found 'interval', but no value.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index db79d38475..73560cdadb 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -55,6 +55,8 @@ public function getWarningList() {
 			168 => 1,
 			169 => 1,
 			170 => 1,
+			207 => 1,
+			208 => 1,
 		);
 	}
 }

From e0d2ee7b8045ba6d6ab6d78ff05b8899ea3f07c4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:10:34 +0100
Subject: [PATCH 344/822] WP/CronInterval: bug fix / prevent parse errors in
 eval-ed code

Follow up on 2026 (not yet released) which added handling of time calculations wrapped in parentheses to the sniff.

This improves on the initial fix by making the code more stable and preventing parse errors in the code (which will eventually be eval-ed) due to unmatched parentheses.

Includes additional unit tests.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   | 27 ++++++++++++++++++---
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 16 ++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index c9cde2446e..b33caadb8c 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -178,9 +178,10 @@ public function process_token( $stackPtr ) {
 						return;
 					}
 
-					$valueStart = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true, null, true );
-					$valueEnd   = $this->phpcsFile->findNext( array( \T_COMMA, \T_CLOSE_PARENTHESIS ), ( $valueStart + 1 ) );
-					$value      = '';
+					$valueStart        = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true, null, true );
+					$valueEnd          = $this->phpcsFile->findNext( array( \T_COMMA, \T_CLOSE_PARENTHESIS ), ( $valueStart + 1 ) );
+					$value             = '';
+					$parentheses_count = 0;
 					for ( $j = $valueStart; $j <= $valueEnd; $j++ ) {
 						if ( isset( Tokens::$emptyTokens[ $this->tokens[ $j ]['code'] ] ) ) {
 							continue;
@@ -195,9 +196,29 @@ public function process_token( $stackPtr ) {
 							break;
 						}
 
+						if ( \T_OPEN_PARENTHESIS === $this->tokens[ $j ]['code'] ) {
+							$value .= $this->tokens[ $j ]['content'];
+							++$parentheses_count;
+							continue;
+						}
+
+						if ( \T_CLOSE_PARENTHESIS === $this->tokens[ $j ]['code'] ) {
+							// Only add a close parenthesis if there are open parentheses.
+							if ( $parentheses_count > 0 ) {
+								$value .= $this->tokens[ $j ]['content'];
+								--$parentheses_count;
+							}
+							continue;
+						}
+
 						$value .= $this->tokens[ $j ]['content'];
 					}
 
+					if ( $parentheses_count > 0 ) {
+						// Make sure all open parenthesis are closed.
+						$value .= str_repeat( ')', $parentheses_count );
+					}
+
 					if ( is_numeric( $value ) ) {
 						$interval = $value;
 						break;
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index e2cae5f5ae..1eebf0ee6f 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -211,3 +211,19 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 	];
 	return $schedules;
 } ); // Warning: time undetermined. Found 'interval', but no value.
+
+// Safeguard fix to prevent an "Parse error: Unmatched ')'" bug in the eval-ed code.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_8_minutes'] = array(
+		'interval' => \WEEK_IN_SECONDS
+	);
+	return $schedules;
+} ); // OK.
+
+// Safeguard fix to prevent an "Parse error: syntax error, unexpected token ";"" bug in the eval-ed code.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_8_minutes'] = array(
+		'interval' => ( 2 * ( \WEEK_IN_SECONDS + 4 ) )
+	);
+	return $schedules;
+} ); // OK.

From 241f0880b031b42ce661cea61446552e29988536 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:18:12 +0100
Subject: [PATCH 345/822] WP/CronInterval: add support for PHP 7.4+ arrow
 function callbacks

PHP 7.4 introduced arrow functions.

While these may not be the first choice for returning an adjusted array value, like is required for adjusting the `cron_schedules`, it is still perfectly possible to do so, so the sniff should handle callbacks declared via arrow functions correctly.

Includes unit tests.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   | 5 ++++-
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 4 ++++
 WordPress/Tests/WP/CronIntervalUnitTest.php | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index b33caadb8c..9fee6e48b8 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -131,6 +131,7 @@ public function process_token( $stackPtr ) {
 		// Search for the function in tokens.
 		$search               = Tokens::$stringTokens;
 		$search[ \T_CLOSURE ] = \T_CLOSURE;
+		$search[ \T_FN ]      = \T_FN;
 		$callbackFunctionPtr  = $this->phpcsFile->findNext( $search, $callback['start'], ( $callback['end'] + 1 ) );
 
 		if ( false === $callbackFunctionPtr ) {
@@ -138,7 +139,9 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( \T_CLOSURE === $this->tokens[ $callbackFunctionPtr ]['code'] ) {
+		if ( \T_CLOSURE === $this->tokens[ $callbackFunctionPtr ]['code']
+			|| \T_FN === $this->tokens[ $callbackFunctionPtr ]['code']
+		) {
 			$functionPtr = $callbackFunctionPtr;
 		} else {
 			$functionName = TextStrings::stripQuotes( $this->tokens[ $callbackFunctionPtr ]['content'] );
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 1eebf0ee6f..650645d3ea 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -227,3 +227,7 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 	);
 	return $schedules;
 } ); // OK.
+
+// Allow for PHP 7.4+ arrow functions as callbacks.
+add_filter( 'cron_schedules', fn ( $schedules ) => $schedules + array( 'every_9_mins' => array( 'interval' => 9 * 60, ) ) ); // Warning: 9 min.
+add_filter( 'cron_schedules', fn ( $schedules ) => array_merge( $schedules, array( 'weekly' => array( 'interval' => WEEK_IN_SECONDS ) ) ) ); // OK: > 10 min.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 73560cdadb..0c9346dff4 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -57,6 +57,7 @@ public function getWarningList() {
 			170 => 1,
 			207 => 1,
 			208 => 1,
+			232 => 1,
 		);
 	}
 }

From b33cc67c12b531010608767ea04d81767d9a7779 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 17:35:40 +0100
Subject: [PATCH 346/822] WP/CronInterval: add support for PHP 7.4/8.1 numbers

PHP 7.4 introduced numeric literals with underscores.
PHP 8.1 introduced explicit octal notation.

While PHPCS backfills the tokens for this, this sniff uses an `eval()` call and if either of these PHP 7.4/8.1 syntaxes would be passed to this `eval()` while PHPCS is being run on PHP < 7.4, this will result in a parse error on the code passed to `eval()`.

Luckily the sniff already contains protection against that, but that means, the sniff would throw the "Detected changing of cron_schedules, but could not detect the interval value." warning, instead of okay-ing correct values/throwing an error for incorrect values when either of those syntaxes is used.

By using the PHPCSUtils `Numbers::getCompleteNumber()` method, we can get access to the decimal value of the encountered number, which allows us to bypass the issue by using that in the code string passed to `eval()`.

Includes unit tests.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   | 11 +++++++
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 34 +++++++++++++++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php |  2 ++
 3 files changed, 47 insertions(+)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 9fee6e48b8..cc249e8fcb 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -14,6 +14,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\Numbers;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 
@@ -199,6 +200,16 @@ public function process_token( $stackPtr ) {
 							break;
 						}
 
+						// Make sure that PHP 7.4 numeric literals and PHP 8.1 explicit octals don't cause problems.
+						if ( \T_LNUMBER === $this->tokens[ $j ]['code']
+							|| \T_DNUMBER === $this->tokens[ $j ]['code']
+						) {
+							$number_info = Numbers::getCompleteNumber( $this->phpcsFile, $j );
+							$value      .= $number_info['decimal'];
+							$j           = $number_info['last_token'];
+							continue;
+						}
+
 						if ( \T_OPEN_PARENTHESIS === $this->tokens[ $j ]['code'] ) {
 							$value .= $this->tokens[ $j ]['content'];
 							++$parentheses_count;
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 650645d3ea..16b259f514 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -231,3 +231,37 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 // Allow for PHP 7.4+ arrow functions as callbacks.
 add_filter( 'cron_schedules', fn ( $schedules ) => $schedules + array( 'every_9_mins' => array( 'interval' => 9 * 60, ) ) ); // Warning: 9 min.
 add_filter( 'cron_schedules', fn ( $schedules ) => array_merge( $schedules, array( 'weekly' => array( 'interval' => WEEK_IN_SECONDS ) ) ) ); // OK: > 10 min.
+
+// Allow for PHP 7.4+ numeric literals with underscores.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_day'] = array(
+		'interval' => 86_400, // 24 hours.
+		'display' => __( 'Once every day' )
+	);
+	return $schedules;
+} ); // OK
+
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_12_mins'] = array(
+		'interval' => 7_2_0, // 12 minutes.
+		'display' => __( 'Once every 12 minutes' )
+	);
+	return $schedules;
+} ); // Warning: 12 min.
+
+// Allow for PHP 8.1 explicit octal notation.
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_six_hours'] = array(
+		'interval' => 0o6 * HOUR_IN_SECONDS, // 6 hours.
+		'display' => __( 'Once every six hours' )
+	);
+	return $schedules;
+} ); // OK
+
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['every_83 seconds'] = array(
+		'interval' => 0O123, // 83 second.
+		'display' => __( 'Once every 83 seconds' )
+	);
+	return $schedules;
+} ); // Warning: 83 seconds.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 0c9346dff4..9715604d5e 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -58,6 +58,8 @@ public function getWarningList() {
 			207 => 1,
 			208 => 1,
 			232 => 1,
+			244 => 1,
+			261 => 1,
 		);
 	}
 }

From b983426eb966dcea24285f0f46b92d31b1ea0792 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:21:53 +0100
Subject: [PATCH 347/822] WP/CronInterval: (properly) add support for PHP 8.0+
 named parameters

Follow up to PR 2090 which already added preliminary support for named parameters to the sniff.

This commit now adds tests with named arguments in the `add_filter()` function calls and safeguards the prevention for false positives on callbacks containing a "cron_schedules" text string.
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   |  2 +-
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 13 +++++++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index cc249e8fcb..122395f06b 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -104,7 +104,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $stackPtr >= $callback['start'] ) {
+		if ( $stackPtr >= $callback['start'] && $stackPtr <= $callback['end'] ) {
 			// "cron_schedules" found in the second parameter, not the first.
 			return;
 		}
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 16b259f514..8cc7f222b7 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -265,3 +265,16 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 	);
 	return $schedules;
 } ); // Warning: 83 seconds.
+
+// Safeguard support for PHP 8.0+ named parameters.
+add_filter( callback: array( $place, 'cron_schedules' ), hook_name: 'some_hook', ); // OK, not the hook we're looking for.
+
+function prefix_cron_schedules( $schedules ) {
+	$schedules['every_2_mins'] = array(
+		'interval' => 120,
+		'display' => __( 'Once every 2 minutes' )
+	);
+	return $schedules;
+}
+add_filter(priority: 8, callback : 'prefix_cron_schedules', hook_name : 'cron_schedules', accepted_args: 1 ); // Warning: 2 min.
+add_filter( callback: 'prefix_cron_schedules', hook_name: 'cron_schedules' ); // Warning: 2 min.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 9715604d5e..9da069a4d0 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -60,6 +60,8 @@ public function getWarningList() {
 			232 => 1,
 			244 => 1,
 			261 => 1,
+			279 => 1,
+			280 => 1,
 		);
 	}
 }

From 163b81d4eb6c915c14d3f819641eaa787d0633e8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Dec 2022 19:03:40 +0100
Subject: [PATCH 348/822] WP/CronInterval: add support for PHP 8.1 first class
 callables

PHP 8.1 introduced a first class callables syntax, which can be used to express callbacks.

This commit adds support for callbacks passed to the `add_filter()` function expressed using this new syntax.

This prevents some false positives as well as prevents the "interval undetermined" warning being displayed for first class callables, where the interval _is_ actually determinable.

Note: there are more flaws in this sniff, like the scoping of the function search not being limited to the class/global scope depending on how the callback is defined, but that is outside the scope of this commit.

Includes unit tests.

Ref: https://wiki.php.net/rfc/first_class_callable_syntax
---
 WordPress/Sniffs/WP/CronIntervalSniff.php   | 67 ++++++++++++++++-----
 WordPress/Tests/WP/CronIntervalUnitTest.inc | 48 +++++++++++++++
 WordPress/Tests/WP/CronIntervalUnitTest.php |  5 ++
 3 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 122395f06b..9fac8f2059 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -130,10 +130,11 @@ public function process_token( $stackPtr ) {
 		unset( $functionPtr );
 
 		// Search for the function in tokens.
-		$search               = Tokens::$stringTokens;
-		$search[ \T_CLOSURE ] = \T_CLOSURE;
-		$search[ \T_FN ]      = \T_FN;
-		$callbackFunctionPtr  = $this->phpcsFile->findNext( $search, $callback['start'], ( $callback['end'] + 1 ) );
+		$search                = Tokens::$stringTokens;
+		$search[ \T_CLOSURE ]  = \T_CLOSURE;
+		$search[ \T_FN ]       = \T_FN;
+		$search[ \T_ELLIPSIS ] = \T_ELLIPSIS;
+		$callbackFunctionPtr   = $this->phpcsFile->findNext( $search, $callback['start'], ( $callback['end'] + 1 ) );
 
 		if ( false === $callbackFunctionPtr ) {
 			$this->confused( $stackPtr );
@@ -144,21 +145,29 @@ public function process_token( $stackPtr ) {
 			|| \T_FN === $this->tokens[ $callbackFunctionPtr ]['code']
 		) {
 			$functionPtr = $callbackFunctionPtr;
-		} else {
-			$functionName = TextStrings::stripQuotes( $this->tokens[ $callbackFunctionPtr ]['content'] );
-
-			for ( $ptr = 0; $ptr < $this->phpcsFile->numTokens; $ptr++ ) {
-				if ( \T_FUNCTION === $this->tokens[ $ptr ]['code'] ) {
-					$foundName = FunctionDeclarations::getName( $this->phpcsFile, $ptr );
-					if ( $foundName === $functionName ) {
-						$functionPtr = $ptr;
-						break;
-					} elseif ( isset( $this->tokens[ $ptr ]['scope_closer'] ) ) {
-						// Skip to the end of the function definition.
-						$ptr = $this->tokens[ $ptr ]['scope_closer'];
+		} elseif ( \T_ELLIPSIS === $this->tokens[ $callbackFunctionPtr ]['code'] ) {
+			// Check if this is a PHP 8.1 first class callable.
+			$before = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $callbackFunctionPtr - 1 ), null, true );
+			$after  = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $callbackFunctionPtr + 1 ), null, true );
+			if ( ( false !== $before && \T_OPEN_PARENTHESIS === $this->tokens[ $before ]['code'] )
+				&& ( false !== $after && \T_CLOSE_PARENTHESIS === $this->tokens[ $after ]['code'] )
+			) {
+				// Ok, now see if we can find the function name.
+				$beforeOpen = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $before - 1 ), null, true );
+				if ( false !== $beforeOpen && \T_STRING === $this->tokens[ $beforeOpen ]['code'] ) {
+					$found_function = $this->find_function_by_name( $this->tokens[ $beforeOpen ]['content'] );
+					if ( false !== $found_function ) {
+						$functionPtr = $found_function;
 					}
 				}
 			}
+			unset( $before, $after, $beforeOpen );
+		} else {
+			$functionName   = TextStrings::stripQuotes( $this->tokens[ $callbackFunctionPtr ]['content'] );
+			$found_function = $this->find_function_by_name( $functionName );
+			if ( false !== $found_function ) {
+				$functionPtr = $found_function;
+			}
 		}
 
 		if ( ! isset( $functionPtr ) ) {
@@ -270,6 +279,32 @@ public function process_token( $stackPtr ) {
 		}
 	}
 
+	/**
+	 * Find a declared function in a file based on the function name.
+	 *
+	 * @param string $functionName The name of the function to find.
+	 *
+	 * @return int|false Integer stack pointer to the function keyword token or
+	 *                   false if not found.
+	 */
+	private function find_function_by_name( $functionName ) {
+		$functionPtr = false;
+		for ( $ptr = 0; $ptr < $this->phpcsFile->numTokens; $ptr++ ) {
+			if ( \T_FUNCTION === $this->tokens[ $ptr ]['code'] ) {
+				$foundName = FunctionDeclarations::getName( $this->phpcsFile, $ptr );
+				if ( $foundName === $functionName ) {
+					$functionPtr = $ptr;
+					break;
+				} elseif ( isset( $this->tokens[ $ptr ]['scope_closer'] ) ) {
+					// Skip to the end of the function definition.
+					$ptr = $this->tokens[ $ptr ]['scope_closer'];
+				}
+			}
+		}
+
+		return $functionPtr;
+	}
+
 	/**
 	 * Add warning about unclear cron schedule change.
 	 *
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 8cc7f222b7..57b51d14ad 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -278,3 +278,51 @@ function prefix_cron_schedules( $schedules ) {
 }
 add_filter(priority: 8, callback : 'prefix_cron_schedules', hook_name : 'cron_schedules', accepted_args: 1 ); // Warning: 2 min.
 add_filter( callback: 'prefix_cron_schedules', hook_name: 'cron_schedules' ); // Warning: 2 min.
+
+// Allow for PHP 8.1+ first class callables as callbacks.
+class FirstClassCallables {
+	public function add_schedules() {
+		add_filter( 'cron_schedules', $this->cron_weekly_schedule(...) ); // Ok: > 15 min.
+		add_filter( 'cron_schedules', $this->cron_eight_minute_schedule(...) ); // Warning: 8 min.
+		add_filter( 'cron_schedules', self::cron_weekly_schedule(...) ); // Ok: > 15 min.
+		add_filter( 'cron_schedules', static::cron_eight_minute_schedule(...) ); // Warning: 8 min.
+		add_filter( 'cron_schedules', [$this, 'cron_weekly_schedule'](...) ); // Ok: > 15 min.
+		add_filter( 'cron_schedules', array($this, 'cron_eight_minute_schedule')(...) ); // Warning: 8 min.
+	}
+
+	public static function cron_weekly_schedule( $schedules ) {
+		$schedules['weekly'] = [
+			'interval' => \WEEK_IN_SECONDS,
+			'display'  => \__( 'Once Weekly', 'text-domain' ),
+		];
+		return $schedules;
+	}
+
+	public static function cron_eight_minute_schedule( $schedules ) {
+		$schedules['every_8_minutes'] = [
+			'interval' => (8 * \MINUTE_IN_SECONDS),
+			'display' => __( 'Once every 8 minutes' )
+		];
+		return $schedules;
+	}
+}
+
+function first_class_weekly_schedule( $schedules ) {
+	$schedules['weekly'] = array(
+		'interval' => WEEK_IN_SECONDS,
+		'display' => __( 'Once Weekly' )
+	);
+	return $schedules;
+}
+add_filter( 'cron_schedules', 'first_class_weekly_schedule'(...)); // Ok: > 15 min.
+add_filter( 'cron_schedules', first_class_weekly_schedule(...)); // Ok: > 15 min.
+
+function first_class_six_min_schedule( $schedules ) {
+	$schedules['every_6_mins'] = array(
+		'interval' => 360,
+		'display' => __( 'Once every 6 minutes' )
+	);
+	return $schedules;
+}
+add_filter( 'cron_schedules', first_class_six_min_schedule(...)); // Warning: 6 min.
+add_filter( 'cron_schedules', 'first_class_six_min_schedule'(...)); // Warning: 6 min.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 9da069a4d0..bf6be22ee4 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -62,6 +62,11 @@ public function getWarningList() {
 			261 => 1,
 			279 => 1,
 			280 => 1,
+			286 => 1,
+			288 => 1,
+			290 => 1,
+			327 => 1,
+			328 => 1,
 		);
 	}
 }

From fe667d73868f35e022949a37b119f74e6b3a69d1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 12:35:18 +0100
Subject: [PATCH 349/822] WP/DeprecatedParameters: verify against WP Core

Updated the array of parameters to search for based on a review of all calls to the `_deprecated_argument()` function in WP Core.

Findings:
* `get_user_option()` was listing the wrong WP version for its deprecation.
    Ref: https://developer.wordpress.org/reference/functions/get_user_option/
* `unregister_setting()` was looking for the wrong (positional) parameter.
    Includes updating the unit test.
    Ref: https://developer.wordpress.org/reference/functions/unregister_setting/
* The `_future_post_hook()` function contains a _soft_ deprecated parameter. Should still be detected by WPCS.
    As per the function docblock, I've set the expected value to `null`.
    Ref: https://developer.wordpress.org/reference/functions/_future_post_hook/
* The `_load_remote_block_patterns()` is a newly deprecated function (per WP 5.9.0).
    Ref: https://developer.wordpress.org/reference/functions/_load_remote_block_patterns/

Includes additional unit tests for the two newly listed functions.
---
 .../Sniffs/WP/DeprecatedParametersSniff.php   | 19 ++++++++++++++++---
 .../Tests/WP/DeprecatedParametersUnitTest.inc |  7 ++++---
 .../Tests/WP/DeprecatedParametersUnitTest.php |  8 ++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 9500977df5..a8891dfc51 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -73,7 +73,20 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 *    );
 	 */
 	protected $target_functions = array(
-
+		'_future_post_hook' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => null,
+				'version' => '2.3.0',
+			),
+		),
+		'_load_remote_block_patterns' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => null,
+				'version' => '5.9.0',
+			),
+		),
 		'add_option' => array(
 			3 => array(
 				'name'    => 'deprecated',
@@ -139,7 +152,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 			3 => array(
 				'name'    => 'deprecated',
 				'value'   => '',
-				'version' => '2.3.0',
+				'version' => '3.0.0',
 			),
 		),
 		'get_wp_title_rss' => array(
@@ -232,7 +245,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 			),
 		),
 		'unregister_setting' => array(
-			4 => array(
+			3 => array(
 				'name'    => 'deprecated',
 				'value'   => '',
 				'version' => '4.7.0',
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
index 498cd164d6..4ab4ba387b 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
@@ -62,7 +62,7 @@ the_author( 'deprecated', 'deprecated' );
 the_author_posts_link( 'deprecated' );
 trackback_rdf( 'deprecated' );
 trackback_url( 'deprecated' );
-unregister_setting( '', '', '', 'deprecated' );
+unregister_setting( '', '', 'deprecated' );
 update_blog_option( '', '', '', 'deprecated' );
 update_user_status( '', '', '', 'deprecated' );
 wp_get_http_headers( '', 'deprecated' );
@@ -74,6 +74,7 @@ wp_notify_postauthor( '', 'null' ); // Null as a string not null.
 wp_title_rss( 'deprecated' );
 wp_upload_bits( '', 'deprecated' );
 xfn_check( '', '', 'deprecated' );
+_future_post_hook( 10, $post );
 
-// All will give an WARNING as they have been deprecated after WP 4.9.
-// Nothing yet.
+// All will give an WARNING as they have been deprecated after WP 5.8.
+_load_remote_block_patterns( $value );
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index 55ff64ae89..fd210bef82 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -28,7 +28,7 @@ class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		$start_line = 42;
-		$end_line   = 76;
+		$end_line   = 77;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		$errors[22] = 1;
@@ -51,6 +51,10 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array();
+		$start_line = 80;
+		$end_line   = 80;
+		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
+
+		return $errors;
 	}
 }

From dfd33cd59523cdf4189ecf726c133805a0aa44d9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 12:36:41 +0100
Subject: [PATCH 350/822] WP/DeprecatedParameterValues: add support for PHP
 8.0+ named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes a change to the array format to allow for recording the parameter name.

Includes additional unit tests.
---
 .../WP/DeprecatedParameterValuesSniff.php     | 141 +++++++++++-------
 .../WP/DeprecatedParameterValuesUnitTest.inc  |  11 ++
 .../WP/DeprecatedParameterValuesUnitTest.php  |   2 +
 3 files changed, 96 insertions(+), 58 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 1f7c052ccc..500f56e04e 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
@@ -46,14 +47,19 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 * Last updated for WordPress 4.9.6.
 	 *
 	 * @since 1.0.0
+	 * @since 3.0.0 The format of the value has changed to support function calls
+	 *              using named parameters.
 	 *
 	 * @var array Multidimensional array with parameter details.
 	 *     $target_functions = array(
 	 *         (string) Function name. => array(
 	 *             (int) Target parameter position, 1-based. => array(
-	 *                 (string) Parameter value. => array(
-	 *                     'alt'     => (string) Suggested alternative.
-	 *                     'version' => (int) The WordPress version when deprecated.
+	 *                 (string) 'name'   => (string|array) Parameter name(s),
+	 *                 (string) 'values' => array(
+	 *                     (string) Parameter value. => array(
+	 *                         'alt'     => (string) Suggested alternative.
+	 *                         'version' => (int) The WordPress version when deprecated.
+	 *                     )
 	 *                 )
 	 *             )
 	 *         )
@@ -62,81 +68,99 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	protected $target_functions = array(
 		'add_settings_field' => array(
 			4 => array(
-				'misc' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.0.0',
-				),
-				'privacy' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.5.0',
+				'name'   => 'page',
+				'values' => array(
+					'misc' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.0.0',
+					),
+					'privacy' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.5.0',
+					),
 				),
 			),
 		),
 		'add_settings_section' => array(
 			4 => array(
-				'misc' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.0.0',
-				),
-				'privacy' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.5.0',
+				'name'   => 'page',
+				'values' => array(
+					'misc' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.0.0',
+					),
+					'privacy' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.5.0',
+					),
 				),
 			),
 		),
 		'bloginfo' => array(
 			1 => array(
-				'home' => array(
-					'alt'     => 'the "url" argument',
-					'version' => '2.2.0',
-				),
-				'siteurl' => array(
-					'alt'     => 'the "url" argument',
-					'version' => '2.2.0',
-				),
-				'text_direction' => array(
-					'alt'     => 'is_rtl()',
-					'version' => '2.2.0',
+				'name'   => 'show',
+				'values' => array(
+					'home' => array(
+						'alt'     => 'the "url" argument',
+						'version' => '2.2.0',
+					),
+					'siteurl' => array(
+						'alt'     => 'the "url" argument',
+						'version' => '2.2.0',
+					),
+					'text_direction' => array(
+						'alt'     => 'is_rtl()',
+						'version' => '2.2.0',
+					),
 				),
 			),
 		),
 		'get_bloginfo' => array(
 			1 => array(
-				'home' => array(
-					'alt'     => 'the "url" argument',
-					'version' => '2.2.0',
-				),
-				'siteurl' => array(
-					'alt'     => 'the "url" argument',
-					'version' => '2.2.0',
-				),
-				'text_direction' => array(
-					'alt'     => 'is_rtl()',
-					'version' => '2.2.0',
+				'name'   => 'show',
+				'values' => array(
+					'home' => array(
+						'alt'     => 'the "url" argument',
+						'version' => '2.2.0',
+					),
+					'siteurl' => array(
+						'alt'     => 'the "url" argument',
+						'version' => '2.2.0',
+					),
+					'text_direction' => array(
+						'alt'     => 'is_rtl()',
+						'version' => '2.2.0',
+					),
 				),
 			),
 		),
 		'register_setting' => array(
 			1 => array(
-				'misc' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.0.0',
-				),
-				'privacy' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.5.0',
+				'name'   => 'option_group',
+				'values' => array(
+					'misc' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.0.0',
+					),
+					'privacy' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.5.0',
+					),
 				),
 			),
 		),
 		'unregister_setting' => array(
 			1 => array(
-				'misc' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.0.0',
-				),
-				'privacy' => array(
-					'alt'     => 'another settings group',
-					'version' => '3.5.0',
+				'name'   => 'option_group',
+				'values' => array(
+					'misc' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.0.0',
+					),
+					'privacy' => array(
+						'alt'     => 'another settings group',
+						'version' => '3.5.0',
+					),
 				),
 			),
 		),
@@ -156,15 +180,16 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 		$this->get_wp_version_from_cli();
-		$param_count = \count( $parameters );
+
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
+			$found_param = PassedParameters::getParameterFromStack( $parameters, $position, $parameter_args['name'] );
 
-			// Stop if the position is higher then the total number of parameters.
-			if ( $position > $param_count ) {
-				break;
+			// Skip if the parameter was not found.
+			if ( false === $found_param ) {
+				continue;
 			}
 
-			$this->process_parameter( $matched_content, $parameters[ $position ], $parameter_args );
+			$this->process_parameter( $matched_content, $found_param, $parameter_args['values'] );
 		}
 	}
 
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
index 39025a4776..82666074c7 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
@@ -27,3 +27,14 @@ echo bloginfo( function_name() );
 
 get_bloginfo( 'wpurl' ); // OK.
 add_settings_field( '', '', '', /* deliberately not passed */ ); // Valid for PHP 7.3+.
+
+// Safeguard support for PHP 8.0+ named parameters.
+add_settings_section( $id, $title, $callback, args: $args ); // OK, optional parameter skipped.
+add_settings_field( page: $page, section: $section, id: $id, title: $title, callback: $callback ); // OK, undetermined.
+add_settings_section( callback: $callback, page: 'general', section: $section, id: $id, title: $title, ); // OK, not the deprecated value.
+add_settings_field( page: 'misc', section: $section, id: $id, title: $title, callback: $callback ); // Error.
+
+get_bloginfo( filter: $filter ); // OK, optional parameter skipped.
+get_bloginfo( filter: $filter, show: $show, ); // OK, undetermined.
+get_bloginfo( filter: $filter, show: 'admin_email', ); // OK, not the deprecated value.
+get_bloginfo( filter: $filter, show: 'text_direction', ); // Error.
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index dd3c909379..22e98a1066 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -41,6 +41,8 @@ public function getErrorList() {
 			16 => 1,
 			17 => 1,
 			18 => 1,
+			35 => 1,
+			40 => 1,
 		);
 	}
 

From fc2fb6ab9dfec790b4f4cce31ae31bded6b5cc10 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 15 Dec 2022 12:37:01 +0100
Subject: [PATCH 351/822] WP/DeprecatedParameterValues: verify against WP Core

Updated the array of parameters and values to search for based on a review of all calls to the `_deprecated_argument()` function in WP Core.

Includes tests.

Refs:
* https://developer.wordpress.org/reference/functions/add_option/
* https://developer.wordpress.org/reference/functions/get_option/
* https://developer.wordpress.org/reference/functions/update_option/
---
 .../WP/DeprecatedParameterValuesSniff.php     | 45 +++++++++++++++++++
 .../WP/DeprecatedParameterValuesUnitTest.inc  | 11 +++++
 .../WP/DeprecatedParameterValuesUnitTest.php  |  9 ++++
 3 files changed, 65 insertions(+)

diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 500f56e04e..365d8ffbfe 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -66,6 +66,21 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 *     );
 	 */
 	protected $target_functions = array(
+		'add_option' => array(
+			1 => array(
+				'name'   => 'option',
+				'values' => array(
+					'blacklist_keys' => array(
+						'alt'     => 'disallowed_keys',
+						'version' => '5.5.0',
+					),
+					'comment_whitelist' => array(
+						'alt'     => 'comment_previously_approved',
+						'version' => '5.5.0',
+					),
+				),
+			),
+		),
 		'add_settings_field' => array(
 			4 => array(
 				'name'   => 'page',
@@ -134,6 +149,21 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 				),
 			),
 		),
+		'get_option' => array(
+			1 => array(
+				'name'   => 'option',
+				'values' => array(
+					'blacklist_keys' => array(
+						'alt'     => 'disallowed_keys',
+						'version' => '5.5.0',
+					),
+					'comment_whitelist' => array(
+						'alt'     => 'comment_previously_approved',
+						'version' => '5.5.0',
+					),
+				),
+			),
+		),
 		'register_setting' => array(
 			1 => array(
 				'name'   => 'option_group',
@@ -164,6 +194,21 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 				),
 			),
 		),
+		'update_option' => array(
+			1 => array(
+				'name'   => 'option',
+				'values' => array(
+					'blacklist_keys' => array(
+						'alt'     => 'disallowed_keys',
+						'version' => '5.5.0',
+					),
+					'comment_whitelist' => array(
+						'alt'     => 'comment_previously_approved',
+						'version' => '5.5.0',
+					),
+				),
+			),
+		),
 	);
 
 	/**
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
index 82666074c7..cd1fefec92 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
@@ -38,3 +38,14 @@ get_bloginfo( filter: $filter ); // OK, optional parameter skipped.
 get_bloginfo( filter: $filter, show: $show, ); // OK, undetermined.
 get_bloginfo( filter: $filter, show: 'admin_email', ); // OK, not the deprecated value.
 get_bloginfo( filter: $filter, show: 'text_direction', ); // Error.
+
+// Parameter values which have been deprecated in WP 5.5. All will give an error as the `minimum_wp_version` > 5.5.
+add_option('blacklist_keys');
+add_option('comment_whitelist', $value);
+add_option(value: $value, option: 'blacklist_keys');
+get_option('blacklist_keys');
+get_option('comment_whitelist', $default);
+get_option(default: $default, option: 'comment_whitelist');
+update_option('blacklist_keys', $value);
+update_option('comment_whitelist', $value);
+update_option(autoload: true, value: $value, option: 'blacklist_keys');
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 22e98a1066..577afeea3a 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -43,6 +43,15 @@ public function getErrorList() {
 			18 => 1,
 			35 => 1,
 			40 => 1,
+			43 => 1,
+			44 => 1,
+			45 => 1,
+			46 => 1,
+			47 => 1,
+			48 => 1,
+			49 => 1,
+			50 => 1,
+			51 => 1,
 		);
 	}
 

From f5256ea227414188efc99671a2669b77d658a5b4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Aug 2020 20:49:08 +0200
Subject: [PATCH 352/822] WP/DiscouragedConstants: allow for the PHP 8.0+
 nullsafe object operator

Ignore tokens preceded by the nullsafe object operator as they won't be the global constant.

Includes minor maintenance tweak to use a predefined array for all object operators.

Includes unit test.
---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php   | 12 ++++++++++--
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index f300a2a3bc..7492f1429c 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
@@ -59,6 +60,8 @@ class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a constant.
 	 *
+	 * Additional tokens are added from within the contructor.
+	 *
 	 * @var array
 	 */
 	private $preceding_tokens_to_ignore = array(
@@ -71,12 +74,17 @@ class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 		\T_IMPLEMENTS      => true,
 		\T_NEW             => true,
 		\T_FUNCTION        => true,
-		\T_DOUBLE_COLON    => true,
-		\T_OBJECT_OPERATOR => true,
 		\T_INSTANCEOF      => true,
 		\T_GOTO            => true,
 	);
 
+	/**
+	 * Constructor to enrich a property.
+	 */
+	public function __construct() {
+		$this->preceding_tokens_to_ignore += Collections::objectOperators();
+	}
+
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 4949a9557a..08309d2d8b 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -70,3 +70,6 @@ switch(	STYLESHEETPATH ) {
 
 define( 'STYLESHEETPATH', 'something' );
 const STYLESHEETPATH = 'something';
+
+// Ignore also as "not a global constant" when the nullsafe object operator is used.
+echo $obj?->STYLESHEETPATH;

From 280b3cc133a9debdd1a59c7836f1483e286a53c3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 19:11:30 +0100
Subject: [PATCH 353/822] WP/DiscouragedConstants: allow for PHP 8.1+ enums

Ignore tokens preceded by the `enum` keyword as they won't be the global constant.

Includes minor maintenance tweak to use a predefined array for all OO keywords.

Includes unit test.
---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php   | 4 +---
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 7492f1429c..93024d9731 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -67,9 +67,6 @@ class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 	private $preceding_tokens_to_ignore = array(
 		\T_NAMESPACE       => true,
 		\T_USE             => true,
-		\T_CLASS           => true,
-		\T_TRAIT           => true,
-		\T_INTERFACE       => true,
 		\T_EXTENDS         => true,
 		\T_IMPLEMENTS      => true,
 		\T_NEW             => true,
@@ -82,6 +79,7 @@ class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 	 * Constructor to enrich a property.
 	 */
 	public function __construct() {
+		$this->preceding_tokens_to_ignore += Tokens::$ooScopeTokens;
 		$this->preceding_tokens_to_ignore += Collections::objectOperators();
 	}
 
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 08309d2d8b..4335413a80 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -73,3 +73,7 @@ const STYLESHEETPATH = 'something';
 
 // Ignore also as "not a global constant" when the nullsafe object operator is used.
 echo $obj?->STYLESHEETPATH;
+
+// Ignore enum names as not a global constant.
+enum STYLESHEETPATH {}
+enum BACKGROUND_COLOR: string implements Colorful {}

From 9508ea183c85a19af8c8b29516fd39b1682cf451 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:41:11 +0100
Subject: [PATCH 354/822] WP/DiscouragedConstants: add support for PHP 8.0+
 named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.
    Ref: https://www.php.net/manual/en/function.define

Includes additional unit tests.
---
 .../Sniffs/WP/DiscouragedConstantsSniff.php      | 16 ++++++++++++----
 .../Tests/WP/DiscouragedConstantsUnitTest.inc    |  4 ++++
 .../Tests/WP/DiscouragedConstantsUnitTest.php    |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 93024d9731..ba789777dd 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 
@@ -50,11 +51,17 @@ class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 	 * Array of functions to check.
 	 *
 	 * @since 0.14.0
+	 * @since 3.0.0  The format of the value has changed from an integer parameter
+	 *               position to an array with the parameter position and name.
 	 *
-	 * @var array <string function name> => <int parameter position>
+	 * @var array<string, <string, in|string>> Function name as key, array with target
+	 *                                         parameter and name as value.
 	 */
 	protected $target_functions = array(
-		'define' => 1,
+		'define' => array(
+			'position' => 1,
+			'name'     => 'constant_name',
+		),
 	);
 
 	/**
@@ -204,11 +211,12 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$target_param  = $this->target_functions[ $function_name ];
 
 		// Was the target parameter passed ?
-		if ( ! isset( $parameters[ $target_param ] ) ) {
+		$found_param = PassedParameters::getParameterFromStack( $parameters, $target_param['position'], $target_param['name'] );
+		if ( false === $found_param ) {
 			return;
 		}
 
-		$raw_content = TextStrings::stripQuotes( $parameters[ $target_param ]['raw'] );
+		$raw_content = TextStrings::stripQuotes( $found_param['raw'] );
 
 		if ( isset( $this->discouraged_constants[ $raw_content ] ) ) {
 			$this->phpcsFile->addWarning(
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 4335413a80..707543ffe2 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -77,3 +77,7 @@ echo $obj?->STYLESHEETPATH;
 // Ignore enum names as not a global constant.
 enum STYLESHEETPATH {}
 enum BACKGROUND_COLOR: string implements Colorful {}
+
+// Safeguard support for PHP 8.0+ named parameters.
+define( case_insensitive: false, value: 'something' ); // OK. Well, not really as missing a required param, but that's not the concern of this sniff.
+define( case_insensitive: false, constant_name: 'STYLESHEETPATH', value: 'something' ); // Bad.
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index 9d48851857..b21a25f2d5 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -53,7 +53,7 @@ public function getWarningList() {
 			67 => 1,
 			71 => 1,
 			72 => 1,
+			83 => 1,
 		);
 	}
-
 }

From ea0a9c2254478d5c03d33ba31eab1c36aac78efc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:52:03 +0100
Subject: [PATCH 355/822] WP/DiscouragedConstants: prevent some false positives

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some false negatives get fixed.

Includes unit tests demonstrating the issue and safeguarding the fix.

Includes ensuring that the information displayed in the error message will also not contain comments.
---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php   | 10 +++++-----
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc |  8 ++++++++
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.php |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index ba789777dd..379e60984d 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -216,16 +216,16 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$raw_content = TextStrings::stripQuotes( $found_param['raw'] );
+		$clean_content = TextStrings::stripQuotes( $found_param['clean'] );
 
-		if ( isset( $this->discouraged_constants[ $raw_content ] ) ) {
+		if ( isset( $this->discouraged_constants[ $clean_content ] ) ) {
 			$this->phpcsFile->addWarning(
 				'Found declaration of constant "%s". Use %s instead.',
 				$stackPtr,
-				MessageHelper::stringToErrorcode( $raw_content . 'DeclarationFound' ),
+				MessageHelper::stringToErrorcode( $clean_content . 'DeclarationFound' ),
 				array(
-					$raw_content,
-					$this->discouraged_constants[ $raw_content ],
+					$clean_content,
+					$this->discouraged_constants[ $clean_content ],
 				)
 			);
 		}
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 707543ffe2..727ca4aa3b 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -81,3 +81,11 @@ enum BACKGROUND_COLOR: string implements Colorful {}
 // Safeguard support for PHP 8.0+ named parameters.
 define( case_insensitive: false, value: 'something' ); // OK. Well, not really as missing a required param, but that's not the concern of this sniff.
 define( case_insensitive: false, constant_name: 'STYLESHEETPATH', value: 'something' ); // Bad.
+
+// Safeguard that comments in the parameters are ignored.
+define(
+	// Name.
+	'STYLESHEETPATH',
+	// Value.
+	'something'
+);
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index b21a25f2d5..6d766d8c7b 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -54,6 +54,7 @@ public function getWarningList() {
 			71 => 1,
 			72 => 1,
 			83 => 1,
+			86 => 1,
 		);
 	}
 }

From 000d23d20162b4c580a6c76c93179ad36533f699 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:55:11 +0100
Subject: [PATCH 356/822] WP/DiscouragedConstants: improve error position
 precision

... for multi-line function calls.
---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php   | 9 ++++++++-
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.php | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 379e60984d..62f7b9bcec 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -219,9 +219,16 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$clean_content = TextStrings::stripQuotes( $found_param['clean'] );
 
 		if ( isset( $this->discouraged_constants[ $clean_content ] ) ) {
+			$first_non_empty = $this->phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$found_param['start'],
+				( $found_param['end'] + 1 ),
+				true
+			);
+
 			$this->phpcsFile->addWarning(
 				'Found declaration of constant "%s". Use %s instead.',
-				$stackPtr,
+				$first_non_empty,
 				MessageHelper::stringToErrorcode( $clean_content . 'DeclarationFound' ),
 				array(
 					$clean_content,
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index 6d766d8c7b..fe03b4dfdb 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -54,7 +54,7 @@ public function getWarningList() {
 			71 => 1,
 			72 => 1,
 			83 => 1,
-			86 => 1,
+			88 => 1,
 		);
 	}
 }

From f9611e2b8bc97766c853f084067176303560fc47 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 11:17:50 +0100
Subject: [PATCH 357/822] WP/DiscouragedConstants: add tests with trait and
 enum constants

... to ensure those aren't recognized as if they were the global constant.

Enums are a PHP 8.1+ features.
Constants in traits are allowed since PHP 8.2.
---
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 727ca4aa3b..5dc64d8ba5 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -89,3 +89,14 @@ define(
 	// Value.
 	'something'
 );
+
+// Safeguard that constants and methods in enums and traits are ignored.
+trait ContainsConst {
+	const STYLESHEETPATH = 'something';
+	private function &STYLESHEETPATH() {}
+}
+
+enum ContainsConst {
+	const STYLESHEETPATH = 'something';
+	private function STYLESHEETPATH() {}
+}

From ef60b2ed4fbfa58c1c5d776eed7e940fc41df467 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 11:09:16 +0100
Subject: [PATCH 358/822] WP/DiscouragedConstants: remove redundant code

... which is no longer needed now support for PHPCS < 3.7.1 has been dropped.
---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 62f7b9bcec..9a59db8eff 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -166,9 +166,8 @@ public function process_arbitrary_tstring( $stackPtr ) {
 		if ( false !== $first_on_line && \T_USE === $this->tokens[ $first_on_line ]['code'] ) {
 			$next_on_line = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $first_on_line + 1 ), null, true );
 			if ( false !== $next_on_line ) {
-				if ( ( \T_STRING === $this->tokens[ $next_on_line ]['code']
-						&& 'const' === $this->tokens[ $next_on_line ]['content'] )
-					|| \T_CONST === $this->tokens[ $next_on_line ]['code'] // Happens in some PHPCS versions.
+				if ( \T_STRING === $this->tokens[ $next_on_line ]['code']
+					&& 'const' === $this->tokens[ $next_on_line ]['content']
 				) {
 					$has_ns_sep = $this->phpcsFile->findNext( \T_NS_SEPARATOR, ( $next_on_line + 1 ), $stackPtr );
 					if ( false !== $has_ns_sep ) {

From 653a981c44a46666a6f08b76217ec0bcb04f5e3c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 11:33:21 +0100
Subject: [PATCH 359/822] WP/EnqueuedResources: add tests with PHP 7.3+
 flexible heredoc/nowdocs

.. to safeguard these are handled correctly.

Note: these are in a separate file for maintainability as any code which would be placed _after_ the flexible heredoc/nowdoc would not be tokenized correctly on PHP < 7.3, making the tests maintainer error prone if the tests were in the same file.
---
 ...st.inc => EnqueuedResourcesUnitTest.1.inc} |  0
 .../Tests/WP/EnqueuedResourcesUnitTest.2.inc  | 19 +++++
 .../Tests/WP/EnqueuedResourcesUnitTest.php    | 74 ++++++++++++-------
 3 files changed, 67 insertions(+), 26 deletions(-)
 rename WordPress/Tests/WP/{EnqueuedResourcesUnitTest.inc => EnqueuedResourcesUnitTest.1.inc} (100%)
 create mode 100644 WordPress/Tests/WP/EnqueuedResourcesUnitTest.2.inc

diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/WP/EnqueuedResourcesUnitTest.inc
rename to WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.2.inc b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.2.inc
new file mode 100644
index 0000000000..ee577730de
--- /dev/null
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.2.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Tests with PHP 7.3+ flexible heredoc/nowdoc.
+ */
+$head = <<<EOT
+	<link rel="stylesheet" href="http://someurl/somefile.css">
+	<script src="http://someurl/somefile.js"></script>
+	EOT;
+
+$head = <<<"EOT"
+        <link rel="stylesheet" href="https://someurl/somefile.css">
+        <script src="https://someurl/somefile.js"></script>
+    EOT;
+
+$head = <<<'EOD'
+		<link rel="stylesheet" href="http://someurl/somefile.css">
+		<script src="http://someurl/somefile.js"></script>
+		EOD;
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index e1697abeaf..cc268491d7 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -24,33 +24,56 @@ class EnqueuedResourcesUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
-		return array(
-			1  => 1,
-			2  => 1,
-			6  => 1,
-			7  => 1,
-			10 => 1,
-			11 => 1,
-			13 => 1,
-			14 => 1,
-			16 => 1,
-			17 => 1,
-			20 => 1,
-			21 => 1,
-			25 => 1,
-			26 => 1,
-			30 => 1,
-			31 => 1,
-			42 => 1,
-			46 => 1,
-			48 => 1,
-			49 => 1,
-			54 => 1,
-			55 => 1,
-		);
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'EnqueuedResourcesUnitTest.1.inc':
+				return array(
+					1  => 1,
+					2  => 1,
+					6  => 1,
+					7  => 1,
+					10 => 1,
+					11 => 1,
+					13 => 1,
+					14 => 1,
+					16 => 1,
+					17 => 1,
+					20 => 1,
+					21 => 1,
+					25 => 1,
+					26 => 1,
+					30 => 1,
+					31 => 1,
+					42 => 1,
+					46 => 1,
+					48 => 1,
+					49 => 1,
+					54 => 1,
+					55 => 1,
+				);
+
+			case 'EnqueuedResourcesUnitTest.2.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
+
+				return array(
+					7  => 1,
+					8  => 1,
+					12 => 1,
+					13 => 1,
+					17 => 1,
+					18 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 
 	/**
@@ -61,5 +84,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }

From dec9d40b33939678ed57ae88e977b5fe7198a55b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 11:46:01 +0100
Subject: [PATCH 360/822] WP/EnqueuedResources: minor code performance tweak

Always retrieve the stack pointer to the last token of a potentially multi-line text string and skip to the end after analyzing the content.

While the `TextStrings::getEndOfCompleteTextString()` and the `TextStrings::getCompleteTextString()` have some overlap, the results of the overlapping code is cached, so this should barely affect performance, while skipping to the end of the text string will greatly improve performance for files containing long multi-line text strings.
---
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index c1c45379de..a6ccae44a0 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -9,7 +9,6 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
@@ -47,18 +46,15 @@ public function register() {
 	 *
 	 * @param int $stackPtr The position of the current token in the stack.
 	 *
-	 * @return void
+	 * @return int Integer stack pointer to skip forward to.
 	 */
 	public function process_token( $stackPtr ) {
 
+		$end_ptr = $stackPtr;
 		$content = $this->tokens[ $stackPtr ]['content'];
 		if ( \T_INLINE_HTML !== $this->tokens[ $stackPtr ]['code'] ) {
-			try {
-				$content = TextStrings::getCompleteTextString( $this->phpcsFile, $stackPtr );
-			} catch ( RuntimeException $e ) {
-				// Not the first token in a multi-line text string. Any issues will already have been reported.
-				return;
-			}
+			$end_ptr = TextStrings::getEndOfCompleteTextString( $this->phpcsFile, $stackPtr );
+			$content = TextStrings::getCompleteTextString( $this->phpcsFile, $stackPtr );
 		}
 
 		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
@@ -80,6 +76,8 @@ public function process_token( $stackPtr ) {
 				);
 			}
 		}
+
+		return ( $end_ptr + 1 );
 	}
 
 	/**
@@ -104,5 +102,4 @@ private function find_token_in_multiline_string( $stackPtr, $content, $match_off
 
 		return ( $stackPtr + $newline_count );
 	}
-
 }

From 793e0857fb02f184f0febe38007c5908d0bbfa1d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 11 Dec 2022 11:50:47 +0100
Subject: [PATCH 361/822] WP/EnqueuedResources: minor message tweak for clarity

---
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index a6ccae44a0..5b73ccfcfe 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -60,7 +60,7 @@ public function process_token( $stackPtr ) {
 		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
 			foreach ( $matches[0] as $match ) {
 				$this->phpcsFile->addError(
-					'Stylesheets must be registered/enqueued via wp_enqueue_style',
+					'Stylesheets must be registered/enqueued via wp_enqueue_style()',
 					$this->find_token_in_multiline_string( $stackPtr, $content, $match[1] ),
 					'NonEnqueuedStylesheet'
 				);
@@ -70,7 +70,7 @@ public function process_token( $stackPtr ) {
 		if ( preg_match_all( '#<script[^>]*(?<=src=)#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
 			foreach ( $matches[0] as $match ) {
 				$this->phpcsFile->addError(
-					'Scripts must be registered/enqueued via wp_enqueue_script',
+					'Scripts must be registered/enqueued via wp_enqueue_script()',
 					$this->find_token_in_multiline_string( $stackPtr, $content, $match[1] ),
 					'NonEnqueuedScript'
 				);

From d452dd76d2e3b9974c37a0760b50a0fe512b3f22 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 09:42:56 +0100
Subject: [PATCH 362/822] WP/EnqueuedResourceParameters: add support for PHP
 8.0+ named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes additional unit tests.
---
 .../Sniffs/WP/EnqueuedResourceParametersSniff.php | 15 +++++++++------
 .../WP/EnqueuedResourceParametersUnitTest.inc     | 12 ++++++++++++
 .../WP/EnqueuedResourceParametersUnitTest.php     |  3 ++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index e5b0dd1d3f..31fc7eadbc 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
  * This checks the enqueued 4th and 5th parameters to make sure the version and in_footer are set.
@@ -118,9 +119,9 @@ public function register() {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-
 		// Check to see if a source ($src) is specified.
-		if ( ! isset( $parameters[2] ) ) {
+		$src_param = PassedParameters::getParameterFromStack( $parameters, 2, 'src' );
+		if ( false === $src_param ) {
 			return;
 		}
 
@@ -128,7 +129,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 * Version Check: Check to make sure the version is set explicitly.
 		 */
 
-		if ( ! isset( $parameters[4] ) || 'null' === $parameters[4]['raw'] ) {
+		$version_param = PassedParameters::getParameterFromStack( $parameters, 4, 'ver' );
+		if ( false === $version_param || 'null' === $version_param['raw'] ) {
 			$type = 'script';
 			if ( strpos( $matched_content, '_style' ) !== false ) {
 				$type = 'style';
@@ -141,7 +143,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				array( $matched_content, $type )
 			);
 			// The version argument should have a non-false value.
-		} elseif ( $this->is_falsy( $parameters[4]['start'], $parameters[4]['end'] ) ) {
+		} elseif ( $this->is_falsy( $version_param['start'], $version_param['end'] ) ) {
 			$this->phpcsFile->addError(
 				'Version parameter is not explicitly set or has been set to an equivalent of "false" for %s; ' .
 				'This means that the WordPress core version will be used which is not recommended for plugin or theme development.',
@@ -164,7 +166,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		if ( ! isset( $parameters[5] ) ) {
+		$infooter_param = PassedParameters::getParameterFromStack( $parameters, 5, 'in_footer' );
+		if ( false === $infooter_param ) {
 			// If in footer is not set, throw a warning about the default.
 			$this->phpcsFile->addWarning(
 				'In footer ($in_footer) is not set explicitly %s; ' .
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
index 098d40de95..928974509e 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
@@ -55,3 +55,15 @@ wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array
 
 wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ), (binary) 123, true ); // OK.
 wp_register_script( 'someScript-js', 'https://example.com/someScript.js' , array( 'jquery' ), b'0', true ); // Error - 0, false or NULL are not allowed.
+
+// Safeguard support for PHP 8.0+ named parameters.
+wp_register_script(
+	ver      : 0, // Error - 0, false or NULL are not allowed.
+	in_footer: false,
+	src      : 'https://example.com/someScript.js',
+	handle   : 'someScript-js',
+);
+wp_enqueue_script(
+	src: 'https://example.com/someScript.js',
+	handle: 'script-name',
+); // Warning - missing $ver, Warning - missing $in_footer.
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index b916b68b45..008ab704f3 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -36,6 +36,7 @@ public function getErrorList() {
 			22 => 1,
 			54 => 1,
 			57 => 1,
+			60 => 1,
 		);
 	}
 
@@ -52,7 +53,7 @@ public function getWarningList() {
 			39 => 2,
 			42 => 1,
 			45 => 1,
+			66 => 2,
 		);
 	}
-
 }

From a635c87abe93ca8d7880a870e78d9d6f97dbf2e6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 09:47:42 +0100
Subject: [PATCH 363/822] WP/EnqueuedResourceParameters: prevent false
 positives

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, a `null` value accompanied by a comment will no longer throw the wrong error.

Includes unit test demonstrating the issue and safeguarding the fix.
---
 .../Sniffs/WP/EnqueuedResourceParametersSniff.php      |  2 +-
 .../Tests/WP/EnqueuedResourceParametersUnitTest.inc    | 10 ++++++++++
 .../Tests/WP/EnqueuedResourceParametersUnitTest.php    |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 31fc7eadbc..3ca121d1e0 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -130,7 +130,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 */
 
 		$version_param = PassedParameters::getParameterFromStack( $parameters, 4, 'ver' );
-		if ( false === $version_param || 'null' === $version_param['raw'] ) {
+		if ( false === $version_param || 'null' === $version_param['clean'] ) {
 			$type = 'script';
 			if ( strpos( $matched_content, '_style' ) !== false ) {
 				$type = 'style';
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
index 928974509e..63bf97b30d 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
@@ -67,3 +67,13 @@ wp_enqueue_script(
 	src: 'https://example.com/someScript.js',
 	handle: 'script-name',
 ); // Warning - missing $ver, Warning - missing $in_footer.
+
+// Safeguard that comments in the parameters are ignored.
+wp_register_script(
+	'someScript-js',
+	'https://example.com/someScript.js',
+	array( 'jquery' ),
+	// Error - 0, false or NULL are not allowed.
+	null,
+	true,
+);
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index 008ab704f3..cefd96d535 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -54,6 +54,7 @@ public function getWarningList() {
 			42 => 1,
 			45 => 1,
 			66 => 2,
+			72 => 1,
 		);
 	}
 }

From 4ae70231fd7692da5a38dbaff2037590f572a9e9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 09:55:41 +0100
Subject: [PATCH 364/822] WP/EnqueuedResourceParameters: improve error position
 precision

... for multi-line function calls.
---
 .../Sniffs/WP/EnqueuedResourceParametersSniff.php      | 10 ++++++++--
 .../Tests/WP/EnqueuedResourceParametersUnitTest.php    |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 3ca121d1e0..5847c57ed4 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -130,6 +130,12 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 */
 
 		$version_param = PassedParameters::getParameterFromStack( $parameters, 4, 'ver' );
+
+		$error_ptr = $stackPtr;
+		if ( false !== $version_param ) {
+			$error_ptr = $this->phpcsFile->findNext( Tokens::$emptyTokens, $version_param['start'], ( $version_param['end'] + 1 ), true );
+		}
+
 		if ( false === $version_param || 'null' === $version_param['clean'] ) {
 			$type = 'script';
 			if ( strpos( $matched_content, '_style' ) !== false ) {
@@ -138,7 +144,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			$this->phpcsFile->addWarning(
 				'Resource version not set in call to %s(). This means new versions of the %s may not always be loaded due to browser caching.',
-				$stackPtr,
+				$error_ptr,
 				'MissingVersion',
 				array( $matched_content, $type )
 			);
@@ -147,7 +153,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$this->phpcsFile->addError(
 				'Version parameter is not explicitly set or has been set to an equivalent of "false" for %s; ' .
 				'This means that the WordPress core version will be used which is not recommended for plugin or theme development.',
-				$stackPtr,
+				$error_ptr,
 				'NoExplicitVersion',
 				array( $matched_content )
 			);
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index cefd96d535..fc01aa4fd8 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList() {
 			22 => 1,
 			54 => 1,
 			57 => 1,
-			60 => 1,
+			61 => 1,
 		);
 	}
 
@@ -54,7 +54,7 @@ public function getWarningList() {
 			42 => 1,
 			45 => 1,
 			66 => 2,
-			72 => 1,
+			77 => 1,
 		);
 	}
 }

From 7267258861870bd5674a7eea5986a39366c3d8c8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 10:27:42 +0100
Subject: [PATCH 365/822] WP/EnqueuedResourceParameters: add support for PHP
 7.4/8.1 numbers

PHP 7.4 introduced numeric literals with underscores.
PHP 8.1 introduced explicit octal notation.

While PHPCS backfills the tokens for this, this sniff uses an `eval()` call and if either of these PHP 7.4/8.1 syntaxes would be passed to this `eval()` while PHPCS is being run on PHP < 7.4, this will result in a parse error on the code passed to `eval()`.

By using the PHPCSUtils `Numbers::getCompleteNumber()` method, we can get access to the decimal value of the encountered number, which allows us to bypass the issue by using that in the code string passed to `eval()`.

Includes unit tests.
---
 WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php  | 9 +++++++++
 .../Tests/WP/EnqueuedResourceParametersUnitTest.inc      | 6 ++++++
 .../Tests/WP/EnqueuedResourceParametersUnitTest.php      | 2 ++
 3 files changed, 17 insertions(+)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 5847c57ed4..481038e5cb 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Numbers;
 use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
@@ -216,6 +217,14 @@ protected function is_falsy( $start, $end ) {
 				continue;
 			}
 
+			// Make sure that PHP 7.4 numeric literals and PHP 8.1 explicit octals don't cause problems.
+			if ( \T_LNUMBER === $this->tokens[ $i ]['code'] || \T_DNUMBER === $this->tokens[ $i ]['code'] ) {
+				$number_info  = Numbers::getCompleteNumber( $this->phpcsFile, $i );
+				$code_string .= $number_info['decimal'];
+				$i            = $number_info['last_token'];
+				continue;
+			}
+
 			$code_string .= $this->tokens[ $i ]['content'];
 		}
 
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
index 63bf97b30d..49b54822e5 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
@@ -77,3 +77,9 @@ wp_register_script(
 	null,
 	true,
 );
+
+// Safeguard handling of PHP 7.4 numeric literals with underscores.
+wp_register_script( 'someScript-js', $url, [], 0_0.0_0, true ); // Error - 0, false or NULL are not allowed.
+
+// Safeguard handling of PHP 8.1 explicit octals.
+wp_register_script( 'someScript-js', $url, [], 0o0, true ); // Error - 0, false or NULL are not allowed.
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index fc01aa4fd8..6de967c74b 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -37,6 +37,8 @@ public function getErrorList() {
 			54 => 1,
 			57 => 1,
 			61 => 1,
+			82 => 1,
+			85 => 1,
 		);
 	}
 

From ed652af2903d9ab206e9fd0a6bbd30a723e037d1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 22 Dec 2022 02:53:45 +0100
Subject: [PATCH 366/822] PHPCS: ruleset tweak

For this repo, we use a separate package for linting code, so there is no need to have the `Generic.PHP.Syntax` sniff running when doing a PHPCS scan (the sniff is included in the `WordPress-Extra` ruleset).

An analysis of the performance of a sniff run on this repo revealed that this was the slowest sniff by far. As excluding it will not have any QA impact, let's make CS runs on the code in this repo faster.
---
 .phpcs.xml.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index a26fa0b778..102cfa4ce5 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -47,6 +47,9 @@
 		<exclude name="WordPress.DB"/>
 		<exclude name="WordPress.Security"/>
 		<exclude name="WordPress.WP"/>
+
+		<!-- Linting is done in a separate CI job, no need to duplicate it. -->
+		<exclude name="Generic.PHP.Syntax"/>
 	</rule>
 
 	<!-- Check code for cross-version PHP compatibility. -->

From 63dbc512b07932cb53c9f8620f63154b00e35f7d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:12:48 +0100
Subject: [PATCH 367/822] CodeAnalysis/EscapedNotTranslated: improvement to the
 error message

... to remove the presumption that positional parameters are being used.
---
 WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index e1ffc20e59..4e06d63a1d 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -81,7 +81,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		);
 
 		$this->phpcsFile->addWarning(
-			'%s() expects only one parameter. Did you mean to use %s() ? Found: %s',
+			'%s() expects only a $text parameter. Did you mean to use %s() ? Found: %s',
 			$stackPtr,
 			'Found',
 			$data

From d04466e2cb9a2425747b373e522c965a99f7bb35 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:26:53 +0100
Subject: [PATCH 368/822] PHP/PregQuoteDelimiter: minor message tweak for
 clarity

---
 WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index 909579d00e..9adb59482d 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -63,7 +63,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		$this->phpcsFile->addWarning(
-			'Passing the $delimiter to preg_quote() is strongly recommended.',
+			'Passing the $delimiter parameter to preg_quote() is strongly recommended.',
 			$stackPtr,
 			'Missing'
 		);

From fe765e70f5afcdf909da1c8d03d610c06bcd9572 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:27:21 +0100
Subject: [PATCH 369/822] PHP/RestrictedPHPFunctions: minor message tweak for
 clarity

---
 WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
index 1bb192d8ce..277b9b3b81 100644
--- a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
@@ -37,7 +37,7 @@ public function getGroups() {
 		return array(
 			'create_function' => array(
 				'type'      => 'error',
-				'message'   => '%s() is deprecated as of PHP 7.2 and removed in PHP 8.0, please use full fledged functions or anonymous functions instead.',
+				'message'   => '%s() is deprecated as of PHP 7.2 and removed in PHP 8.0. Please use declared named or anonymous functions instead.',
 				'functions' => array(
 					'create_function',
 				),

From 3077efb4b3fb152649e32c3d046d928e66178732 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 18 Jul 2022 00:38:59 +0200
Subject: [PATCH 370/822] PHP/TypeCasts: minor message tweak for clarity

... and remove the advise to assign null as this could cause yet other problems due to the PHP 8.1 "passing null to non-nullable" deprecation (though passing an unassigned variable is in a way just as bad, but that's a whole other story).
---
 WordPress/Sniffs/PHP/TypeCastsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 448c859278..90c5d4bcf8 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -73,7 +73,7 @@ public function process_token( $stackPtr ) {
 
 			case \T_UNSET_CAST:
 				$this->phpcsFile->addError(
-					'Using the "(unset)" cast is forbidden as the type cast is removed in PHP 8. Use the "unset()" language construct or assign "null" as the value to the variable instead.',
+					'Using the "(unset)" cast is forbidden as the type cast is removed in PHP 8.0. Use the "unset()" language construct instead.',
 					$stackPtr,
 					'UnsetFound'
 				);

From ec499378b063701b6373012b8e7c2eebc13fd1a4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 07:38:01 +0100
Subject: [PATCH 371/822] Security/SafeRedirect: minor message tweak for
 clarity

---
 WordPress/Sniffs/Security/SafeRedirectSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/SafeRedirectSniff.php b/WordPress/Sniffs/Security/SafeRedirectSniff.php
index 2f6aa6a686..b15837c07d 100644
--- a/WordPress/Sniffs/Security/SafeRedirectSniff.php
+++ b/WordPress/Sniffs/Security/SafeRedirectSniff.php
@@ -37,7 +37,7 @@ public function getGroups() {
 		return array(
 			'wp_redirect' => array(
 				'type'      => 'warning',
-				'message'   => '%s() found. Using wp_safe_redirect(), along with the allowed_redirect_hosts filter if needed, can help avoid any chances of malicious redirects within code. It is also important to remember to call exit() after a redirect so that no other unwanted code is executed.',
+				'message'   => '%s() found. Using wp_safe_redirect(), along with the "allowed_redirect_hosts" filter if needed, can help avoid any chances of malicious redirects within code. It is also important to remember to call exit() after a redirect so that no other unwanted code is executed.',
 				'functions' => array(
 					'wp_redirect',
 				),

From 6db3d69c8a71191d8b32ad2a0abdbefee3413b3e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 2 Jul 2020 07:06:19 +0200
Subject: [PATCH 372/822] WP/GlobalVariablesOverride: implement PHPCSUtils

---
 .../WP/GlobalVariablesOverrideSniff.php       | 57 ++++++-------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 7381b7d8a3..3565f08b56 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -10,8 +10,11 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\Lists;
+use PHPCSUtils\Utils\Parentheses;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
@@ -70,19 +73,6 @@ class GlobalVariablesOverrideSniff extends Sniff {
 		'wp_cockneyreplace' => true,
 	);
 
-	/**
-	 * Scoped object and function structures to skip over as
-	 * variables will have a different scope within those.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @var array
-	 */
-	private $skip_over = array(
-		\T_FUNCTION => true,
-		\T_CLOSURE  => true,
-	);
-
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -92,15 +82,11 @@ class GlobalVariablesOverrideSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		// Add the OO scope tokens to the $skip_over property.
-		$this->skip_over += Tokens::$ooScopeTokens;
-
-		$targets = array(
+		$targets  = array(
 			\T_GLOBAL,
 			\T_VARIABLE,
-			\T_LIST,
-			\T_OPEN_SHORT_ARRAY,
 		);
+		$targets += Collections::listOpenTokensBC();
 
 		// Only used to skip over test classes.
 		$targets += Tokens::$ooScopeTokens;
@@ -146,9 +132,9 @@ public function process_token( $stackPtr ) {
 		 * Examine variables not within a function scope and access to the `$GLOBALS`
 		 * variable based on the variable token.
 		 */
-		$in_function_scope = $this->phpcsFile->hasCondition( $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+		$in_function_scope = Conditions::hasCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
 
-		if ( ( \T_LIST === $token['code'] || \T_OPEN_SHORT_ARRAY === $token['code'] )
+		if ( isset( Collections::listOpenTokensBC()[ $token['code'] ] )
 			&& false === $in_function_scope
 			&& false === $this->treat_files_as_scoped
 		) {
@@ -276,16 +262,13 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 * Function parameters with the same name as a WP global variable are fine,
 		 * including when they are being assigned a default value.
 		 */
-		if ( false === $in_list && isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			foreach ( $this->tokens[ $stackPtr ]['nested_parenthesis'] as $opener => $closer ) {
-				if ( isset( $this->tokens[ $opener ]['parenthesis_owner'] )
-					&& ( \T_FUNCTION === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code']
-						|| \T_CLOSURE === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code'] )
-				) {
-					return;
-				}
+		if ( false === $in_list ) {
+			$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+			if ( false !== $functionPtr ) {
+				return;
 			}
-			unset( $opener, $closer );
+
+			unset( $functionPtr );
 		}
 
 		/*
@@ -346,14 +329,12 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 		 */
 		$start = $ptr;
 		if ( true === $in_function_scope ) {
-			$function_cond = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
-			$closure_cond  = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-			$scope_cond    = max( $function_cond, $closure_cond ); // If false, it will evaluate as zero, so this is fine.
-			if ( isset( $this->tokens[ $scope_cond ]['scope_closer'] ) === false ) {
+			$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+			if ( isset( $this->tokens[ $functionPtr ]['scope_closer'] ) === false ) {
 				// Live coding or parse error.
 				return;
 			}
-			$end = $this->tokens[ $scope_cond ]['scope_closer'];
+			$end = $this->tokens[ $functionPtr ]['scope_closer'];
 		} else {
 			// Global statement in the global namespace with file is being treated as scoped.
 			$end = $this->phpcsFile->numTokens;
@@ -362,7 +343,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 		for ( $ptr = $start; $ptr < $end; $ptr++ ) {
 
 			// Skip over nested functions, classes and the likes.
-			if ( isset( $this->skip_over[ $this->tokens[ $ptr ]['code'] ] ) ) {
+			if ( isset( Collections::closedScopes()[ $this->tokens[ $ptr ]['code'] ] ) ) {
 				if ( ! isset( $this->tokens[ $ptr ]['scope_closer'] ) ) {
 					// Live coding or parse error.
 					break;
@@ -373,9 +354,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			}
 
 			// Make sure to recognize assignments to variables in a list construct.
-			if ( \T_LIST === $this->tokens[ $ptr ]['code']
-				|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $ptr ]['code']
-			) {
+			if ( isset( Collections::listOpenTokensBC()[ $this->tokens[ $ptr ]['code'] ] ) ) {
 				$list_open_close = Lists::getOpenClose( $this->phpcsFile, $ptr );
 
 				if ( false === $list_open_close ) {

From 08d6be3c3fd159f9490b86841249165c6f0916c4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 14:02:08 +0100
Subject: [PATCH 373/822] WP/GlobalVariablesOverride: minor efficiency tweak

Change the format of the `$search` array to have the "value" as the key instead of as the value, which allows for using the more performance friendly `isset()` instead of `in_array()`.
---
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 3565f08b56..d823f65c0a 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -312,7 +312,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				if ( WPGlobalVariablesHelper::is_wp_global( $var_name )
 					&& isset( $this->override_allowed[ $var_name ] ) === false
 				) {
-					$search[] = $var['content'];
+					$search[ $var['content'] ] = true;
 				}
 			}
 
@@ -369,7 +369,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 						$var_name = '$' . TextStrings::stripQuotes( VariableHelper::get_array_access_key( $this->phpcsFile, $ptr ) );
 					}
 
-					if ( \in_array( $var_name, $search, true ) ) {
+					if ( isset( $search[ $var_name ] ) ) {
 						$this->process_variable_assignment( $ptr, true );
 					}
 				}
@@ -383,7 +383,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 				continue;
 			}
 
-			if ( \in_array( $this->tokens[ $ptr ]['content'], $search, true ) === false ) {
+			if ( isset( $search[ $this->tokens[ $ptr ]['content'] ] ) === false ) {
 				// Not one of the variables we're interested in.
 				continue;
 			}

From 4b3c4b9c8bdcb6c2607d5477fe84c77761f50755 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 14:11:20 +0100
Subject: [PATCH 374/822] WP/GlobalVariablesOverride: add extra test

... to cover an edge case which was already handled in the code, but not covered by a test.
---
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 7b97c5743d..ef085e4b6b 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -240,3 +240,7 @@ list( $active_signup, list( $s => $typenow, $GLOBALS['status'], ), $ignore ) = $
 
 // List with array assignments.
 [ $path[ $type ], , ] = $array; // Bad x 1.
+
+function use_of_globals_without_key() {
+	$keys = array_keys( $GLOBALS ); // OK, this is just about handling the $GLOBALS without a key.
+}

From 592a9274017edc6cdae5aa7fbb2ac0c460edfaad Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 16:32:45 +0100
Subject: [PATCH 375/822] WP/GlobalVariablesOverride: bug fix - allow for
 `global` statement closed via close tag

The parsing of a `global` variable import statement would walk until the next semi-colon, while the statement can also be ended by a PHP close tag.

This could lead to false positives as well as false negatives.

Fixed now.

Includes unit tests.

Includes removing a redundant variable assignment.
---
 .../WP/GlobalVariablesOverrideSniff.php       | 20 +++++++------------
 .../WP/GlobalVariablesOverrideUnitTest.1.inc  | 15 ++++++++++++++
 .../WP/GlobalVariablesOverrideUnitTest.php    |  1 +
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index d823f65c0a..5213e3810e 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -297,28 +297,22 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 		/*
 		 * Collect the variables to watch for.
 		 */
-		$search = array();
-		$ptr    = ( $stackPtr + 1 );
-		while ( isset( $this->tokens[ $ptr ] ) ) {
-			$var = $this->tokens[ $ptr ];
-
-			// Halt the loop at end of statement.
-			if ( \T_SEMICOLON === $var['code'] ) {
-				break;
-			}
+		$search           = array();
+		$ptr              = ( $stackPtr + 1 );
+		$end_of_statement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $ptr );
 
-			if ( \T_VARIABLE === $var['code'] ) {
-				$var_name = substr( $var['content'], 1 );
+		while ( isset( $this->tokens[ $ptr ] ) && $ptr < $end_of_statement ) {
+			if ( \T_VARIABLE === $this->tokens[ $ptr ]['code'] ) {
+				$var_name = substr( $this->tokens[ $ptr ]['content'], 1 );
 				if ( WPGlobalVariablesHelper::is_wp_global( $var_name )
 					&& isset( $this->override_allowed[ $var_name ] ) === false
 				) {
-					$search[ $var['content'] ] = true;
+					$search[ $this->tokens[ $ptr ]['content'] ] = true;
 				}
 			}
 
 			++$ptr;
 		}
-		unset( $var );
 
 		if ( empty( $search ) ) {
 			return;
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index ef085e4b6b..2ae2434932 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -244,3 +244,18 @@ list( $active_signup, list( $s => $typenow, $GLOBALS['status'], ), $ignore ) = $
 function use_of_globals_without_key() {
 	$keys = array_keys( $GLOBALS ); // OK, this is just about handling the $GLOBALS without a key.
 }
+
+function global_import_ended_by_close_tag_false_negative() {
+	global $pagenow ?>
+	<div>Some HTML</div>
+	<?php
+	$pagenow = 'test'; // Bad, global variable in function scope.
+}
+
+function global_import_ended_by_close_tag_false_positive() {
+	global $pagenow ?>
+	<div>Some HTML</div>
+	<?php
+	$post = '2016'; // Ok, non-global variable in function scope. Would previously be seen as part of the global statement...
+	$post = '2017'; // Ok, non-global variable in function scope.
+}
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index b7700ed669..8e2d30fb4e 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -62,6 +62,7 @@ public function getErrorList( $testFile = '' ) {
 					234 => 2,
 					239 => 3,
 					242 => 1,
+					252 => 1,
 				);
 
 			case 'GlobalVariablesOverrideUnitTest.2.inc':

From d88e7ec60c0c84d841b1962089cf9885f4781b55 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 18:31:25 +0100
Subject: [PATCH 376/822] WP/GlobalVariablesOverride: add support for PHP 7.4+
 arrow functions

PHP 7.4 introduced arrow functions.

For the purposes of this sniff, default value assignments to parameters declared in an arrow function should be ignored to prevent false positives.

I've also reviewed the other places where _special handling_ is in place for functions/closures and have concluded that this does not apply to arrow functions.

I have updated line 333 to use the PHPCSUtils `Collections::functionDeclarationTokens()` token array for convenience, but it won't have any effect on arrow functions as `global` statements are not supported in arrow functions (well, that is, I haven't been able to set up any code which didn't result in a parse error for that. May need revisiting if someone more creative than me comes up with a way to do it...)

Includes unit test for the parameter default value part.
---
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php  | 11 +++++++++--
 .../Tests/WP/GlobalVariablesOverrideUnitTest.1.inc    |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 5213e3810e..e9ecb2c624 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -131,6 +131,13 @@ public function process_token( $stackPtr ) {
 		 * on that.
 		 * Examine variables not within a function scope and access to the `$GLOBALS`
 		 * variable based on the variable token.
+		 *
+		 * Note: No special handling here for code found within PHP 7.4+ arrow functions.
+		 * Arrow functions are "open", i.e. they have by value access to variables in the
+		 * surrounding scope, but they cannot modify the value.
+		 * Additionally, as they can only have one statement, a `global` statement _within_
+		 * an arrow function declaration will lead to a parse error as the result is
+		 * not a returnable value.
 		 */
 		$in_function_scope = Conditions::hasCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
 
@@ -263,7 +270,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		 * including when they are being assigned a default value.
 		 */
 		if ( false === $in_list ) {
-			$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+			$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
 			if ( false !== $functionPtr ) {
 				return;
 			}
@@ -323,7 +330,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 		 */
 		$start = $ptr;
 		if ( true === $in_function_scope ) {
-			$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+			$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
 			if ( isset( $this->tokens[ $functionPtr ]['scope_closer'] ) === false ) {
 				// Live coding or parse error.
 				return;
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 2ae2434932..4a2cd2158c 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -259,3 +259,6 @@ function global_import_ended_by_close_tag_false_positive() {
 	$post = '2016'; // Ok, non-global variable in function scope. Would previously be seen as part of the global statement...
 	$post = '2017'; // Ok, non-global variable in function scope.
 }
+
+// Safeguard correct handling of PHP 7.4+ arrow functions.
+$arrow = fn($urls = []) => $urls + ['extra']; // OK, default value assignment to arrow function parameter should be disregarded.

From 3001b456d9e8952c88ed87a8495d2434c153624f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 18:41:33 +0100
Subject: [PATCH 377/822] WP/GlobalVariablesOverride: add test with PHP 7.4+
 null coalesce assignment

PHP 7.4 introduced the null coalesce equal operator.

As the `VariableHelper::is_assignment()` uses the `Tokens::$assignmentTokens` array to determine whether something is an assignment and the `T_COALESCE_EQUAL` token is included in that array, no functional changes need to be made to support this.

Just adding a test to safeguard the support.
---
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc | 5 +++++
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 4a2cd2158c..49b9714b41 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -262,3 +262,8 @@ function global_import_ended_by_close_tag_false_positive() {
 
 // Safeguard correct handling of PHP 7.4+ arrow functions.
 $arrow = fn($urls = []) => $urls + ['extra']; // OK, default value assignment to arrow function parameter should be disregarded.
+
+function recognize_nullcoalesce_equals() {
+	global $tax;
+	$tax ??= 'other'; // Bad, potentially overrides the variable.
+}
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index 8e2d30fb4e..c73079fd9c 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -63,6 +63,7 @@ public function getErrorList( $testFile = '' ) {
 					239 => 3,
 					242 => 1,
 					252 => 1,
+					268 => 1,
 				);
 
 			case 'GlobalVariablesOverrideUnitTest.2.inc':

From f50b9787e7d35f3343f1cb11dd4bbd4d6e8d4ed5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 18:49:32 +0100
Subject: [PATCH 378/822] WP/GlobalVariablesOverride: add test with PHP 8.0+
 constructor property promotion

PHP 8.0 introduced constructor property promotion.

As default value assignments in function declaration statements are excluded already, no functional changes need to be made to support this.

Just adding a test to safeguard that this is handled correctly.
---
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 49b9714b41..9d572f2aaf 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -267,3 +267,12 @@ function recognize_nullcoalesce_equals() {
 	global $tax;
 	$tax ??= 'other'; // Bad, potentially overrides the variable.
 }
+
+// Safeguard that assignments to properties using PHP 8.0+ constructor property promotion don't lead to false positives.
+class ConstructorPropertyPromotion {
+	public function __construct(
+		public int $timestart = 0,
+		protected int|bool $timeend = false,
+		$post = null
+	) {} // Ok.
+}

From ec372d0056fea551c34727c2ac1c395dfd718a65 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 19:14:39 +0100
Subject: [PATCH 379/822] WP/GlobalVariablesOverride: add test with PHP 8.1+
 enums

PHP 8.1 introduced snums.

As enums cannot be used as test classes, there isn't really anything special about them, so no functional changes need to be made to support this.

Just adding a test to safeguard that they are handled correctly.
---
 .../WP/GlobalVariablesOverrideUnitTest.1.inc   | 18 ++++++++++++++++++
 .../WP/GlobalVariablesOverrideUnitTest.php     |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 9d572f2aaf..fa95298116 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -276,3 +276,21 @@ class ConstructorPropertyPromotion {
 		$post = null
 	) {} // Ok.
 }
+
+/*
+ * Safeguard that assignment in PHP 8.1+ enums are treated correctly.
+ * Note: enums cannot contain property declaration.
+ */
+enum Suit: string implements Colorful {
+	case Hearts = 'H';
+	case Diamonds = 'D';
+	case Clubs = 'C';
+	case Spades = 'S';
+
+	public function color( $_wp_admin_css_colors = 'red' ): string { // OK, parameter, not the global variable.
+		global $status, $mode;
+		$status = 'something'; // Bad, global variable in function scope.
+		$post = '2017'; // Ok, non-global variable in function scope.
+		[$mode] = $array; // Bad, global variable in function scope.
+	}
+}
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index c73079fd9c..daf566de68 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -64,6 +64,8 @@ public function getErrorList( $testFile = '' ) {
 					242 => 1,
 					252 => 1,
 					268 => 1,
+					292 => 1,
+					294 => 1,
 				);
 
 			case 'GlobalVariablesOverrideUnitTest.2.inc':

From e224af4aed053d6c38e9b0e166270c6ecf8792aa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 13:56:07 +0100
Subject: [PATCH 380/822] WP/GlobalVariablesOverride: minor code readability
 improvement

---
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index e9ecb2c624..08bc00ce68 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -208,7 +208,10 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		if ( 'GLOBALS' === $var_name ) {
 			$bracketPtr = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
-			if ( false === $bracketPtr || \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $bracketPtr ]['code'] || ! isset( $this->tokens[ $bracketPtr ]['bracket_closer'] ) ) {
+			if ( false === $bracketPtr
+				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $bracketPtr ]['code']
+				|| ! isset( $this->tokens[ $bracketPtr ]['bracket_closer'] )
+			) {
 				return;
 			}
 

From 4c9261cb01928bff68d9fe9724eead26fbc9b310 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Dec 2022 13:55:31 +0100
Subject: [PATCH 381/822] WP/GlobalVariablesOverride: minor comment fix

---
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 08bc00ce68..b60cfb42c3 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -340,7 +340,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			}
 			$end = $this->tokens[ $functionPtr ]['scope_closer'];
 		} else {
-			// Global statement in the global namespace with file is being treated as scoped.
+			// Global statement in the global namespace in a file which is being treated as scoped.
 			$end = $this->phpcsFile->numTokens;
 		}
 

From 1a728021e27b1eb64425957c59f8f5a142156346 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 2 Jan 2023 23:49:08 +0100
Subject: [PATCH 382/822] Composer: update for PHPCSUtils + PHPCSExtra 1.0.0

PHPCSUtils 1.0.0 and PHPCSExtra 1.0.0 have both been tagged & released. :tada:

This means that the `minimum-stability`/`prefer-stable` settings should no longer be needed.

Ref:
* https://github.com/PHPCSStandards/PHPCSUtils/releases/tag/v1.0.0
* https://github.com/PHPCSStandards/PHPCSExtra/releases/tag/v1.0.0
---
 composer.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/composer.json b/composer.json
index f9ec27028a..433c213807 100644
--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,6 @@
 			"dealerdirect/phpcodesniffer-composer-installer": true
 		}
 	},
-	"minimum-stability": "dev",
-	"prefer-stable": true,
 	"scripts": {
 		"lint": [
 			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"

From 1c45ebc08af0744c3af127a82aaa986eee13732b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 13:17:21 +0100
Subject: [PATCH 383/822] DB/DirectDatabaseQuery: remove redundant code

This code is a remnant of the old-style custom ignore comment mechanism which was removed in 2063.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 56ca4ef699..83a0633d11 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -186,18 +186,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$endOfStatement   = $this->phpcsFile->findNext( \T_SEMICOLON, ( $stackPtr + 1 ), null, false, null, true );
-		$endOfLineComment = '';
-		for ( $i = ( $endOfStatement + 1 ); $i < $this->phpcsFile->numTokens; $i++ ) {
-
-			if ( $this->tokens[ $i ]['line'] !== $this->tokens[ $endOfStatement ]['line'] ) {
-				break;
-			}
-
-			if ( \T_COMMENT === $this->tokens[ $i ]['code'] ) {
-				$endOfLineComment .= $this->tokens[ $i ]['content'];
-			}
-		}
+		$endOfStatement = $this->phpcsFile->findNext( \T_SEMICOLON, ( $stackPtr + 1 ), null, false, null, true );
 
 		// Check for Database Schema Changes.
 		for ( $_pos = ( $stackPtr + 1 ); $_pos < $endOfStatement; $_pos++ ) {

From 5f44d4e1623eb71b0a44c3b892fa68339f120cdb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 12:57:40 +0100
Subject: [PATCH 384/822] DB/DirectDatabaseQuery: add missing test case

... to cover the one uncovered line.
---
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 6 ++++++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 88f1fba18d..ad2d791830 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -274,3 +274,9 @@ EOD
 		wp_cache_add( 'baz', $baz );
 	}
 }
+
+// Non-cachable call should bow out after `DirectQuery` warning.
+function non_cachable() {
+	global $wpdb;
+	$wpdb->insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ); // Warning direct DB call.
+}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 02117429f3..b6b8dd2232 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -84,7 +84,7 @@ public function getWarningList() {
 			252 => 1,
 			265 => 1,
 			269 => 1,
+			281 => 1,
 		);
 	}
-
 }

From 0b002506db9347b46e010b73c4c4f4cdfa1020b4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 2 Jul 2020 07:01:40 +0200
Subject: [PATCH 385/822] DB/DirectDatabaseQuery: implement PHPCSUtils

:point_right: This change will be easier to review while ignoring whitespace changes.
---
 .../Sniffs/DB/DirectDatabaseQuerySniff.php    | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 83a0633d11..ba3a1a99de 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -10,6 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\DB;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Conditions;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -208,36 +210,30 @@ public function process_token( $stackPtr ) {
 
 		$cached       = false;
 		$wp_cache_get = false;
-		if ( ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
-			$scope_function = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
 
-			if ( false === $scope_function ) {
-				$scope_function = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-			}
-
-			if ( false !== $scope_function ) {
-				$scopeStart = $this->tokens[ $scope_function ]['scope_opener'];
-				$scopeEnd   = $this->tokens[ $scope_function ]['scope_closer'];
+		$scope_function = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
+		if ( false !== $scope_function ) {
+			$scopeStart = $this->tokens[ $scope_function ]['scope_opener'];
+			$scopeEnd   = $this->tokens[ $scope_function ]['scope_closer'];
 
-				for ( $i = ( $scopeStart + 1 ); $i < $scopeEnd; $i++ ) {
-					if ( \T_STRING === $this->tokens[ $i ]['code'] ) {
+			for ( $i = ( $scopeStart + 1 ); $i < $scopeEnd; $i++ ) {
+				if ( \T_STRING === $this->tokens[ $i ]['code'] ) {
 
-						if ( isset( $this->cacheDeleteFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
+					if ( isset( $this->cacheDeleteFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
 
-							if ( \in_array( $method, array( 'query', 'update', 'replace', 'delete' ), true ) ) {
-								$cached = true;
-								break;
-							}
-						} elseif ( isset( $this->cacheGetFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
+						if ( \in_array( $method, array( 'query', 'update', 'replace', 'delete' ), true ) ) {
+							$cached = true;
+							break;
+						}
+					} elseif ( isset( $this->cacheGetFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
 
-							$wp_cache_get = true;
+						$wp_cache_get = true;
 
-						} elseif ( isset( $this->cacheSetFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
+					} elseif ( isset( $this->cacheSetFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
 
-							if ( $wp_cache_get ) {
-								$cached = true;
-								break;
-							}
+						if ( $wp_cache_get ) {
+							$cached = true;
+							break;
 						}
 					}
 				}

From 3ce178cc5da2482da74e5967937b5d0ce684cd80 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Aug 2020 07:42:20 +0200
Subject: [PATCH 386/822] DB/DirectDatabaseQuery: add support for PHP 8.0+
 nullsafe object operator

Prevent false negatives in case someone would use the PHP 8.0 nullsafe object operator on the `$wpdb` variable.

Also makes the token walking more stable by preventing an unrelated object operator from being recognized as if it were an operator operating on the `$wpdb` object (false positive).

Includes tests.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   | 10 +++++++---
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 14 ++++++++++++++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php |  2 ++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index ba3a1a99de..a860dce512 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -174,9 +174,13 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$is_object_call = $this->phpcsFile->findNext( \T_OBJECT_OPERATOR, ( $stackPtr + 1 ), null, false, null, true );
-		if ( false === $is_object_call ) {
-			return; // This is not a call to the wpdb object.
+		$is_object_call = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		if ( false === $is_object_call
+			|| ( \T_OBJECT_OPERATOR !== $this->tokens[ $is_object_call ]['code']
+				&& \T_NULLSAFE_OBJECT_OPERATOR !== $this->tokens[ $is_object_call ]['code'] )
+		) {
+			// This is not a call to the wpdb object.
+			return;
 		}
 
 		$methodPtr = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $is_object_call + 1 ), null, true, null, true );
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index ad2d791830..5ee85cbac1 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -280,3 +280,17 @@ function non_cachable() {
 	global $wpdb;
 	$wpdb->insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ); // Warning direct DB call.
 }
+
+// Safeguard recognition of PHP 8.0+ nullsafe object operator.
+function nullsafe_object_operator() {
+	global $wpdb;
+	$listofthings = $wpdb?->get_col( 'SELECT something FROM somewhere WHERE someotherthing = 1' ); // Warning x 2.
+	$last = $wpdb?->insert( $wpdb->users, $data, $where ); // Warning x 1.
+}
+
+function stabilize_token_walking($other_db) {
+	global $wpdb;
+	// Overwritting $wpdb is bad, of course, but that's not the concern of this sniff.
+	// This test is making sure that the `$other_db->query` code is not flagged as if it were a call to a `$wpdb` method.
+	$wpdb = $other_db->query;
+}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index b6b8dd2232..c6b700f30b 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -85,6 +85,8 @@ public function getWarningList() {
 			265 => 1,
 			269 => 1,
 			281 => 1,
+			287 => 2,
+			288 => 1,
 		);
 	}
 }

From 37003f0588398803cfc9d5be8fab3ee9640b6ad3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 13:36:50 +0100
Subject: [PATCH 387/822] DB/DirectDatabaseQuery: bug fix - code style
 independent token walking

Don't allow the sniff to get confused by comments.

Related to 763

Includes tests.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   | 2 +-
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 7 +++++++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index a860dce512..ea7a28ae5f 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -183,7 +183,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$methodPtr = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $is_object_call + 1 ), null, true, null, true );
+		$methodPtr = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $is_object_call + 1 ), null, true );
 		$method    = $this->tokens[ $methodPtr ]['content'];
 
 		$this->mergeFunctionLists();
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 5ee85cbac1..f8bd29ffe0 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -294,3 +294,10 @@ function stabilize_token_walking($other_db) {
 	// This test is making sure that the `$other_db->query` code is not flagged as if it were a call to a `$wpdb` method.
 	$wpdb = $other_db->query;
 }
+
+function ignore_comments() {
+	global $wpdb;
+	$wpdb-> // Let's pretend this is a method-chain (this is the comment which should not confuse the sniff).
+		insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ); // Warning direct DB call.
+}
+
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index c6b700f30b..44c090d4a8 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -87,6 +87,7 @@ public function getWarningList() {
 			281 => 1,
 			287 => 2,
 			288 => 1,
+			300 => 1,
 		);
 	}
 }

From 307ff0b5a949ee7a4b0caa36461751519355633f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 13:48:29 +0100
Subject: [PATCH 388/822] DB/DirectDatabaseQuery: bug fix - finding end of
 statement

Prevent false positives from walking too far when a database query statement is ended by a PHP close tag.

Includes unit tests.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   | 4 ++--
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 6 ++++++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index ea7a28ae5f..1da2b668d8 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -192,11 +192,11 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$endOfStatement = $this->phpcsFile->findNext( \T_SEMICOLON, ( $stackPtr + 1 ), null, false, null, true );
+		$endOfStatement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr + 1 ) );
 
 		// Check for Database Schema Changes.
 		for ( $_pos = ( $stackPtr + 1 ); $_pos < $endOfStatement; $_pos++ ) {
-			$_pos = $this->phpcsFile->findNext( Tokens::$textStringTokens, $_pos, $endOfStatement, false, null, true );
+			$_pos = $this->phpcsFile->findNext( Tokens::$textStringTokens, $_pos, $endOfStatement );
 			if ( false === $_pos ) {
 				break;
 			}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index f8bd29ffe0..941c6a8c5b 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -301,3 +301,9 @@ function ignore_comments() {
 		insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ); // Warning direct DB call.
 }
 
+function correctly_determine_end_of_statement() {
+	global $wpdb;
+	$wpdb->get_col( $query, $col ) ?><-- Warning x 2 -->
+	<?php
+	$next_query = 'ALTER TABLE TO ADD SOME FIELDS' ); // Should not be flagged as not in a call to $wpdb.
+}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 44c090d4a8..8f1d90150c 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -88,6 +88,7 @@ public function getWarningList() {
 			287 => 2,
 			288 => 1,
 			300 => 1,
+			306 => 2,
 		);
 	}
 }

From 0913f35d3ae5748061e4121c0996a9578e8ed326 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 13:57:16 +0100
Subject: [PATCH 389/822] DB/DirectDatabaseQuery: bug fix - ignore `TRUNCATE`
 queries

Prevent unsolvable false positives for `TRUNCATE` queries. Those cannot be cached and need a direct DB query. (second opinion appreciated!)

Includes unit tests.

Fixes 1947
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   |  8 +++++++-
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 1da2b668d8..2f4d86372b 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Conditions;
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -194,13 +195,18 @@ public function process_token( $stackPtr ) {
 
 		$endOfStatement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr + 1 ) );
 
-		// Check for Database Schema Changes.
+		// Check for Database Schema Changes/ table truncation.
 		for ( $_pos = ( $stackPtr + 1 ); $_pos < $endOfStatement; $_pos++ ) {
 			$_pos = $this->phpcsFile->findNext( Tokens::$textStringTokens, $_pos, $endOfStatement );
 			if ( false === $_pos ) {
 				break;
 			}
 
+			if ( strpos( TextStrings::stripQuotes( $this->tokens[ $_pos ]['content'] ), 'TRUNCATE ' ) === 0 ) {
+				// Ignore queries to truncate the database as caching those is irrelevant and they need a direct db query.
+				return;
+			}
+
 			if ( preg_match( '#\b(?:ALTER|CREATE|DROP)\b#i', $this->tokens[ $_pos ]['content'] ) > 0 ) {
 				$this->phpcsFile->addWarning( 'Attempting a database schema change is discouraged.', $_pos, 'SchemaChange' );
 			}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 941c6a8c5b..2e75d64ece 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -307,3 +307,13 @@ function correctly_determine_end_of_statement() {
 	<?php
 	$next_query = 'ALTER TABLE TO ADD SOME FIELDS' ); // Should not be flagged as not in a call to $wpdb.
 }
+
+function stay_silent_for_truncate_query() {
+	global $wpdb;
+	$wpdb->query(
+		$wpdb->prepare(
+			'TRUNCATE TABLE `%1$s`',
+			plugin_get_table_name( 'Name' )
+		)
+	);
+}

From 8fe70b4506801e907616838def4459909b132b8c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:12:32 +0100
Subject: [PATCH 390/822] Sniff: move the `$SQL*Functions` properties to the
 `DB/PreparedSQL` Sniff

The `Sniff::$SQLEscapingFunctions` and `Sniff::$SQLAutoEscapedFunctions` properties are _only_ used by the `WordPress.DB.PreparedSQL` sniff, so these don't belong in the generic base `Sniff` class.

A [code search](https://sourcegraph.com/search?q=context:global+-%3ESQL%28AutoEscaped%7CEscaping%29Functions+-file:%5E%28.*/%29%3Fvendor/wp-coding-standards/.*%24&patternType=regexp&case=yes&sm=0) also shows these properties are not used by sniffs from external standards, so this change should have no noticeable impact.

Includes changing the visibility of the properties from `protected` to `private`.
---
 WordPress/Sniff.php                      | 28 ---------------------
 WordPress/Sniffs/DB/PreparedSQLSniff.php | 32 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 97d6a62eb2..3ff244c2d7 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -380,34 +380,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'wp_dropdown_pages'       => true,
 	);
 
-	/**
-	 * Functions that escape values for use in SQL queries.
-	 *
-	 * @since 0.9.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $SQLEscapingFunctions = array(
-		'absint'      => true,
-		'esc_sql'     => true,
-		'floatval'    => true,
-		'intval'      => true,
-		'like_escape' => true,
-	);
-
-	/**
-	 * Functions whose output is automatically escaped for use in SQL queries.
-	 *
-	 * @since 0.9.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $SQLAutoEscapedFunctions = array(
-		'count' => true,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index e9bd2b5578..7a53f8e0a2 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -48,6 +48,38 @@ class PreparedSQLSniff extends Sniff {
 		'query'       => true,
 	);
 
+	/**
+	 * Functions that escape values for use in SQL queries.
+	 *
+	 * @since 0.9.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  - Moved from the Sniff class to this class.
+	 *               - The property visibility has changed from `protected` to `private`.
+	 *
+	 * @var array<string, bool>
+	 */
+	private $SQLEscapingFunctions = array(
+		'absint'      => true,
+		'esc_sql'     => true,
+		'floatval'    => true,
+		'intval'      => true,
+		'like_escape' => true,
+	);
+
+	/**
+	 * Functions whose output is automatically escaped for use in SQL queries.
+	 *
+	 * @since 0.9.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  - Moved from the Sniff class to this class.
+	 *               - The property visibility has changed from `protected` to `private`.
+	 *
+	 * @var array<string, bool>
+	 */
+	private $SQLAutoEscapedFunctions = array(
+		'count' => true,
+	);
+
 	/**
 	 * Tokens that we don't flag when they are found in a $wpdb method call.
 	 *

From f2f04c796f9f44f86940f441cf82817f70d37946 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:15:07 +0100
Subject: [PATCH 391/822] DB/PreparedSQL: change visibility of a property

... which is only intended for use by this sniff. Was `protected`, now `private`.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 7a53f8e0a2..81b576be31 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -84,10 +84,11 @@ class PreparedSQLSniff extends Sniff {
 	 * Tokens that we don't flag when they are found in a $wpdb method call.
 	 *
 	 * @since 0.9.0
+	 * @since 3.0.0 The property visibility has changed from `protected` to `private`.
 	 *
 	 * @var array
 	 */
-	protected $ignored_tokens = array(
+	private $ignored_tokens = array(
 		\T_OBJECT_OPERATOR          => true,
 		\T_OPEN_PARENTHESIS         => true,
 		\T_CLOSE_PARENTHESIS        => true,

From b6165b25f4843809bd4662e9b6ff8ad122c08efc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 07:22:33 +0100
Subject: [PATCH 392/822] DB/PreparedSQL: minor code tweak

---
 WordPress/Sniffs/DB/PreparedSQLSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 81b576be31..877274b791 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -214,7 +214,7 @@ function ( $symbol ) {
 				) {
 
 					// Find the opening parenthesis.
-					$opening_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $this->i + 1 ), null, true, null, true );
+					$opening_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $this->i + 1 ), null, true );
 
 					if ( false !== $opening_paren
 						&& \T_OPEN_PARENTHESIS === $this->tokens[ $opening_paren ]['code']

From 34a54c3c446130693df13d8a092aeb254d662e5b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:28:37 +0100
Subject: [PATCH 393/822] DB/PreparedSQL: use predefined token collections [1]

Leverage predefined token collections in PHPCS and PHPCSUtils to fill the list of `$ignored_tokens`.

This commit start using the PHPCS native `Tokens::$bracketTokens` collection.
In addition to the parentheses and square bracket tokens, that collection includes the curly brace tokens. As those, in and of itself, are not problematic, I believe it is safe to include these.

Includes a test demonstrating the issue.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 7 ++-----
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 2 ++
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 877274b791..8daf457484 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -90,12 +90,8 @@ class PreparedSQLSniff extends Sniff {
 	 */
 	private $ignored_tokens = array(
 		\T_OBJECT_OPERATOR          => true,
-		\T_OPEN_PARENTHESIS         => true,
-		\T_CLOSE_PARENTHESIS        => true,
 		\T_STRING_CONCAT            => true,
 		\T_CONSTANT_ENCAPSED_STRING => true,
-		\T_OPEN_SQUARE_BRACKET      => true,
-		\T_CLOSE_SQUARE_BRACKET     => true,
 		\T_COMMA                    => true,
 		\T_LNUMBER                  => true,
 		\T_START_HEREDOC            => true,
@@ -139,7 +135,8 @@ class PreparedSQLSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-
+		// Enrich the array of tokens which can be safely ignored.
+		$this->ignored_tokens += Tokens::$bracketTokens;
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
 		return array(
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 01a13f4ff3..c1b5f81ad4 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -120,5 +120,7 @@ $wpdb?->query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "'
 WPDB::prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
 $wpdb->Query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
 
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . {$foo} . ";" ); // Bad - on $foo, not on the {}.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 59ca42a768..95022576ee 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -57,6 +57,7 @@ public function getErrorList() {
 			118 => 1,
 			120 => 1,
 			121 => 1,
+			123 => 1,
 		);
 	}
 

From 76570a0a3cfdac7f2ff583bff127f6d738275e77 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:28:43 +0100
Subject: [PATCH 394/822] DB/PreparedSQL: use predefined token collections [2]

Leverage predefined token collections in PHPCS and PHPCSUtils to fill the list of `$ignored_tokens`.

This commit start using the PHPCS native `Tokens::$castTokens` collection.

The `Tokens::$castTokens` collection contains _all_ cast tokens, not just the int/float/boolean cast tokens. However, as a cast token, in and of itself, is not problematic, I believe it is safe to include these.

What I mean by this, is that the sniff shouldn't trigger on seeing `(object)` in an SQL query. The sniff should trigger on the `$var`, which is being cast to an object, as an object cast is not a "safe" cast for use in SQL queries.

Having those extra cast tokens in the "ignore" list, therefore doesn't make the sniff any less effective as the sniff has a separate check for whether or not a type cast is considered "safe".

Includes a test demonstrating the issue.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 4 +---
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 1 +
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 8daf457484..c839beb0d6 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -99,9 +99,6 @@ class PreparedSQLSniff extends Sniff {
 		\T_START_NOWDOC             => true,
 		\T_NOWDOC                   => true,
 		\T_END_NOWDOC               => true,
-		\T_INT_CAST                 => true,
-		\T_DOUBLE_CAST              => true,
-		\T_BOOL_CAST                => true,
 		\T_NS_SEPARATOR             => true,
 	);
 
@@ -137,6 +134,7 @@ class PreparedSQLSniff extends Sniff {
 	public function register() {
 		// Enrich the array of tokens which can be safely ignored.
 		$this->ignored_tokens += Tokens::$bracketTokens;
+		$this->ignored_tokens += Tokens::$castTokens;
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
 		return array(
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index c1b5f81ad4..b7302ae69a 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -121,6 +121,7 @@ WPDB::prepare( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "'
 $wpdb->Query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
 
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . {$foo} . ";" ); // Bad - on $foo, not on the {}.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . (array) $foo . ";" ); // Bad - on $foo, not on the (array).
 
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 95022576ee..3d65eaf858 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -58,6 +58,7 @@ public function getErrorList() {
 			120 => 1,
 			121 => 1,
 			123 => 1,
+			124 => 1,
 		);
 	}
 

From 44ee285cc07bd9ef8dabd40aa28f3baa2f41a289 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:39:22 +0100
Subject: [PATCH 395/822] DB/PreparedSQL: use predefined token collections [3]

Leverage predefined token collections in PHPCS and PHPCSUtils to fill the list of `$ignored_tokens`.

This commit start using the PHPCS native `Tokens::$heredocTokens` collection.

The `Tokens::$heredocTokens` collection contains the same tokens as were already in the array + `T_HEREDOC`.
As the contents of `T_HEREDOC` tokens needs to be examined, that token is subsequently removed again from the array.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index c839beb0d6..5514ec4fb7 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -94,11 +94,6 @@ class PreparedSQLSniff extends Sniff {
 		\T_CONSTANT_ENCAPSED_STRING => true,
 		\T_COMMA                    => true,
 		\T_LNUMBER                  => true,
-		\T_START_HEREDOC            => true,
-		\T_END_HEREDOC              => true,
-		\T_START_NOWDOC             => true,
-		\T_NOWDOC                   => true,
-		\T_END_NOWDOC               => true,
 		\T_NS_SEPARATOR             => true,
 	);
 
@@ -134,9 +129,13 @@ class PreparedSQLSniff extends Sniff {
 	public function register() {
 		// Enrich the array of tokens which can be safely ignored.
 		$this->ignored_tokens += Tokens::$bracketTokens;
+		$this->ignored_tokens += Tokens::$heredocTokens;
 		$this->ignored_tokens += Tokens::$castTokens;
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
+		// The contents of heredoc tokens needs to be examined.
+		unset( $this->ignored_tokens[ \T_HEREDOC ] );
+
 		return array(
 			\T_VARIABLE,
 			\T_STRING,

From 68140e7bd209d6eae5f49baede0c0ffe620441ab Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:49:46 +0100
Subject: [PATCH 396/822] DB/PreparedSQL: use predefined token collections +
 allow floats [4]

Leverage predefined token collections in PHPCS and PHPCSUtils to fill the list of `$ignored_tokens`.

This commit start using the PHPCS native `Tokens::$arithmeticTokens` collection.

Arithmetic operator tokens, including the `+` and `-` signs should not be flagged by the sniff.
Same goes for floating point numbers. Those should be treated the same as integers as SQL supports those without issue.

Includes a few tests demonstrating the issue.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 2 ++
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 5514ec4fb7..c249d0b215 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -94,6 +94,7 @@ class PreparedSQLSniff extends Sniff {
 		\T_CONSTANT_ENCAPSED_STRING => true,
 		\T_COMMA                    => true,
 		\T_LNUMBER                  => true,
+		\T_DNUMBER                  => true,
 		\T_NS_SEPARATOR             => true,
 	);
 
@@ -131,6 +132,7 @@ public function register() {
 		$this->ignored_tokens += Tokens::$bracketTokens;
 		$this->ignored_tokens += Tokens::$heredocTokens;
 		$this->ignored_tokens += Tokens::$castTokens;
+		$this->ignored_tokens += Tokens::$arithmeticTokens;
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
 		// The contents of heredoc tokens needs to be examined.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index b7302ae69a..0476747bcb 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -122,6 +122,9 @@ $wpdb->Query( "SELECT * FROM $wpdb->posts WHERE post_title LIKE '" . foo() . "';
 
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . {$foo} . ";" ); // Bad - on $foo, not on the {}.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . (array) $foo . ";" ); // Bad - on $foo, not on the (array).
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . -10 . ";" ); // OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . +1.0 . ";" ); // OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 10 / 2.5 . ";" ); // OK.
 
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts

From 2f1d5a638d358a2da1cef5a2361bf7bc6844be86 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 07:02:07 +0100
Subject: [PATCH 397/822] DB/PreparedSQL: use predefined token collections [5]

Leverage predefined token collections in PHPCS and PHPCSUtils to fill the list of `$ignored_tokens`.

This commit start using the PHPCSUtils `incrementDecrementOperators()` collection.

This effectively adds two additional tokens to the "safe" list, `++` and `--`. These tokens, in and of itself, are not problematic, so I believe it is safe to include these.

It could even be argued that increment/decrement tokens should be treated the same as "safe casted" tokens, as incrementing or decrementing a variable effectively turns it into a benign integer.

Includes a test demonstrating the issue.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 2 ++
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 1 +
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 1 +
 3 files changed, 4 insertions(+)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index c249d0b215..624983d0d5 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\DB;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
@@ -133,6 +134,7 @@ public function register() {
 		$this->ignored_tokens += Tokens::$heredocTokens;
 		$this->ignored_tokens += Tokens::$castTokens;
 		$this->ignored_tokens += Tokens::$arithmeticTokens;
+		$this->ignored_tokens += Collections::incrementDecrementOperators();
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
 		// The contents of heredoc tokens needs to be examined.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 0476747bcb..2d7667be0d 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -125,6 +125,7 @@ $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . (array) $foo . ";" )
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . -10 . ";" ); // OK.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . +1.0 . ";" ); // OK.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 10 / 2.5 . ";" ); // OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . ++$foo . ";" ); // Bad - on $foo, not on the ++.
 
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 3d65eaf858..8ab7b3d952 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -59,6 +59,7 @@ public function getErrorList() {
 			121 => 1,
 			123 => 1,
 			124 => 1,
+			128 => 1,
 		);
 	}
 

From ac3bbc5964d674982a21d406bf695d4c1a2a3bd0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 07:11:36 +0100
Subject: [PATCH 398/822] DB/PreparedSQL: allow for the PHP 8.0+ nullsafe
 object operator

Like for the "normal" object operator: don't throw a "not prepared" error for the nullsafe object operator itself.
Same goes for the `::` object operator.

Includes unit test.
---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 2 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.inc | 4 ++++
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 624983d0d5..cf7541948c 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -90,7 +90,6 @@ class PreparedSQLSniff extends Sniff {
 	 * @var array
 	 */
 	private $ignored_tokens = array(
-		\T_OBJECT_OPERATOR          => true,
 		\T_STRING_CONCAT            => true,
 		\T_CONSTANT_ENCAPSED_STRING => true,
 		\T_COMMA                    => true,
@@ -135,6 +134,7 @@ public function register() {
 		$this->ignored_tokens += Tokens::$castTokens;
 		$this->ignored_tokens += Tokens::$arithmeticTokens;
 		$this->ignored_tokens += Collections::incrementDecrementOperators();
+		$this->ignored_tokens += Collections::objectOperators();
 		$this->ignored_tokens += Tokens::$emptyTokens;
 
 		// The contents of heredoc tokens needs to be examined.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
index 2d7667be0d..d20502e89f 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.inc
@@ -127,5 +127,9 @@ $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . +1.0 . ";" ); // OK.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 10 / 2.5 . ";" ); // OK.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . ++$foo . ";" ); // Bad - on $foo, not on the ++.
 
+// Safeguard handling of PHP 8.0+ nullsafe object operators found within a query.
+$wpdb->query( $wpdb->prepare( 'SELECT * FROM ' . $wpdb::TABLE_NAME . " WHERE post_title LIKE '%s';", '%something' ) ); // OK.
+$wpdb->query( $wpdb->prepare( 'SELECT * FROM ' . $notwpdb?->posts . " WHERE post_title LIKE '%s';", '%something' ) ); // Bad.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 8ab7b3d952..a0702728db 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -60,6 +60,7 @@ public function getErrorList() {
 			123 => 1,
 			124 => 1,
 			128 => 1,
+			132 => 2,
 		);
 	}
 

From a756ab6626535ff3cc5fce0b770c56e0ed9368cb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 07:16:12 +0100
Subject: [PATCH 399/822] DB/PreparedSQL: add test with PHP 7.3+ flexible
 heredoc

... to safeguard the sniff handles this correctly, in the same way as "normal" heredocs.

Note: the tests are in a separate file for maintainability as any code which would be placed _after_ the flexible heredoc/nowdoc would not be tokenized correctly on PHP < 7.3, making the tests maintainer error prone if the tests were in the same file.
---
 ...UnitTest.inc => PreparedSQLUnitTest.1.inc} |  0
 WordPress/Tests/DB/PreparedSQLUnitTest.2.inc  |  9 ++
 WordPress/Tests/DB/PreparedSQLUnitTest.php    | 84 +++++++++++--------
 3 files changed, 59 insertions(+), 34 deletions(-)
 rename WordPress/Tests/DB/{PreparedSQLUnitTest.inc => PreparedSQLUnitTest.1.inc} (100%)
 create mode 100644 WordPress/Tests/DB/PreparedSQLUnitTest.2.inc

diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/DB/PreparedSQLUnitTest.inc
rename to WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc
new file mode 100644
index 0000000000..c454a31048
--- /dev/null
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc
@@ -0,0 +1,9 @@
+<?php
+
+// Safeguard handling of PHP 7.3+ flexible heredoc.
+$wpdb->query( <<<EOT
+		SELECT *
+		FROM {$wpdb->posts}
+		WHERE ID = {$foo};
+	EOT
+); // Bad.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index a0702728db..e9d867d7ae 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -25,43 +25,59 @@ class PreparedSQLUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @since 0.8.0
+	 * @param string $testFile The name of the file being tested.
 	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
-		return array(
-			3   => 1,
-			4   => 1,
-			5   => 1,
-			7   => 1,
-			8   => 1,
-			11  => 1, // Old-style WPCS ignore comments are no longer supported.
-			12  => 1, // Old-style WPCS ignore comments are no longer supported.
-			16  => 1,
-			17  => 1,
-			18  => 1,
-			20  => 1,
-			21  => 1,
-			54  => 1,
-			64  => 1,
-			71  => 1,
-			85  => 1,
-			90  => 1,
-			106 => 1,
-			107 => 1,
-			108 => 1,
-			109 => 1,
-			112 => 1,
-			115 => 1,
-			118 => 1,
-			120 => 1,
-			121 => 1,
-			123 => 1,
-			124 => 1,
-			128 => 1,
-			132 => 2,
-		);
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'PreparedSQLUnitTest.1.inc':
+				return array(
+					3   => 1,
+					4   => 1,
+					5   => 1,
+					7   => 1,
+					8   => 1,
+					11  => 1, // Old-style WPCS ignore comments are no longer supported.
+					12  => 1, // Old-style WPCS ignore comments are no longer supported.
+					16  => 1,
+					17  => 1,
+					18  => 1,
+					20  => 1,
+					21  => 1,
+					54  => 1,
+					64  => 1,
+					71  => 1,
+					85  => 1,
+					90  => 1,
+					106 => 1,
+					107 => 1,
+					108 => 1,
+					109 => 1,
+					112 => 1,
+					115 => 1,
+					118 => 1,
+					120 => 1,
+					121 => 1,
+					123 => 1,
+					124 => 1,
+					128 => 1,
+					132 => 2,
+				);
+
+			case 'PreparedSQLUnitTest.2.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
+
+				return array(
+					7 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 
 	/**

From 18bc55b11dc48a82c7bb6f3fba953d037dd8e6ef Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 07:18:52 +0100
Subject: [PATCH 400/822] DB/PreparedSQL: add test with PHP 7.4+ numeric
 literals with underscores and PHP 8.1+ explicit octals

... to safeguard the sniff handles this correctly, in the same way as "normal" integers.
---
 WordPress/Tests/DB/PreparedSQLUnitTest.1.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
index d20502e89f..97a85f1843 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
@@ -131,5 +131,9 @@ $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . ++$foo . ";" ); // B
 $wpdb->query( $wpdb->prepare( 'SELECT * FROM ' . $wpdb::TABLE_NAME . " WHERE post_title LIKE '%s';", '%something' ) ); // OK.
 $wpdb->query( $wpdb->prepare( 'SELECT * FROM ' . $notwpdb?->posts . " WHERE post_title LIKE '%s';", '%something' ) ); // Bad.
 
+// Safeguard handling of PHP 7.4+ numeric literals with undersocres and PHP 8.1 explicit octals.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 10_000 . ";" ); // OK.
+$wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 0o34 . ";" ); // OK.
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts

From 3384661edc25e3fc92d42a669a92b302ccb8a109 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 06:13:20 +0100
Subject: [PATCH 401/822] DB/PreparedSQL: minor documentation tweaks

---
 WordPress/Sniffs/DB/PreparedSQLSniff.php   | 6 ++++--
 WordPress/Tests/DB/PreparedSQLUnitTest.php | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index cf7541948c..20063483b6 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -38,7 +38,7 @@ class PreparedSQLSniff extends Sniff {
 	 * @since 0.8.0
 	 * @since 0.11.0 Changed from static to non-static.
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	protected $methods = array(
 		'get_var'     => true,
@@ -84,6 +84,8 @@ class PreparedSQLSniff extends Sniff {
 	/**
 	 * Tokens that we don't flag when they are found in a $wpdb method call.
 	 *
+	 * This token array is augmented from within the register() method.
+	 *
 	 * @since 0.9.0
 	 * @since 3.0.0 The property visibility has changed from `protected` to `private`.
 	 *
@@ -218,7 +220,7 @@ function ( $symbol ) {
 						&& \T_OPEN_PARENTHESIS === $this->tokens[ $opening_paren ]['code']
 						&& isset( $this->tokens[ $opening_paren ]['parenthesis_closer'] )
 					) {
-						// Skip past the end of the function.
+						// Skip past to the end of the function call.
 						$this->i = $this->tokens[ $opening_paren ]['parenthesis_closer'];
 						continue;
 					}
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index e9d867d7ae..3264342c61 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -83,8 +83,6 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @since 0.8.0
-	 *
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {

From 0162df1e5520ad5de5e895f5bdde3bc05d7dca7a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 00:56:23 +0100
Subject: [PATCH 402/822] Helpers/MinimumWPVersionTrait: split
 `wp_version_compare()` method

.. into two methods:
* `wp_version_compare()` which does the actual compare.
* `normalize_version_number()` to handle the version number normalization.

This is just a code simplification/removal of duplicate code. No functional changes.
---
 WordPress/Helpers/MinimumWPVersionTrait.php | 32 +++++++++++++++------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 22eb5ab3a2..bc72da3d7e 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -100,8 +100,7 @@ protected function get_wp_version_from_cli() {
 	/**
 	 * Compares two version numbers.
 	 *
-	 * Ensures that the version numbers are comparable via the PHP version_compare() function
-	 * by making sure they comply with the minimum "PHP-standardized" version number requirements.
+	 * @since 3.0.0
 	 *
 	 * @param string $version1 First version number.
 	 * @param string $version2 Second version number.
@@ -110,14 +109,31 @@ protected function get_wp_version_from_cli() {
 	 * @return bool
 	 */
 	protected function wp_version_compare( $version1, $version2, $operator ) {
-		if ( preg_match( '`^\d+\.\d+$`', $version1 ) ) {
-			$version1 .= '.0';
-		}
+		$version1 = $this->normalize_version_number( $version1 );
+		$version2 = $this->normalize_version_number( $version2 );
+
+		return version_compare( $version1, $version2, $operator );
+	}
 
-		if ( preg_match( '`^\d+\.\d+$`', $version2 ) ) {
-			$version2 .= '.0';
+	/**
+	 * Normalize a version number.
+	 *
+	 * Ensures that a version number is comparable via the PHP version_compare() function
+	 * by making sure it complies with the minimum "PHP-standardized" version number requirements.
+	 *
+	 * Presumes the input is a numeric version number string. The behaviour with other input is undetermined.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $version Version number.
+	 *
+	 * @return string
+	 */
+	private function normalize_version_number( $version ) {
+		if ( preg_match( '`^\d+\.\d+$`', $version ) ) {
+			$version .= '.0';
 		}
 
-		return version_compare( $version1, $version2, $operator );
+		return $version;
 	}
 }

From b0ce9100937a391611ba5eb9b920014f42ef2696 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 01:27:06 +0100
Subject: [PATCH 403/822] Helpers/MinimumWPVersionTrait: reduce use of magic
 number

The default value for the `minimum_wp_version` property is used in a number of places, mostly in the test files when resetting a changed value for the property to its default, making it a "magic number".

Preferably, a magic number should be assigned to a constant and the constant should be used everywhere.
Unfortunately, that's not possible as a) constants in traits are not allowed prior to PHP 8.2 and b) code in test case files does not get executed, so using the constant is not an option anyway.

This commit now makes couple of changes to improve/stabilize working with this "magic" number.
* The magic number is now only set in one place  - in the new `$default_minimum_wp_version` property.
* A user-provided `minimum_wp_version` property value from a ruleset will now be validated in the same way as a CLI value for the same.
    If no value is found or an invalid value is found, the default value for the `minimum_wp_version` property will be used.
    Includes making it explicit in the `composer.json` file that the `Filter` extension is a prerequisite for this package.
* In test case files, a "reset" of the `minimum_wp_version` property can now unset the value, lowering the maintenance burden when the default value for the `minimum_wp_version` property changes.
    Note: test files for the `Deprecated*` sniffs will still need updating whenever the value changes.

---

I wonder if we should rename the `get_wp_version_from_cli()` method to a better name. The method was already renamed in WPCS 3.0.0, so renaming it again does not add a breaking change which wasn't already there in the first place.

The reason is that, on the one hand, the `get_` prefix suggests that the method returns a value, which it doesn't. And on the other hand, the `from_cli` isn't fully covering the functionality anymore.

Name suggestions welcome.

Some (rough) ideas:
* `validate_minimum_wp_version()`
* `set_minimum_wp_version()`

Opinions ?

---

Fixes 2171
---
 WordPress/Helpers/MinimumWPVersionTrait.php   | 40 ++++++++++++++-----
 .../Tests/WP/AlternativeFunctionsUnitTest.inc |  6 +--
 WordPress/Tests/WP/CapabilitiesUnitTest.1.inc |  2 +-
 composer.json                                 |  1 +
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index bc72da3d7e..5782017751 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -68,7 +68,22 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @var string WordPress version.
 	 */
-	public $minimum_wp_version = '5.8';
+	public $minimum_wp_version;
+
+	/**
+	 * Default minimum supported WordPress version.
+	 *
+	 * By default, the minimum_wp_version presumes that a project will support the current
+	 * WP version and up to three releases before.
+	 *
+	 * {@internal This should be a constant, but constants in traits are not supported
+	 *            until PHP 8.2.}}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string WordPress version.
+	 */
+	private $default_minimum_wp_version = '5.8';
 
 	/**
 	 * Overrule the minimum supported WordPress version with a command-line/config value.
@@ -83,18 +98,25 @@ trait MinimumWPVersionTrait {
 	 *               - Renamed from `get_wp_version_from_cl()` to `get_wp_version_from_cli()`.
 	 */
 	protected function get_wp_version_from_cli() {
-		$cli_supported_version = Helper::getConfigData( 'minimum_wp_version' );
+		$minimum_wp_version = '';
 
-		if ( empty( $cli_supported_version ) ) {
-			return;
+		// Use a ruleset provided value if available.
+		if ( ! empty( $this->minimum_wp_version ) ) {
+			$minimum_wp_version = $this->minimum_wp_version;
 		}
 
-		$cli_supported_version = trim( $cli_supported_version );
-		if ( ! empty( $cli_supported_version )
-			&& filter_var( $cli_supported_version, \FILTER_VALIDATE_FLOAT ) !== false
-		) {
-			$this->minimum_wp_version = $cli_supported_version;
+		// A CLI provided value overrules a ruleset provided value.
+		$cli_supported_version = Helper::getConfigData( 'minimum_wp_version' );
+		if ( ! empty( $cli_supported_version ) ) {
+			$minimum_wp_version = $cli_supported_version;
 		}
+
+		// If no valid value was provided, use the default.
+		if ( filter_var( $minimum_wp_version, \FILTER_VALIDATE_FLOAT ) === false ) {
+			$minimum_wp_version = $this->default_minimum_wp_version;
+		}
+
+		$this->minimum_wp_version = $minimum_wp_version;
 	}
 
 	/**
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
index e5212cf5e0..a88e5638a9 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -83,7 +83,7 @@ fputs(); // Warning.
 parse_url( 'http://example.com/' ); // OK, alternative was not yet available.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.4
 parse_url( 'http://example.com/' ); // Warning, not using $component param, so can switch over.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version
 
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.0
 parse_url($url, PHP_URL_QUERY); // OK, alternative was not yet available.
@@ -91,7 +91,7 @@ parse_url($url, PHP_URL_QUERY); // OK, alternative was not yet available.
 parse_url($url, PHP_URL_QUERY); // OK, $component param not yet available.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
 parse_url($url, PHP_URL_SCHEME); // Warning, using $component param, but also using WP 4.7+, so can switch over.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version
 
 /*
  * Tests for support for PHP 8.0+ named parameters.
@@ -108,7 +108,7 @@ parse_url(component : PHP_URL_QUERY, url : $url); // OK.
 parse_url(url : $url); // Warning.
 // phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 4.7
 parse_url(component: PHP_URL_SCHEME, url: $url, ); // Warning.
-// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version 5.8
+// phpcs:set WordPress.WP.AlternativeFunctions minimum_wp_version
 
 // Safeguard support for PHP 8.0+ named parameters for the custom logic related to file_get_contents().
 file_get_contents( use_include_path: true, filename: $local_file, ); // OK.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
index f0de254a73..b17784dbb6 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
@@ -45,7 +45,7 @@ if ( author_can( $post, '' ) ) { } // Error.
 // phpcs:set WordPress.WP.Capabilities minimum_wp_version 2.9
 if ( author_can( $post, 'level_3' ) ) { } // Warning.
 
-// phpcs:set WordPress.WP.Capabilities minimum_wp_version 5.9
+// phpcs:set WordPress.WP.Capabilities minimum_wp_version
 if ( author_can( $post, 'level_5' ) ) { } // Error.
 add_options_page( 'page_title', 'menu_title', 'level_10', 'menu_slug', 'function' ); // Error.
 
diff --git a/composer.json b/composer.json
index 433c213807..8c236b034e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
 	],
 	"require": {
 		"php": ">=5.4",
+		"ext-filter": "*",
 		"squizlabs/php_codesniffer": "^3.7.1",
 		"phpcsstandards/phpcsutils": "^1.0",
 		"phpcsstandards/phpcsextra": "^1.0"

From b17c9fbbc93e0d0c2d25099c485d57e3bc4a2ec9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 9 Jan 2023 06:52:52 +0100
Subject: [PATCH 404/822] Helpers/MinimumWPVersionTrait: rename method

... from `get_wp_version_from_cli()` to `set_minimum_wp_version()`.
---
 WordPress/Helpers/MinimumWPVersionTrait.php            | 6 +++---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php      | 2 +-
 WordPress/Sniffs/WP/CapabilitiesSniff.php              | 2 +-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php         | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php       | 2 +-
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php | 2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 5782017751..df39567a83 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -17,7 +17,7 @@
  *
  * Usage instructions:
  * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
- * - Call the `MinimumWPVersionTrait::get_wp_version_from_cli()` method in the `process()`/`process_token()`
+ * - Call the `MinimumWPVersionTrait::set_minimum_wp_version()` method in the `process()`/`process_token()`
  *   method.
  * - After that, the `MinimumWPVersionTrait::$minimum_wp_version` property can be freely used
  *   in the sniff.
@@ -95,9 +95,9 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @since 0.14.0
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
-	 *               - Renamed from `get_wp_version_from_cl()` to `get_wp_version_from_cli()`.
+	 *               - Renamed from `get_wp_version_from_cl()` to `set_minimum_wp_version()`.
 	 */
-	protected function get_wp_version_from_cli() {
+	protected function set_minimum_wp_version() {
 		$minimum_wp_version = '';
 
 		// Use a ruleset provided value if available.
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index e5d6b5893f..1930837d2e 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -221,7 +221,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli();
+		$this->set_minimum_wp_version();
 
 		/*
 		 * Deal with exceptions.
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index c246c1cf91..a70985b56f 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -434,7 +434,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		if ( isset( $this->deprecated_capabilities[ $matched_parameter ] ) ) {
-			$this->get_wp_version_from_cli( $this->phpcsFile );
+			$this->set_minimum_wp_version( $this->phpcsFile );
 			$is_error = $this->wp_version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_wp_version, '<' );
 
 			$data = array(
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 6fedb05913..201ae5ed8d 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -97,7 +97,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli();
+		$this->set_minimum_wp_version();
 
 		$class_name = ltrim( strtolower( $matched_content ), '\\' );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 129ce3b2d7..af461e10ac 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1526,7 +1526,7 @@ public function getGroups() {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$this->get_wp_version_from_cli();
+		$this->set_minimum_wp_version();
 
 		$function_name = strtolower( $matched_content );
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 365d8ffbfe..b813299972 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -224,7 +224,7 @@ class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$this->get_wp_version_from_cli();
+		$this->set_minimum_wp_version();
 
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {
 			$found_param = PassedParameters::getParameterFromStack( $parameters, $position, $parameter_args['name'] );
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index a8891dfc51..f8ecb799a0 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -323,7 +323,7 @@ class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 
-		$this->get_wp_version_from_cli();
+		$this->set_minimum_wp_version();
 
 		$paramCount = \count( $parameters );
 		foreach ( $this->target_functions[ $matched_content ] as $position => $parameter_args ) {

From 62cbbfa46a406fe6be53aa0f39b8688c60d0d80d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 01:00:28 +0100
Subject: [PATCH 405/822] NamingConventions/PrefixAllGlobals: minor code tweak

Using `type` instead of `code` is not currently needed as all relevant tokens will exist in PHPCS 3.7.1.
Using `code` has a minor advantage as it will allow for IDE auto-completion.
---
 .../PrefixAllGlobalsSniff.php                 | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 1972ece24d..ce153ee011 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -385,8 +385,8 @@ public function process_token( $stackPtr ) {
 			$error_text = 'Unknown syntax used';
 			$error_code = 'NonPrefixedSyntaxFound';
 
-			switch ( $this->tokens[ $stackPtr ]['type'] ) {
-				case 'T_FUNCTION':
+			switch ( $this->tokens[ $stackPtr ]['code'] ) {
+				case \T_FUNCTION:
 					// Methods in a class do not need to be prefixed.
 					if ( $this->phpcsFile->hasCondition( $stackPtr, Tokens::$ooScopeTokens ) === true ) {
 						return;
@@ -411,22 +411,22 @@ public function process_token( $stackPtr ) {
 					$error_code = 'NonPrefixedFunctionFound';
 					break;
 
-				case 'T_CLASS':
-				case 'T_INTERFACE':
-				case 'T_TRAIT':
+				case \T_CLASS:
+				case \T_INTERFACE:
+				case \T_TRAIT:
 					$item_name  = $this->phpcsFile->getDeclarationName( $stackPtr );
 					$error_text = 'Classes declared';
 					$error_code = 'NonPrefixedClassFound';
 
-					switch ( $this->tokens[ $stackPtr ]['type'] ) {
-						case 'T_CLASS':
+					switch ( $this->tokens[ $stackPtr ]['code'] ) {
+						case \T_CLASS:
 							if ( class_exists( '\\' . $item_name, false ) ) {
 								// Backfill for PHP native class.
 								return;
 							}
 							break;
 
-						case 'T_INTERFACE':
+						case \T_INTERFACE:
 							if ( interface_exists( '\\' . $item_name, false ) ) {
 								// Backfill for PHP native interface.
 								return;
@@ -436,7 +436,7 @@ public function process_token( $stackPtr ) {
 							$error_code = 'NonPrefixedInterfaceFound';
 							break;
 
-						case 'T_TRAIT':
+						case \T_TRAIT:
 							// phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.trait_existsFound
 							if ( function_exists( '\trait_exists' ) && trait_exists( '\\' . $item_name, false ) ) {
 								// Backfill for PHP native trait.
@@ -454,7 +454,7 @@ public function process_token( $stackPtr ) {
 
 					break;
 
-				case 'T_CONST':
+				case \T_CONST:
 					// Constants in a class do not need to be prefixed.
 					if ( true === Scopes::isOOConstant( $this->phpcsFile, $stackPtr ) ) {
 						return;

From 6099b17f6da77da780281e9462842299fe2ca2d2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 00:48:53 +0100
Subject: [PATCH 406/822] NamingConventions/PrefixAllGlobals: remove some
 redundant code

... which could never be reached anyway.
---
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ce153ee011..ea2f4b93a9 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -446,10 +446,6 @@ public function process_token( $stackPtr ) {
 							$error_text = 'Traits declared';
 							$error_code = 'NonPrefixedTraitFound';
 							break;
-
-						default:
-							// Left empty on purpose.
-							break;
 					}
 
 					break;

From 43380249d2ef385f51f5c1ed012126d4b734ed2a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 02:11:09 +0100
Subject: [PATCH 407/822] NamingConventions/PrefixAllGlobals: add extra tests

... to cover some previously uncovered code.

None of these should lead to errors/warnings.
---
 .../PrefixAllGlobalsUnitTest.1.inc             | 13 +++++++++++++
 .../PrefixAllGlobalsUnitTest.5.inc             |  9 +++++++++
 .../PrefixAllGlobalsUnitTest.6.inc             | 11 +++++++++++
 .../PrefixAllGlobalsUnitTest.7.inc             | 12 ++++++++++++
 .../PrefixAllGlobalsUnitTest.8.inc             | 17 +++++++++++++++++
 .../PrefixAllGlobalsUnitTest.9.inc             | 18 ++++++++++++++++++
 6 files changed, 80 insertions(+)
 create mode 100644 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.5.inc
 create mode 100644 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.6.inc
 create mode 100644 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.7.inc
 create mode 100644 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.8.inc
 create mode 100644 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.9.inc

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 2966bb1a2b..a3e3eb3fed 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -519,4 +519,17 @@ function 😊_do_something(){}
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] 😊😊
 function 😊😊_do_something(){}
 
+// Reset to the standard test prefixes.
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
+
+if ( ! interface_exists( 'Serializable' ) ) {
+	interface Serializable {} // Introduced in PHP 5.1.0.
+}
+
+// Not wrapped in a `defined()` as the `const` keyword can only be used in the top-level scope.
+// Just presume the file containing this code is included conditionally ;-)
+const E_DEPRECATED = 8192; // Introduced in PHP 5.3.0.
+
+apply_filters( /* name missing */, $var ); // Ignore as undetermined.
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.5.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.5.inc
new file mode 100644
index 0000000000..0da871d894
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.5.inc
@@ -0,0 +1,9 @@
+<?php
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
+
+/*
+ * This test just safeguards that the sniff bows out when there are no prefixes.
+ * This test file should generate no errors or warnings.
+ */
+
+class ABC {}
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.6.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.6.inc
new file mode 100644
index 0000000000..d894c36ef8
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.6.inc
@@ -0,0 +1,11 @@
+<?php
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
+
+/*
+ * This test safeguards the sniff bows out correctly during live coding/when certain parse errors are encountered.
+ * This test file should generate no errors or warnings.
+ */
+
+const
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.7.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.7.inc
new file mode 100644
index 0000000000..97efa26d75
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.7.inc
@@ -0,0 +1,12 @@
+<?php
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
+
+/*
+ * This test safeguards an edge case and makes sure the sniff bows out correctly during live coding with variable variables.
+ * This test file should generate no errors or warnings.
+ */
+
+echo ${$testing_non_assignment_variable_variable}['deref']
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.8.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.8.inc
new file mode 100644
index 0000000000..174bfbffb4
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.8.inc
@@ -0,0 +1,17 @@
+<?php
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
+
+/*
+ * This test safeguards a few edge cases and makes sure the sniff bows out correctly when it finds:
+ * - $GLOBALS without a key. Note: overwritting the $GLOBALS variable is no longer allowed since PHP 8.1.
+ * - $GLOBALS without a key due to live coding.
+ *
+ * This test file should generate no errors or warnings.
+ */
+
+$GLOBALS = 'overwritten';
+
+$GLOBALS
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.9.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.9.inc
new file mode 100644
index 0000000000..df7982056b
--- /dev/null
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.9.inc
@@ -0,0 +1,18 @@
+<?php
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
+
+/*
+ * This test safeguards yet another edge case to make sure the sniff bows out correctly
+ * for unfinished global statements within functions (live coding/parse error).
+ *
+ * This test file should generate no errors or warnings.
+ */
+
+function acronym_unfinished_global_statement($param) {
+	global $var1, $var2 // Deliberately missing semi-colon.
+	
+	foreach ($param as $var2) {}
+}
+
+// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From 02b272acf2813647a7c3c1b66dbd3984f92d311d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:05:45 +0200
Subject: [PATCH 408/822] NamingConventions/PrefixAllGlobals: implement
 PHPCSUtils

No functional changes.
---
 .../PrefixAllGlobalsSniff.php                 | 82 +++++++------------
 1 file changed, 28 insertions(+), 54 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ea2f4b93a9..b1c7535bf1 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -11,12 +11,18 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\Context;
+use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\Parentheses;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use PHPCSUtils\Utils\Variables;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
@@ -120,24 +126,6 @@ class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 */
 	private $previous_prefixes = array();
 
-	/**
-	 * A list of all PHP superglobals with the exception of $GLOBALS which is handled separately.
-	 *
-	 * @since 0.12.0
-	 *
-	 * @var array
-	 */
-	protected $superglobals = array(
-		'_COOKIE'  => true,
-		'_ENV'     => true,
-		'_GET'     => true,
-		'_FILES'   => true,
-		'_POST'    => true,
-		'_REQUEST' => true,
-		'_SERVER'  => true,
-		'_SESSION' => true,
-	);
-
 	/**
 	 * A list of core hooks that are allowed to be called by plugins and themes.
 	 *
@@ -236,10 +224,9 @@ public function register() {
 			\T_CONST            => \T_CONST,
 			\T_VARIABLE         => \T_VARIABLE,
 			\T_DOLLAR           => \T_DOLLAR, // Variable variables.
-			\T_LIST             => \T_LIST,
-			\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
 		);
 		$targets += Tokens::$ooScopeTokens; // T_ANON_CLASS is only used for skipping over test classes.
+		$targets += Collections::listOpenTokensBC();
 
 		// Add function call target for hook names and constants defined using define().
 		$parent = parent::register();
@@ -328,9 +315,7 @@ public function process_token( $stackPtr ) {
 
 			return $this->process_variable_assignment( $stackPtr );
 
-		} elseif ( \T_LIST === $this->tokens[ $stackPtr ]['code']
-			|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
-		) {
+		} elseif ( isset( Collections::listOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
 			return $this->process_list_assignment( $stackPtr );
 
 		} elseif ( \T_NAMESPACE === $this->tokens[ $stackPtr ]['code'] ) {
@@ -388,7 +373,7 @@ public function process_token( $stackPtr ) {
 			switch ( $this->tokens[ $stackPtr ]['code'] ) {
 				case \T_FUNCTION:
 					// Methods in a class do not need to be prefixed.
-					if ( $this->phpcsFile->hasCondition( $stackPtr, Tokens::$ooScopeTokens ) === true ) {
+					if ( Scopes::isOOMethod( $this->phpcsFile, $stackPtr ) === true ) {
 						return;
 					}
 
@@ -401,7 +386,7 @@ public function process_token( $stackPtr ) {
 						return;
 					}
 
-					$item_name = $this->phpcsFile->getDeclarationName( $stackPtr );
+					$item_name = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
 					if ( isset( $this->built_in_functions[ $item_name ] ) ) {
 						// Backfill for PHP native function.
 						return;
@@ -414,7 +399,7 @@ public function process_token( $stackPtr ) {
 				case \T_CLASS:
 				case \T_INTERFACE:
 				case \T_TRAIT:
-					$item_name  = $this->phpcsFile->getDeclarationName( $stackPtr );
+					$item_name  = ObjectDeclarations::getName( $this->phpcsFile, $stackPtr );
 					$error_text = 'Classes declared';
 					$error_code = 'NonPrefixedClassFound';
 
@@ -568,13 +553,9 @@ protected function process_variable_variable( $stackPtr ) {
 		 * forbidden since PHP 7.0. Presuming cross-version code and if not, that
 		 * is for the PHPCompatibility standard to detect.
 		 */
-		if ( $this->phpcsFile->hasCondition( $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) ) === true ) {
-			$condition = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
-			if ( false === $condition ) {
-				$condition = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-			}
-
-			$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ]['scope_opener'] );
+		$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
+		if ( false !== $functionPtr ) {
+			$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $functionPtr ]['scope_opener'] );
 			if ( false === $has_global ) {
 				// No variable import happening.
 				return;
@@ -635,7 +616,9 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		$variable_name = substr( $this->tokens[ $stackPtr ]['content'], 1 ); // Strip the dollar sign.
 
 		// Bow out early if we know for certain no prefix is needed.
-		if ( $this->variable_prefixed_or_allowed( $stackPtr, $variable_name ) === true ) {
+		if ( 'GLOBALS' !== $variable_name
+			&& $this->variable_prefixed_or_allowed( $stackPtr, $variable_name ) === true
+		) {
 			return;
 		}
 
@@ -681,16 +664,12 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 			}
 		} else {
 			// Function parameters do not need to be prefixed.
-			if ( false === $in_list && isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-				foreach ( $this->tokens[ $stackPtr ]['nested_parenthesis'] as $opener => $closer ) {
-					if ( isset( $this->tokens[ $opener ]['parenthesis_owner'] )
-						&& ( \T_FUNCTION === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code']
-							|| \T_CLOSURE === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code'] )
-					) {
-						return;
-					}
+			if ( false === $in_list ) {
+				$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+				if ( false !== $functionPtr ) {
+					return;
 				}
-				unset( $opener, $closer );
+				unset( $functionPtr );
 			}
 
 			// Properties in a class do not need to be prefixed.
@@ -699,13 +678,9 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 			}
 
 			// Local variables in a function do not need to be prefixed unless they are being imported.
-			if ( $this->phpcsFile->hasCondition( $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) ) === true ) {
-				$condition = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
-				if ( false === $condition ) {
-					$condition = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-				}
-
-				$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ]['scope_opener'] );
+			$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
+			if ( false !== $functionPtr ) {
+				$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $functionPtr ]['scope_opener'] );
 				if ( false === $has_global ) {
 					// No variable import happening.
 					return;
@@ -733,8 +708,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 					}
 				}
 
-				unset( $condition, $has_global, $end_of_statement, $ptr, $imported );
-
+				unset( $has_global, $end_of_statement, $ptr, $imported );
 			}
 		}
 
@@ -939,7 +913,7 @@ private function is_prefixed( $stackPtr, $name ) {
 	 */
 	private function variable_prefixed_or_allowed( $stackPtr, $name ) {
 		// Ignore superglobals and WP global variables.
-		if ( isset( $this->superglobals[ $name ] ) || WPGlobalVariablesHelper::is_wp_global( $name ) ) {
+		if ( Variables::isSuperglobalName( $name ) || WPGlobalVariablesHelper::is_wp_global( $name ) ) {
 			return true;
 		}
 
@@ -981,7 +955,7 @@ private function validate_prefixes() {
 
 			$prefix_length = strlen( $prefix );
 			if ( function_exists( 'iconv_strlen' ) ) {
-				$prefix_length = iconv_strlen( $prefix, $this->phpcsFile->config->encoding );
+				$prefix_length = iconv_strlen( $prefix, Helper::getEncoding( $this->phpcsFile ) );
 			}
 
 			if ( $prefix_length < self::MIN_PREFIX_LENGTH ) {

From 0ce6401f7eb6452d26db53739a96077c4793eee1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 06:20:16 +0100
Subject: [PATCH 409/822] NamingConventions/PrefixAllGlobals: minor bug fix

The regex as-was allowed for the `x7f` (= DEL) character to be part of a name.

The origin of this bug was the PHP manual, where the regexes were originally incorrect. This was fixed in https://github.com/php/doc-en/commit/6187696fb48916b4585a8a837bf725845f7cf3c7

No unit tests included as, to be honest, I haven't got a clue how to add a test with the DEL character ;-)

Includes adding a note about why this condition is not using PHPCSUtils.
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index b1c7535bf1..24da8d10c6 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -968,8 +968,13 @@ private function validate_prefixes() {
 				continue;
 			}
 
-			// Validate the prefix against characters allowed for function, class, constant names etc.
-			if ( preg_match( '`^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff\\\\]*$`', $prefix ) !== 1 ) {
+			/*
+			 * Validate the prefix against characters allowed for function, class, constant names etc.
+			 * Note: this does not use the PHPCSUtils `NamingConventions::isValidIdentifierName()` method
+			 * as we want to allow namespace separators in the prefixes.
+			 */
+			if ( preg_match( '`^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff\\\\]*$`', $prefix ) !== 1 ) {
+
 				$this->phpcsFile->addWarning(
 					'The "%s" prefix is not a valid namespace/function/class/variable/constant prefix in PHP.',
 					0,

From 67e32b5e6773e07ef21b370cd48096c8f9e3d487 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 03:38:29 +0100
Subject: [PATCH 410/822] NamingConventions/PrefixAllGlobals: (mostly) ignore
 PHP 7.4+ arrow functions

PHP 7.4 introduced arrow functions.

For the purposes of this sniff:
* Parameters declared by arrow functions (with a default value assignment) do not need to be prefixed.
* New variables declared within an arrow function are local to the arrow function, so can be ignored.
* A `global` statement is not allowed within an arrow function.

And as an arrow function can only contain one statement, the chances of anything else within the arrow function needing to be flagged are slim, except when an arrow function declares a closure.
Note: nesting a named function declaration in an arrow function is not allowed (parse error).

PHPCS adds the `parenthesis_*` keys correctly and adds the arrow function parentheses to the `nested_parenthesis` array, so the function parameters can be handled same like parameters for closures/named functions.

However, while PHPCS does add the `scope_*` keys to the `T_FN` function, it does **not** add the `T_FN` to the `conditions` array for tokens between the `scope_opener` and the `scope_closer`.
The reason for this, is that the `scope_closer` of arrow functions can overlap with other `scope_closer`s, like in nested arrow function, which would make the `conditions` array unusable.

With the above in mind, I'm proposing to skip over the contents of arrow functions and ignore everything in them completely, with the one exception, that if an arrow function declares a closure, the closure will still be examined.

While this could potentially lead to some false negatives, I do believe this is the best we can do for now.

Includes unit tests.
---
 .../PrefixAllGlobalsSniff.php                 | 36 +++++++++++++++----
 .../PrefixAllGlobalsUnitTest.1.inc            | 20 +++++++++++
 .../PrefixAllGlobalsUnitTest.php              |  2 ++
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 24da8d10c6..c900ead3c2 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -219,11 +219,12 @@ public function register() {
 
 		// Set the sniff targets.
 		$targets  = array(
-			\T_NAMESPACE        => \T_NAMESPACE,
-			\T_FUNCTION         => \T_FUNCTION,
-			\T_CONST            => \T_CONST,
-			\T_VARIABLE         => \T_VARIABLE,
-			\T_DOLLAR           => \T_DOLLAR, // Variable variables.
+			\T_NAMESPACE => \T_NAMESPACE,
+			\T_FUNCTION  => \T_FUNCTION,
+			\T_CONST     => \T_CONST,
+			\T_VARIABLE  => \T_VARIABLE,
+			\T_DOLLAR    => \T_DOLLAR, // Variable variables.
+			\T_FN_ARROW  => \T_FN_ARROW, // T_FN_ARROW is only used for skipping over (for now).
 		);
 		$targets += Tokens::$ooScopeTokens; // T_ANON_CLASS is only used for skipping over test classes.
 		$targets += Collections::listOpenTokensBC();
@@ -301,6 +302,29 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		/*
+		 * Ignore the contents of arrow functions which do not declare closures.
+		 *
+		 * - Parameters declared by arrow functions do not need to be prefixed (handled elsewhere).
+		 * - New variables declared within an arrow function are local to the arrow function, so can be ignored.
+		 * - A `global` statement is not allowed within an arrow function.
+		 *
+		 * Note: this does mean some convoluted code may get ignored (false negatives), but this is currently
+		 * not reliably solvable as PHPCS does not add arrow functions to the 'conditions' array.
+		 */
+		if ( \T_FN_ARROW === $this->tokens[ $stackPtr ]['code']
+			&& isset( $this->tokens[ $stackPtr ]['scope_closer'] )
+		) {
+			$has_closure = $this->phpcsFile->findNext( \T_CLOSURE, ( $stackPtr + 1 ), $this->tokens[ $stackPtr ]['scope_closer'] );
+			if ( false !== $has_closure ) {
+				// Skip to the start of the closure.
+				return $has_closure;
+			}
+
+			// Skip the arrow function completely.
+			return $this->tokens[ $stackPtr ]['scope_closer'];
+		}
+
 		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
 			// Disallow excluding function groups for this sniff.
 			$this->exclude = array();
@@ -665,7 +689,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 		} else {
 			// Function parameters do not need to be prefixed.
 			if ( false === $in_list ) {
-				$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+				$functionPtr = Parentheses::getLastOwner( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
 				if ( false !== $functionPtr ) {
 					return;
 				}
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index a3e3eb3fed..b5e0e44513 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -532,4 +532,24 @@ const E_DEPRECATED = 8192; // Introduced in PHP 5.3.0.
 
 apply_filters( /* name missing */, $var ); // Ignore as undetermined.
 
+/*
+ * Safeguard correct handling (ignoring) of PHP 7.4+ arrow functions.
+ */
+// Parameters in a arrow function declaration do not need to be prefixed.
+$acronym_fn = fn($foo = 10, $bar = 20) => $foo;
+
+// Variable variables local to the arrow function do not need to be prefixed.
+$acronym_fn = fn($acronym_name, $acronym_value) => $$acronym_name = $acronym_value;
+
+// Function local variables in a arrow function declaration do not need to be prefixed.
+$acronym_fn = fn($acronym_name, $acronym_value) => $new = $acronym_value;
+
+// The `$GLOBAL['my_key']` assignment and the function declaration within the closure should still be flagged.
+$acronym_fn = fn($a, $b) =>
+	$no_prefix = function($a, $b) { // The `$no_prefix` variable should be ignored.
+		$GLOBALS['my_key'] = 10; // Bad.
+		function named() {} // Bad.
+		return $a + $b;
+	};
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index c2008776b3..5bf8754cfe 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -82,6 +82,8 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					464 => 2,
 					465 => 1,
 					468 => 1,
+					550 => 1,
+					551 => 1,
 				);
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':

From 767838d5a2748e5d7a96da96c2e031683e330985 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 03:48:55 +0100
Subject: [PATCH 411/822] NamingConventions/PrefixAllGlobals: add test with PHP
 7.4 null coalesce equals

... to safeguard assignments using that operator are recognized correctly.
---
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc   | 5 +++++
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.php     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index b5e0e44513..a50cf39150 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -552,4 +552,9 @@ $acronym_fn = fn($a, $b) =>
 		return $a + $b;
 	};
 
+// Safeguard that assignments using the PHP 7.4+ null coalesce equals operator are handled correctly.
+function acronym_null_coalesce_equals() {
+	$GLOBALS['my_key'] ??= 10; // Bad.
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 5bf8754cfe..3cdd2f133a 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -84,6 +84,7 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					468 => 1,
 					550 => 1,
 					551 => 1,
+					557 => 1,
 				);
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':

From 685d45f96e52ec8f0e173c0e625c3562c87e8ec6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 03:55:27 +0100
Subject: [PATCH 412/822] NamingConventions/PrefixAllGlobals: add test with PHP
 8.0 nullsafe object operator

... to safeguard assignments to properties are not flagged when using that operator.
---
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index a50cf39150..0741aafbe5 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -557,4 +557,7 @@ function acronym_null_coalesce_equals() {
 	$GLOBALS['my_key'] ??= 10; // Bad.
 }
 
+// Safeguard that property assignments using the PHP 8.0 nullsafe object operator do not trigger false positives.
+$acronym_object??->property = 10;
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From c01623531f322305587ec71b2e7669869df24e61 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 04:54:15 +0100
Subject: [PATCH 413/822] NamingConventions/PrefixAllGlobals: add support for
 PHP 8.0+ named parameters

1. Adjusted the logic in the sniff to allow for named parameters using the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method and the new `WPHookHelper::get_hook_name_param()` method.
2. The parameter name used for `define()` is in line with the name as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) is the only relevant name.

Includes additional unit tests.

Note: function calls with named arguments are not supported for the `do_action()` or `apply_filters()` functions as those have a parameter with a spread operator (but that's irrelevant for the sniff).
---
 .../PrefixAllGlobalsSniff.php                 | 22 ++++++++++------
 .../PrefixAllGlobalsUnitTest.1.inc            | 26 ++++++++++++++++++-
 .../PrefixAllGlobalsUnitTest.php              |  4 +++
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index c900ead3c2..d741ad0e4f 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -20,6 +20,7 @@
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\Parentheses;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use PHPCSUtils\Utils\Variables;
@@ -796,14 +797,19 @@ protected function process_list_assignment( $stackPtr ) {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
+		if ( 'define' === $matched_content ) {
+			$target_param = PassedParameters::getParameterFromStack( $parameters, 1, 'constant_name' );
+
+		} else {
+			$target_param = WPHookHelper::get_hook_name_param( $matched_content, $parameters );
+		}
 
-		// No matter whether it is a constant definition or a hook call, both use the first parameter.
-		if ( ! isset( $parameters[1] ) ) {
+		if ( false === $target_param ) {
 			return;
 		}
 
 		$is_error    = true;
-		$raw_content = TextStrings::stripQuotes( $parameters[1]['raw'] );
+		$raw_content = TextStrings::stripQuotes( $target_param['raw'] );
 
 		if ( ( 'define' !== $matched_content
 			&& isset( $this->allowed_core_hooks[ $raw_content ] ) )
@@ -813,14 +819,14 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		if ( $this->is_prefixed( $parameters[1]['start'], $raw_content ) === true ) {
+		if ( $this->is_prefixed( $target_param['start'], $raw_content ) === true ) {
 			return;
 		} else {
 			// This may be a dynamic hook/constant name.
 			$first_non_empty = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				$parameters[1]['start'],
-				( $parameters[1]['end'] + 1 ),
+				$target_param['start'],
+				( $target_param['end'] + 1 ),
 				true
 			);
 
@@ -832,7 +838,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			// Try again with just the first token if it's a text string.
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ]['code'] ] )
-				&& $this->is_prefixed( $parameters[1]['start'], $first_non_empty_content ) === true
+				&& $this->is_prefixed( $target_param['start'], $first_non_empty_content ) === true
 			) {
 				return;
 			}
@@ -843,7 +849,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				$exploded = explode( '$', $first_non_empty_content );
 				$first    = rtrim( $exploded[0], '{' );
 				if ( '' !== $first ) {
-					if ( $this->is_prefixed( $parameters[1]['start'], $first ) === true ) {
+					if ( $this->is_prefixed( $target_param['start'], $first ) === true ) {
 						return;
 					}
 				} else {
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 0741aafbe5..32cf2cf670 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -557,7 +557,31 @@ function acronym_null_coalesce_equals() {
 	$GLOBALS['my_key'] ??= 10; // Bad.
 }
 
-// Safeguard that property assignments using the PHP 8.0 nullsafe object operator do not trigger false positives.
+// Safeguard that property assignments using the PHP 8.0+ nullsafe object operator do not trigger false positives.
 $acronym_object??->property = 10;
 
+/*
+ * Safeguard support for function calls using PHP 8.0+ named parameters.
+ */
+define( value: 0 ); // OK. Well, not really as missing a required param, but that's not the concern of this sniff.
+define(
+	value        : 'not_prefixed',
+	constant_name: 'NOT_PREFIXED', // Bad.
+);
+define(
+	case_insensitive: true,
+	constant_name: 'ACRONYM_PREFIXED', // OK.
+	value: 0,
+);
+
+do_action_ref_array( hook: 'My-Hook', args: $args ); // OK. Well, not really, but using the wrong parameter name, so not our concern.
+do_action_ref_array( args: $args, hook_name: 'acronym_hook', ); // OK.
+do_action_ref_array( args: $args, hook_name: 'My-Hook', ); // Bad.
+do_action( hook_name: "acronym_plugin_action_{$acronym_filter_var}" ); // OK.
+
+apply_filters_ref_array( args: $args ); // OK. Well, not really, but missing required parameter, so not our concern.
+apply_filters_ref_array( args: $var, hook_name: 'acronym_filter', ); // OK.
+apply_filters_ref_array( args: $var, hook_name: 'theme_filter', ); // Bad.
+apply_filters_ref_array( hook_name: 'theme_filter_' . $acronym_filter_var ); // Bad.
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 3cdd2f133a..9f74f7d40d 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -85,6 +85,10 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					550 => 1,
 					551 => 1,
 					557 => 1,
+					569 => 1,
+					579 => 1,
+					584 => 1,
+					585 => 1,
 				);
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':

From e6fea708600b1935346e97d30b74bd2d1da89dba Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 05:06:32 +0100
Subject: [PATCH 414/822] NamingConventions/PrefixAllGlobals: prevent some
 false positives

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, some false positives get fixed.

Includes unit tests demonstrating the issue and safeguarding the fix.

Includes renaming the variable name to which the value was being assigned to allow it to continue to be descriptive.

The switch to using the `clean` key also makes sure that the information displayed in the error message will not contain comments, making those message cleaner too.
---
 .../PrefixAllGlobalsSniff.php                  | 18 +++++++++---------
 .../PrefixAllGlobalsUnitTest.1.inc             |  6 ++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index d741ad0e4f..c1498b10de 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -808,18 +808,18 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
-		$is_error    = true;
-		$raw_content = TextStrings::stripQuotes( $target_param['raw'] );
+		$is_error      = true;
+		$clean_content = TextStrings::stripQuotes( $target_param['clean'] );
 
 		if ( ( 'define' !== $matched_content
-			&& isset( $this->allowed_core_hooks[ $raw_content ] ) )
+			&& isset( $this->allowed_core_hooks[ $clean_content ] ) )
 			|| ( 'define' === $matched_content
-			&& isset( $this->allowed_core_constants[ $raw_content ] ) )
+			&& isset( $this->allowed_core_constants[ $clean_content ] ) )
 		) {
 			return;
 		}
 
-		if ( $this->is_prefixed( $target_param['start'], $raw_content ) === true ) {
+		if ( $this->is_prefixed( $target_param['start'], $clean_content ) === true ) {
 			return;
 		} else {
 			// This may be a dynamic hook/constant name.
@@ -863,12 +863,12 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		if ( 'define' === $matched_content ) {
-			if ( \defined( '\\' . $raw_content ) ) {
+			if ( \defined( '\\' . $clean_content ) ) {
 				// Backfill for PHP native constant.
 				return;
 			}
 
-			if ( strpos( $raw_content, '\\' ) !== false ) {
+			if ( strpos( $clean_content, '\\' ) !== false ) {
 				// Namespaced or unreachable constant.
 				return;
 			}
@@ -886,12 +886,12 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 		}
 
-		$data[] = $raw_content;
+		$data[] = $clean_content;
 
 		$recorded = MessageHelper::addMessage( $this->phpcsFile, self::ERROR_MSG, $first_non_empty, $is_error, $error_code, $data );
 
 		if ( true === $recorded ) {
-			$this->record_potential_prefix_metric( $stackPtr, $raw_content );
+			$this->record_potential_prefix_metric( $stackPtr, $clean_content );
 		}
 	}
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 32cf2cf670..c47a3569e1 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -584,4 +584,10 @@ apply_filters_ref_array( args: $var, hook_name: 'acronym_filter', ); // OK.
 apply_filters_ref_array( args: $var, hook_name: 'theme_filter', ); // Bad.
 apply_filters_ref_array( hook_name: 'theme_filter_' . $acronym_filter_var ); // Bad.
 
+// Safeguard that comments in the parameters are ignored.
+apply_filters( /* test */ 'widget_title', $title );
+do_action( /* test */ 'add_meta_boxes' );
+
+define( /* test */ 'FORCE_SSL_ADMIN', true );
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From ccae70dc9044d567b12929231e1b256e6fbce230 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 05:15:03 +0100
Subject: [PATCH 415/822] NamingConventions/PrefixAllGlobals: add test with PHP
 8.0+ constructor property promotion

PHP 8.0 introduced constructor property promotion.

As default value assignments in function declaration statements are excluded already, no functional changes need to be made to support this.

Just adding a test to safeguard that this is handled correctly.
---
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index c47a3569e1..3d7cacc41d 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -590,4 +590,13 @@ do_action( /* test */ 'add_meta_boxes' );
 
 define( /* test */ 'FORCE_SSL_ADMIN', true );
 
+// Safeguard that assignments to properties using PHP 8.0+ constructor property promotion don't lead to false positives.
+class Acronym_ConstructorPropertyPromotion {
+	public function __construct(
+		public int $timestart = 0,
+		protected int|bool $timeend = false,
+		$post = null
+	) {} // Ok.
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From ff0ce2ec20acb0ff619dd9b595ce74c120471604 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 05:40:36 +0100
Subject: [PATCH 416/822] NamingConventions/PrefixAllGlobals: add support for
 PHP 8.1+ enums

PHP 8.1 introduced enums as a new OO structure.

Unless in a (prefixed) namespace, enum names should also be prefixed.

The `Tokens::$ooScopeTokens` array used in the `register()` method already contains the `T_ENUM` token, so the sniff is already listening for it.

This commit now adjusts the sniff to actually handle enums as well.

Includes additional unit tests.

Note: enums cannot `extend`, so cannot ever be regarded as "test classes" for the purposes of this sniff.
---
 .../PrefixAllGlobalsStandard.xml              |  2 +-
 .../PrefixAllGlobalsSniff.php                 | 12 ++++++++++++
 .../PrefixAllGlobalsUnitTest.1.inc            | 19 +++++++++++++++++++
 .../PrefixAllGlobalsUnitTest.2.inc            |  2 ++
 .../PrefixAllGlobalsUnitTest.php              |  4 ++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
index 0776d7f51c..a97d139438 100644
--- a/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
+++ b/WordPress/Docs/NamingConventions/PrefixAllGlobalsStandard.xml
@@ -5,7 +5,7 @@
     >
     <standard>
     <![CDATA[
-    All globals terms must be prefixed with a theme/plugin specific term. Global terms include Namespace names, Class/Interface/Trait names (when not namespaced), Functions (when not namespaced or in an OO structure), Constants/Variable names declared in the global namespace, and Hook names.
+    All globals terms must be prefixed with a theme/plugin specific term. Global terms include Namespace names, Class/Interface/Trait/Enum names (when not namespaced), Functions (when not namespaced or in an OO structure), Constants/Variable names declared in the global namespace, and Hook names.
 
     A prefix must be distinct and unique to the plugin/theme, in order to prevent potential conflicts with other plugins/themes and with WordPress itself.
 
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index c1498b10de..6560434534 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -424,6 +424,7 @@ public function process_token( $stackPtr ) {
 				case \T_CLASS:
 				case \T_INTERFACE:
 				case \T_TRAIT:
+				case \T_ENUM:
 					$item_name  = ObjectDeclarations::getName( $this->phpcsFile, $stackPtr );
 					$error_text = 'Classes declared';
 					$error_code = 'NonPrefixedClassFound';
@@ -456,6 +457,17 @@ public function process_token( $stackPtr ) {
 							$error_text = 'Traits declared';
 							$error_code = 'NonPrefixedTraitFound';
 							break;
+
+						case \T_ENUM:
+							// phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.enum_existsFound
+							if ( function_exists( '\enum_exists' ) && enum_exists( '\\' . $item_name, false ) ) {
+								// Backfill for PHP native enum.
+								return;
+							}
+
+							$error_text = 'Enums declared';
+							$error_code = 'NonPrefixedEnumFound';
+							break;
 					}
 
 					break;
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 3d7cacc41d..ef8c32c111 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -599,4 +599,23 @@ class Acronym_ConstructorPropertyPromotion {
 	) {} // Ok.
 }
 
+/*
+ * Safeguard that PHP 8.1+ enums are treated correctly.
+ */
+enum Example {} // Bad.
+enum Another_Example: int {} // Bad.
+
+enum Acronym: string implements SomeInterface {} // OK.
+enum AcronymExample { // OK.
+	// Constants and methods declared within an enum do not need to be prefixed. (Properties are not allowed)
+	const SOME_CONSTANT = 'value'; // OK.
+	public function do_something( $param = 'default' ) {} // OK x2.
+
+	// Global constants and hook names still do need to be prefixed when defined within an enum.
+	protected function hello() {
+		define( 'FOO', 'value' ); // Bad.
+		apply_filters( 'foo', $args ); // Bad.
+	}
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.2.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.2.inc
index 7a9193871a..2591ae91e5 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.2.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.2.inc
@@ -17,4 +17,6 @@ trait T_Example {}
 // Issue #1056.
 define( __NAMESPACE__ . '\PLUGIN_FILE', __FILE__ );
 
+enum E_Example {}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 9f74f7d40d..dd39963545 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -89,6 +89,10 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					579 => 1,
 					584 => 1,
 					585 => 1,
+					605 => 1,
+					606 => 1,
+					616 => 1,
+					617 => 1,
 				);
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':

From a7b0b07c85922427cf2942fafa11fa4e98daacaa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 05:45:56 +0100
Subject: [PATCH 417/822] NamingConventions/PrefixAllGlobals: add tests with
 PHP 8.2+ constants in traits

... to ensure those aren't recognized as if they were the global constant.

Constants in traits are allowed since PHP 8.2.
The `final` keyword can be used with OO constants since PHP 8.1.
---
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 2 +-
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 6560434534..42fcd66c3a 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -473,7 +473,7 @@ public function process_token( $stackPtr ) {
 					break;
 
 				case \T_CONST:
-					// Constants in a class do not need to be prefixed.
+					// Constants in an OO construct do not need to be prefixed.
 					if ( true === Scopes::isOOConstant( $this->phpcsFile, $stackPtr ) ) {
 						return;
 					}
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index ef8c32c111..1f170c4b8f 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -618,4 +618,9 @@ enum AcronymExample { // OK.
 	}
 }
 
+// Safeguard that the sniff ignores PHP 8.2+ constants in traits correctly.
+trait Acronym_Has_Constant {
+	final const NON_PREFIXED = true; // OK.
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From 0e5cfb5c2ec67042b043e78c852558b24d076742 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 08:45:18 +0100
Subject: [PATCH 418/822] NamingConventions/PrefixAllGlobals: bug fix - finding
 end of global statement

Prevent false positives when a global statement is ended by a PHP close tag.

Includes unit tests.
---
 .../NamingConventions/PrefixAllGlobalsSniff.php       |  2 +-
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc  | 11 +++++++++++
 .../NamingConventions/PrefixAllGlobalsUnitTest.php    |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 42fcd66c3a..ce92022dad 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -724,7 +724,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 				}
 
 				// Ok, this may be an imported global variable.
-				$end_of_statement = $this->phpcsFile->findNext( \T_SEMICOLON, ( $has_global + 1 ) );
+				$end_of_statement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $has_global + 1 ) );
 				if ( false === $end_of_statement ) {
 					// No semi-colon - live coding.
 					return;
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 1f170c4b8f..5dff3dc521 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -623,4 +623,15 @@ trait Acronym_Has_Constant {
 	final const NON_PREFIXED = true; // OK.
 }
 
+// Safeguard improved finding of end of global statement.
+function acronym_close_tag_can_end_global_statement() {
+	global $something, $acronym_else ?>
+
+	<?php
+	echo $breakOutOfTheStatement;
+	$acronym_else = 'value'; // OK.
+	$something = 'value'; // Bad.
+	$breakOutOfTheStatement = 'value'; // OK.
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index dd39963545..ef8d58db2d 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -93,6 +93,7 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 					606 => 1,
 					616 => 1,
 					617 => 1,
+					633 => 1,
 				);
 
 			case 'PrefixAllGlobalsUnitTest.4.inc':

From 58b1ff1d95090b9220857db1a10f71838c16ee6f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 7 Jan 2023 08:51:33 +0100
Subject: [PATCH 419/822] NamingConventions/PrefixAllGlobals: bug fix - only
 check global statement in current scope

Prevent false positives when a nested function/closure declaration also contains a `global` statement.

Includes unit test.
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php |  6 ++++--
 .../NamingConventions/PrefixAllGlobalsUnitTest.1.inc   | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ce92022dad..73d6777f35 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -718,8 +718,10 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 			$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, Collections::functionDeclarationTokens() );
 			if ( false !== $functionPtr ) {
 				$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $functionPtr ]['scope_opener'] );
-				if ( false === $has_global ) {
-					// No variable import happening.
+				if ( false === $has_global
+					|| Conditions::getLastCondition( $this->phpcsFile, $has_global, Collections::functionDeclarationTokens() ) !== $functionPtr
+				) {
+					// No variable import happening in the current scope.
 					return;
 				}
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 5dff3dc521..8cf713258c 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -634,4 +634,14 @@ function acronym_close_tag_can_end_global_statement() {
 	$breakOutOfTheStatement = 'value'; // OK.
 }
 
+// Safeguard improved checking if global statement is in the current scope.
+function acronym_only_check_global_statement_in_current_scope() {
+	$closure = function() {
+		global $something;
+		return $something;
+	};
+
+	$something = 'value'; // OK, global statement is in different scope.
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From db0cc941815c6fb3446c35a49c9596819d0e4598 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:07:19 +0100
Subject: [PATCH 420/822] Move "snake case" related utility to dedicated
 `SnakeCaseHelper`

The "snake case" related utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `get_snake_case_name_suggestion()` method to the new `WordPressCS\WordPress\Helpers\SnakeCaseHelper` and starts using that class in the relevant sniffs.

**Note**:
It is expected for PHPCSUtils to have dedicated methods for the same at some point in the future. If/when those methods become available, it is recommended for the sniffs to start using the PHPCSUtils methods.
With that in mind, this class is marked as not part of the public API.

Related to 1465
---
 WordPress/Helpers/SnakeCaseHelper.php         | 48 +++++++++++++++++++
 WordPress/Sniff.php                           | 19 --------
 .../ValidFunctionNameSniff.php                |  5 +-
 .../ValidVariableNameSniff.php                | 10 ++--
 4 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 WordPress/Helpers/SnakeCaseHelper.php

diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
new file mode 100644
index 0000000000..90a653b827
--- /dev/null
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper utilities for checking if a name is in snake_case.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class SnakeCaseHelper {
+
+	/**
+	 * Transform the name of a PHP construct (function, variable etc) to one in snake_case.
+	 *
+	 * @since 2.0.0 Moved from the `WordPress.NamingConventions.ValidFunctionName` sniff
+	 *              to this class, renamed from `get_name_suggestion` and made static
+	 *              so it can also be used by classes which don't extend this class.
+	 * @since 3.0.0 Moved from the Sniff class to this class.
+	 *
+	 * @param string $name The construct name.
+	 *
+	 * @return string
+	 */
+	public static function get_suggestion( $name ) {
+		$suggested = preg_replace( '`([A-Z])`', '_$1', $name );
+		$suggested = strtolower( $suggested );
+		$suggested = str_replace( '__', '_', $suggested );
+		$suggested = trim( $suggested, '_' );
+		return $suggested;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 3ff244c2d7..c92b0e15f4 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -459,25 +459,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Transform the name of a PHP construct (function, variable etc) to one in snake_case.
-	 *
-	 * @since 2.0.0 Moved from the `WordPress.NamingConventions.ValidFunctionName` sniff
-	 *              to this class, renamed from `get_name_suggestion` and made static
-	 *              so it can also be used by classes which don't extend this class.
-	 *
-	 * @param string $name The construct name.
-	 *
-	 * @return string
-	 */
-	public static function get_snake_case_name_suggestion( $name ) {
-		$suggested = preg_replace( '`([A-Z])`', '_$1', $name );
-		$suggested = strtolower( $suggested );
-		$suggested = str_replace( '__', '_', $suggested );
-		$suggested = trim( $suggested, '_' );
-		return $suggested;
-	}
-
 	/**
 	 * Get the last pointer in a line.
 	 *
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 9ff9e31c76..9ff58be4ec 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -14,6 +14,7 @@
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
+use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -115,7 +116,7 @@ protected function process_function_declaration( $stackPtr, $functionName ) {
 			$error     = 'Function name "%s" is not in snake case format, try "%s"';
 			$errorData = array(
 				$functionName,
-				$this->get_snake_case_name_suggestion( $functionName ),
+				SnakeCaseHelper::get_suggestion( $functionName ),
 			);
 			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionNameInvalid', $errorData );
 		}
@@ -182,7 +183,7 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 			$errorData = array(
 				$methodName,
 				$className,
-				$this->get_snake_case_name_suggestion( $methodName ),
+				SnakeCaseHelper::get_suggestion( $methodName ),
 			);
 			$this->phpcsFile->addError( $error, $stackPtr, 'MethodNameInvalid', $errorData );
 		}
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 1ca6552366..d5f4667ae7 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -13,7 +13,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
-use WordPressCS\WordPress\Sniff;
+use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
 
 /**
  * Checks the naming of variables and member variables.
@@ -146,7 +146,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 						$error = 'Object property "$%s" is not in valid snake_case format, try "$%s"';
 						$data  = array(
 							$original_var_name,
-							Sniff::get_snake_case_name_suggestion( $original_var_name ),
+							SnakeCaseHelper::get_suggestion( $original_var_name ),
 						);
 						$phpcs_file->addError( $error, $var, 'UsedPropertyNotSnakeCase', $data );
 					}
@@ -182,7 +182,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 			if ( isset( $error, $error_name ) ) {
 				$data = array(
 					$original_var_name,
-					Sniff::get_snake_case_name_suggestion( $original_var_name ),
+					SnakeCaseHelper::get_suggestion( $original_var_name ),
 				);
 				$phpcs_file->addError( $error, $stack_ptr, $error_name, $data );
 			}
@@ -219,7 +219,7 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 			$error = 'Member variable "$%s" is not in valid snake_case format, try "$%s"';
 			$data  = array(
 				$var_name,
-				Sniff::get_snake_case_name_suggestion( $var_name ),
+				SnakeCaseHelper::get_suggestion( $var_name ),
 			);
 			$phpcs_file->addError( $error, $stack_ptr, 'PropertyNotSnakeCase', $data );
 		}
@@ -258,7 +258,7 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 					$error = 'Variable "$%s" is not in valid snake_case format, try "$%s"';
 					$data  = array(
 						$var_name,
-						Sniff::get_snake_case_name_suggestion( $var_name ),
+						SnakeCaseHelper::get_suggestion( $var_name ),
 					);
 					$phpcs_file->addError( $error, $stack_ptr, 'InterpolatedVariableNotSnakeCase', $data );
 				}

From 5b92f21d47b49371c19d53d1671c014bd0a3a9c4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 16:27:58 +0100
Subject: [PATCH 421/822] SnakeCaseHelper::get_suggestion(): bug fix -
 underscore handling

The `SnakeCaseHelper::get_suggestion()` method should have no opinion on the use of leading/trailing/double underscores in a name.

In practice, however, it did and the suggested name would be incorrect.

Fixed now.

Includes tests to safeguard this fix in the `ValidFunctionName` test case file, though the current methodology for testing would not catch a regression.

To illustrate the issue - originally, the error messages for these new tests would read:
```
216 | ERROR | Method name "___Leading_Underscores" in class UnderScoreHandling is not in snake case format, try "leading_underscores"
 217 | ERROR | Method name "Multiple_______Underscores" in class UnderScoreHandling is not in snake case format, try "multiple____underscores"
 218 | ERROR | Method name "Trailing_Underscores___" in class UnderScoreHandling is not in snake case format, try "trailing_underscores"
```

With the fix, the error messages for the new tests read:
```
 216 | ERROR | Method name "___Leading_Underscores" in class UnderScoreHandling is not in snake case format, try "___leading_underscores"
 217 | ERROR | Method name "Multiple_______Underscores" in class UnderScoreHandling is not in snake case format, try "multiple_______underscores"
 218 | ERROR | Method name "Trailing_Underscores___" in class UnderScoreHandling is not in snake case format, try "trailing_underscores___"
```
---
 WordPress/Helpers/SnakeCaseHelper.php                      | 4 +---
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.inc  | 7 +++++++
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.php  | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index 90a653b827..4592594129 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -39,10 +39,8 @@ final class SnakeCaseHelper {
 	 * @return string
 	 */
 	public static function get_suggestion( $name ) {
-		$suggested = preg_replace( '`([A-Z])`', '_$1', $name );
+		$suggested = preg_replace( '`(?<!_|^)([A-Z])`', '_$1', $name );
 		$suggested = strtolower( $suggested );
-		$suggested = str_replace( '__', '_', $suggested );
-		$suggested = trim( $suggested, '_' );
 		return $suggested;
 	}
 }
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index e7f2da4e56..73806451fd 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -177,3 +177,10 @@ class DeprecatedWithAttribute {
 	#[AnotherAttribute]
 	public static function __deprecatedMethod() {}
 }
+
+// Safeguard that the suggested replacement name does not suggest undue changes to underscores in the name.
+class UnderScoreHandling {
+	public function ___Leading_Underscores() {} // Bad, replacement suggestion should be: ___leading_underscores.
+	public function Multiple_______Underscores() {} // Bad, replacement suggestion should be: multiple_______underscores.
+	public function Trailing_Underscores___() {}// Bad, replacement suggestion should be: trailing_underscores___.
+}
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 4c07520c95..8e2f32fefd 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -47,6 +47,9 @@ public function getErrorList() {
 			116 => 1,
 			117 => 1,
 			157 => 2,
+			183 => 1,
+			184 => 1,
+			185 => 1,
 		);
 	}
 

From 18e06753863a159f2791424271447348dd332821 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:48:51 +0100
Subject: [PATCH 422/822] NamingConventions/ValidFunctionName: add extra tests

The handling of function names only consisting of underscore was already special cased in the sniff, but not covered by tests.

Similarly, live coding was not covered.
---
 .../NamingConventions/ValidFunctionNameUnitTest.inc   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index 73806451fd..13e911a4ce 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -184,3 +184,14 @@ class UnderScoreHandling {
 	public function Multiple_______Underscores() {} // Bad, replacement suggestion should be: multiple_______underscores.
 	public function Trailing_Underscores___() {}// Bad, replacement suggestion should be: trailing_underscores___.
 }
+
+// Safeguard that functions with a name only consisting of underscores are always ignored.
+function __() {}
+
+class OnlyUnderscores {
+	public function _____() {}
+}
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+function

From 2dd12d2810c23de594202429e0f344bee52111aa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 1 Jul 2020 22:27:55 +0200
Subject: [PATCH 423/822] NamingConventions/ValidFunctionName: implement
 PHPCSUtils methods

PHP is largely case-insensitive for class and method name, but not completely: the case-insensitivety does not apply to the non-ascii range.

The PHPCSUtils methods recognize this correctly.

Includes minor efficiency tweak by only doing the PHP4 constructor/destructor comparison when it's a real class as a name match can never be made for anonymous classes anyway.

Includes unit tests.

Note: the test would previously pass, but only due to the `strtolower()` mangling both the class name as well as the method name equally.
---
 .../ValidFunctionNameSniff.php                | 23 ++++++++-----------
 .../ValidFunctionNameUnitTest.inc             |  7 ++++++
 .../ValidFunctionNameUnitTest.php             |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 9ff58be4ec..e1ee74d935 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\BackCompat\BCTokens;
 use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\NamingConventions;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
@@ -142,19 +143,16 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 			$className = '[Anonymous Class]';
 		} else {
 			$className = ObjectDeclarations::getName( $this->phpcsFile, $currScope );
-		}
-
-		$methodNameLc = strtolower( $methodName );
-		$classNameLc  = strtolower( $className );
 
-		// PHP4 constructors are allowed to break our rules.
-		if ( $methodNameLc === $classNameLc ) {
-			return;
-		}
+			// PHP4 constructors are allowed to break our rules.
+			if ( NamingConventions::isEqual( $methodName, $className ) === true ) {
+				return;
+			}
 
-		// PHP4 destructors are allowed to break our rules.
-		if ( '_' . $classNameLc === $methodNameLc ) {
-			return;
+			// PHP4 destructors are allowed to break our rules.
+			if ( NamingConventions::isEqual( $methodName, '_' . $className ) === true ) {
+				return;
+			}
 		}
 
 		// PHP magic methods are exempt from our rules.
@@ -178,7 +176,7 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 		}
 
 		// Check for all lowercase.
-		if ( $methodNameLc !== $methodName ) {
+		if ( strtolower( $methodName ) !== $methodName ) {
 			$error     = 'Method name "%s" in class %s is not in snake case format, try "%s"';
 			$errorData = array(
 				$methodName,
@@ -188,5 +186,4 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 			$this->phpcsFile->addError( $error, $stackPtr, 'MethodNameInvalid', $errorData );
 		}
 	}
-
 }
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index 13e911a4ce..aed7ce2582 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -192,6 +192,13 @@ class OnlyUnderscores {
 	public function _____() {}
 }
 
+// Class vs function name PHP case-sensitivity quirks.
+class FooBÃÈ {
+	function FooBÃÈ() {} // OK, same case.
+	function fOOBÃÈ() {} // OK, same case for the non-ascii chars.
+	function FooBãè() {} // Bad - not PHP 4-type constructor, non ascii chars not in same case - POC: https://3v4l.org/YOc2R.
+}
+
 // Live coding/parse error.
 // This has to be the last test in the file.
 function
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 8e2f32fefd..04f8801412 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -50,6 +50,7 @@ public function getErrorList() {
 			183 => 1,
 			184 => 1,
 			185 => 1,
+			199 => 1,
 		);
 	}
 
@@ -61,5 +62,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }

From 6bc2936d7bb4248382cf858273899c6f227517f4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:02:25 +0100
Subject: [PATCH 424/822] NamingConventions/ValidFunctionName: add tests
 covering PHP 8.1+ enums

The various PHPCSUtils `Scopes` functions support enums since PHPCSUtils 1.0.0-alpha4, so enums are automatically supported now, but let's safeguard this with a test anyway.
---
 .../ValidFunctionNameUnitTest.inc             | 19 +++++++++++++++++++
 .../ValidFunctionNameUnitTest.php             |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index aed7ce2582..e87eff22e9 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -199,6 +199,25 @@ class FooBÃÈ {
 	function FooBãè() {} // Bad - not PHP 4-type constructor, non ascii chars not in same case - POC: https://3v4l.org/YOc2R.
 }
 
+// Safeguard that methods in enums are correctly handled by the sniff.
+enum Suit {
+	case Hearts;
+	case Diamonds;
+
+	public function color(): string {} // OK.
+	public function __changeColor(): string {} // Bad
+
+	public function &getShape(): string // Bad.
+	{
+		return "Rectangle";
+	}
+
+	// These are the only three magic methods allowed in enums.
+	public function __call( $a, $b ) {} // Ok.
+	public static function __callStatic( $a, $b ) {} // Ok.
+	public function __invoke() {} // Ok.
+}
+
 // Live coding/parse error.
 // This has to be the last test in the file.
 function
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 04f8801412..c4d74c2256 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -51,6 +51,8 @@ public function getErrorList() {
 			184 => 1,
 			185 => 1,
 			199 => 1,
+			208 => 2,
+			210 => 1,
 		);
 	}
 

From 0e2ca5f123de5a0996048ea51e55d8b5f082a7a9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:02:47 +0100
Subject: [PATCH 425/822] NamingConventions/ValidFunctionName: minor comment
 fix

---
 WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index e1ee74d935..368d2fd011 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -128,7 +128,7 @@ protected function process_function_declaration( $stackPtr, $functionName ) {
 	 *
 	 * @since 0.1.0
 	 * @since 3.0.0 Renamed from `processTokenWithinScope()` to `process_method_declaration()`.
-	 *              Method signature has been changed as well as this method no longer overloads
+	 *              Method signature has been changed as well, as this method no longer overloads
 	 *              a method from the PEAR sniff which was previously the sniff parent.
 	 *
 	 * @param int    $stackPtr   The position where this token was found.

From 8de7e5ed5e6e9aa7cc9f8d9f75d03e1b779bb355 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 13:58:03 +0100
Subject: [PATCH 426/822] NamingConventions/ValidVariableName: sync with
 upstream

Synced in relevant changes as made upstream in the following commit:
* https://github.com/squizlabs/PHP_CodeSniffer/commit/beeb36fbbb8139ada4d97a15fd71e7ac5775a92e - Making sure the sniff works correctly with PHP 7.4+ typed properties.
---
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 +-
 .../Tests/NamingConventions/ValidVariableNameUnitTest.inc   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index d5f4667ae7..446b0c75ff 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -27,7 +27,7 @@
  * @since   2.0.0  - Defers to the upstream `$phpReservedVars` property.
  *                 - Now offers name suggestions for variables in violation.
  *
- * Last synced with base class June 2018 at commit 78ddbae97cac078f09928bf89e3ab9e53ad2ace0.
+ * Last synced with base class January 2022 at commit 4b49a952bf0e2c3863d0a113256bae0d7fe63d52.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
  *
  * @uses PHP_CodeSniffer\Sniffs\AbstractVariableSniff::$phpReservedVars
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index e5923c3d1d..5ba205bcaa 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -11,19 +11,19 @@ class MyClass {
 	var $_varName = 'hello'; // Bad.
 
 	public $varNamf  = 'hello'; // Bad.
-	public $var_namf = 'hello';
+	public bool $var_namf = 'hello';
 	public $varnamf  = 'hello';
 	public $_varNamf = 'hello'; // Bad.
 
 	protected $varNamg  = 'hello'; // Bad.
 	protected $var_namg = 'hello';
 	protected $varnamg  = 'hello';
-	protected $_varNamg = 'hello'; // Bad.
+	protected string $_varNamg = 'hello'; // Bad.
 
 	private $_varNamh  = 'hello'; // Bad.
 	private $_var_namh = 'hello';
 	private $_varnamh  = 'hello';
-	private $varNamh   = 'hello'; // Bad.
+	private int|string $varNamh   = 'hello'; // Bad.
 }
 
 echo $varName; // Bad.

From f7dfae899ce2cfed861ce28b9369522345f90903 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 9 Jan 2023 07:50:29 +0100
Subject: [PATCH 427/822] NamingConventions/ValidVariableName: bug fix

When a text string with interpolated variables contained a variable on the `$wordpress_mixed_case_vars` list, any variables found in the text string _after_ it would not be examined or flagged.

Fixed now.

Includes test proving the bug and safeguarding the fix.
---
 WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php   | 2 +-
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc | 2 ++
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 446b0c75ff..b239e4c241 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -251,7 +251,7 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 
 				// Likewise if it is a mixed-case var used by WordPress core.
 				if ( isset( $this->wordpress_mixed_case_vars[ $var_name ] ) ) {
-					return;
+					continue;
 				}
 
 				if ( false === self::isSnakeCase( $var_name ) ) {
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 5ba205bcaa..c08f0f8459 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -186,3 +186,5 @@ class MultiVarDeclarations {
 			$multiStatic3 = ''; // Bad.
 	}
 }
+
+echo "This is $post_ID with $ThisShouldBeFlagged"; // Bad.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 85e1d22524..e6637fb1eb 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -82,6 +82,7 @@ public function getErrorList() {
 			182 => 1,
 			184 => 1,
 			186 => 1,
+			190 => 1,
 		);
 	}
 

From 35d66895ddd2c365a9292009cdb8e22adf176cc0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 14:36:58 +0100
Subject: [PATCH 428/822] NamingConventions/ValidVariableName: implement
 PHPCSUtils [1]

Includes minor efficiency tweak.

Includes adding a test for the OO property verification, which was so far untested.
---
 .../ValidVariableNameSniff.php                 | 18 +++++++-----------
 .../ValidVariableNameUnitTest.inc              |  9 +++++++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index b239e4c241..bc5c228756 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -9,9 +9,10 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
 
@@ -199,22 +200,17 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 	 * @return void
 	 */
 	protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
-
-		$tokens = $phpcs_file->getTokens();
-
-		$var_name     = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
-		$member_props = $phpcs_file->getMemberProperties( $stack_ptr );
-		if ( empty( $member_props ) ) {
-			// Couldn't get any info about this variable, which
-			// generally means it is invalid or possibly has a parse
-			// error. Any errors will be reported by the core, so
-			// we can ignore it.
+		// Make sure this is actually an OO property and not an OO method parameter or illegal property declaration.
+		if ( Scopes::isOOProperty( $phpcs_file, $stack_ptr ) === false ) {
 			return;
 		}
 
 		// Merge any custom variables with the defaults.
 		$this->merge_allow_lists();
 
+		$tokens   = $phpcs_file->getTokens();
+		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+
 		if ( ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) && false === self::isSnakeCase( $var_name ) ) {
 			$error = 'Member variable "$%s" is not in valid snake_case format, try "$%s"';
 			$data  = array(
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index c08f0f8459..3630a94653 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -95,7 +95,7 @@ echo $comment->comment_author_IP;
 class Foo {
 	public $_public_leading_underscore;
 	private $private_no_underscore_loading;
-	
+
 	function Bar( $VARname ) { // Bad.
 		$localVariable = false; // Bad.
 		echo Some_Class::$VarName; // Bad.
@@ -176,7 +176,7 @@ class MultiVarDeclarations {
 		$multiVar5 = false, // Bad.
 		$multiVar6 = 123, // Bad.
 		$multi_var7 = 'string'; // Ok.
-		
+
 	public function testMultiGlobalAndStatic() {
 		global $multiGlobal1, $multi_global2, // Bad x 1.
 			$multiGlobal3; // Bad.
@@ -188,3 +188,8 @@ class MultiVarDeclarations {
 }
 
 echo "This is $post_ID with $ThisShouldBeFlagged"; // Bad.
+
+// Safeguard that illegal property declarations are ignored.
+interface PropertiesNotAllowed {
+	public $notAllowed;
+}

From 9e6b3fac6fbbac1844f3b5e1696aed77f57654d0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 14:38:52 +0100
Subject: [PATCH 429/822] NamingConventions/ValidVariableName: implement
 PHPCSUtils [2]

Includes minor efficiency tweaks.
---
 .../NamingConventions/ValidVariableNameSniff.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index bc5c228756..5701369f40 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\Variables;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
 
@@ -25,13 +26,10 @@
  *
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   2.0.0  - Defers to the upstream `$phpReservedVars` property.
- *                 - Now offers name suggestions for variables in violation.
+ * @since   2.0.0  Now offers name suggestions for variables in violation.
  *
  * Last synced with base class January 2022 at commit 4b49a952bf0e2c3863d0a113256bae0d7fe63d52.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
- *
- * @uses PHP_CodeSniffer\Sniffs\AbstractVariableSniff::$phpReservedVars
  */
 class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 
@@ -109,18 +107,18 @@ class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * @return void
 	 */
 	protected function processVariable( File $phpcs_file, $stack_ptr ) {
-
-		$tokens   = $phpcs_file->getTokens();
-		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+		$tokens = $phpcs_file->getTokens();
 
 		// If it's a php reserved var, then its ok.
-		if ( isset( $this->phpReservedVars[ $var_name ] ) ) {
+		if ( Variables::isPHPReservedVarName( $tokens[ $stack_ptr ]['content'] ) ) {
 			return;
 		}
 
 		// Merge any custom variables with the defaults.
 		$this->merge_allow_lists();
 
+		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+
 		// Likewise if it is a mixed-case var used by WordPress core.
 		if ( isset( $this->wordpress_mixed_case_vars[ $var_name ] ) ) {
 			return;
@@ -241,7 +239,7 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 
 			foreach ( $matches[1] as $var_name ) {
 				// If it's a php reserved var, then its ok.
-				if ( isset( $this->phpReservedVars[ $var_name ] ) ) {
+				if ( Variables::isPHPReservedVarName( $var_name ) ) {
 					continue;
 				}
 

From 9c4ff7c8d68d317d4c95ff9e04219c46230946fa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 11:42:54 +0100
Subject: [PATCH 430/822] NamingConventions/ValidVariableName: implement
 PHPCSUtils [3]

Improve and stabilize the retrieval of embedded variables by:
1. Using the `TextStrings::getEmbed()` method to retrieve all embedded expressions.
2. Subsequently still using the regex to match variables within embedded expressions, but with an improved regex.
    - Fixed the `\x7f-\xff` range to `\x80-\xff` (was originally wrong in the PHP manual).
    - Only match a variable in braces - `${foo}` - when the braces are balanced.
        Note: this syntax is deprecated as per PHP 8.2, but that's not the concern of this sniff.
    - Capture the variable name in a named match.

Includes tests.
---
 .../ValidVariableNameSniff.php                | 19 +++++++++++++------
 .../ValidVariableNameUnitTest.inc             |  9 +++++++++
 .../ValidVariableNameUnitTest.php             |  4 ++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 5701369f40..453c6db286 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\TextStrings;
 use PHPCSUtils\Utils\Variables;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
@@ -220,7 +221,7 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 	}
 
 	/**
-	 * Processes the variable found within a double quoted string.
+	 * Processes the variables found within a double quoted string.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcs_file The file being scanned.
 	 * @param int                         $stack_ptr  The position of the double quoted
@@ -229,15 +230,21 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 	 * @return void
 	 */
 	protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
-
 		$tokens = $phpcs_file->getTokens();
 
-		if ( preg_match_all( '|[^\\\]\${?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)|', $tokens[ $stack_ptr ]['content'], $matches ) > 0 ) {
+		// There will always be embeds if the processVariableInString() was called.
+		$embeds = TextStrings::getEmbeds( $tokens[ $stack_ptr ]['content'] );
 
-			// Merge any custom variables with the defaults.
-			$this->merge_allow_lists();
+		// Merge any custom variables with the defaults.
+		$this->merge_allow_lists();
+
+		foreach ( $embeds as $embed ) {
+			// Grab any variables contained in the embed.
+			if ( preg_match_all( '`\$(\{)?(?<name>[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(?(1)\})`', $embed, $matches ) === 0 ) {
+				continue;
+			}
 
-			foreach ( $matches[1] as $var_name ) {
+			foreach ( $matches['name'] as $var_name ) {
 				// If it's a php reserved var, then its ok.
 				if ( Variables::isPHPReservedVarName( $var_name ) ) {
 					continue;
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 3630a94653..133548f7c0 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -193,3 +193,12 @@ echo "This is $post_ID with $ThisShouldBeFlagged"; // Bad.
 interface PropertiesNotAllowed {
 	public $notAllowed;
 }
+
+echo "This is \$someName"; // OK, variable is literal text.
+
+echo "This is ${$someName}"; // Bad.
+echo "This is ${Foo}"; // Bad.
+echo "This is {${getName()}}"; // OK, expression, should be ignored.
+echo "This is $Foo?->bar"; // Bad, expression, but the $Foo in it should still be flagged.
+echo "This is {$foo['bar']?->baz()()}"; // OK.
+echo "This is {$Foo['bar']?->baz()()}"; // Bad, expression, but the $Foo in it should still be flagged.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index e6637fb1eb..48916aad2d 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -83,6 +83,10 @@ public function getErrorList() {
 			184 => 1,
 			186 => 1,
 			190 => 1,
+			199 => 1,
+			200 => 1,
+			202 => 1,
+			204 => 1,
 		);
 	}
 

From ea1b426c107db6f60715d770b4599dad40c87a16 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 11:54:45 +0100
Subject: [PATCH 431/822] NamingConventions/ValidVariableName: add tests with
 PHP 7.4+ arrow functions

... to safeguard those are handled correctly.
---
 .../NamingConventions/ValidVariableNameUnitTest.inc      | 9 +++++++++
 .../NamingConventions/ValidVariableNameUnitTest.php      | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 133548f7c0..fc05a041e8 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -202,3 +202,12 @@ echo "This is {${getName()}}"; // OK, expression, should be ignored.
 echo "This is $Foo?->bar"; // Bad, expression, but the $Foo in it should still be flagged.
 echo "This is {$foo['bar']?->baz()()}"; // OK.
 echo "This is {$Foo['bar']?->baz()()}"; // Bad, expression, but the $Foo in it should still be flagged.
+
+// Safeguard that parameters in all types of function declarations, including PHP 7.4+ arrow functions, are flagged.
+function has_params( $without_default, $with_default = 'default' ) {} // OK.
+$closure = function ( $without_default, $with_default = 'default' ) {}; // OK.
+$arrow = fn ( $without_default, $with_default = 'default' ) => 10; // OK.
+
+function has_params( $withoutDefault, $withDefault = 'default' ) {} // Bad x 2.
+$closure = function ( $withoutDefault, $withDefault = 'default' ) {}; // Bad x 2.
+$arrow = fn ( $withoutDefault, $withDefault = 'default' ) => 10; // Bad x 2.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 48916aad2d..88ef3f69ec 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -87,6 +87,9 @@ public function getErrorList() {
 			200 => 1,
 			202 => 1,
 			204 => 1,
+			211 => 2,
+			212 => 2,
+			213 => 2,
 		);
 	}
 

From 976e729de7b03b9f2fe31fbeec4f46d41d31efcc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 19:58:27 +0100
Subject: [PATCH 432/822] NamingConventions/ValidVariableName: allow for the
 PHP 8.0+ nullsafe object operator

Check for both the `T_OBJECT_OPERATOR` as well as the `T_NULLSAFE_OBJECT_OPERATOR`.

Includes unit tests.
---
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php   | 8 +++++---
 .../Tests/NamingConventions/ValidVariableNameUnitTest.inc | 6 ++++++
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php | 2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 453c6db286..cb8c7471c5 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use PHPCSUtils\Utils\Variables;
@@ -126,7 +127,9 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 		}
 
 		$obj_operator = $phpcs_file->findNext( Tokens::$emptyTokens, ( $stack_ptr + 1 ), null, true );
-		if ( \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code'] ) {
+		if ( \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code']
+			|| \T_NULLSAFE_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code']
+		) {
 			// Check to see if we are using a variable from an object.
 			$var = $phpcs_file->findNext( Tokens::$emptyTokens, ( $obj_operator + 1 ), null, true );
 			if ( \T_STRING === $tokens[ $var ]['code'] ) {
@@ -156,7 +159,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 
 		$in_class     = false;
 		$obj_operator = $phpcs_file->findPrevious( Tokens::$emptyTokens, ( $stack_ptr - 1 ), null, true );
-		if ( \T_DOUBLE_COLON === $tokens[ $obj_operator ]['code'] || \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code'] ) {
+		if ( isset( Collections::objectOperators()[ $tokens[ $obj_operator ]['code'] ] ) ) {
 			// The variable lives within a class, and is referenced like
 			// this: MyClass::$_variable or $class->variable.
 			$in_class = true;
@@ -300,5 +303,4 @@ protected function merge_allow_lists() {
 			$this->addedCustomProperties['properties'] = $this->allowed_custom_properties;
 		}
 	}
-
 }
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index fc05a041e8..f5721d9b13 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -211,3 +211,9 @@ $arrow = fn ( $without_default, $with_default = 'default' ) => 10; // OK.
 function has_params( $withoutDefault, $withDefault = 'default' ) {} // Bad x 2.
 $closure = function ( $withoutDefault, $withDefault = 'default' ) {}; // Bad x 2.
 $arrow = fn ( $withoutDefault, $withDefault = 'default' ) => 10; // Bad x 2.
+
+// Safeguard recognizing property access using PHP 8.0 nullsafe operator.
+echo $this?->varName2; // Bad.
+echo $this?->var_name2;
+echo $this?->varname2;
+echo $this?->_varName2; // Bad.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 88ef3f69ec..19d9c6a587 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -90,6 +90,8 @@ public function getErrorList() {
 			211 => 2,
 			212 => 2,
 			213 => 2,
+			216 => 1,
+			219 => 1,
 		);
 	}
 

From a62babca698e78aacddf66ca84d3895138b42ba3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 12:02:43 +0100
Subject: [PATCH 433/822] NamingConventions/ValidVariableName: add tests with
 PHP 8.1+ enums

... to safeguard variables found in those are handled correctly.
---
 .../NamingConventions/ValidVariableNameUnitTest.inc    | 10 ++++++++++
 .../NamingConventions/ValidVariableNameUnitTest.php    |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index f5721d9b13..c83c5d2ce1 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -217,3 +217,13 @@ echo $this?->varName2; // Bad.
 echo $this?->var_name2;
 echo $this?->varname2;
 echo $this?->_varName2; // Bad.
+
+// Safeguard handling of PHP 8.1 enums.
+enum EnumExample {
+	public $notAllowed; // OK, well, not really, but properties are not allowed in enums, so ignore.
+
+	public function method( $paramName ) { // Bad.
+		$local_variable = 'OK';
+		$localVariable  = 'Bad';
+	}
+}
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 19d9c6a587..dbb8725c8f 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -92,6 +92,8 @@ public function getErrorList() {
 			213 => 2,
 			216 => 1,
 			219 => 1,
+			225 => 1,
+			227 => 1,
 		);
 	}
 

From 0e3cfa27772913b2e490a4c01ae011d55a4235a5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 14:16:01 +0100
Subject: [PATCH 434/822] NamingConventions/ValidVariableName: add extra test

... which tests code previously untested.
---
 .../Tests/NamingConventions/ValidVariableNameUnitTest.inc    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index c83c5d2ce1..f742e91ece 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -227,3 +227,8 @@ enum EnumExample {
 		$localVariable  = 'Bad';
 	}
 }
+
+// Safeguard ignoring of allowed mixed case property names.
+class Has_Mixed_Case_Property {
+	public $post_ID; // OK.
+}

From 3762052a37d0aed5eaa63ca0139090f851c62d36 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Jan 2023 13:52:15 +0100
Subject: [PATCH 435/822] NamingConventions/ValidVariableName: minor
 documentation improvement

---
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index f742e91ece..267c02c4e4 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -127,7 +127,7 @@ echo "This is a $comment_ID"; // Bad
 echo "This is $PHP_SELF with $HTTP_RAW_POST_DATA"; // Ok.
 
 /*
- * Ignoring unit tests.
+ * Testing custom properties.
  */
 // phpcs:set WordPress.NamingConventions.ValidVariableName allowed_custom_properties[] varName,DOMProperty
 echo MyClass::$varName; // Ok, allowed.

From 8811e57cf6a0c81de05d9648ed647ae61611844a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 22:53:21 +0100
Subject: [PATCH 436/822] CodeAnalysis/AssignmentInCondition: remove parse
 error related warning

The `WordPress.CodeAnalysis.AssignmentInCondition` contained a `NonVariableAssignmentFound` error code, which would flag assignments in condition not involving a variable.

Generally speaking, sniffs stay silent on parse errors and a non-variable assignment in condition will in most cases be a parse error and in all other cases a runtime Fatal Error.
This can be seen here: https://3v4l.org/oQgjR Uncomment any of the commented out lines to see the parse error/fatal error.

With that in mind, I propose to remove the `NonVariableAssignmentFound` error code from the sniff.
---
 .../AssignmentInConditionSniff.php            |  6 --
 .../AssignmentInConditionUnitTest.inc         | 35 -------
 .../AssignmentInConditionUnitTest.php         | 94 ++++++++-----------
 3 files changed, 40 insertions(+), 95 deletions(-)

diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
index bf5879b8df..34d8c1f68f 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
@@ -219,12 +219,6 @@ public function process_token( $stackPtr ) {
 					$hasAssignment,
 					$errorCode
 				);
-			} else {
-				$this->phpcsFile->addWarning(
-					'Assignment found within a condition. Did you mean to do a comparison?',
-					$hasAssignment,
-					'NonVariableAssignmentFound'
-				);
 			}
 
 			$startPos = $hasAssignment;
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
index db14911bc4..9d96e99056 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
@@ -75,25 +75,6 @@ while ( $sample = false ) {}
 if ($a = 123) :
 endif;
 
-// Non-variable assignment found.
-if (123 = $a) {}
-if (strtolower($b) = $b) {}
-if (array( 1 => 'a', 2 => 'b' ) = $b) {}
-
-if (SOME_CONSTANT = 123) {
-} else if(self::SOME_CONSTANT -= 10) {}
-
-if ( $a() = 123 ) {
-} else if ( $b->something() = 123 ) {
-} elseif ( $c::something() = 123 ) {}
-
-switch ( true ) {
-	case 'something' = $sample:
-		break;
-}
-
-while (list($field_name, $file_names) = each($formfiles)) {}
-
 /*
  * Ternaries should also be checked, but can only be reliably done when in parenthesis.
  */
@@ -135,19 +116,3 @@ $content = preg_replace_callback(
 	},
 	$content
 );
-
-$array = array(
-	'a' => 1 = 2 ? 'a' : 'b', // OK: no relevant parenthesis found, so can't determine start/end of ternary.
-	'b' => (1 = 2) ? 'a' : 'b', // Bad.
-	'c' => (1 = 2 ? 'a' : 'b'), // Bad.
-	'd' => (1 === 2) ? 'a' : 'b', // OK.
-);
-
-$print = ( function () {
-?>
-<div id=<?php echo 1 = 2 ? 'a' : 'b' ?><!-- OK: no relevant parenthesis, so can't determine start/end of ternary. -->
-<div id=<?php echo (1 = 2) ? 'a' : 'b' ?><!-- Bad. -->
-<div id=<?php echo (1 = 2 ? 'a' : 'b') ?><!-- Bad. -->
-<div id=<?php echo (1 === 2 ? 'a' : 'b') ?><!-- OK. -->
-<?php
-});
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
index 57785b8370..bf0a2adfe9 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
@@ -36,60 +36,46 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			29  => 1,
-			30  => 1,
-			31  => 1,
-			32  => 1,
-			33  => 1,
-			34  => 1,
-			35  => 1,
-			36  => 1,
-			37  => 1,
-			38  => 1,
-			39  => 1,
-			40  => 1,
-			41  => 1,
-			42  => 1,
-			43  => 1,
-			44  => 2,
-			46  => 1,
-			47  => 1,
-			50  => 1,
-			51  => 1,
-			52  => 1,
-			53  => 1,
-			54  => 1,
-			55  => 1,
-			56  => 1,
-			58  => 1,
-			60  => 1,
-			63  => 2,
-			67  => 1,
-			68  => 2,
-			71  => 1,
-			73  => 1,
-			75  => 1,
-			79  => 1,
-			80  => 1,
-			81  => 1,
-			83  => 1,
-			84  => 1,
-			86  => 1,
-			87  => 1,
-			88  => 1,
-			91  => 1,
-			95  => 1,
-			106 => 1,
-			107 => 1,
-			108 => 2,
-			109 => 1,
-			110 => 1,
-			111 => 2,
-			112 => 3,
-			141 => 1,
-			142 => 1,
-			149 => 1,
-			150 => 1,
+			29 => 1,
+			30 => 1,
+			31 => 1,
+			32 => 1,
+			33 => 1,
+			34 => 1,
+			35 => 1,
+			36 => 1,
+			37 => 1,
+			38 => 1,
+			39 => 1,
+			40 => 1,
+			41 => 1,
+			42 => 1,
+			43 => 1,
+			44 => 2,
+			46 => 1,
+			47 => 1,
+			50 => 1,
+			51 => 1,
+			52 => 1,
+			53 => 1,
+			54 => 1,
+			55 => 1,
+			56 => 1,
+			58 => 1,
+			60 => 1,
+			63 => 2,
+			67 => 1,
+			68 => 2,
+			71 => 1,
+			73 => 1,
+			75 => 1,
+			87 => 1,
+			88 => 1,
+			89 => 2,
+			90 => 1,
+			91 => 1,
+			92 => 2,
+			93 => 3,
 		);
 	}
 

From b5fc372ce2232f08857ac18341cbc7074bc730ed Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:16:23 +0100
Subject: [PATCH 437/822] Arrays/MultipleStatementAlignment: add some extra
 tests

... for previously uncovered code.
---
 .../Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc   | 6 ++++++
 .../Arrays/MultipleStatementAlignmentUnitTest.1.inc.fixed   | 6 ++++++
 .../Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc   | 6 ++++++
 .../Arrays/MultipleStatementAlignmentUnitTest.2.inc.fixed   | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc
index 56ed50ae9b..dffd787a7c 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc
@@ -580,3 +580,9 @@ list(
 ) = $some_var;
 
 // phpcs:set WordPress.Arrays.MultipleStatementAlignment alignMultilineItems always
+
+$array = array();
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = array(
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc.fixed
index 385997c6ec..9b30d41346 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.1.inc.fixed
@@ -566,3 +566,9 @@ list(
 ) = $some_var;
 
 // phpcs:set WordPress.Arrays.MultipleStatementAlignment alignMultilineItems always
+
+$array = array();
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = array(
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc
index e0853944ba..7f3f9956e4 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc
@@ -580,3 +580,9 @@ $deprecated_functions = [
 ] = $some_var;
 
 // phpcs:set WordPress.Arrays.MultipleStatementAlignment alignMultilineItems always
+
+$array = [];
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = [
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc.fixed
index 8988cea16c..5f046cc464 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.2.inc.fixed
@@ -566,3 +566,9 @@ $deprecated_functions = [
 ] = $some_var;
 
 // phpcs:set WordPress.Arrays.MultipleStatementAlignment alignMultilineItems always
+
+$array = [];
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = [

From 4330f6ddb9669475a51951709a1558164d8d9e8d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:15:59 +0100
Subject: [PATCH 438/822] Arrays/MultipleStatementAlignment: implement
 PHPCSUtils

Includes removing some conditions which are now redundant.
---
 .../MultipleStatementAlignmentSniff.php       | 43 +++----------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 88ad18f430..7323e4d1d9 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\Sniff;
@@ -149,10 +150,7 @@ class MultipleStatementAlignmentSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		return array(
-			\T_ARRAY,
-			\T_OPEN_SHORT_ARRAY,
-		);
+		return Collections::arrayOpenTokensBC();
 	}
 
 	/**
@@ -167,7 +165,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] )
 			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
@@ -295,34 +293,9 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 		$total_items       = \count( $items );
 
 		foreach ( $items as $key => $item ) {
-			if ( strpos( $item['raw'], '=>' ) === false ) {
-				// Ignore items without assignment operators.
-				unset( $items[ $key ] );
-				continue;
-			}
-
-			// Find the position of the first double arrow.
-			$double_arrow = $this->phpcsFile->findNext(
-				\T_DOUBLE_ARROW,
-				$item['start'],
-				( $item['end'] + 1 )
-			);
-
+			// Find the double arrow if there is one.
+			$double_arrow = Arrays::getDoubleArrowPtr( $this->phpcsFile, $item['start'], $item['end'] );
 			if ( false === $double_arrow ) {
-				// Shouldn't happen, just in case.
-				unset( $items[ $key ] );
-				continue;
-			}
-
-			// Make sure the arrow is for this item and not for a nested array value assignment.
-			$has_array_opener = $this->phpcsFile->findNext(
-				$this->register(),
-				$item['start'],
-				$double_arrow
-			);
-
-			if ( false !== $has_array_opener ) {
-				// Double arrow is for a nested array.
 				unset( $items[ $key ] );
 				continue;
 			}
@@ -335,12 +308,6 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 				true
 			);
 
-			if ( false === $last_index_token ) {
-				// Shouldn't happen, but just in case.
-				unset( $items[ $key ] );
-				continue;
-			}
-
 			if ( true === $this->ignoreNewlines
 				&& $this->tokens[ $last_index_token ]['line'] !== $this->tokens[ $double_arrow ]['line']
 			) {

From 8bb78c91214a9e17e5c4eca82644f35fc50f28ca Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 12:55:53 +0100
Subject: [PATCH 439/822] Arrays/ArrayIndentation: add extra test

... for previously uncovered code.
---
 WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc       | 4 ++++
 WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
index 85216b112d..75dd116217 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc
@@ -442,3 +442,7 @@ $bad = array(
 	'key1' => 'value1', /* comment
 	end */ 'key2' => 'value2',
 );
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = array(
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
index fc4d940a95..99a98589df 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.1.inc.fixed
@@ -442,3 +442,7 @@ $bad = array(
 	'key1' => 'value1', /* comment
 	end */ 'key2' => 'value2',
 );
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$array = array(

From 6fc4227fbc5020e82370bd5e6fa23b9eb9033ce3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:39:41 +0200
Subject: [PATCH 440/822] Arrays/ArrayIndentation: implement PHPCSUtils

---
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 11049c41f5..83fa37a852 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -12,6 +12,7 @@
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 
@@ -76,10 +77,7 @@ public function register() {
 		unset( $this->ignore_tokens[ \T_START_HEREDOC ], $this->ignore_tokens[ \T_START_NOWDOC ] );
 		$this->ignore_tokens[ \T_INLINE_HTML ] = \T_INLINE_HTML;
 
-		return array(
-			\T_ARRAY,
-			\T_OPEN_SHORT_ARRAY,
-		);
+		return Collections::arrayOpenTokensBC();
 	}
 
 	/**
@@ -95,7 +93,7 @@ public function process_token( $stackPtr ) {
 			$this->tab_width = Helper::getTabWidth( $this->phpcsFile );
 		}
 
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] )
 			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.
@@ -431,9 +429,7 @@ protected function ignore_token( $ptr ) {
 		 * If it's a subsequent line of a multi-line sting, it will not start with a quote
 		 * character, nor just *be* a quote character.
 		 */
-		if ( \T_CONSTANT_ENCAPSED_STRING === $token_code
-			|| \T_DOUBLE_QUOTED_STRING === $token_code
-		) {
+		if ( isset( Tokens::$stringTokens[ $token_code ] ) === true ) {
 			// Deal with closing quote of a multi-line string being on its own line.
 			if ( "'" === $this->tokens[ $ptr ]['content']
 				|| '"' === $this->tokens[ $ptr ]['content']

From a17ebdee39f641c30db93198ca6df0a60a3e67df Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 19:11:27 +0100
Subject: [PATCH 441/822] Utils/I18nTextDomainFixer: add
 `load_script_textdomain()` function

The `load_script_textdomain()` function was added to WP in WP 5.0.

Ref: https://developer.wordpress.org/reference/functions/load_script_textdomain/
---
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php           | 1 +
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc       | 4 ++++
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed | 4 ++++
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php         | 1 +
 4 files changed, 10 insertions(+)

diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index bdf26f1dc4..d4743eb50a 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -81,6 +81,7 @@ class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 		'load_muplugin_textdomain'               => 1,
 		'load_theme_textdomain'                  => 1,
 		'load_child_theme_textdomain'            => 1,
+		'load_script_textdomain'                 => 2,
 		'unload_textdomain'                      => 1,
 
 		'__'                                     => 2,
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
index 630639124a..3ba44f1416 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
@@ -203,5 +203,9 @@ __ngettext( $singular, $plural, $number ); // Error.
 __ngettext_noop( $singular, $plural, 'other-text-domain' ); // Error.
 translate_with_context( $text, 'third-text-domain' ); // Error.
 
+// New WP function.
+load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // OK.
+load_script_textdomain( $handle, 'third-text-domain', '/path/to/languages/' ); // Error.
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
index bd50e3a2f9..d82c94d1af 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
@@ -207,5 +207,9 @@ __ngettext( $singular, $plural, $number, 'something-else' ); // Error.
 __ngettext_noop( $singular, $plural, 'something-else' ); // Error.
 translate_with_context( $text, 'something-else' ); // Error.
 
+// New WP function.
+load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // OK.
+load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // Error.
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 48521bc666..98d481ae86 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -140,6 +140,7 @@ public function getErrorList( $testFile = '' ) {
 					202 => 1,
 					203 => 1,
 					204 => 1,
+					208 => 1,
 				);
 
 			default:

From af45a7ab278862dd2c4773f7d3c7bbf417955a5b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 20:10:40 +0100
Subject: [PATCH 442/822] Utils/I18nTextDomainFixer: update lists of
 plugin/theme headers

... as per the current lists of supported headers in the linked theme/plugin handbook pages.
---
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index d4743eb50a..31dc0e0b7e 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -157,23 +157,26 @@ class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *            required (true) or optional (false) header.
 	 */
 	private $theme_headers = array(
-		'Theme Name'  => true,
-		'Theme URI'   => false,
-		'Author'      => true,
-		'Author URI'  => false,
-		'Description' => true,
-		'Version'     => true,
-		'License'     => true,
-		'License URI' => true,
-		'Tags'        => false,
-		'Text Domain' => true,
-		'Domain Path' => false,
+		'Theme Name'        => true,
+		'Theme URI'         => false,
+		'Author'            => true,
+		'Author URI'        => false,
+		'Description'       => true,
+		'Version'           => true,
+		'Requires at least' => true,
+		'Tested up to'      => true,
+		'Requires PHP'      => true,
+		'License'           => true,
+		'License URI'       => true,
+		'Text Domain'       => true,
+		'Tags'              => false,
+		'Domain Path'       => false,
 	);
 
 	/**
 	 * Possible headers for a plugin.
 	 *
-	 * @link https://developer.wordpress.org/plugins/the-basics/header-requirements/
+	 * @link https://developer.wordpress.org/plugins/plugin-basics/header-requirements/
 	 *
 	 * @since 1.2.0
 	 *
@@ -181,17 +184,20 @@ class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *            required (true) or optional (false) header.
 	 */
 	private $plugin_headers = array(
-		'Plugin Name' => true,
-		'Plugin URI'  => false,
-		'Description' => false,
-		'Version'     => false,
-		'Author'      => false,
-		'Author URI'  => false,
-		'License'     => false,
-		'License URI' => false,
-		'Text Domain' => false,
-		'Domain Path' => false,
-		'Network'     => false,
+		'Plugin Name'       => true,
+		'Plugin URI'        => false,
+		'Description'       => false,
+		'Version'           => false,
+		'Requires at least' => false,
+		'Requires PHP'      => false,
+		'Author'            => false,
+		'Author URI'        => false,
+		'License'           => false,
+		'License URI'       => false,
+		'Text Domain'       => false,
+		'Domain Path'       => false,
+		'Network'           => false,
+		'Update URI'        => false,
 	);
 
 	/**

From f5a5f1b8c7fff818728ba2fd9e14797c06c651ea Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 19:25:41 +0100
Subject: [PATCH 443/822] Utils/I18nTextDomainFixer: add some extra tests

... for a few situations which were handled by the sniff, but so far not covered by tests.
---
 .../Tests/Utils/I18nTextDomainFixerUnitTest.4.inc     | 10 ++++++++++
 .../Utils/I18nTextDomainFixerUnitTest.4.inc.fixed     | 11 +++++++++++
 .../Tests/Utils/I18nTextDomainFixerUnitTest.5.inc     |  9 +++++++++
 .../Tests/Utils/I18nTextDomainFixerUnitTest.6.inc     | 11 +++++++++++
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php |  1 +
 5 files changed, 42 insertions(+)
 create mode 100644 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.5.inc
 create mode 100644 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.6.inc

diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
index 3ba44f1416..1b40989944 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
@@ -207,5 +207,15 @@ translate_with_context( $text, 'third-text-domain' ); // Error.
 load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // OK.
 load_script_textdomain( $handle, 'third-text-domain', '/path/to/languages/' ); // Error.
 
+// Test ignoring multi-token text domains.
+__( $text, 'my' 'domain' ); // Parse error, but not our concern.
+
+// Test with space based code indentation
+function foo() {
+    unload_textdomain(
+        /* Missing domain. */
+    );
+}
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
index d82c94d1af..490825bc31 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
@@ -211,5 +211,16 @@ translate_with_context( $text, 'something-else' ); // Error.
 load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // OK.
 load_script_textdomain( $handle, 'something-else', '/path/to/languages/' ); // Error.
 
+// Test ignoring multi-token text domains.
+__( $text, 'my' 'domain' ); // Parse error, but not our concern.
+
+// Test with space based code indentation
+function foo() {
+    unload_textdomain(
+        /* Missing domain. */
+        'something-else'
+    );
+}
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.5.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.5.inc
new file mode 100644
index 0000000000..0592c31a0a
--- /dev/null
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.5.inc
@@ -0,0 +1,9 @@
+<?php
+// phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain
+
+// Testing behaviour when the `new_text_domain` property is not set.
+
+load_textdomain( 'something-else', '/path/to/file.mo' );
+__( $text, 'something-else' );
+
+// phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.6.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.6.inc
new file mode 100644
index 0000000000..67c0875167
--- /dev/null
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.6.inc
@@ -0,0 +1,11 @@
+<?php
+// phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
+// phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain something-else
+
+// Testing behaviour when the `old_text_domain` property is not set.
+
+load_textdomain( 'old-domain', '/path/to/file.mo' );
+__( $text, 'old-domain' );
+
+// phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
+// phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 98d481ae86..4cec6d5bf9 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -141,6 +141,7 @@ public function getErrorList( $testFile = '' ) {
 					203 => 1,
 					204 => 1,
 					208 => 1,
+					215 => 1,
 				);
 
 			default:

From 6d033ccefd9115d6fde230ac88e016a72778e596 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:05:23 +0200
Subject: [PATCH 444/822] Utils/I18nTextDomainFixer: implement PHPCSUtils

---
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index 31dc0e0b7e..bd78315c8e 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\Utils;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -334,14 +335,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		if ( isset( $this->tab_width ) === false ) {
-			if ( isset( $this->phpcsFile->config->tabWidth ) === false
-				|| 0 === $this->phpcsFile->config->tabWidth
-			) {
-				// We have no idea how wide tabs are, so assume 4 spaces for fixing.
-				$this->tab_width = 4;
-			} else {
-				$this->tab_width = $this->phpcsFile->config->tabWidth;
-			}
+			$this->tab_width = Helper::getTabWidth( $this->phpcsFile );
 		}
 
 		if ( \T_DOC_COMMENT_OPEN_TAG === $this->tokens[ $stackPtr ]['code']

From ea1c5b1db7a6d75e38cf945e6be3239b6dce1592 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 19:07:42 +0100
Subject: [PATCH 445/822] Utils/I18nTextDomainFixer: add support for PHP 8.0+
 named parameters

1. Adjusted the way the correct parameters are retrieved to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.1 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes a change to the array format to allow for recording the parameter name.

Note: for now, I've not (yet) made the `MissingArgDomain` error auto-fixable in function calls with named arguments. I do think it's possible to do so, but also need to prioritize and I deem this sniff low priority (as it is "off" by default unless certain required properties are passed).

Includes additional unit tests.
---
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php | 221 ++++++++++++++----
 .../Utils/I18nTextDomainFixerUnitTest.4.inc   |  29 +++
 .../I18nTextDomainFixerUnitTest.4.inc.fixed   |  29 +++
 .../Utils/I18nTextDomainFixerUnitTest.php     |   5 +
 4 files changed, 237 insertions(+), 47 deletions(-)

diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index bd78315c8e..5dfb4b609e 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -73,51 +74,159 @@ class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 * The WP Internationalization related functions to target for the replacements.
 	 *
 	 * @since 1.2.0
+	 * @since 3.0.0 The format of the value has changed from a numerically indexed
+	 *              array containing parameter positions to an array with the parameter
+	 *              position as the index and the parameter name as value.
 	 *
-	 * @var array <string function name> => <int parameter position>
+	 * @var array<string, array<string, int|string>> Function name as key, array with target
+	 *                                               parameter and name as value.
 	 */
 	protected $target_functions = array(
-		'load_textdomain'                        => 1,
-		'load_plugin_textdomain'                 => 1,
-		'load_muplugin_textdomain'               => 1,
-		'load_theme_textdomain'                  => 1,
-		'load_child_theme_textdomain'            => 1,
-		'load_script_textdomain'                 => 2,
-		'unload_textdomain'                      => 1,
-
-		'__'                                     => 2,
-		'_e'                                     => 2,
-		'_x'                                     => 3,
-		'_ex'                                    => 3,
-		'_n'                                     => 4,
-		'_nx'                                    => 5,
-		'_n_noop'                                => 3,
-		'_nx_noop'                               => 4,
-		'translate_nooped_plural'                => 3,
-		'_c'                                     => 2, // Deprecated.
-		'_nc'                                    => 4, // Deprecated.
-		'__ngettext'                             => 4, // Deprecated.
-		'__ngettext_noop'                        => 3, // Deprecated.
-		'translate_with_context'                 => 2, // Deprecated.
-
-		'esc_html__'                             => 2,
-		'esc_html_e'                             => 2,
-		'esc_html_x'                             => 3,
-		'esc_attr__'                             => 2,
-		'esc_attr_e'                             => 2,
-		'esc_attr_x'                             => 3,
-
-		'is_textdomain_loaded'                   => 1,
-		'get_translations_for_domain'            => 1,
+		'load_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'load_plugin_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'load_muplugin_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'load_theme_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'load_child_theme_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'load_script_textdomain' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'unload_textdomain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+
+		'__' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'_e' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'_x' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+		'_ex' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+		'_n' => array(
+			'position' => 4,
+			'name'     => 'domain',
+		),
+		'_nx' => array(
+			'position' => 5,
+			'name'     => 'domain',
+		),
+		'_n_noop' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+		'_nx_noop' => array(
+			'position' => 4,
+			'name'     => 'domain',
+		),
+		'translate_nooped_plural' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+
+		'esc_html__' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'esc_html_e' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'esc_html_x' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+		'esc_attr__' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'esc_attr_e' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'esc_attr_x' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+
+		'is_textdomain_loaded' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'get_translations_for_domain' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+
+		// Deprecated functions.
+		'_c' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'_nc' => array(
+			'position' => 4,
+			'name'     => 'domain',
+		),
+		'__ngettext' => array(
+			'position' => 4,
+			'name'     => 'domain',
+		),
+		'__ngettext_noop' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
+		'translate_with_context' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
 
 		// Shouldn't be used by plugins/themes.
-		'translate'                              => 2,
-		'translate_with_gettext_context'         => 3,
+		'translate' => array(
+			'position' => 2,
+			'name'     => 'domain',
+		),
+		'translate_with_gettext_context' => array(
+			'position' => 3,
+			'name'     => 'domain',
+		),
 
 		// WP private functions. Shouldn't be used by plugins/themes.
-		'_load_textdomain_just_in_time'          => 1,
-		'_get_path_to_translation_from_lang_dir' => 1,
-		'_get_path_to_translation'               => 1,
+		'_load_textdomain_just_in_time' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'_get_path_to_translation_from_lang_dir' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
+		'_get_path_to_translation' => array(
+			'position' => 1,
+			'name'     => 'domain',
+		),
 	);
 
 	/**
@@ -364,18 +473,27 @@ public function process_token( $stackPtr ) {
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$target_param = $this->target_functions[ $matched_content ];
+		$target_param_specs = $this->target_functions[ $matched_content ];
+		$found_param        = PassedParameters::getParameterFromStack( $parameters, $target_param_specs['position'], $target_param_specs['name'] );
 
-		if ( isset( $parameters[ $target_param ] ) === false && 1 !== $target_param ) {
+		if ( false === $found_param && 1 !== $target_param_specs['position'] ) {
 			$error_msg  = 'Missing $domain arg';
 			$error_code = 'MissingArgDomain';
 
-			if ( isset( $parameters[ ( $target_param - 1 ) ] ) ) {
+			$has_named_params = false;
+			foreach ( $parameters as $param ) {
+				if ( isset( $param['name'] ) ) {
+					$has_named_params = true;
+					break;
+				}
+			}
+
+			if ( false === $has_named_params && isset( $parameters[ ( $target_param_specs['position'] - 1 ) ] ) ) {
 				$fix = $this->phpcsFile->addFixableError( $error_msg, $stackPtr, $error_code );
 
 				if ( true === $fix ) {
-					$start_previous = $parameters[ ( $target_param - 1 ) ]['start'];
-					$end_previous   = $parameters[ ( $target_param - 1 ) ]['end'];
+					$start_previous = $parameters[ ( $target_param_specs['position'] - 1 ) ]['start'];
+					$end_previous   = $parameters[ ( $target_param_specs['position'] - 1 ) ]['end'];
 					if ( \T_WHITESPACE === $this->tokens[ $start_previous ]['code']
 						&& $this->tokens[ $start_previous ]['content'] === $this->phpcsFile->eolChar
 					) {
@@ -404,6 +522,16 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 						$this->phpcsFile->fixer->addContent( $end_previous, $replacement );
 					}
 				}
+			} elseif ( true === $has_named_params ) {
+				/*
+				 * Function call using named arguments. For now, we will not auto-fix this.
+				 *
+				 * {@internal If we don't bother with indentation and such, this can be made
+				 * auto-fixable by getting the 'end' of the last seen parameter and adding the
+				 * domain parameter, with the 'domain: ' parameter label, after the last
+				 * seen parameter.}
+				 */
+				$this->phpcsFile->addError( $error_msg, $stackPtr, $error_code );
 			} else {
 				$error_msg .= ' and preceding argument(s)';
 				$error_code = 'MissingArgs';
@@ -416,8 +544,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		// Target parameter found. Let's examine it.
-		$domain_param_start = $parameters[ $target_param ]['start'];
-		$domain_param_end   = $parameters[ $target_param ]['end'];
+		$domain_param_start = $found_param['start'];
+		$domain_param_end   = $found_param['end'];
 		$domain_token       = null;
 
 		for ( $i = $domain_param_start; $i <= $domain_param_end; $i++ ) {
@@ -471,10 +599,9 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 	 * @return void
 	 */
 	public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {
-
 		$target_param = $this->target_functions[ $matched_content ];
 
-		if ( 1 !== $target_param ) {
+		if ( 1 !== $target_param['position'] ) {
 			// Only process the no param case as fixable if the text domain is expected to be the first parameter.
 			$this->phpcsFile->addWarning( 'Missing $domain arg and preceding argument(s)', $stackPtr, 'MissingArgs' );
 			return;
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
index 1b40989944..c6b450259c 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
@@ -217,5 +217,34 @@ function foo() {
     );
 }
 
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+// Missing domain parameter.
+_n( plural: $plural, single: $single ); // Error.
+esc_attr_x(
+	context : $context
+	text    : $text,
+);
+
+// Has correct domain parameter.
+load_textdomain( mofile: '/path/to/file.mo', domain: 'something-else', );
+_e( $text, domain: 'something-else' );
+_nx_noop(
+	domain: 'something-else',
+	context: $context,
+	singular: $singular,
+	plural: $plural,
+);
+
+// Has incorrect domain parameter.
+load_muplugin_textdomain( mu_plugin_rel_path: '/languages/', domain: 'other-text-domain', );
+__( $text, domain: 'text-domain' );
+esc_html_x(
+	$text,
+	domain: 'text-domain',
+	context: $context,
+);
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
index 490825bc31..7fac6cdf5f 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
@@ -222,5 +222,34 @@ function foo() {
     );
 }
 
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+// Missing domain parameter.
+_n( plural: $plural, single: $single ); // Error.
+esc_attr_x(
+	context : $context
+	text    : $text,
+);
+
+// Has correct domain parameter.
+load_textdomain( mofile: '/path/to/file.mo', domain: 'something-else', );
+_e( $text, domain: 'something-else' );
+_nx_noop(
+	domain: 'something-else',
+	context: $context,
+	singular: $singular,
+	plural: $plural,
+);
+
+// Has incorrect domain parameter.
+load_muplugin_textdomain( mu_plugin_rel_path: '/languages/', domain: 'something-else', );
+__( $text, domain: 'something-else' );
+esc_html_x(
+	$text,
+	domain: 'something-else',
+	context: $context,
+);
+
 // phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain[]
 // phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain false
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 4cec6d5bf9..b3e85398c7 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -142,6 +142,11 @@ public function getErrorList( $testFile = '' ) {
 					204 => 1,
 					208 => 1,
 					215 => 1,
+					224 => 1,
+					225 => 1,
+					241 => 1,
+					242 => 1,
+					245 => 1,
 				);
 
 			default:

From a9e81f5780aa7791c4e4c9608e55ae7d9c731800 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:30:10 +0100
Subject: [PATCH 446/822] NamingConventions/Valid(Function|Variable)Name: bug
 fix for error determination

This commit fixes two, closely related, issues:
1. The "is a name in snake case ?" determination was done in three slightly different ways between the `ValidFunctionName` sniff and the `ValidVariableName` sniff and the `SnakeCaseHelper::get_suggestion()` method, which meant that a name which would be regarded valid snakecase for the one, may not be regarded as valid snakecase for the other.
    It could also result in the suggested name being the same as the existing name.
2. The "is a name in snake case ?" as well as the suggestion determination didn't take non-ASCII characters into account consistently.

While PHPCSUtils will at some point get better methods for handling these things, for now, we can still make a quick fix to improve this situation.

To that end, I've made the following changes:
* Instead of having each sniff determine whether or not something is valid snakecase itself, let the sniffs retrieve the suggested alternative name and compare the original name against that and only throw an error if the suggestion is not the same as the original name.
    This also allows for removing some code related to potential leading underscores (which looks to be redundant anyway).
* Improved the creation of the suggestion to handle non-ASCII names better (in as far as possible).

Includes:
* The `Mbstring` extension has been added as a suggested extension to the `composer.json` file.
* Adding one extra test run to the CI workflow which runs the tests without the Mbstring extension to safeguard the fallback code.

Includes unit tests.

Fixes 1891

---

Note: as of PHP 8.2, `strtolower()` no longer acts on non-ASCII characters, which largely got rid of the issue already and made for some interesting debugging. Unfortunately, we cannot rely on everyone being on PHP 8.2...
---
 .github/workflows/unit-tests.yml              |  8 ++-
 WordPress/Helpers/SnakeCaseHelper.php         | 14 ++++-
 .../ValidFunctionNameSniff.php                | 11 ++--
 .../ValidVariableNameSniff.php                | 54 +++++++------------
 .../ValidFunctionNameUnitTest.inc             |  5 ++
 .../ValidFunctionNameUnitTest.php             |  2 +
 .../ValidVariableNameUnitTest.inc             |  5 ++
 .../ValidVariableNameUnitTest.php             |  2 +
 composer.json                                 |  3 ++
 9 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 06469666b3..4a4a59f4bf 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -23,7 +23,13 @@ jobs:
       matrix:
         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' ]
         phpcs_version: [ '3.7.1', 'dev-master' ]
-        #include:
+        extensions: [ '' ]
+
+        include:
+          - php: '7.4'
+            phpcs_version: 'dev-master'
+            extensions: ':mbstring' # = Disable Mbstring.
+
           # Add extra build to test against PHPCS 4.
           #- php: '7.4'
           #  phpcs_version: '4.0.x-dev as 3.9.99'
diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index 4592594129..a510486785 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -9,6 +9,8 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
+use PHPCSUtils\BackCompat\Helper;
+
 /**
  * Helper utilities for checking if a name is in snake_case.
  *
@@ -40,7 +42,17 @@ final class SnakeCaseHelper {
 	 */
 	public static function get_suggestion( $name ) {
 		$suggested = preg_replace( '`(?<!_|^)([A-Z])`', '_$1', $name );
-		$suggested = strtolower( $suggested );
+
+		if ( preg_match( '`^[a-z0-9_]+$i`', $suggested ) === 1 ) {
+			// If the name only contains ASCII characters, we can safely lowercase it.
+			$suggested = strtolower( $suggested );
+		} elseif ( function_exists( 'mb_strtolower' ) ) {
+			$suggested = mb_strtolower( $suggested, Helper::getEncoding() );
+		} else {
+			// If the name contains non-ASCII chars and Mbstring is not available, only transliterate the ASCII chars.
+			$suggested = strtr( $suggested, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz' );
+		}
+
 		return $suggested;
 	}
 }
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 368d2fd011..e927563d96 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -100,7 +100,6 @@ public function process_token( $stackPtr ) {
 	 * @return void
 	 */
 	protected function process_function_declaration( $stackPtr, $functionName ) {
-
 		// PHP magic functions are exempt from our rules.
 		if ( FunctionDeclarations::isMagicFunctionName( $functionName ) === true ) {
 			return;
@@ -113,11 +112,12 @@ protected function process_function_declaration( $stackPtr, $functionName ) {
 			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
 		}
 
-		if ( strtolower( $functionName ) !== $functionName ) {
+		$suggested_name = SnakeCaseHelper::get_suggestion( $functionName );
+		if ( $suggested_name !== $functionName ) {
 			$error     = 'Function name "%s" is not in snake case format, try "%s"';
 			$errorData = array(
 				$functionName,
-				SnakeCaseHelper::get_suggestion( $functionName ),
+				$suggested_name,
 			);
 			$this->phpcsFile->addError( $error, $stackPtr, 'FunctionNameInvalid', $errorData );
 		}
@@ -176,12 +176,13 @@ protected function process_method_declaration( $stackPtr, $methodName, $currScop
 		}
 
 		// Check for all lowercase.
-		if ( strtolower( $methodName ) !== $methodName ) {
+		$suggested_name = SnakeCaseHelper::get_suggestion( $methodName );
+		if ( $suggested_name !== $methodName ) {
 			$error     = 'Method name "%s" in class %s is not in snake case format, try "%s"';
 			$errorData = array(
 				$methodName,
 				$className,
-				SnakeCaseHelper::get_suggestion( $methodName ),
+				$suggested_name,
 			);
 			$this->phpcsFile->addError( $error, $stackPtr, 'MethodNameInvalid', $errorData );
 		}
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index cb8c7471c5..7886ab93e0 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -137,19 +137,16 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 				if ( \T_OPEN_PARENTHESIS !== $tokens[ $bracket ]['code'] ) {
 					$obj_var_name = $tokens[ $var ]['content'];
 
-					// There is no way for us to know if the var is public or
-					// private, so we have to ignore a leading underscore if there is
-					// one and just check the main part of the variable name.
-					$original_var_name = $obj_var_name;
-					if ( '_' === substr( $obj_var_name, 0, 1 ) ) {
-						$obj_var_name = substr( $obj_var_name, 1 );
+					if ( isset( $this->allowed_mixed_case_member_var_names[ $obj_var_name ] ) ) {
+						return;
 					}
 
-					if ( ! isset( $this->allowed_mixed_case_member_var_names[ $obj_var_name ] ) && self::isSnakeCase( $obj_var_name ) === false ) {
+					$suggested_name = SnakeCaseHelper::get_suggestion( $obj_var_name );
+					if ( $suggested_name !== $obj_var_name ) {
 						$error = 'Object property "$%s" is not in valid snake_case format, try "$%s"';
 						$data  = array(
-							$original_var_name,
-							SnakeCaseHelper::get_suggestion( $original_var_name ),
+							$obj_var_name,
+							$suggested_name,
 						);
 						$phpcs_file->addError( $error, $var, 'UsedPropertyNotSnakeCase', $data );
 					}
@@ -165,15 +162,8 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 			$in_class = true;
 		}
 
-		// There is no way for us to know if the var is public or private,
-		// so we have to ignore a leading underscore if there is one and just
-		// check the main part of the variable name.
-		$original_var_name = $var_name;
-		if ( '_' === substr( $var_name, 0, 1 ) && true === $in_class ) {
-			$var_name = substr( $var_name, 1 );
-		}
-
-		if ( self::isSnakeCase( $var_name ) === false ) {
+		$suggested_name = SnakeCaseHelper::get_suggestion( $var_name );
+		if ( $suggested_name !== $var_name ) {
 			if ( $in_class && ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) ) {
 				$error      = 'Object property "$%s" is not in valid snake_case format, try "$%s"';
 				$error_name = 'UsedPropertyNotSnakeCase';
@@ -184,8 +174,8 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 
 			if ( isset( $error, $error_name ) ) {
 				$data = array(
-					$original_var_name,
-					SnakeCaseHelper::get_suggestion( $original_var_name ),
+					$var_name,
+					$suggested_name,
 				);
 				$phpcs_file->addError( $error, $stack_ptr, $error_name, $data );
 			}
@@ -213,11 +203,16 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 		$tokens   = $phpcs_file->getTokens();
 		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
 
-		if ( ! isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) && false === self::isSnakeCase( $var_name ) ) {
+		if ( isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) ) {
+			return;
+		}
+
+		$suggested_name = SnakeCaseHelper::get_suggestion( $var_name );
+		if ( $suggested_name !== $var_name ) {
 			$error = 'Member variable "$%s" is not in valid snake_case format, try "$%s"';
 			$data  = array(
 				$var_name,
-				SnakeCaseHelper::get_suggestion( $var_name ),
+				$suggested_name,
 			);
 			$phpcs_file->addError( $error, $stack_ptr, 'PropertyNotSnakeCase', $data );
 		}
@@ -258,11 +253,12 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 					continue;
 				}
 
-				if ( false === self::isSnakeCase( $var_name ) ) {
+				$suggested_name = SnakeCaseHelper::get_suggestion( $var_name );
+				if ( $suggested_name !== $var_name ) {
 					$error = 'Variable "$%s" is not in valid snake_case format, try "$%s"';
 					$data  = array(
 						$var_name,
-						SnakeCaseHelper::get_suggestion( $var_name ),
+						$suggested_name,
 					);
 					$phpcs_file->addError( $error, $stack_ptr, 'InterpolatedVariableNotSnakeCase', $data );
 				}
@@ -270,16 +266,6 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 		}
 	}
 
-	/**
-	 * Return whether the variable is in snake_case.
-	 *
-	 * @param string $var_name Variable name.
-	 * @return bool
-	 */
-	public static function isSnakeCase( $var_name ) {
-		return (bool) preg_match( '/^[a-z0-9_]+$/', $var_name );
-	}
-
 	/**
 	 * Merge a custom allow list provided via a custom ruleset with the predefined allow list,
 	 * if we haven't already.
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index e87eff22e9..7aca57807e 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -218,6 +218,11 @@ enum Suit {
 	public function __invoke() {} // Ok.
 }
 
+// Related to #1891 - ensure the sniff does not throw an error if the suggested alternative would be the same as the original name.
+function lähtöaika() {} // OK.
+function lÄhtÖaika() {} // Bad, but only handled by the sniff if Mbstring is available.
+function lÄhtOaika() {} // Bad, handled via transliteration of non-ASCII chars if Mbstring is not available.
+
 // Live coding/parse error.
 // This has to be the last test in the file.
 function
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index c4d74c2256..76d5dcbcff 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -53,6 +53,8 @@ public function getErrorList() {
 			199 => 1,
 			208 => 2,
 			210 => 1,
+			223 => function_exists( 'mb_strtolower' ) ? 1 : 0,
+			224 => 1,
 		);
 	}
 
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 267c02c4e4..22b258c33b 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -232,3 +232,8 @@ enum EnumExample {
 class Has_Mixed_Case_Property {
 	public $post_ID; // OK.
 }
+
+// Issue #1891 - ensure the sniff does not throw an error if the suggested alternative would be the same as the original name.
+$lähtöaika = true; // OK.
+$lÄhtÖaika = true; // Bad, but only handled by the sniff if Mbstring is available.
+$lÄhtOaika = true; // Bad, handled via transliteration of non-ASCII chars if Mbstring is not available.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index dbb8725c8f..4668810917 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -94,6 +94,8 @@ public function getErrorList() {
 			219 => 1,
 			225 => 1,
 			227 => 1,
+			238 => function_exists( 'mb_strtolower' ) ? 1 : 0,
+			239 => 1,
 		);
 	}
 
diff --git a/composer.json b/composer.json
index 8c236b034e..3459ab5000 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,9 @@
 		"php-parallel-lint/php-parallel-lint": "^1.3.2",
 		"php-parallel-lint/php-console-highlighter": "^1.0.0"
 	},
+	"suggest": {
+		"ext-mbstring": "For improved results"
+	},
 	"config": {
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true

From a4c4c114b0dcb54a32c7c4978ef8fc1d4702eaf0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:39:44 +0100
Subject: [PATCH 447/822] CodeAnalysis/AssignmentInCondition: defer to upstream
 sniff

Upstream PR squizlabs/PHP_CodeSniffer 1594 pulled largely the same sniff to PHPCS itself and was merged in PHPCS 3.1.0.

The only part of the sniff I held back at the time, was the "is this an assignment in a ternary condition" part of the sniff as that was (and still is) more prone to false positives/negatives due to the difficulty in determining the start and end of the condition.

As the minimum supported PHPCS version for WPCS is now well beyond PHPCS 3.1.0, I'd like to propose to defer to the upstream sniff for the control structure condition checking and to only keep the code related to checking for assignments in ternary conditions in WPCS.

To prevent confusion between the two sniffs (the upstream one and this one) and to make it clear which is checking what, I also propose to rename the sniff to `WordPress.CodeAnalysis.AssignmentInTernaryCondition`.

Includes bringing the WPCS native PHPCS ruleset inline with this change.
---
 .phpcs.xml.dist                               |   2 +-
 WordPress-Core/ruleset.xml                    |   9 +-
 ... => AssignmentInTernaryConditionSniff.php} | 109 +++++-----------
 .../AssignmentInConditionUnitTest.inc         | 118 ------------------
 .../AssignmentInTernaryConditionUnitTest.inc  |  43 +++++++
 ... AssignmentInTernaryConditionUnitTest.php} |  52 ++------
 6 files changed, 86 insertions(+), 247 deletions(-)
 rename WordPress/Sniffs/CodeAnalysis/{AssignmentInConditionSniff.php => AssignmentInTernaryConditionSniff.php} (51%)
 delete mode 100644 WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
 create mode 100644 WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
 rename WordPress/Tests/CodeAnalysis/{AssignmentInConditionUnitTest.php => AssignmentInTernaryConditionUnitTest.php} (56%)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 102cfa4ce5..162f4cecbe 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -40,7 +40,7 @@
 		<exclude name="WordPress.NamingConventions.ValidVariableName"/>
 
 		<!-- While conditions with assignments are a typical way to walk the token stream. -->
-		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
+		<exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
 
 		<!-- The code in this project is run in the context of PHPCS, not WP. -->
 		<exclude name="WordPress.DateTime"/>
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 0cc36250a6..5742137257 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -619,11 +619,10 @@
 	<rule ref="WordPress.PHP.StrictInArray"/>
 
 	<!-- Rule: Assignments must not be placed in conditionals.
-		 Note: sniff is a duplicate of upstream. Can be removed once minimum PHPCS requirement has gone up.
-		 https://github.com/squizlabs/PHP_CodeSniffer/pull/1594
-		 Update: the "assignment in ternary" part of the sniff is currently not yet covered in
-		 the upstream version. This needs to be pulled first before we can defer to upstream. -->
-	<rule ref="WordPress.CodeAnalysis.AssignmentInCondition"/>
+		 The "assignment in ternary" part of the sniff is currently not yet covered in
+		 the upstream version, which is why there is still a WP native sniff as well. -->
+	<rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
+	<rule ref="WordPress.CodeAnalysis.AssignmentInTernaryCondition"/>
 
 	<!-- Rule: In a switch statement... If a case contains a block, then falls through
 		 to the next block, this must be explicitly commented. -->
diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
similarity index 51%
rename from WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
rename to WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index 34d8c1f68f..11a5fcfbe7 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -22,13 +22,13 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
+ * @since   3.0.0  - The generic "assignment in condition" logic has been removed from the sniff
+ *                   in favour of the upstream `Generic.CodeAnalysis.AssignmentInCondition` sniff.
+ *                 - The sniff has been renamed from `AssignmentInCondition` to `AssignmentInTernaryCondition`.
  *
- * {@internal This sniff is a duplicate of the same sniff as pulled upstream.
- * Once the upstream sniff has been merged and the minimum WPCS PHPCS requirement has gone up to
- * the version in which the sniff was merged, this version can be safely removed.
- * {@link https://github.com/squizlabs/PHP_CodeSniffer/pull/1594} }}
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/1594 Upstream sniff.
  */
-class AssignmentInConditionSniff extends Sniff {
+class AssignmentInTernaryConditionSniff extends Sniff {
 
 	/**
 	 * Assignment tokens to trigger on.
@@ -69,12 +69,6 @@ public function register() {
 		$this->condition_start_tokens = $starters;
 
 		return array(
-			\T_IF,
-			\T_ELSEIF,
-			\T_FOR,
-			\T_SWITCH,
-			\T_CASE,
-			\T_WHILE,
 			\T_INLINE_THEN,
 		);
 	}
@@ -92,79 +86,42 @@ public function process_token( $stackPtr ) {
 
 		$token = $this->tokens[ $stackPtr ];
 
-		// Find the condition opener/closer.
-		if ( \T_FOR === $token['code'] ) {
-			if ( isset( $token['parenthesis_opener'], $token['parenthesis_closer'] ) === false ) {
-				return;
-			}
-
-			$semicolon = $this->phpcsFile->findNext( \T_SEMICOLON, ( $token['parenthesis_opener'] + 1 ), $token['parenthesis_closer'] );
-			if ( false === $semicolon ) {
-				return;
-			}
+		// Check if the condition for the ternary is bracketed.
+		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+		if ( false === $prev ) {
+			// Shouldn't happen, but in that case we don't have anything to examine anyway.
+			return;
+		}
 
-			$opener    = $semicolon;
-			$semicolon = $this->phpcsFile->findNext( \T_SEMICOLON, ( $opener + 1 ), $token['parenthesis_closer'] );
-			if ( false === $semicolon ) {
+		if ( \T_CLOSE_PARENTHESIS === $this->tokens[ $prev ]['code'] ) {
+			if ( ! isset( $this->tokens[ $prev ]['parenthesis_opener'] ) ) {
 				return;
 			}
 
-			$closer = $semicolon;
-			unset( $semicolon );
+			$opener = $this->tokens[ $prev ]['parenthesis_opener'];
+			$closer = $prev;
+		} elseif ( isset( $token['nested_parenthesis'] ) ) {
+			$closer = end( $token['nested_parenthesis'] );
+			$opener = key( $token['nested_parenthesis'] );
 
-		} elseif ( \T_CASE === $token['code'] ) {
-			if ( isset( $token['scope_opener'] ) === false ) {
+			$next_statement_closer = $this->phpcsFile->findEndOfStatement( $stackPtr, array( \T_COLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_SQUARE_BRACKET ) );
+			if ( false !== $next_statement_closer && $next_statement_closer < $closer ) {
+				// Parentheses are unrelated to the ternary.
 				return;
 			}
 
-			$opener = $stackPtr;
-			$closer = $token['scope_opener'];
-
-		} elseif ( \T_INLINE_THEN === $token['code'] ) {
-			// Check if the condition for the ternary is bracketed.
-			$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-			if ( false === $prev ) {
-				// Shouldn't happen, but in that case we don't have anything to examine anyway.
+			$prev_statement_closer = $this->phpcsFile->findStartOfStatement( $stackPtr, array( \T_COLON, \T_OPEN_PARENTHESIS, \T_OPEN_SQUARE_BRACKET ) );
+			if ( false !== $prev_statement_closer && $opener < $prev_statement_closer ) {
+				// Parentheses are unrelated to the ternary.
 				return;
 			}
 
-			if ( \T_CLOSE_PARENTHESIS === $this->tokens[ $prev ]['code'] ) {
-				if ( ! isset( $this->tokens[ $prev ]['parenthesis_opener'] ) ) {
-					return;
-				}
-
-				$opener = $this->tokens[ $prev ]['parenthesis_opener'];
-				$closer = $prev;
-			} elseif ( isset( $token['nested_parenthesis'] ) ) {
-				$closer = end( $token['nested_parenthesis'] );
-				$opener = key( $token['nested_parenthesis'] );
-
-				$next_statement_closer = $this->phpcsFile->findEndOfStatement( $stackPtr, array( \T_COLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_SQUARE_BRACKET ) );
-				if ( false !== $next_statement_closer && $next_statement_closer < $closer ) {
-					// Parentheses are unrelated to the ternary.
-					return;
-				}
-
-				$prev_statement_closer = $this->phpcsFile->findStartOfStatement( $stackPtr, array( \T_COLON, \T_OPEN_PARENTHESIS, \T_OPEN_SQUARE_BRACKET ) );
-				if ( false !== $prev_statement_closer && $opener < $prev_statement_closer ) {
-					// Parentheses are unrelated to the ternary.
-					return;
-				}
-
-				if ( $closer > $stackPtr ) {
-					$closer = $stackPtr;
-				}
-			} else {
-				// No parenthesis found, can't determine where the conditional part of the ternary starts.
-				return;
+			if ( $closer > $stackPtr ) {
+				$closer = $stackPtr;
 			}
 		} else {
-			if ( isset( $token['parenthesis_opener'], $token['parenthesis_closer'] ) === false ) {
-				return;
-			}
-
-			$opener = $token['parenthesis_opener'];
-			$closer = $token['parenthesis_closer'];
+			// No parenthesis found, can't determine where the conditional part of the ternary starts.
+			return;
 		}
 
 		$startPos = $opener;
@@ -207,17 +164,10 @@ public function process_token( $stackPtr ) {
 			}
 
 			if ( true === $hasVariable ) {
-				$errorCode = 'Found';
-				if ( \T_WHILE === $token['code'] ) {
-					$errorCode = 'FoundInWhileCondition';
-				} elseif ( \T_INLINE_THEN === $token['code'] ) {
-					$errorCode = 'FoundInTernaryCondition';
-				}
-
 				$this->phpcsFile->addWarning(
 					'Variable assignment found within a condition. Did you mean to do a comparison?',
 					$hasAssignment,
-					$errorCode
+					'FoundInTernaryCondition'
 				);
 			}
 
@@ -225,5 +175,4 @@ public function process_token( $stackPtr ) {
 
 		} while ( $startPos < $closer );
 	}
-
 }
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
deleted file mode 100644
index 9d96e99056..0000000000
--- a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-// OK.
-if ($a === 123) {
-} elseif ($a == 123) {
-} elseif ($a !== 123) {
-} elseif ($a != 123) {}
-
-function abc( $a = 'default' ) {}
-if (in_array( $a, array( 1 => 'a', 2 => 'b' ) ) ) {}
-
-switch ( $a === $b ) {}
-switch ( true ) {
-	case $sample == 'something':
-		break;
-}
-
-for ( $i = 0; $i == 100; $i++ ) {}
-for ( $i = 0; $i >= 100; $i++ ) {}
-for ( $i = 0; ; $i++ ) {}
-for (;;) {}
-
-do {
-} while ( $sample == false );
-
-while ( $sample === false ) {}
-
-// Assignments in condition.
-if ($a = 123) {
-} elseif ($a = 'abc') {
-} else if( $a += 10 ) {
-} else if($a -= 10) {
-} else if($a *= 10) {
-} else if($a **= 10) {
-} else if($a /= 10) {
-} else if($a .= strtolower($b)) {
-} else if($a %= SOME_CONSTANT) {
-} else if($a &= 2) {
-} else if($a |= 2) {
-} else if($a ^= 2) {
-} else if($a <<= 2) {
-} else if($a >>= 2) {
-} else if($a ??= $b) {
-} elseif( $a = 'abc' && $b = 'def' ) {
-} elseif(
-    $a = 'abc'
-	&& $a .= 'def'
-) {}
-
-if ($a[] = 123) {
-} elseif ($a['something'] = 123) {
-} elseif (self::$a = 123) {
-} elseif (parent::$a *= 123) {
-} elseif (static::$a = 123) {
-} elseif (MyClass::$a .= 'abc') {
-} else if( $this->something += 10 ) {}
-
-switch ( $a = $b ) {}
-switch ( true ) {
-	case $sample = 'something':
-		break;
-
-	case $sample = 'something' && $a = $b:
-		break;
-}
-
-for ( $i = 0; $i = 100; $i++ ) {}
-for ( $i = 0; $i = 100 && $b = false; $i++ ) {}
-
-do {
-} while ( $sample = false );
-
-while ( $sample = false ) {}
-
-if ($a = 123) :
-endif;
-
-/*
- * Ternaries should also be checked, but can only be reliably done when in parenthesis.
- */
-
-// OK.
-$mode = ( $a == 'something' ) ? 'on' : 'off';
-$mode = ( $a == 'on' ? 'true' : $a == 'off' ? 't' : 'f' );
-
-// Bad.
-$mode = ( $a = 'on' ) ? 'on' : 'off';
-$mode = ( $a = 'on' ) ?: 'off';
-$mode = ( $a = 'on' ) ? 'true' : ( $a = 'off' ? 't' : ${$a->prop} ); // Bad x 2.
-$mode = ( $a = 'on' ? 'on' : 'off' );
-$mode = ( ${$a->prop} = 'on' ?: 'off' );
-$mode = ( $a = 'on' ? 'true' : ( $a = 'off' ? 't' : 'f' ) ); // Bad x 2.
-$mode = ( $a['test'] = 'on' ? 'true' : $a['test'] = 'off' ? 't' : 'f' ); // Bad x 3. The first ? triggers 1, the second (correctly) 2.
-
-// Currently not checked.
-$mode = $a = 'on' ? 'on' : 'off';
-$mode = $a = 'on' ?: 'off';
-$mode = $a = 'on' ? 'true' : $a = 'off' ? 't' : 'f';
-
-// Issue #1227.
-( function () {
-	$foo = 42;
-	return 1 === 2 ? 'a' : 'b';
-} );
-
-call_user_func( function () {
-	$foo = 42;
-	return 1 === 2 ? 'a' : 'b';
-} );
-
-$content = preg_replace_callback(
-	'/(?s)<table class="viz full.+?<\/table>/',
-	function( $matches ) {
-		$rowcount = substr_count( $table, '<tr>' );
-		$height   = $rowcount < 6 ? '100' : '250';
-	},
-	$content
-);
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
new file mode 100644
index 0000000000..7084f35bfe
--- /dev/null
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * Ternaries can only reliably be checked when in parenthesis.
+ */
+
+// OK.
+$mode = ( $a == 'something' ) ? 'on' : 'off';
+$mode = ( $a == 'on' ? 'true' : $a == 'off' ? 't' : 'f' );
+
+// Bad.
+$mode = ( $a = 'on' ) ? 'on' : 'off';
+$mode = ( $a = 'on' ) ?: 'off';
+$mode = ( $a = 'on' ) ? 'true' : ( $a = 'off' ? 't' : ${$a->prop} ); // Bad x 2.
+$mode = ( $a = 'on' ? 'on' : 'off' );
+$mode = ( ${$a->prop} = 'on' ?: 'off' );
+$mode = ( $a = 'on' ? 'true' : ( $a = 'off' ? 't' : 'f' ) ); // Bad x 2.
+$mode = ( $a['test'] = 'on' ? 'true' : $a['test'] = 'off' ? 't' : 'f' ); // Bad x 3. The first ? triggers 1, the second (correctly) 2.
+
+// Currently not checked.
+$mode = $a = 'on' ? 'on' : 'off';
+$mode = $a = 'on' ?: 'off';
+$mode = $a = 'on' ? 'true' : $a = 'off' ? 't' : 'f';
+
+// Issue #1227.
+( function () {
+	$foo = 42;
+	return 1 === 2 ? 'a' : 'b';
+} );
+
+call_user_func( function () {
+	$foo = 42;
+	return 1 === 2 ? 'a' : 'b';
+} );
+
+$content = preg_replace_callback(
+	'/(?s)<table class="viz full.+?<\/table>/',
+	function( $matches ) {
+		$rowcount = substr_count( $table, '<tr>' );
+		$height   = $rowcount < 6 ? '100' : '250';
+	},
+	$content
+);
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
similarity index 56%
rename from WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
rename to WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index bf0a2adfe9..26568c04d1 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -12,13 +12,13 @@
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 /**
- * Unit test class for the AssignmentInCondition sniff.
+ * Unit test class for the AssignmentInTernaryCondition sniff.
  *
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
  */
-class AssignmentInConditionUnitTest extends AbstractSniffUnitTest {
+class AssignmentInTernaryConditionUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
@@ -36,47 +36,13 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			29 => 1,
-			30 => 1,
-			31 => 1,
-			32 => 1,
-			33 => 1,
-			34 => 1,
-			35 => 1,
-			36 => 1,
-			37 => 1,
-			38 => 1,
-			39 => 1,
-			40 => 1,
-			41 => 1,
-			42 => 1,
-			43 => 1,
-			44 => 2,
-			46 => 1,
-			47 => 1,
-			50 => 1,
-			51 => 1,
-			52 => 1,
-			53 => 1,
-			54 => 1,
-			55 => 1,
-			56 => 1,
-			58 => 1,
-			60 => 1,
-			63 => 2,
-			67 => 1,
-			68 => 2,
-			71 => 1,
-			73 => 1,
-			75 => 1,
-			87 => 1,
-			88 => 1,
-			89 => 2,
-			90 => 1,
-			91 => 1,
-			92 => 2,
-			93 => 3,
+			12 => 1,
+			13 => 1,
+			14 => 2,
+			15 => 1,
+			16 => 1,
+			17 => 2,
+			18 => 3,
 		);
 	}
-
 }

From bc993675fccad509eab67a82188969e385bda9fb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:42:47 +0100
Subject: [PATCH 448/822] CodeAnalysis/AssignmentInTernaryCondition: remove
 some redundant code

There will always be non-empty tokens before a ternary, if nothing else, a PHP open tag, so this condition is redundant.
---
 .../CodeAnalysis/AssignmentInTernaryConditionSniff.php       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index 11a5fcfbe7..e85cfd523f 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -88,11 +88,6 @@ public function process_token( $stackPtr ) {
 
 		// Check if the condition for the ternary is bracketed.
 		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-		if ( false === $prev ) {
-			// Shouldn't happen, but in that case we don't have anything to examine anyway.
-			return;
-		}
-
 		if ( \T_CLOSE_PARENTHESIS === $this->tokens[ $prev ]['code'] ) {
 			if ( ! isset( $this->tokens[ $prev ]['parenthesis_opener'] ) ) {
 				return;

From 955938e59cc62205f93b0ce51ed56e44acd45a26 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:58:15 +0100
Subject: [PATCH 449/822] CodeAnalysis/AssignmentInTernaryCondition: add some
 extra tests

... to cover code (which is bowing out of the sniff) previously uncovered.
---
 .../AssignmentInTernaryConditionUnitTest.inc          | 11 +++++++++++
 .../AssignmentInTernaryConditionUnitTest.php          |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
index 7084f35bfe..5d60ec21d6 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
@@ -41,3 +41,14 @@ $content = preg_replace_callback(
 	},
 	$content
 );
+
+$array = array(
+	'key' => $key = true ?: $alt // OK, well, not really, but currently not checked for lack of usable parenthesis start/end points.
+);
+
+$mode = ( isOn() = true ) ? 'on' : 'off'; // OK, well, not really, but this is a fatal error, so not the concern of this sniff.
+
+$mode = ( $a = $b = 'on' ) ? 'on' : 'off'; // Multi-assignment. Error x 2.
+
+$mode = ( $a['key'] = 'on' ) ? 'on' : 'off'; // Bad.
+$mode = ( $a->prop = 'on' ) ? 'on' : 'off'; // Bad.
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index 26568c04d1..a8bbe5bb79 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -43,6 +43,9 @@ public function getWarningList() {
 			16 => 1,
 			17 => 2,
 			18 => 3,
+			51 => 2,
+			53 => 1,
+			54 => 1,
 		);
 	}
 }

From fde17e0a4ec63826f1755e0b73c5c9ed43a3872c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:03:56 +0100
Subject: [PATCH 450/822] CodeAnalysis/AssignmentInTernaryCondition: implement
 PHPCSUtils

---
 .../CodeAnalysis/AssignmentInTernaryConditionSniff.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index e85cfd523f..2000155317 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\CodeAnalysis;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Parentheses;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Detects variable assignments being made within conditions.
@@ -96,8 +97,8 @@ public function process_token( $stackPtr ) {
 			$opener = $this->tokens[ $prev ]['parenthesis_opener'];
 			$closer = $prev;
 		} elseif ( isset( $token['nested_parenthesis'] ) ) {
-			$closer = end( $token['nested_parenthesis'] );
-			$opener = key( $token['nested_parenthesis'] );
+			$opener = Parentheses::getLastOpener( $this->phpcsFile, $stackPtr );
+			$closer = Parentheses::getLastCloser( $this->phpcsFile, $stackPtr );
 
 			$next_statement_closer = $this->phpcsFile->findEndOfStatement( $stackPtr, array( \T_COLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_SQUARE_BRACKET ) );
 			if ( false !== $next_statement_closer && $next_statement_closer < $closer ) {

From 3e4e3c8ba7860472ee043c3f890bb4946868965d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:07:38 +0100
Subject: [PATCH 451/822] CodeAnalysis/AssignmentInTernaryCondition: add test
 with PHP 7.4+ null coalesce equals

... to ensure it is recognized as an assignment.
---
 .../CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc      | 3 +++
 .../CodeAnalysis/AssignmentInTernaryConditionUnitTest.php      | 1 +
 2 files changed, 4 insertions(+)

diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
index 5d60ec21d6..575ba29e81 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
@@ -52,3 +52,6 @@ $mode = ( $a = $b = 'on' ) ? 'on' : 'off'; // Multi-assignment. Error x 2.
 
 $mode = ( $a['key'] = 'on' ) ? 'on' : 'off'; // Bad.
 $mode = ( $a->prop = 'on' ) ? 'on' : 'off'; // Bad.
+
+// Safeguard recognition of PHP 7.4+ null coalesce equals.
+$mode = ( $a ??= 'on' ) ? 'on' : 'off';
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index a8bbe5bb79..f0a1d45742 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -46,6 +46,7 @@ public function getWarningList() {
 			51 => 2,
 			53 => 1,
 			54 => 1,
+			57 => 1,
 		);
 	}
 }

From 93c6698fd072f84c4fc0cb64d2d37ea8f055f71b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 15:05:36 +0100
Subject: [PATCH 452/822] QA: make all test classes `final`

---
 WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php      | 2 +-
 WordPress/Tests/Arrays/ArrayIndentationUnitTest.php             | 2 +-
 WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php  | 2 +-
 WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php          | 2 +-
 WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php   | 2 +-
 .../Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php | 2 +-
 WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php   | 2 +-
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php              | 2 +-
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php          | 2 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.php                      | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.php                | 2 +-
 WordPress/Tests/DB/RestrictedFunctionsUnitTest.php              | 2 +-
 WordPress/Tests/DB/SlowDBQueryUnitTest.php                      | 2 +-
 WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php       | 2 +-
 WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php        | 2 +-
 WordPress/Tests/Files/FileNameUnitTest.php                      | 2 +-
 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php  | 2 +-
 WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php | 2 +-
 WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php     | 2 +-
 WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php | 2 +-
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php | 2 +-
 WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php            | 2 +-
 WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php         | 2 +-
 WordPress/Tests/PHP/DontExtractUnitTest.php                     | 2 +-
 WordPress/Tests/PHP/IniSetUnitTest.php                          | 2 +-
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php                | 2 +-
 WordPress/Tests/PHP/POSIXFunctionsUnitTest.php                  | 2 +-
 WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php              | 2 +-
 WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php          | 2 +-
 WordPress/Tests/PHP/StrictInArrayUnitTest.php                   | 2 +-
 WordPress/Tests/PHP/TypeCastsUnitTest.php                       | 2 +-
 WordPress/Tests/PHP/YodaConditionsUnitTest.php                  | 2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.php               | 2 +-
 WordPress/Tests/Security/NonceVerificationUnitTest.php          | 2 +-
 WordPress/Tests/Security/PluginMenuSlugUnitTest.php             | 2 +-
 WordPress/Tests/Security/SafeRedirectUnitTest.php               | 2 +-
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php    | 2 +-
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php           | 2 +-
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.php             | 2 +-
 WordPress/Tests/WP/CapabilitiesUnitTest.php                     | 2 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.php                   | 2 +-
 WordPress/Tests/WP/ClassNameCaseUnitTest.php                    | 2 +-
 WordPress/Tests/WP/CronIntervalUnitTest.php                     | 2 +-
 WordPress/Tests/WP/DeprecatedClassesUnitTest.php                | 2 +-
 WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php              | 2 +-
 WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php        | 2 +-
 WordPress/Tests/WP/DeprecatedParametersUnitTest.php             | 2 +-
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.php             | 2 +-
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php             | 2 +-
 WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php       | 2 +-
 WordPress/Tests/WP/EnqueuedResourcesUnitTest.php                | 2 +-
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php          | 2 +-
 WordPress/Tests/WP/I18nUnitTest.php                             | 2 +-
 WordPress/Tests/WP/PostsPerPageUnitTest.php                     | 2 +-
 WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php     | 2 +-
 WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php  | 2 +-
 WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php    | 2 +-
 WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php          | 2 +-
 58 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index 8e48396caa..482c22490c 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class ArrayDeclarationSpacingUnitTest extends AbstractSniffUnitTest {
+final class ArrayDeclarationSpacingUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
index 4bc179dca2..3291de971a 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class ArrayIndentationUnitTest extends AbstractSniffUnitTest {
+final class ArrayIndentationUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * The tab width to use during testing.
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 08cb83eb77..8414f8ac31 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class ArrayKeySpacingRestrictionsUnitTest extends AbstractSniffUnitTest {
+final class ArrayKeySpacingRestrictionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
index 7dedd535dd..19741593b9 100644
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
+++ b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class CommaAfterArrayItemUnitTest extends AbstractSniffUnitTest {
+final class CommaAfterArrayItemUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
index 62eda13d2b..84aeb96181 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
@@ -22,7 +22,7 @@
  *
  * @since   0.14.0
  */
-class MultipleStatementAlignmentUnitTest extends AbstractSniffUnitTest {
+final class MultipleStatementAlignmentUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * The tab width to use during testing.
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index f0a1d45742..2c6d4eb998 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   0.14.0
  */
-class AssignmentInTernaryConditionUnitTest extends AbstractSniffUnitTest {
+final class AssignmentInTernaryConditionUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
index a8b0707234..6caee59867 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   2.2.0
  */
-class EscapedNotTranslatedUnitTest extends AbstractSniffUnitTest {
+final class EscapedNotTranslatedUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 8f1d90150c..4d425b392b 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  */
-class DirectDatabaseQueryUnitTest extends AbstractSniffUnitTest {
+final class DirectDatabaseQueryUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 68c908da66..61decb7521 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   0.14.0
  */
-class PreparedSQLPlaceholdersUnitTest extends AbstractSniffUnitTest {
+final class PreparedSQLPlaceholdersUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 3264342c61..5ff2c8f616 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  */
-class PreparedSQLUnitTest extends AbstractSniffUnitTest {
+final class PreparedSQLUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 183af9717a..05a522e9de 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -21,7 +21,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
  */
-class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
+final class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Add a number of extra restricted classes to unit test the abstract
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index 5149dbb8fb..e37298a136 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
+final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 1d31c2b930..62753ee481 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  */
-class SlowDBQueryUnitTest extends AbstractSniffUnitTest {
+final class SlowDBQueryUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
index a029fba1f8..e1eae57eb0 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   2.2.0
  */
-class CurrentTimeTimestampUnitTest extends AbstractSniffUnitTest {
+final class CurrentTimeTimestampUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
index ecfc78867f..53fdbbd2ca 100644
--- a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   2.2.0
  */
-class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
+final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index cf10c9c799..6ea01ae9d0 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.11.0     Actually added tests ;-)
  * @since   0.13.0     Class name changed: this class is now namespaced.
  */
-class FileNameUnitTest extends AbstractSniffUnitTest {
+final class FileNameUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Error files with the expected nr of errors.
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index ef8d58db2d..3cd0128329 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class PrefixAllGlobalsUnitTest extends AbstractSniffUnitTest {
+final class PrefixAllGlobalsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 76d5dcbcff..49a787b68d 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -19,7 +19,7 @@
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
  */
-class ValidFunctionNameUnitTest extends AbstractSniffUnitTest {
+final class ValidFunctionNameUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index a327263ff1..ddaabad882 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class ValidHookNameUnitTest extends AbstractSniffUnitTest {
+final class ValidHookNameUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index 75193d32e0..a20c4f2e24 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   2.2.0
  */
-class ValidPostTypeSlugUnitTest extends AbstractSniffUnitTest {
+final class ValidPostTypeSlugUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Set warnings level to 3 to trigger suggestions as warnings.
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 4668810917..c5b4ec547a 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class ValidVariableNameUnitTest extends AbstractSniffUnitTest {
+final class ValidVariableNameUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
index c008eb6afa..67da444d39 100644
--- a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DevelopmentFunctionsUnitTest extends AbstractSniffUnitTest {
+final class DevelopmentFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
index 1670834cd2..bd8c5aad27 100644
--- a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DiscouragedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
+final class DiscouragedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
index 6654bdac00..c86ab344d8 100644
--- a/WordPress/Tests/PHP/DontExtractUnitTest.php
+++ b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
  */
-class DontExtractUnitTest extends AbstractSniffUnitTest {
+final class DontExtractUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index 7f546008ac..abca628317 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since 2.1.0
  */
-class IniSetUnitTest extends AbstractSniffUnitTest {
+final class IniSetUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
index c187b22c18..0867ed8419 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   1.1.0
  */
-class NoSilencedErrorsUnitTest extends AbstractSniffUnitTest {
+final class NoSilencedErrorsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
index e9df9b0d5a..bfadfe6b35 100644
--- a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
+final class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
index 28818b106b..fe84b6f445 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   1.0.0
  */
-class PregQuoteDelimiterUnitTest extends AbstractSniffUnitTest {
+final class PregQuoteDelimiterUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
index af8707d3cd..8ed0c52e94 100644
--- a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   0.14.0
  */
-class RestrictedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
+final class RestrictedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index 90f47d788f..c8174a3595 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class StrictInArrayUnitTest extends AbstractSniffUnitTest {
+final class StrictInArrayUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index 8644cc8dd3..db837c8b97 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since 1.2.0
  */
-class TypeCastsUnitTest extends AbstractSniffUnitTest {
+final class TypeCastsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/PHP/YodaConditionsUnitTest.php b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
index cab9a34b36..cd87e263a9 100644
--- a/WordPress/Tests/PHP/YodaConditionsUnitTest.php
+++ b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class YodaConditionsUnitTest extends AbstractSniffUnitTest {
+final class YodaConditionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 571cd24b1b..6054315a7c 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0     Class name changed: this class is now namespaced.
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  */
-class EscapeOutputUnitTest extends AbstractSniffUnitTest {
+final class EscapeOutputUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 825c5f289e..4f164d0d33 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
  */
-class NonceVerificationUnitTest extends AbstractSniffUnitTest {
+final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index 39b4a6f935..8555d23212 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  */
-class PluginMenuSlugUnitTest extends AbstractSniffUnitTest {
+final class PluginMenuSlugUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
index d16634cbe5..b42d75b9fa 100644
--- a/WordPress/Tests/Security/SafeRedirectUnitTest.php
+++ b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   1.0.0
  */
-class SafeRedirectUnitTest extends AbstractSniffUnitTest {
+final class SafeRedirectUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 2f51624db5..1337bbe669 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  */
-class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
+final class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index b3e85398c7..e89b04bf50 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -19,7 +19,7 @@
  *
  * @since   1.2.0
  */
-class I18nTextDomainFixerUnitTest extends AbstractSniffUnitTest {
+final class I18nTextDomainFixerUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * The tab width to use during testing.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 698e63bdd7..497b4682ad 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
+final class AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index 448916df03..38ae5f4f0d 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -18,7 +18,7 @@
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0
  */
-class CapabilitiesUnitTest extends AbstractSniffUnitTest {
+final class CapabilitiesUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Adjust the config to allow for testing with specific CLI arguments.
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 1f511aa39d..c222ac3725 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class CapitalPDangitUnitTest extends AbstractSniffUnitTest {
+final class CapitalPDangitUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
index 862ec11761..c91b007160 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.php
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since 3.0.0
  */
-class ClassNameCaseUnitTest extends AbstractSniffUnitTest {
+final class ClassNameCaseUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index bf6be22ee4..a77d930230 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
  */
-class CronIntervalUnitTest extends AbstractSniffUnitTest {
+final class CronIntervalUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index 2dace9a7d7..73a34b6388 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
+final class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 8133019ed1..2a89b089ac 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
+final class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 577afeea3a..50d104ec7f 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   1.0.0
  */
-class DeprecatedParameterValuesUnitTest extends AbstractSniffUnitTest {
+final class DeprecatedParameterValuesUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index fd210bef82..78aa55d753 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
+final class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index fe03b4dfdb..cadcffd534 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -17,7 +17,7 @@
  * @package WPCS\WordPressCodingStandards
  * @since   0.14.0
  */
-class DiscouragedConstantsUnitTest extends AbstractSniffUnitTest {
+final class DiscouragedConstantsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index f081e22da8..814a9b9cae 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
+final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index 6de967c74b..aaf9ba40e5 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since   1.0.0
  */
-class EnqueuedResourceParametersUnitTest extends AbstractSniffUnitTest {
+final class EnqueuedResourceParametersUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index cc268491d7..83b735b9ce 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class EnqueuedResourcesUnitTest extends AbstractSniffUnitTest {
+final class EnqueuedResourcesUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index daf566de68..de2194ccdc 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -21,7 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
  *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
  */
-class GlobalVariablesOverrideUnitTest extends AbstractSniffUnitTest {
+final class GlobalVariablesOverrideUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index a30ef55718..8140b66b4c 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class I18nUnitTest extends AbstractSniffUnitTest {
+final class I18nUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Set CLI values before the file is tested.
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 212408ed84..7a302347fa 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -22,7 +22,7 @@
  *                 limit being part of the WP category, and the check for pagination
  *                 disabling being part of the VIP category.
  */
-class PostsPerPageUnitTest extends AbstractSniffUnitTest {
+final class PostsPerPageUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
index 8a06a67409..f46131110a 100644
--- a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
@@ -19,7 +19,7 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class CastStructureSpacingUnitTest extends AbstractSniffUnitTest {
+final class CastStructureSpacingUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 91fa3f8464..e7e8494a45 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -19,7 +19,7 @@
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
  */
-class ControlStructureSpacingUnitTest extends AbstractSniffUnitTest {
+final class ControlStructureSpacingUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
index 4ee31b2649..52a3776022 100644
--- a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -18,7 +18,7 @@
  *
  * @since 3.0.0
  */
-class ObjectOperatorSpacingUnitTest extends AbstractSniffUnitTest {
+final class ObjectOperatorSpacingUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index 9c2c148c24..09aa9efec3 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -21,7 +21,7 @@
  *                     The rest of the sniff is unit tested upstream.
  * @since   0.13.0     Class name changed: this class is now namespaced.
  */
-class OperatorSpacingUnitTest extends AbstractSniffUnitTest {
+final class OperatorSpacingUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.

From 4ff4d7273f906c34baf5e4de3fda84afd6222f00 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 10 Dec 2022 15:32:01 +0100
Subject: [PATCH 453/822] QA: make all non-abstract sniff classes `final`

The PHPCS autoloader does not always play nice with sniffs which extend other sniffs, especially if both sniffs (parent and child) are included in the same standard.

To discourage sniffs extending each other, I propose making all non-abstract sniff classes `final`with the exception of four classes of which it is known that those are being extended based on a public code search.

The four exceptions are:
* `NamingConventions.ValidHookName`
* `Security.EscapeOutput`
* `Security.NonceVerification`
* `Security.ValidatedSanitizedInput`

If needs be, a sniff in an external standard can still _use_ logic from the WPCS sniffs. On the one hand, they can use the new `Helper` classes and traits. On the other hand, they can do a preliminary check on certain data and defer to a new or preinstantiated instance of a WPCS sniff for everything else.

Note: this list of sniffs being extended is likely incomplete.
If reports come in from external standards that they are running into trouble using alternative logic, we can still remove the `final` keyword from select sniffs in a patch release. However, adding the `final` keyword needs to be done in a major.

Ref:
* https://sourcegraph.com/search?q=context:global+use+WordPressCS+-repo:%5Egithub%5C.com/WordPress/WordPress-Coding-Standards%24+-repo:%5Egithub%5C.com/WPTT/WPThemeReview%24+-file:%5E%28.*/%29%3Fvendor/wp-coding-standards/.*%24&patternType=standard&case=yes&sm=0
---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php        | 2 +-
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php               | 2 +-
 WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php    | 2 +-
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php            | 2 +-
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php     | 2 +-
 .../Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php   | 2 +-
 WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php     | 2 +-
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php                | 2 +-
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php            | 2 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php                        | 2 +-
 WordPress/Sniffs/DB/RestrictedClassesSniff.php                  | 2 +-
 WordPress/Sniffs/DB/RestrictedFunctionsSniff.php                | 2 +-
 WordPress/Sniffs/DB/SlowDBQuerySniff.php                        | 2 +-
 WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php         | 2 +-
 WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php          | 2 +-
 WordPress/Sniffs/Files/FileNameSniff.php                        | 2 +-
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php    | 2 +-
 WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php   | 2 +-
 WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php   | 2 +-
 WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php   | 2 +-
 WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php              | 2 +-
 WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php           | 2 +-
 WordPress/Sniffs/PHP/DontExtractSniff.php                       | 2 +-
 WordPress/Sniffs/PHP/IniSetSniff.php                            | 2 +-
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php                  | 2 +-
 WordPress/Sniffs/PHP/POSIXFunctionsSniff.php                    | 2 +-
 WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php                | 2 +-
 WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php            | 2 +-
 WordPress/Sniffs/PHP/StrictInArraySniff.php                     | 2 +-
 WordPress/Sniffs/PHP/TypeCastsSniff.php                         | 2 +-
 WordPress/Sniffs/PHP/YodaConditionsSniff.php                    | 2 +-
 WordPress/Sniffs/Security/PluginMenuSlugSniff.php               | 2 +-
 WordPress/Sniffs/Security/SafeRedirectSniff.php                 | 2 +-
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php             | 2 +-
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php               | 2 +-
 WordPress/Sniffs/WP/CapabilitiesSniff.php                       | 2 +-
 WordPress/Sniffs/WP/CapitalPDangitSniff.php                     | 2 +-
 WordPress/Sniffs/WP/ClassNameCaseSniff.php                      | 2 +-
 WordPress/Sniffs/WP/CronIntervalSniff.php                       | 2 +-
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php                  | 2 +-
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php                | 2 +-
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php          | 2 +-
 WordPress/Sniffs/WP/DeprecatedParametersSniff.php               | 2 +-
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php               | 2 +-
 WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php               | 2 +-
 WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php         | 2 +-
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php                  | 2 +-
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php            | 2 +-
 WordPress/Sniffs/WP/I18nSniff.php                               | 2 +-
 WordPress/Sniffs/WP/PostsPerPageSniff.php                       | 2 +-
 WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php       | 2 +-
 WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php    | 2 +-
 WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php      | 2 +-
 WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php            | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index b2f0efed5f..6cab1ae48b 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -41,7 +41,7 @@
  *                 "must be multi-line" rule. This behaviour can be changed using the
  *                 `allow_single_item_single_line_associative_arrays` property.
  */
-class ArrayDeclarationSpacingSniff extends Sniff {
+final class ArrayDeclarationSpacingSniff extends Sniff {
 
 	/**
 	 * Whether or not to allow single item associative arrays to be single line.
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 83fa37a852..0661baa627 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -29,7 +29,7 @@
  * {@internal This sniff should eventually be pulled upstream as part of a solution
  * for https://github.com/squizlabs/PHP_CodeSniffer/issues/582 }}
  */
-class ArrayIndentationSniff extends Sniff {
+final class ArrayIndentationSniff extends Sniff {
 
 	/**
 	 * Should tabs be used for indenting?
diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index dec890ed4b..04035457ef 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -25,7 +25,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   2.2.0  The sniff now also checks the size of the spacing, if applicable.
  */
-class ArrayKeySpacingRestrictionsSniff extends Sniff {
+final class ArrayKeySpacingRestrictionsSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index 9889633794..24e619cccc 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -32,7 +32,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class CommaAfterArrayItemSniff extends Sniff {
+final class CommaAfterArrayItemSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 7323e4d1d9..d3a86894f1 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -31,7 +31,7 @@
  * {@internal This sniff should eventually be pulled upstream as part of a solution
  * for https://github.com/squizlabs/PHP_CodeSniffer/issues/582 }}
  */
-class MultipleStatementAlignmentSniff extends Sniff {
+final class MultipleStatementAlignmentSniff extends Sniff {
 
 	/**
 	 * Whether or not to ignore an array item for the purpose of alignment
diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index 2000155317..b5a3379f97 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -29,7 +29,7 @@
  *
  * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/1594 Upstream sniff.
  */
-class AssignmentInTernaryConditionSniff extends Sniff {
+final class AssignmentInTernaryConditionSniff extends Sniff {
 
 	/**
 	 * Assignment tokens to trigger on.
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 4e06d63a1d..c373eb7582 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -22,7 +22,7 @@
  *
  * @since   2.2.0
  */
-class EscapedNotTranslatedSniff extends AbstractFunctionParameterSniff {
+final class EscapedNotTranslatedSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 2f4d86372b..c7ce36980b 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -30,7 +30,7 @@
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  * @since   3.0.0  Support for the very sniff specific WPCS native ignore comment syntax has been removed.
  */
-class DirectDatabaseQuerySniff extends Sniff {
+final class DirectDatabaseQuerySniff extends Sniff {
 
 	/**
 	 * List of custom cache get functions.
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 18d116a2eb..7d5e0f2235 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -42,7 +42,7 @@
  *
  * @since   0.14.0
  */
-class PreparedSQLPlaceholdersSniff extends Sniff {
+final class PreparedSQLPlaceholdersSniff extends Sniff {
 
 	use WPDBTrait;
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 20063483b6..4da8cab299 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -28,7 +28,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  */
-class PreparedSQLSniff extends Sniff {
+final class PreparedSQLSniff extends Sniff {
 
 	use WPDBTrait;
 
diff --git a/WordPress/Sniffs/DB/RestrictedClassesSniff.php b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
index e4c12da09d..2c4dd33426 100644
--- a/WordPress/Sniffs/DB/RestrictedClassesSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
@@ -26,7 +26,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class RestrictedClassesSniff extends AbstractClassRestrictionsSniff {
+final class RestrictedClassesSniff extends AbstractClassRestrictionsSniff {
 
 	/**
 	 * Groups of classes to restrict.
diff --git a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
index e7a24fe8a0..7bdaa0e520 100644
--- a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
@@ -26,7 +26,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index 714f89454b..6f4c0c2af2 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -22,7 +22,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  */
-class SlowDBQuerySniff extends AbstractArrayAssignmentRestrictionsSniff {
+final class SlowDBQuerySniff extends AbstractArrayAssignmentRestrictionsSniff {
 
 	/**
 	 * Groups of variables to restrict.
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 946a41872d..6cac190e09 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -30,7 +30,7 @@
  *
  * @since   2.2.0
  */
-class CurrentTimeTimestampSniff extends AbstractFunctionParameterSniff {
+final class CurrentTimeTimestampSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
index 0da070190c..b09fed969a 100644
--- a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
@@ -18,7 +18,7 @@
  *
  * @since 2.2.0
  */
-class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index fd0ed414bf..e69472572c 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -35,7 +35,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
-class FileNameSniff extends Sniff {
+final class FileNameSniff extends Sniff {
 
 	use IsUnitTestTrait;
 
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 73d6777f35..72a174e23f 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -45,7 +45,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
-class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
+final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 
 	use IsUnitTestTrait;
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index e927563d96..6f3ac34151 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -33,7 +33,7 @@
  * @since   3.0.0  This sniff has been refactored and no longer extends the upstream
  *                 PEAR.NamingConventions.ValidFunctionName sniff.
  */
-class ValidFunctionNameSniff extends Sniff {
+final class ValidFunctionNameSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 24972bc8c4..8b880f5648 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -27,7 +27,7 @@
  *
  * @since 2.2.0
  */
-class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
+final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * Max length of a post type name is limited by the SQL field.
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 7886ab93e0..8e14268e0c 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -33,7 +33,7 @@
  * Last synced with base class January 2022 at commit 4b49a952bf0e2c3863d0a113256bae0d7fe63d52.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
  */
-class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
+final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 
 	/**
 	 * Mixed-case variables used by WordPress.
diff --git a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
index 59e914dcf7..5239078245 100644
--- a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DevelopmentFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class DevelopmentFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
index 82ba2a5ab3..8f224880e8 100644
--- a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
@@ -20,7 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   0.14.0 `create_function` was moved to the PHP.RestrictedFunctions sniff.
  */
-class DiscouragedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class DiscouragedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to discourage.
diff --git a/WordPress/Sniffs/PHP/DontExtractSniff.php b/WordPress/Sniffs/PHP/DontExtractSniff.php
index 9f837696a7..63fdf37f8c 100644
--- a/WordPress/Sniffs/PHP/DontExtractSniff.php
+++ b/WordPress/Sniffs/PHP/DontExtractSniff.php
@@ -23,7 +23,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
  */
-class DontExtractSniff extends AbstractFunctionRestrictionsSniff {
+final class DontExtractSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 4af33f1724..e6d825739f 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -25,7 +25,7 @@
  *
  * @since 2.1.0
  */
-class IniSetSniff extends AbstractFunctionParameterSniff {
+final class IniSetSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * Array of functions that must be checked.
diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index c2fe61bb26..6b946c6ff3 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -26,7 +26,7 @@
  *
  * @since   1.1.0
  */
-class NoSilencedErrorsSniff extends Sniff {
+final class NoSilencedErrorsSniff extends Sniff {
 
 	/**
 	 * Number of tokens to display in the error message to show
diff --git a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
index 4a0281ad28..d998fe12c4 100644
--- a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
@@ -25,7 +25,7 @@
  *                 `WordPress.PHP.DiscouragedPHPFunctions` sniffs.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class POSIXFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class POSIXFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index 9adb59482d..2041468b88 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -19,7 +19,7 @@
  *
  * @since   1.0.0
  */
-class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
+final class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
index 277b9b3b81..52c76398f8 100644
--- a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
@@ -18,7 +18,7 @@
  *
  * @since   0.14.0
  */
-class RestrictedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class RestrictedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to forbid.
diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 3d647a2b5c..9cf92719d6 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -25,7 +25,7 @@
  * @since   0.11.0 Refactored to extend the new WordPressCS native `AbstractFunctionParameterSniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class StrictInArraySniff extends AbstractFunctionParameterSniff {
+final class StrictInArraySniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 90c5d4bcf8..74bf70ae8f 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -27,7 +27,7 @@
  * @since   2.0.0 No longer checks that type casts are lowercase or short form.
  *                Relevant PHPCS native sniffs have been included in the rulesets instead.
  */
-class TypeCastsSniff extends Sniff {
+final class TypeCastsSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index 4869ab68c0..821a68d1d2 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -24,7 +24,7 @@
  * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class YodaConditionsSniff extends Sniff {
+final class YodaConditionsSniff extends Sniff {
 
 	/**
 	 * The tokens that indicate the start of a condition.
diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index a07e04422f..b816b4c951 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -25,7 +25,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  */
-class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
+final class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/Security/SafeRedirectSniff.php b/WordPress/Sniffs/Security/SafeRedirectSniff.php
index b15837c07d..ac0ab9fc33 100644
--- a/WordPress/Sniffs/Security/SafeRedirectSniff.php
+++ b/WordPress/Sniffs/Security/SafeRedirectSniff.php
@@ -18,7 +18,7 @@
  *
  * @since   1.0.0
  */
-class SafeRedirectSniff extends AbstractFunctionRestrictionsSniff {
+final class SafeRedirectSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index 5dfb4b609e..e2a90d52af 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -29,7 +29,7 @@
  *
  * @since   1.2.0
  */
-class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
+final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * A list of tokenizers this sniff supports.
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 1930837d2e..3269bf2caa 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -26,7 +26,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index a70985b56f..01e750d0e2 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -28,7 +28,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class CapabilitiesSniff extends AbstractFunctionParameterSniff {
+final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index ebb1177b7a..27a38bebd3 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -26,7 +26,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   3.0.0  Now also checks namespace names.
  */
-class CapitalPDangitSniff extends Sniff {
+final class CapitalPDangitSniff extends Sniff {
 
 	/**
 	 * Regex to match a large number or spelling variations of WordPress in text strings.
diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index 7aa5b9d3e6..d974210e6f 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -18,7 +18,7 @@
  *
  * @since 3.0.0
  */
-class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
+final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 
 	/**
 	 * List of all WP native classes.
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 9fac8f2059..84d1792b49 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -32,7 +32,7 @@
  * @since   0.14.0 The minimum cron interval tested against is now configurable.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
  */
-class CronIntervalSniff extends Sniff {
+final class CronIntervalSniff extends Sniff {
 
 	/**
 	 * Minimum allowed cron interval in seconds.
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 201ae5ed8d..072b77a4fe 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -32,7 +32,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
+final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index af461e10ac..1243fb40b2 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -32,7 +32,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index b813299972..8c37254247 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -25,7 +25,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
+final class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index f8ecb799a0..a3a4ace94e 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -34,7 +34,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
-class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
+final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 
 	use MinimumWPVersionTrait;
 
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 9a59db8eff..729272ece0 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -24,7 +24,7 @@
  *
  * @since   0.14.0
  */
-class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
+final class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * List of discouraged WP constants and their replacements.
diff --git a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
index d51504a3d3..a8cc1ca0b1 100644
--- a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
@@ -19,7 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  */
-class DiscouragedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
+final class DiscouragedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * Groups of functions to restrict.
diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 481038e5cb..a1d78344ef 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -29,7 +29,7 @@
  *
  * @since 1.0.0
  */
-class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSniff {
+final class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 5b73ccfcfe..261aff2795 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -27,7 +27,7 @@
  * @since   3.0.0  Added a check for a complete text string in the case where it
  *                 spans two lines.
  */
-class EnqueuedResourcesSniff extends Sniff {
+final class EnqueuedResourcesSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index b60cfb42c3..35d2538bb7 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -38,7 +38,7 @@
  *
  * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
-class GlobalVariablesOverrideSniff extends Sniff {
+final class GlobalVariablesOverrideSniff extends Sniff {
 
 	use IsUnitTestTrait;
 
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index f9b92e735c..99550d596a 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -36,7 +36,7 @@
  *                 The parent `exclude` property is, however, disabled as it
  *                 would disable the whole sniff.
  */
-class I18nSniff extends AbstractFunctionRestrictionsSniff {
+final class I18nSniff extends AbstractFunctionRestrictionsSniff {
 
 	/**
 	 * These Regexes were originally copied from https://www.php.net/function.sprintf#93552
diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index 968a0342b9..942c65b835 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -25,7 +25,7 @@
  *                 limit being part of the WP category, and the check for pagination
  *                 disabling being part of the VIP category.
  */
-class PostsPerPageSniff extends AbstractArrayAssignmentRestrictionsSniff {
+final class PostsPerPageSniff extends AbstractArrayAssignmentRestrictionsSniff {
 
 	/**
 	 * Posts per page property
diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index 6322409951..b0e0c285f5 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -28,7 +28,7 @@
  *                 upstream `Generic.Formatting.SpaceAfterCast.NoSpace` error.
  * @since   2.2.0  Added exception for whitespace between spread operator and cast.
  */
-class CastStructureSpacingSniff extends Sniff {
+final class CastStructureSpacingSniff extends Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 7ab0230b80..82822be62d 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -29,7 +29,7 @@
  * to see if there are upstream fixes made from which this sniff can benefit, is warranted.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
  */
-class ControlStructureSpacingSniff extends Sniff {
+final class ControlStructureSpacingSniff extends Sniff {
 
 	/**
 	 * Check for blank lines on start/end of control structures.
diff --git a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index 2970fe927d..607035d22e 100644
--- a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -24,7 +24,7 @@
  * @since 3.0.0
  * @link  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
  */
-class ObjectOperatorSpacingSniff extends Squiz_ObjectOperatorSpacingSniff {
+final class ObjectOperatorSpacingSniff extends Squiz_ObjectOperatorSpacingSniff {
 
 	/**
 	 * Processes this test, when one of its tokens is encountered.
diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index fe8f02d63e..f7125bc0c0 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -35,7 +35,7 @@
  * Last verified with base class July 2020 at commit a957a73e3533353451eb9fd62ee58bd0aba2773c.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
  */
-class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {
+final class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {
 
 	/**
 	 * Allow newlines instead of spaces.

From c82dba45399ec593094b3311d6252879ac448537 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:26:59 +0100
Subject: [PATCH 454/822] PHPCS: enforce classes to be abstract or final

... for the files in this package.
---
 .phpcs.xml.dist | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 162f4cecbe..062f9d0e6a 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -70,6 +70,13 @@
 	<!-- Enforce PSR1 compatible namespaces. -->
 	<rule ref="PSR1.Classes.ClassDeclaration"/>
 
+	<!-- Enforce that classes are abstract or final. -->
+	<rule ref="Universal.Classes.RequireFinalClass">
+		<!-- ... with the exception of four sniffs which are known to be extended by external standards. -->
+		<exclude-pattern>/WordPress/Sniffs/NamingConventions/ValidHookNameSniff\.php$</exclude-pattern>
+		<exclude-pattern>/WordPress/Sniffs/Security/(EscapeOutput|NonceVerification|ValidatedSanitizedInput)Sniff\.php$</exclude-pattern>
+	</rule>
+
 
 	<!--
 	#############################################################################

From f5f1fef294c2b483b10c3d4a29d79648c9d071b0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 14 Jun 2021 19:38:41 +0200
Subject: [PATCH 455/822] Documentation: various minor tweaks

---
 WordPress/Helpers/VariableHelper.php                       | 2 +-
 WordPress/Helpers/WPDBTrait.php                            | 7 +++----
 .../Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php      | 2 +-
 WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php  | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index d1a47b8950..e4aa4f1392 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -102,7 +102,7 @@ public static function get_array_access_keys( File $phpcsFile, $stackPtr, $all =
 	 *              - The $phpcsFile parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-	 * @param int                         $stackPtr  The index of the token in the stack.
+	 * @param int                         $stackPtr  The index of the variable token in the stack.
 	 *
 	 * @return string|false The array index key whose value is being accessed.
 	 */
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 3fb1c64947..a09257ebc7 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -17,11 +17,10 @@
 /**
  * Helper utilities for sniffs which examine WPDB method calls.
  *
- * {@internal The method in this trait was previously contained in the
- * `WordPressCS\WordPress\Sniff` class and has been moved here.}
- *
  * @package WPCS\WordPressCodingStandards
- * @since   3.0.0
+ *
+ * @since   3.0.0 The method in this trait was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 trait WPDBTrait {
 
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 4e06d63a1d..e9fe57069e 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -43,7 +43,7 @@ class EscapedNotTranslatedSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var array <string function_name> => <string alternative function>
+	 * @var array<string, string> Key is the name of the function being matched, value the alternative to use.
 	 */
 	protected $target_functions = array(
 		'esc_html' => 'esc_html__',
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index eeacc5fca9..c04461dff4 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -234,7 +234,7 @@ protected function prepare_regex() {
 	 *
 	 * @param string $text_string    The target string.
 	 * @param string $regex          The punctuation regular expression to use.
-	 * @param string $transform_type Whether to a partial or complete transform.
+	 * @param string $transform_type Whether to do a partial or complete transform.
 	 *                               Valid values are: 'full', 'case', 'punctuation'.
 	 * @return string
 	 */
@@ -258,7 +258,7 @@ protected function transform( $text_string, $regex, $transform_type = 'full' ) {
 	 *
 	 * @param string $text_string    The target string.
 	 * @param string $regex          The punctuation regular expression to use.
-	 * @param string $transform_type Whether to a partial or complete transform.
+	 * @param string $transform_type Whether to do a partial or complete transform.
 	 *                               Valid values are: 'full', 'case', 'punctuation'.
 	 * @return string
 	 */

From acc1d060251ee2b7d5b03f591d1629851a071b3f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 08:14:27 +0200
Subject: [PATCH 456/822] Ruleset: various minor doc updates

Rules which are "covered" by a sniff normally are prefixed with "Covers rule:", while rules not (yet) covered by a sniff are prefixed with "Rule: ".

This updates the ruleset inline docs to be consistent with that again.

Includes fixing an incorrect link and some minor text tweaks to be in line with the handbook texts.
---
 WordPress-Core/ruleset.xml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 5742137257..6927ac395c 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -67,7 +67,7 @@
 	<!--
 	#############################################################################
 	Handbook: General - Writing include/require statements.
-	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#single-and-double-quotes
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#writing-include-require-statements
 	#############################################################################
 	-->
 
@@ -104,7 +104,7 @@
 	<!-- Covers rule: It is _strongly recommended_ to avoid reserved keywords as function parameter names. -->
 	<rule ref="Universal.NamingConventions.NoReservedKeywordParameterNames"/>
 
-	<!-- Covers rule: Class names should use capitalized words separated by underscores. -->
+	<!-- Covers rule: Class, trait, interface, enum names should use capitalized words separated by underscores. -->
 	<rule ref="PEAR.NamingConventions.ValidClassName"/>
 
 	<!-- Covers rule: Constants should be in all upper-case with underscores separating words. -->
@@ -145,7 +145,7 @@
 	#############################################################################
 	-->
 	<!-- Covers rule: Always put spaces after commas, and on both sides of logical,
-		 comparison, string and assignment operators. -->
+		 arithmetic, comparison, string and assignment operators. -->
 	<rule ref="WordPress.WhiteSpace.OperatorSpacing"/>
 	<rule ref="Squiz.Strings.ConcatenationSpacing">
 		<properties>
@@ -177,7 +177,6 @@
 		<severity>0</severity>
 	</rule>
 
-
 	<!-- Covers rule: Call a function, like so: my_function( $param1, func_param( $param2 ) ); -->
 	<rule ref="PEAR.Functions.FunctionCallSignature">
 		<properties>
@@ -207,7 +206,7 @@
 	<!-- Covers rule: ... array items, only include a space around the index if it is a variable. -->
 	<rule ref="WordPress.Arrays.ArrayKeySpacingRestrictions"/>
 
-	<!-- Rule: In a switch block, there must be no space between the case condition and the colon. -->
+	<!-- Covers rule: In a switch block, there must be no space between the case condition and the colon. -->
 	<!-- Covered by the PSR2.ControlStructures.SwitchDeclaration sniff. -->
 
 	<!-- Covers rule: Unless otherwise specified, parentheses should have spaces inside them. -->
@@ -531,7 +530,7 @@
 		 An exception would be using ! empty(), as testing for false here is generally more intuitive.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/643 -->
 
-	<!-- Rule: The short ternary operator must not be used. -->
+	<!-- Covers rule: The short ternary operator must not be used. -->
 	<rule ref="Universal.Operators.DisallowShortTernary"/>
 
 
@@ -587,7 +586,7 @@
 		 as possible, preferably by using $wpdb->prepare(). -->
 	<rule ref="WordPress.DB.PreparedSQL"/>
 
-	<!-- Rule: in $wpdb->prepare - %s is used for string placeholders and %d is used for integer
+	<!-- Covers rule: in $wpdb->prepare - %s is used for string placeholders and %d is used for integer
 		 placeholders. Note that they are not 'quoted'! -->
 	<rule ref="WordPress.DB.PreparedSQLPlaceholders"/>
 
@@ -606,41 +605,41 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#clever-code
 	#############################################################################
 	-->
-	<!-- Rule: In general, readability is more important than cleverness or brevity.
+	<!-- Covers rule: In general, readability is more important than cleverness or brevity.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/607 -->
 	<rule ref="Squiz.PHP.DisallowMultipleAssignments"/>
 	<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
 
-	<!-- Rule: Unless absolutely necessary, loose comparisons should not be used,
+	<!-- Covers rule: Unless absolutely necessary, loose comparisons should not be used,
 		 as their behaviour can be misleading. -->
 	<rule phpcs-only="true" ref="Universal.Operators.StrictComparisons">
 		<type>warning</type>
 	</rule>
 	<rule ref="WordPress.PHP.StrictInArray"/>
 
-	<!-- Rule: Assignments must not be placed in conditionals.
+	<!-- Covers rule: Assignments must not be placed in conditionals.
 		 The "assignment in ternary" part of the sniff is currently not yet covered in
 		 the upstream version, which is why there is still a WP native sniff as well. -->
 	<rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
 	<rule ref="WordPress.CodeAnalysis.AssignmentInTernaryCondition"/>
 
-	<!-- Rule: In a switch statement... If a case contains a block, then falls through
+	<!-- Covers rule: In a switch statement... If a case contains a block, then falls through
 		 to the next block, this must be explicitly commented. -->
 	<!-- Covered by the PSR2.ControlStructures.SwitchDeclaration sniff. -->
 
-	<!-- Rule: The goto statement must never be used. -->
+	<!-- Covers rule: The goto statement must never be used. -->
 	<rule ref="Generic.PHP.DiscourageGoto">
 		<type>error</type>
 		<message>The "goto" language construct should not be used.</message>
 	</rule>
 
-	<!-- Rule: The eval() construct is very dangerous, and is impossible to secure. ... these must not be used. -->
+	<!-- Covers rule: The eval() construct is very dangerous, and is impossible to secure. ... these must not be used. -->
 	<rule ref="Squiz.PHP.Eval.Discouraged">
 		<type>error</type>
 		<message>eval() is a security risk so not allowed.</message>
 	</rule>
 
-	<!-- Rule: create_function() function, which internally performs an eval(),
+	<!-- Covers rule: create_function() function, which internally performs an eval(),
 		 is deprecated in PHP 7.2 and has been removed in PHP 8.0. ... these must not be used. -->
 	<rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
 
@@ -668,8 +667,8 @@
 	<!-- Rule: Never use the /e switch, use preg_replace_callback instead.
 		 https://github.com/WordPress/WordPress-Coding-Standards/issues/632 -->
 
-	<!-- Rule: It's most convenient to use single-quoted strings for regular expressions.
-		 Already covered by Squiz.Strings.DoubleQuoteUsage -->
+	<!-- Covers rule: It's most convenient to use single-quoted strings for regular expressions. -->
+	<!-- Covered by the Squiz.Strings.DoubleQuoteUsage sniff. -->
 
 
 	<!--

From 515a1d122aeaddc0777b3b83a05b78f57c706b63 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Jun 2022 00:05:27 +0200
Subject: [PATCH 457/822] Minor CS/QA fixes

---
 WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 8133019ed1..340f3e3a49 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -97,7 +97,7 @@ public function getWarningList() {
 		);
 
 		// Temporarily until PHPCS supports PHP 8.2.
-		if ( PHP_VERSION_ID >= 80200 ) {
+		if ( \PHP_VERSION_ID >= 80200 ) {
 			unset( $warnings[364] ); // Function call to readonly.
 		}
 

From 65f6ead3c9914af4707735cb174cdb651d6d10ae Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:03:12 +0100
Subject: [PATCH 458/822] WP/PostsPerPage: minor clean up of test case file

Get rid of some strange space indents.
---
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 16f1da15eb..40b480b5f3 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -18,13 +18,13 @@ $query_args['numberposts'] = '-1'; // OK.
 $query_args['my_posts_per_page'] = -1; // OK.
 
 // phpcs:set WordPress.WP.PostsPerPage posts_per_page 50
- $query_args['posts_per_page'] = 50; // OK.
- $query_args['posts_per_page'] = 100; // Bad.
- $query_args['posts_per_page'] = 200; // Bad.
- $query_args['posts_per_page'] = 300; // Bad.
+$query_args['posts_per_page'] = 50; // OK.
+$query_args['posts_per_page'] = 100; // Bad.
+$query_args['posts_per_page'] = 200; // Bad.
+$query_args['posts_per_page'] = 300; // Bad.
 // phpcs:set WordPress.WP.PostsPerPage posts_per_page 200
- $query_args['posts_per_page'] = 50; // OK.
- $query_args['posts_per_page'] = 100; // OK.
- $query_args['posts_per_page'] = 200; // OK.
- $query_args['posts_per_page'] = 300; // Bad.
+$query_args['posts_per_page'] = 50; // OK.
+$query_args['posts_per_page'] = 100; // OK.
+$query_args['posts_per_page'] = 200; // OK.
+$query_args['posts_per_page'] = 300; // Bad.
 // phpcs:set WordPress.WP.PostsPerPage posts_per_page 100

From e3cd13a59fa5d52b0cbd66616347e8f9fa7803b9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Mar 2023 09:56:54 +0100
Subject: [PATCH 459/822] GH Actions: minor tweak to composer install

Since Composer 2.2, we can be more specific about which platform requirements should be ignored.

This change ensures that only the "high" end of a PHP requirement will be ignored and no other platform requirements are ignored.

Ref: https://blog.packagist.com/composer-2-2/#-ignore-platform-req-improvements
---
 .github/workflows/quicktest.yml  | 2 +-
 .github/workflows/unit-tests.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index e738d3971a..ffc397709b 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -69,7 +69,7 @@ jobs:
         if: ${{ matrix.php >= 8.0 || matrix.php == 'latest' }}
         uses: ramsey/composer-install@v2
         with:
-          composer-options: --ignore-platform-reqs
+          composer-options: --ignore-platform-req=php+
           custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Lint PHP files against parse errors
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 4a4a59f4bf..7e75816761 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -75,7 +75,7 @@ jobs:
         if: ${{ matrix.php >= 8.0 }}
         uses: ramsey/composer-install@v2
         with:
-          composer-options: --ignore-platform-reqs
+          composer-options: --ignore-platform-req=php+
           custom-cache-suffix: $(date -u "+%Y-%m")
 
       - name: Lint PHP files against parse errors

From 4173fa62227d535033aebb3ba64d5e9d9232b2e8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Mar 2023 10:13:34 +0100
Subject: [PATCH 460/822] GH Actions/quicktest: simplify the matrix

The `include` section was set up in Travis (and transferred to GH Actions) as the _lowest_ supported PHPCS version at that time, wasn't compatible with the highest supported PHP version (yet).

As that is no longer the case, we can now bring this back to a simplified matrix for the Quick Test and just test against high/low PHP with high/low PHPCS.
---
 .github/workflows/quicktest.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index ffc397709b..fb77347d5a 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -24,12 +24,7 @@ jobs:
     strategy:
       matrix:
         php: [ '5.4', 'latest' ]
-        phpcs_version: [ 'dev-master' ]
-        include:
-          - php: '7.3'
-            phpcs_version: '3.7.1'
-          - php: '5.4'
-            phpcs_version: '3.7.1'
+        phpcs_version: [ '3.7.1', 'dev-master' ]
 
     name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
 

From 6e78de91cfb25a453005e0fc28d4c6599eaf0127 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Mar 2023 10:27:52 +0100
Subject: [PATCH 461/822] GH Actions/ruleset-test: minimize the install

Given that:
* The ruleset test doesn't need PHPUnit to run.
* The ruleset test is run on PHP `latest`, which conflicts with our highest supported PHPUnit version.
* And the Composer install is run without `--ignore-platform-*` resulting in PHPUnit 5.2.7 being installed (last PHPUnit version which didn't have a PHP requirement)

I propose to install with `--no-dev` for the ruleset test.

While this doesn't necessarily remove the "conflict", it should still make the Composer install faster and at least won't create a cache with a completely incorrect PHPUnit version.
---
 .github/workflows/basic-qa.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index c08e613dcb..f1b7b362c6 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -120,6 +120,7 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
+          composer-options: --no-dev
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 

From 957ee9ef64b821e686235ccf3ce334ef9efc301c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Mar 2023 10:18:21 +0100
Subject: [PATCH 462/822] GH Actions: tweak the way the PHPCS versions are set

As things were, whenever the minimum PHPCS version would be changed, the branch protection settings for both the `master` and the `develop` branch would need to be updated and all "required builds" referencing the old PHPCS version would need to be removed, while new "required builds" would need to be added referencing the new minimum PHPCS version.

This was a fiddly process and time-consuming.

The change proposed in this commit takes advantage of the Composer `--prefer-lowest` setting to archive the same without a hard-coded PHPCS version in the build name, which means that once the branch protection settings have been updated for this PR, they shouldn't need updating anymore for future PHPCS version bumps.
---
 .github/workflows/basic-qa.yml   | 9 +++++++--
 .github/workflows/quicktest.yml  | 9 +++++++--
 .github/workflows/unit-tests.yml | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index f1b7b362c6..eb3cc03eb6 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -98,7 +98,7 @@ jobs:
     strategy:
       matrix:
         php: [ 'latest' ]
-        phpcs_version: [ '3.7.1', 'dev-master' ]
+        phpcs_version: [ 'lowest', 'dev-master' ]
 
     name: "Ruleset test: PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}"
 
@@ -114,7 +114,8 @@ jobs:
           ini-values: error_reporting = E_ALL & ~E_DEPRECATED
           coverage: none
 
-      - name: Set PHPCS version
+      - name: "Set PHPCS version (master)"
+        if: ${{ matrix.phpcs_version != 'lowest' }}
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies
@@ -124,6 +125,10 @@ jobs:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
+      - name: "Set PHPCS version (lowest)"
+        if: ${{ matrix.phpcs_version == 'lowest' }}
+        run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
+
       - name: Test the WordPress-Core ruleset
         run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress-Core
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index fb77347d5a..16c58137d9 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         php: [ '5.4', 'latest' ]
-        phpcs_version: [ '3.7.1', 'dev-master' ]
+        phpcs_version: [ 'lowest', 'dev-master' ]
 
     name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
 
@@ -50,7 +50,8 @@ jobs:
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
           coverage: none
 
-      - name: Set PHPCS version
+      - name: "Set PHPCS version (master)"
+        if: ${{ matrix.phpcs_version != 'lowest' }}
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies (PHP < 8.0 )
@@ -67,6 +68,10 @@ jobs:
           composer-options: --ignore-platform-req=php+
           custom-cache-suffix: $(date -u "+%Y-%m")
 
+      - name: "Set PHPCS version (lowest)"
+        if: ${{ matrix.phpcs_version == 'lowest' }}
+        run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
+
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint -- --checkstyle
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 7e75816761..a6615ae18e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         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' ]
-        phpcs_version: [ '3.7.1', 'dev-master' ]
+        phpcs_version: [ 'lowest', 'dev-master' ]
         extensions: [ '' ]
 
         include:
@@ -61,7 +61,8 @@ jobs:
           coverage: none
           tools: cs2pr
 
-      - name: Set PHPCS version
+      - name: "Set PHPCS version (master)"
+        if: ${{ matrix.phpcs_version != 'lowest' }}
         run: composer require squizlabs/php_codesniffer:"${{ matrix.phpcs_version }}" --no-update --no-scripts --no-interaction
 
       - name: Install Composer dependencies (PHP < 8.0 )
@@ -78,6 +79,10 @@ jobs:
           composer-options: --ignore-platform-req=php+
           custom-cache-suffix: $(date -u "+%Y-%m")
 
+      - name: "Set PHPCS version (lowest)"
+        if: ${{ matrix.phpcs_version == 'lowest' }}
+        run: composer update squizlabs/php_codesniffer --prefer-lowest --ignore-platform-req=php+ --no-scripts --no-interaction
+
       - name: Lint PHP files against parse errors
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint -- --checkstyle | cs2pr

From 572240c1ffa34dfebd4b884beb64415ce75616f8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 24 Mar 2023 12:07:10 +0100
Subject: [PATCH 463/822] Composer: up the minimum PHPCS version to 3.7.2

Follow up on 2090 and 2058 and as discussed in 2214.

This updates the minimum PHPCS version from `3.7.1` to `3.7.2.

Ref: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.7.2
---
 .github/CONTRIBUTING.md | 2 +-
 README.md               | 2 +-
 composer.json           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8b4acb11b9..1715e8fe82 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 
 ## Pre-requisites
 * WordPress-Coding-Standards
-* PHP_CodeSniffer 3.7.1 or higher
+* PHP_CodeSniffer 3.7.2 or higher
 * PHPUnit 4.x, 5.x, 6.x or 7.x
 
 The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
diff --git a/README.md b/README.md
index 95bf532ee0..61cc7ce14e 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/P
 
 ### Requirements
 
-The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.1** or higher.
+The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.2** or higher.
 
 ### Composer
 
diff --git a/composer.json b/composer.json
index 3459ab5000..cf1c2ccb23 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 	"require": {
 		"php": ">=5.4",
 		"ext-filter": "*",
-		"squizlabs/php_codesniffer": "^3.7.1",
+		"squizlabs/php_codesniffer": "^3.7.2",
 		"phpcsstandards/phpcsutils": "^1.0",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},

From ea2bd3548b859ebf237067566c73e3cfbd2fae63 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 15 Mar 2023 21:59:56 +0100
Subject: [PATCH 464/822] WP/I18n: minor code simplification

The `AbstractFunctionRestrictionsSniff` already checks for a next token and verifies that token is an open parenthesis, this doesn't need to be duplicated.
---
 WordPress/Sniffs/WP/I18nSniff.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 99550d596a..c5d34db42c 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -235,10 +235,7 @@ public function process_token( $stack_ptr ) {
 	public function process_matched_token( $stack_ptr, $group_name, $matched_content ) {
 
 		$func_open_paren_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stack_ptr + 1 ), null, true );
-		if ( false === $func_open_paren_token
-			|| \T_OPEN_PARENTHESIS !== $this->tokens[ $func_open_paren_token ]['code']
-			|| ! isset( $this->tokens[ $func_open_paren_token ]['parenthesis_closer'] )
-		) {
+		if ( ! isset( $this->tokens[ $func_open_paren_token ]['parenthesis_closer'] ) ) {
 			// Live coding, parse error or not a function call.
 			return;
 		}

From e4bcb88ec10742ad539e4b7516f1dc1c6f2f9a0d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 09:01:29 +0100
Subject: [PATCH 465/822] WP/I18n: fix property reset in tests

Some new tests were added _after_ the property reset at the end of the test case file.

This commit moves the reset to the end of the file again.
---
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 8 ++++----
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 8 ++++----
 WordPress/Tests/WP/I18nUnitTest.php         | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 14641c6d2e..f3fcc9120a 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -215,13 +215,13 @@ __( '<b><i>Foo</b></i>', 'my-slug' );
 __( '<b><i>Foo</b></i></b>', 'my-slug' );
 __( '<foo>Foo</bar>', 'my-slug' );
 
-// phpcs:set WordPress.WP.I18n text_domain[]
-// phpcs:set WordPress.WP.I18n check_translator_comments true
-
-// Test handling of more complex embedded variables and expressions.
+// Test handling of more complex embedded variables and expressions. All of these should throw an error.
 __( "${foo}", 'my-slug' );
 __( "{$foo['bar']}", 'my-slug' );
 __( "{$foo->bar()}", 'my-slug' );
 __( "{$foo['bar']->baz()()}", 'my-slug' );
 __( "${foo->bar}", 'my-slug' );
 __( "${foo["${bar['baz']}"]}", 'my-slug' );
+
+// phpcs:set WordPress.WP.I18n text_domain[]
+// phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index cb5170a640..81ec6a4b95 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -215,13 +215,13 @@ __( '<b><i>Foo</b></i>', 'my-slug' );
 __( '<b><i>Foo</b></i></b>', 'my-slug' );
 __( '<foo>Foo</bar>', 'my-slug' );
 
-// phpcs:set WordPress.WP.I18n text_domain[]
-// phpcs:set WordPress.WP.I18n check_translator_comments true
-
-// Test handling of more complex embedded variables and expressions.
+// Test handling of more complex embedded variables and expressions. All of these should throw an error.
 __( "${foo}", 'my-slug' );
 __( "{$foo['bar']}", 'my-slug' );
 __( "{$foo->bar()}", 'my-slug' );
 __( "{$foo['bar']->baz()()}", 'my-slug' );
 __( "${foo->bar}", 'my-slug' );
 __( "${foo["${bar['baz']}"]}", 'my-slug' );
+
+// phpcs:set WordPress.WP.I18n text_domain[]
+// phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 8140b66b4c..c5c7de870d 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -119,12 +119,12 @@ public function getErrorList( $testFile = '' ) {
 					178 => 1,
 					181 => 3,
 					184 => 1,
+					219 => 1,
+					220 => 1,
+					221 => 1,
 					222 => 1,
 					223 => 1,
 					224 => 1,
-					225 => 1,
-					226 => 1,
-					227 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From c9e8dbd0eb18630b172b0b505f192c5b24d91786 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 15 Mar 2023 21:55:47 +0100
Subject: [PATCH 466/822] WP/I18n: complete refactor of the sniff

As things were, the `WordPress.WP.I18n` sniff was based on the `AbstractFunctionRestrictionsSniff` class and used legacy custom code to parse the function call to parameters.

In this refactor, the parent sniff is switched to the `AbstractFunctionParameterSniff` class, which uses the PHPCSUtils `PassedParameters` class to parse the function call parameters.

Making this change will allow for supporting function calls using named parameters as supported since PHP 8.0.

As the code in the sniff needed significant changes to account for the difference in the array format containing parameter information, all code in the sniff has been reviewed and in a lot of places, rewritten.

The new code is more modular, has much lower cognitive and cyclomatic complexity and should be easier to read, understand and adjust when changes to the sniff are needed in the future.

Having said that, I have tried to keep the _functional_ changes to a minimum while doing this refactor.
I _have_ addressed some logic errors and low hanging fruit, like making the error messages more informative, but other than that, this refactor does not contain significant functional changes and all error codes remain the same as before.

Notes on the refactor:
* The sniff previously contained some logic for toggling messages from error to warning `$is_error = empty( $context['warning'] );`.
    This logic has been removed as the `'warning'` array key was never set or changed anyway.
* The `check_argument_tokens()` method has been split and is replaced by the `check_argument_is_string_literal()` and the `check_textdomain_matches()` methods.
* In contrast to the behaviour previously in the `check_argument_tokens()` method, the `check_argument_is_string_literal()` method will consistently return a boolean value indicating whether or not the parameter examined is a string literal.
* The `check_text()` method has been split and is replaced by the `check_placeholders_in_string()`, `check_string_has_translatable_content()` and the `check_string_has_no_html_wrapper()` methods.
* The `check_textdomain_matches()`, `check_placeholders_in_string()`, `check_string_has_translatable_content()`, `check_string_has_no_html_wrapper()` and the `compare_single_and_plural_arguments()` checks will now only be run if the parameter being examined consists of a text string literal.
    In other words, these will only run when there are only one or more `T_CONSTANT_ENCAPSED_STRING` tokens (single line and multi-line string supported) as in all other cases, examining the _contents_ of the tokens will be unreliable and is likely to result in false positives.
    It looks like this was always the intention, but was previously not always executed correctly.
    Case in point: if the parameter consisted of one non-empty token, even though that token was not a string literal, the `compare_single_and_plural_arguments()` check would previously still be executed.
    Along the same line, the checks previously contained in the `check_text()` method were previously only executed when the parameter had exactly one functional token. I.e. they were previously not run on multi-line text strings, but they were run on non-text strings, like a `T_VARIABLE` token.
* Take note: the above also means that the (partial) support for providing certain texts as heredocs/nowdocs has been removed.
    If tests would show that heredoc/nowdocs _are_ supported by the `pot` file generators, this should be brought back, but as it was, the support for heredocs/nowdocs in the sniff was incomplete anyhow, so better to not support these at all.
* The logic within the `compare_single_and_plural_arguments()` check has also been adjusted to not throw the `MismatchedPlaceholders` error when the `MissingSingularPlaceholder` is already being thrown.
    While we shouldn't be hiding one error behind another, this is not one of those cases and the `MismatchedPlaceholders` error would be unsolvable until the `MissingSingularPlaceholder` is solved anyway.
* The `check_for_translator_comment()` will now only examine parameters for placeholders if the parameter passed is a single string literal.
    Includes a couple of extra tests to verify.

Additionally, this refactor includes the following other changes:
* In error messages referring to a parameter name, the correct distinction between `$single` and `$singular` is now made.
    Previously, those error messages would reference the `$singular` parameter in the `_n_noop()` and `_nx_noop()` functions as if it were called `$single`. This incorrect parameter name becomes confusing when named parameters are taken into account.
* The error message for the `TooManyFunctionArgs` error code will now be thrown on the function name token instead of on the function call parenthesis opener.
* The error message for the `MissingArg*[Default]` error codes will now be thrown on the function name token instead of on the function call parenthesis opener.
* The error message for the `TooManyFunctionArgs` error code has been updated to be more informative.
    Old: `Too many arguments for function "%s".`
    New: `Too many parameters passed to function "%s()". Expected: %s parameters, received: %s`
* The error message for the `MissingArg*[Default]` error code has been updated to be more informative.
    Old: `Missing $%s arg. [...]`
    New: `Missing $%s parameter in function call to %s(). [...]`
* The error message for the `NonSingularStringLiteral*` error code has been updated to be more informative.
    Old: `The $%s arg must be a single string literal, not "%s".`
    New: `The $%s parameter must be a single text string literal. Found: %s`
* The error message for the `InterpolatedVariable*` error codes has been updated to be more informative.
    Old: `The $%s arg must not contain interpolated variables or expressions. Found "%s".`
    New: `The $%s parameter must not contain interpolated variables or expressions. Found: %s`
* The error message for the `SuperfluousDefaultTextDomain` error code has been updated to be more informative.
    Old: `No need to supply the text domain when the only accepted text domain is "default".`
    New: `No need to supply the text domain in function call to %s() when the only accepted text domain is "default".`
* The error messages for the `MixedOrderedPlaceholders*` and `UnorderedPlaceholders*` error codes now use quotes around values in the error messages more consistently.
* The error message for the `MixedOrderedPlaceholders*` error codes has been updated to be more informative.
    Old: `Multiple placeholders should be ordered. Mix of ordered and non-ordered placeholders found. Found: %s.`
    New: `Multiple placeholders in translatable strings should be ordered. Mix of ordered and non-ordered placeholders found. Found: "%s" in %s.` (where the second %s is the complete parameter contents)
* The error message for the `UnorderedPlaceholders*` error codes has been updated to be more informative.
    Old: `Multiple placeholders should be ordered. Expected "%s", but got "%s".`
    New: `Multiple placeholders in translatable strings should be ordered. Expected "%s", but got "%s" in %s.` (where the third %s is the complete parameter contents)
* The error message for the `NoEmptyStrings` error code has been updated to be more informative.
    Old: `Strings should have translatable content`
    New: `The $%s text string should have translatable content. Found: %s`
    => This may read a little awkward for the `$text` parameter. Suggestions for further improvement welcome.
* The error message for the `NoHtmlWrappedStrings` error code has been updated to be more informative.
    Old: `Strings should not be wrapped in HTML`
    New: `Translatable string should not be wrapped in HTML. Found: %s`
* Also note that the placeholders found will be sorted using "natural sort" now for the `MismatchedPlaceholders` error, which should make the error message more readable for those text strings with lots of placeholders.
* The error message for the MissingTranslatorsCommenterror code has been updated to be more informative.
    Old: `A gettext call containing placeholders was found, but was not accompanied by a "translators:" comment on the line above to clarify the meaning of the placeholders.`
    New: `A function call to %s() with texts containing placeholders was found, but was not accompanied by a "translators:" comment on the line above to clarify the meaning of the placeholders.`

Extra tests have been added to safeguard the following situations which were previously mostly accounted for, but not safeguarded:
* Ensuring that a missing parameter will be recognized and flagged correctly with `MissingArg*[Default]`, even when there is a placeholder comment in the "parameter space".
* Ensuring that the `SuperfluousDefaultTextDomain` fixer does not remove any potential comments _after_ the `'default'` text domain.
* The `MismatchedPlaceholders` check which did not have dedicated tests until now.
---
 WordPress/Sniffs/WP/I18nSniff.php           | 930 +++++++++++---------
 WordPress/Tests/WP/I18nUnitTest.1.inc       |  20 +
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed |  20 +
 WordPress/Tests/WP/I18nUnitTest.2.inc       |   3 +
 WordPress/Tests/WP/I18nUnitTest.php         |  16 +-
 5 files changed, 577 insertions(+), 412 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index c5d34db42c..543fb55f60 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -12,9 +12,10 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use XMLReader;
-use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 
 /**
@@ -35,8 +36,11 @@
  *                 `AbstractFunctionRestrictionSniff` class.
  *                 The parent `exclude` property is, however, disabled as it
  *                 would disable the whole sniff.
+ * @since   3.0.0  This class now extends the WordPressCS native
+ *                 `AbstractFunctionParameterSniff` class.
+ *                 The parent `exclude` property is still disabled.
  */
-final class I18nSniff extends AbstractFunctionRestrictionsSniff {
+final class I18nSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * These Regexes were originally copied from https://www.php.net/function.sprintf#93552
@@ -87,9 +91,6 @@ final class I18nSniff extends AbstractFunctionRestrictionsSniff {
 	/**
 	 * Text domain.
 	 *
-	 * @todo Eventually this should be able to be auto-supplied via looking at $this->phpcsFile->getFilename()
-	 * @link https://youtrack.jetbrains.com/issue/WI-17740
-	 *
 	 * @var string[]|string
 	 */
 	public $text_domain;
@@ -151,6 +152,52 @@ final class I18nSniff extends AbstractFunctionRestrictionsSniff {
 	 */
 	private $text_domain_is_default = false;
 
+	/**
+	 * Parameter specifications for the functions in each group.
+	 *
+	 * {@internal Even when not all parameters will be examined, the parameter list should still
+	 * be complete in the below array to allow for a correct "total parameters" calculation.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array Array of the parameter positions and names.
+	 */
+	private $parameter_specs = array(
+		'simple' => array(
+			1 => 'text',
+			2 => 'domain',
+		),
+		'context' => array(
+			1 => 'text',
+			2 => 'context',
+			3 => 'domain',
+		),
+		'number' => array(
+			1 => 'single',
+			2 => 'plural',
+			3 => 'number',
+			4 => 'domain',
+		),
+		'number_context' => array(
+			1 => 'single',
+			2 => 'plural',
+			3 => 'number',
+			4 => 'context',
+			5 => 'domain',
+		),
+		'noopnumber' => array(
+			1 => 'singular',
+			2 => 'plural',
+			3 => 'domain',
+		),
+		'noopnumber_context' => array(
+			1 => 'singular',
+			2 => 'plural',
+			3 => 'context',
+			4 => 'domain',
+		),
+	);
+
 	/**
 	 * Groups of functions to restrict.
 	 *
@@ -184,11 +231,11 @@ public function getGroups() {
 	 *              whether something is a function call. The logic after that has
 	 *              been split off to the `process_matched_token()` method.
 	 *
-	 * @param int $stack_ptr The position of the current token in the stack.
+	 * @param int $stackPtr The position of the current token in the stack.
 	 *
 	 * @return void
 	 */
-	public function process_token( $stack_ptr ) {
+	public function process_token( $stackPtr ) {
 
 		// Reset defaults.
 		$this->text_domain_contains_default = false;
@@ -217,7 +264,7 @@ public function process_token( $stack_ptr ) {
 		// Prevent exclusion of the i18n group.
 		$this->exclude = array();
 
-		parent::process_token( $stack_ptr );
+		parent::process_token( $stackPtr );
 	}
 
 	/**
@@ -225,400 +272,373 @@ public function process_token( $stack_ptr ) {
 	 *
 	 * @since 1.0.0 Logic split off from the `process_token()` method.
 	 *
-	 * @param int    $stack_ptr       The position of the current token in the stack.
+	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
 	 * @param string $matched_content The token content (function name) which was matched.
 	 *
-	 * @return int|void Integer stack pointer to skip forward or void to continue
-	 *                  normal file processing.
+	 * @return void
 	 */
-	public function process_matched_token( $stack_ptr, $group_name, $matched_content ) {
+	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 
-		$func_open_paren_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stack_ptr + 1 ), null, true );
+		$func_open_paren_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 		if ( ! isset( $this->tokens[ $func_open_paren_token ]['parenthesis_closer'] ) ) {
 			// Live coding, parse error or not a function call.
 			return;
 		}
 
 		if ( 'typos' === $group_name && '_' === $matched_content ) {
-			$this->phpcsFile->addError( 'Found single-underscore "_()" function when double-underscore expected.', $stack_ptr, 'SingleUnderscoreGetTextFunction' );
+			$this->phpcsFile->addError( 'Found single-underscore "_()" function when double-underscore expected.', $stackPtr, 'SingleUnderscoreGetTextFunction' );
 			return;
 		}
 
 		if ( \in_array( $matched_content, array( 'translate', 'translate_with_gettext_context' ), true ) ) {
-			$this->phpcsFile->addWarning( 'Use of the "%s()" function is reserved for low-level API usage.', $stack_ptr, 'LowLevelTranslationFunction', array( $matched_content ) );
+			$this->phpcsFile->addWarning( 'Use of the "%s()" function is reserved for low-level API usage.', $stackPtr, 'LowLevelTranslationFunction', array( $matched_content ) );
 		}
 
-		$arguments_tokens = array();
-		$argument_tokens  = array();
-		$tokens           = $this->tokens;
+		parent::process_matched_token( $stackPtr, $group_name, $matched_content );
+	}
 
-		// Look at arguments.
-		for ( $i = ( $func_open_paren_token + 1 ); $i < $this->tokens[ $func_open_paren_token ]['parenthesis_closer']; $i++ ) {
-			$this_token                = $this->tokens[ $i ];
-			$this_token['token_index'] = $i;
-			if ( isset( Tokens::$emptyTokens[ $this_token['code'] ] ) ) {
-				continue;
-			}
-			if ( \T_COMMA === $this_token['code'] ) {
-				$arguments_tokens[] = $argument_tokens;
-				$argument_tokens    = array();
-				continue;
-			}
+	/**
+	 * Process the function if no parameters were found.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $group_name      The name of the group which was matched.
+	 * @param string $matched_content The token content (function name) which was matched.
+	 *
+	 * @return void
+	 */
+	public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {
+		$function_param_specs = $this->parameter_specs[ $this->i18n_functions[ $matched_content ] ];
 
-			// Merge consecutive single or double quoted strings (when they span multiple lines).
-			if ( isset( Tokens::$textStringTokens[ $this_token['code'] ] ) ) {
-				for ( $j = ( $i + 1 ); $j < $this->tokens[ $func_open_paren_token ]['parenthesis_closer']; $j++ ) {
-					if ( $this_token['code'] === $this->tokens[ $j ]['code'] ) {
-						$this_token['content'] .= $this->tokens[ $j ]['content'];
-						$i                      = $j;
-					} else {
-						break;
-					}
-				}
-			}
-			$argument_tokens[] = $this_token;
+		foreach ( $function_param_specs as $param_name ) {
+			$error_code = MessageHelper::stringToErrorcode( 'MissingArg' . ucfirst( $param_name ) );
+			$this->phpcsFile->addError(
+				'Missing $%s parameter in function call to %s().',
+				$stackPtr,
+				$error_code,
+				array( $param_name, $matched_content )
+			);
+		}
+	}
 
-			// Include everything up to and including the parenthesis_closer if this token has one.
-			if ( ! empty( $this_token['parenthesis_closer'] ) ) {
-				for ( $j = ( $i + 1 ); $j <= $this_token['parenthesis_closer']; $j++ ) {
-					$tokens[ $j ]['token_index'] = $j;
-					$argument_tokens[]           = $tokens[ $j ];
-				}
-				$i = $this_token['parenthesis_closer'];
+	/**
+	 * Process the parameters of a matched function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $group_name      The name of the group which was matched.
+	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param array  $parameters      Array with information about the parameters.
+	 *
+	 * @return void
+	 */
+	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
+		/*
+		 * Retrieve the individual parameters from the array in a way that we know which is which.
+		 */
+		$parameter_details = array();
+
+		$function_param_specs = $this->parameter_specs[ $this->i18n_functions[ $matched_content ] ];
+		$expected_args        = count( $function_param_specs );
+
+		foreach ( $function_param_specs as $position => $name ) {
+			if ( 'number' === $name ) {
+				// This sniff does not examine the $number parameter.
+				continue;
 			}
-		}
 
-		if ( ! empty( $argument_tokens ) ) {
-			$arguments_tokens[] = $argument_tokens;
+			$parameter_details[ $name ] = PassedParameters::getParameterFromStack( $parameters, $position, $name );
 		}
-		unset( $argument_tokens );
 
-		$argument_assertions = array();
-		if ( 'simple' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'text',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		} elseif ( 'context' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'text',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'context',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		} elseif ( 'number' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'single',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'plural',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			array_shift( $arguments_tokens );
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		} elseif ( 'number_context' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'single',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'plural',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			array_shift( $arguments_tokens );
-			$argument_assertions[] = array(
-				'arg_name' => 'context',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		} elseif ( 'noopnumber' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'single',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'plural',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		} elseif ( 'noopnumber_context' === $this->i18n_functions[ $matched_content ] ) {
-			$argument_assertions[] = array(
-				'arg_name' => 'single',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'plural',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'context',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-			$argument_assertions[] = array(
-				'arg_name' => 'domain',
-				'tokens'   => array_shift( $arguments_tokens ),
-			);
-		}
+		/*
+		 * Examine the individual parameters.
+		 */
+		$this->check_argument_count( $stackPtr, $matched_content, $parameters, $expected_args );
 
-		if ( ! empty( $arguments_tokens ) ) {
-			$this->phpcsFile->addError( 'Too many arguments for function "%s".', $func_open_paren_token, 'TooManyFunctionArgs', array( $matched_content ) );
-		}
+		foreach ( $parameter_details as $param_name => $param_info ) {
+			$is_string_literal = $this->check_argument_is_string_literal( $stackPtr, $matched_content, $param_name, $param_info );
 
-		foreach ( $argument_assertions as $argument_assertion_context ) {
-			if ( empty( $argument_assertion_context['tokens'][0] ) ) {
-				$argument_assertion_context['stack_ptr'] = $func_open_paren_token;
-			} else {
-				$argument_assertion_context['stack_ptr'] = $argument_assertion_context['tokens'][0]['token_index'];
+			/*
+			 * If the parameter exists, remember whether the argument was a valid string literal.
+			 * This is used in a few places to determine whether the checks which examine a text string should run.
+			 */
+			if ( false !== $param_info ) {
+				$parameter_details[ $param_name ]['is_string_literal'] = $is_string_literal;
+			}
+
+			if ( false === $is_string_literal ) {
+				continue;
+			}
+
+			if ( 'domain' === $param_name && ! empty( $this->text_domain ) ) {
+				$this->check_textdomain_matches( $matched_content, $param_name, $param_info );
+			}
+
+			if ( \in_array( $param_name, array( 'text', 'single', 'singular', 'plural' ), true ) ) {
+				$this->check_placeholders_in_string( $matched_content, $param_name, $param_info );
+				$has_content = $this->check_string_has_translatable_content( $matched_content, $param_name, $param_info );
+				if ( true === $has_content ) {
+					$this->check_string_has_no_html_wrapper( $matched_content, $param_name, $param_info );
+				}
 			}
-			$this->check_argument_tokens( $argument_assertion_context );
 		}
 
 		/*
 		 * For _n*() calls, compare the singular and plural strings.
+		 *
 		 * If either of the arguments is missing, empty or has more than 1 token, skip out.
-		 * An error for that will already have been reported via the `check_argument_tokens()` method.
+		 * An error for that will already have been reported via the `check_argument_is_string_literal()` method.
 		 */
-		if ( false !== strpos( $this->i18n_functions[ $matched_content ], 'number' )
-			&& isset( $argument_assertions[0]['tokens'], $argument_assertions[1]['tokens'] )
-			&& count( $argument_assertions[0]['tokens'] ) === 1
-			&& count( $argument_assertions[1]['tokens'] ) === 1
-		) {
-			$single_context = $argument_assertions[0];
-			$plural_context = $argument_assertions[1];
+		$single_details = null;
+		if ( isset( $parameter_details['single'] ) ) {
+			$single_details = $parameter_details['single'];
+		} elseif ( isset( $parameter_details['singular'] ) ) {
+			$single_details = $parameter_details['singular'];
+		}
 
-			$this->compare_single_and_plural_arguments( $stack_ptr, $single_context, $plural_context );
+		if ( isset( $single_details, $parameter_details['plural'] )
+			&& false !== $single_details
+			&& false !== $parameter_details['plural']
+			&& true === $single_details['is_string_literal']
+			&& true === $parameter_details['plural']['is_string_literal']
+		) {
+			$this->compare_single_and_plural_arguments( $stackPtr, $single_details, $parameter_details['plural'] );
 		}
 
+		/*
+		 * Check if a translators comments is necessary and if so, if it exists.
+		 */
 		if ( true === $this->check_translator_comments ) {
-			$this->check_for_translator_comment( $stack_ptr, $argument_assertions );
+			$this->check_for_translator_comment( $stackPtr, $matched_content, $parameter_details );
 		}
 	}
 
 	/**
-	 * Check if supplied tokens represent a translation text string literal.
+	 * Verify that there are no superfluous function arguments.
 	 *
-	 * @param array $context Context (@todo needs better description).
-	 * @return bool
+	 * @since 3.0.0 Check moved from the `process_matched_token()` method to this method.
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param array  $parameters      The parameters array.
+	 * @param int    $expected_count  The expected number of passed arguments.
+	 *
+	 * @return void
 	 */
-	protected function check_argument_tokens( $context ) {
-		$stack_ptr = $context['stack_ptr'];
-		$tokens    = $context['tokens'];
-		$arg_name  = $context['arg_name'];
-		$is_error  = empty( $context['warning'] );
-		$content   = isset( $tokens[0] ) ? $tokens[0]['content'] : '';
-
-		if ( empty( $tokens ) || 0 === \count( $tokens ) ) {
-			$code = MessageHelper::stringToErrorcode( 'MissingArg' . ucfirst( $arg_name ) );
-			if ( 'domain' !== $arg_name ) {
-				MessageHelper::addMessage( $this->phpcsFile, 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
-				return false;
-			}
-
-			// Ok, we're examining a text domain, now deal correctly with the 'default' text domain.
-			if ( true === $this->text_domain_is_default ) {
-				return true;
-			}
+	private function check_argument_count( $stackPtr, $matched_content, $parameters, $expected_count ) {
+		$actual_count = count( $parameters );
+		if ( $actual_count > $expected_count ) {
+			$this->phpcsFile->addError(
+				'Too many parameters passed to function "%s()". Expected: %s parameters, received: %s',
+				$stackPtr,
+				'TooManyFunctionArgs',
+				array( $matched_content, $expected_count, $actual_count )
+			);
+		}
+	}
 
-			if ( true === $this->text_domain_contains_default ) {
-				$this->phpcsFile->addWarning(
-					'Missing $%s arg. If this text string is supposed to use a WP Core translation, use the "default" text domain.',
-					$stack_ptr,
-					$code . 'Default',
-					array( $arg_name )
-				);
-			} elseif ( ! empty( $this->text_domain ) ) {
-				MessageHelper::addMessage( $this->phpcsFile, 'Missing $%s arg.', $stack_ptr, $is_error, $code, array( $arg_name ) );
-			}
+	/**
+	 * Check if an arbitrary function call parameter is a text string literal suitable for use in the translation functions.
+	 *
+	 * Will also check and warn about missing parameters.
+	 *
+	 * @since 3.0.0 Most of the logic in this method used to be contained in the, now removed, `check_argument_tokens()` method.
+	 *
+	 * @param int         $stackPtr        The position of the current token in the stack.
+	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $param_name      The name of the parameter being examined.
+	 * @param array|false $param_info      Parameter info array for an individual parameter,
+	 *                                     as received from the PassedParemeters class.
+	 *
+	 * @return bool Whether or not the argument is a string literal.
+	 */
+	private function check_argument_is_string_literal( $stackPtr, $matched_content, $param_name, $param_info ) {
+		/*
+		 * Check if the parameter was supplied.
+		 */
+		if ( false === $param_info || '' === $param_info['clean'] ) {
+			$error_code = MessageHelper::stringToErrorcode( 'MissingArg' . ucfirst( $param_name ) );
+
+			/*
+			 * Special case the text domain parameter, which is allowed to be "missing"
+			 * when set to `default` (= WP Core translation).
+			 */
+			if ( 'domain' === $param_name ) {
+				if ( empty( $this->text_domain ) ) {
+					// If no text domain is passed, presume WP Core.
+					return false;
+				}
 
-			return false;
-		}
+				if ( true === $this->text_domain_is_default ) {
+					return false;
+				}
 
-		if ( \count( $tokens ) > 1 ) {
-			$contents = '';
-			foreach ( $tokens as $token ) {
-				$contents .= $token['content'];
+				if ( true === $this->text_domain_contains_default ) {
+					$this->phpcsFile->addWarning(
+						'Missing $%s parameter in function call to %s(). If this text string is supposed to use a WP Core translation, use the "default" text domain.',
+						$stackPtr,
+						$error_code . 'Default',
+						array( $param_name, $matched_content )
+					);
+					return false;
+				}
 			}
-			$code = MessageHelper::stringToErrorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
-			MessageHelper::addMessage(
-				$this->phpcsFile,
-				'The $%s arg must be a single string literal, not "%s".',
-				$stack_ptr,
-				$is_error,
-				$code,
-				array( $arg_name, $contents )
+
+			$this->phpcsFile->addError(
+				'Missing $%s parameter in function call to %s().',
+				$stackPtr,
+				$error_code,
+				array( $param_name, $matched_content )
 			);
+
 			return false;
 		}
 
-		if ( \in_array( $arg_name, array( 'text', 'single', 'plural' ), true ) ) {
-			$this->check_text( $context );
-		}
+		/*
+		 * Check if the parameter consists of one singular text string literal.
+		 * Heredoc/nowdocs not allowed. Multi-line single/double quoted strings are allowed.
+		 */
+		$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+		for ( $i = $first_non_empty; $i <= $param_info['end']; $i++ ) {
+			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
+				continue;
+			}
 
-		if ( \T_DOUBLE_QUOTED_STRING === $tokens[0]['code'] || \T_HEREDOC === $tokens[0]['code'] ) {
-			$interpolated_variables = TextStrings::getEmbeds( $content );
-			foreach ( $interpolated_variables as $interpolated_variable ) {
-				$code = MessageHelper::stringToErrorcode( 'InterpolatedVariable' . ucfirst( $arg_name ) );
-				MessageHelper::addMessage(
-					$this->phpcsFile,
-					'The $%s arg must not contain interpolated variables or expressions. Found "%s".',
-					$stack_ptr,
-					$is_error,
-					$code,
-					array( $arg_name, $interpolated_variable )
+			if ( isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) === false ) {
+				$error_code = MessageHelper::stringToErrorcode( 'NonSingularStringLiteral' . ucfirst( $param_name ) );
+				$this->phpcsFile->addError(
+					'The $%s parameter must be a single text string literal. Found: %s',
+					$first_non_empty,
+					$error_code,
+					array( $param_name, $param_info['clean'] )
 				);
-			}
-			if ( ! empty( $interpolated_variables ) ) {
 				return false;
 			}
 		}
 
-		if ( isset( Tokens::$textStringTokens[ $tokens[0]['code'] ] ) ) {
-			if ( 'domain' === $arg_name && ! empty( $this->text_domain ) ) {
-				$stripped_content = TextStrings::stripQuotes( $content );
-
-				if ( ! \in_array( $stripped_content, $this->text_domain, true ) ) {
-					MessageHelper::addMessage(
-						$this->phpcsFile,
-						'Mismatched text domain. Expected \'%s\' but got %s.',
-						$stack_ptr,
-						$is_error,
-						'TextDomainMismatch',
-						array( implode( "' or '", $this->text_domain ), $content )
-					);
-					return false;
-				}
-
-				if ( true === $this->text_domain_is_default && 'default' === $stripped_content ) {
-					$fixable    = false;
-					$error      = 'No need to supply the text domain when the only accepted text domain is "default".';
-					$error_code = 'SuperfluousDefaultTextDomain';
-
-					if ( $tokens[0]['token_index'] === $stack_ptr ) {
-						$prev = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $stack_ptr - 1 ), null, true );
-						if ( false !== $prev && \T_COMMA === $this->tokens[ $prev ]['code'] ) {
-							$fixable = true;
-						}
-					}
-
-					if ( false === $fixable ) {
-						$this->phpcsFile->addWarning( $error, $stack_ptr, $error_code );
-						return false;
-					}
-
-					$fix = $this->phpcsFile->addFixableWarning( $error, $stack_ptr, $error_code );
-					if ( true === $fix ) {
-						// Remove preceeding comma, whitespace and the text domain token.
-						$this->phpcsFile->fixer->beginChangeset();
-						for ( $i = $prev; $i <= $stack_ptr; $i++ ) {
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-						}
-						$this->phpcsFile->fixer->endChangeset();
-					}
+		/*
+		 * Make sure the text string does not contain any interpolated variable.
+		 */
+		if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
+			$error_code = MessageHelper::stringToErrorcode( 'InterpolatedVariable' . ucfirst( $param_name ) );
 
-					return false;
-				}
+			$interpolated_variables = TextStrings::getEmbeds( $param_info['clean'] );
+			foreach ( $interpolated_variables as $interpolated_variable ) {
+				$this->phpcsFile->addError(
+					'The $%s parameter must not contain interpolated variables or expressions. Found: %s',
+					$first_non_empty,
+					$error_code,
+					array( $param_name, $interpolated_variable )
+				);
 			}
 
-			return true;
+			if ( ! empty( $interpolated_variables ) ) {
+				return false;
+			}
 		}
 
-		$code = MessageHelper::stringToErrorcode( 'NonSingularStringLiteral' . ucfirst( $arg_name ) );
-		MessageHelper::addMessage(
-			$this->phpcsFile,
-			'The $%s arg must be a single string literal, not "%s".',
-			$stack_ptr,
-			$is_error,
-			$code,
-			array( $arg_name, $content )
-		);
-		return false;
+		return true;
 	}
 
 	/**
-	 * Check for inconsistencies between single and plural arguments.
+	 * Check the correct text domain is being used.
+	 *
+	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_argument_tokens()` method.
+	 *
+	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $param_name      The name of the parameter being examined.
+	 * @param array|false $param_info      Parameter info array for an individual parameter,
+	 *                                     as received from the PassedParemeters class.
 	 *
-	 * @param int   $stack_ptr      The position of the current token in the stack.
-	 * @param array $single_context Single context (@todo needs better description).
-	 * @param array $plural_context Plural context (@todo needs better description).
 	 * @return void
 	 */
-	protected function compare_single_and_plural_arguments( $stack_ptr, $single_context, $plural_context ) {
-		$single_content = $single_context['tokens'][0]['content'];
-		$plural_content = $plural_context['tokens'][0]['content'];
+	private function check_textdomain_matches( $matched_content, $param_name, $param_info ) {
+		$stripped_content = TextStrings::stripQuotes( $param_info['clean'] );
 
-		preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $single_content, $single_placeholders );
-		$single_placeholders = $single_placeholders[0];
+		if ( ! \in_array( $stripped_content, $this->text_domain, true ) ) {
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
 
-		preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $plural_content, $plural_placeholders );
-		$plural_placeholders = $plural_placeholders[0];
+			$this->phpcsFile->addError(
+				'Mismatched text domain. Expected \'%s\' but got %s.',
+				$first_non_empty,
+				'TextDomainMismatch',
+				array( implode( "' or '", $this->text_domain ), $param_info['clean'] )
+			);
+			return;
+		}
 
-		// English conflates "singular" with "only one", described in the codex:
-		// https://codex.wordpress.org/I18n_for_WordPress_Developers#Plurals .
-		if ( \count( $single_placeholders ) < \count( $plural_placeholders ) ) {
-			$error_string = 'Missing singular placeholder, needed for some languages. See https://codex.wordpress.org/I18n_for_WordPress_Developers#Plurals';
-			$single_index = $single_context['tokens'][0]['token_index'];
+		if ( true === $this->text_domain_is_default && 'default' === $stripped_content ) {
+			$fixable    = false;
+			$error      = 'No need to supply the text domain in function call to %s() when the only accepted text domain is "default".';
+			$error_code = 'SuperfluousDefaultTextDomain';
+			$data       = array( $matched_content );
 
-			$this->phpcsFile->addError( $error_string, $single_index, 'MissingSingularPlaceholder' );
-		}
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
 
-		// Reordering is fine, but mismatched placeholders is probably wrong.
-		sort( $single_placeholders );
-		sort( $plural_placeholders );
+			$before_param = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $first_non_empty - 1 ), null, true );
+			if ( \T_COMMA === $this->tokens[ $before_param ]['code'] ) {
+				$fixable = true;
+			}
 
-		if ( $single_placeholders !== $plural_placeholders ) {
-			$this->phpcsFile->addWarning( 'Mismatched placeholders is probably an error', $stack_ptr, 'MismatchedPlaceholders' );
+			if ( false === $fixable ) {
+				$this->phpcsFile->addWarning( $error, $first_non_empty, $error_code, $data );
+				return;
+			}
+
+			$fix = $this->phpcsFile->addFixableWarning( $error, $first_non_empty, $error_code, $data );
+			if ( true === $fix ) {
+				// Remove preceeding comma, whitespace and the text domain token.
+				$this->phpcsFile->fixer->beginChangeset();
+				for ( $i = $before_param; $i <= $first_non_empty; $i++ ) {
+					$this->phpcsFile->fixer->replaceToken( $i, '' );
+				}
+				$this->phpcsFile->fixer->endChangeset();
+			}
 		}
 	}
 
 	/**
-	 * Check the string itself for problems.
+	 * Check the placeholders used in translatable text for common problems.
+	 *
+	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
+	 *
+	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $param_name      The name of the parameter being examined.
+	 * @param array|false $param_info      Parameter info array for an individual parameter,
+	 *                                     as received from the PassedParemeters class.
 	 *
-	 * @param array $context Context (@todo needs better description).
 	 * @return void
 	 */
-	protected function check_text( $context ) {
-		$stack_ptr = $context['stack_ptr'];
-		$arg_name  = $context['arg_name'];
-		$content   = $context['tokens'][0]['content'];
-		$is_error  = empty( $context['warning'] );
+	private function check_placeholders_in_string( $matched_content, $param_name, $param_info ) {
+		$content = $param_info['clean'];
 
 		// UnorderedPlaceholders: Check for multiple unordered placeholders.
 		$unordered_matches_count = preg_match_all( self::UNORDERED_SPRINTF_PLACEHOLDER_REGEX, $content, $unordered_matches );
 		$unordered_matches       = $unordered_matches[0];
 		$all_matches_count       = preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $content, $all_matches );
 
-		if ( $unordered_matches_count > 0 && $unordered_matches_count !== $all_matches_count && $all_matches_count > 1 ) {
-			$code = MessageHelper::stringToErrorcode( 'MixedOrderedPlaceholders' . ucfirst( $arg_name ) );
+		if ( $unordered_matches_count > 0
+			&& $unordered_matches_count !== $all_matches_count
+			&& $all_matches_count > 1
+		) {
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+			$error_code      = MessageHelper::stringToErrorcode( 'MixedOrderedPlaceholders' . ucfirst( $param_name ) );
+
 			$this->phpcsFile->addError(
-				'Multiple placeholders should be ordered. Mix of ordered and non-ordered placeholders found. Found: %s.',
-				$stack_ptr,
-				$code,
-				array( implode( ', ', $all_matches[0] ) )
+				'Multiple placeholders in translatable strings should be ordered. Mix of ordered and non-ordered placeholders found. Found: "%s" in %s.',
+				$first_non_empty,
+				$error_code,
+				array( implode( ', ', $all_matches[0] ), $param_info['clean'] )
 			);
+			return;
+		}
 
-		} elseif ( $unordered_matches_count >= 2 ) {
-			$code = MessageHelper::stringToErrorcode( 'UnorderedPlaceholders' . ucfirst( $arg_name ) );
+		if ( $unordered_matches_count >= 2 ) {
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+			$error_code      = MessageHelper::stringToErrorcode( 'UnorderedPlaceholders' . ucfirst( $param_name ) );
 
 			$suggestions     = array();
 			$replace_regexes = array();
@@ -628,48 +648,79 @@ protected function check_text( $context ) {
 				$to_insert        .= ( '"' !== $content[0] ) ? '$' : '\$';
 				$suggestions[ $i ] = substr_replace( $unordered_matches[ $i ], $to_insert, 1, 0 );
 
-				// Prepare the strings for use a regex.
+				// Prepare the strings for use in a regex.
 				$replace_regexes[ $i ] = '`\Q' . $unordered_matches[ $i ] . '\E`';
-				// Note: the initial \\ is a literal \, the four \ in the replacement translate to also to a literal \.
+				// Note: the initial \\ is a literal \, the four \ in the replacement translate also to a literal \.
 				$replacements[ $i ] = str_replace( '\\', '\\\\', $suggestions[ $i ] );
 				// Note: the $ needs escaping to prevent numeric sequences after the $ being interpreted as match replacements.
 				$replacements[ $i ] = str_replace( '$', '\\$', $replacements[ $i ] );
 			}
 
-			$fix = MessageHelper::addFixableMessage(
-				$this->phpcsFile,
-				'Multiple placeholders should be ordered. Expected \'%s\', but got %s.',
-				$stack_ptr,
-				$is_error,
-				$code,
-				array( implode( ', ', $suggestions ), implode( ', ', $unordered_matches ) )
+			$fix = $this->phpcsFile->addFixableError(
+				'Multiple placeholders in translatable strings should be ordered. Expected "%s", but got "%s" in %s.',
+				$first_non_empty,
+				$error_code,
+				array( implode( ', ', $suggestions ), implode( ', ', $unordered_matches ), $param_info['clean'] )
 			);
 
 			if ( true === $fix ) {
 				$fixed_str = preg_replace( $replace_regexes, $replacements, $content, 1 );
 
-				$this->phpcsFile->fixer->replaceToken( $stack_ptr, $fixed_str );
+				$this->phpcsFile->fixer->replaceToken( $first_non_empty, $fixed_str );
 			}
 		}
+	}
 
-		/*
-		 * NoEmptyStrings.
-		 *
-		 * Strip placeholders and surrounding quotes.
-		 */
-		$content_without_quotes  = trim( TextStrings::stripQuotes( $content ) );
+	/**
+	 * Check if a parameter which is supposed to hold translatable text actually has translatable text.
+	 *
+	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
+	 *
+	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $param_name      The name of the parameter being examined.
+	 * @param array|false $param_info      Parameter info array for an individual parameter,
+	 *                                     as received from the PassedParemeters class.
+	 *
+	 * @return bool Whether or not the text string has translatable content.
+	 */
+	private function check_string_has_translatable_content( $matched_content, $param_name, $param_info ) {
+		// Strip placeholders and surrounding quotes.
+		$content_without_quotes  = trim( TextStrings::stripQuotes( $param_info['clean'] ) );
 		$non_placeholder_content = preg_replace( self::SPRINTF_PLACEHOLDER_REGEX, '', $content_without_quotes );
 
 		if ( '' === $non_placeholder_content ) {
-			$this->phpcsFile->addError( 'Strings should have translatable content', $stack_ptr, 'NoEmptyStrings' );
-			return;
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+
+			$this->phpcsFile->addError(
+				'The $%s text string should have translatable content. Found: %s',
+				$first_non_empty,
+				'NoEmptyStrings',
+				array( $param_name, $param_info['clean'] )
+			);
+			return false;
 		}
 
-		/*
-		 * NoHtmlWrappedStrings
-		 *
-		 * Strip surrounding quotes.
-		 */
+		return true;
+	}
+
+	/**
+	 * Ensure that a translatable text string is not wrapped in HTML code.
+	 *
+	 * If the text is wrapped in HTML, the HTML should be moved out of the translatable text string.
+	 *
+	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
+	 *
+	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $param_name      The name of the parameter being examined.
+	 * @param array|false $param_info      Parameter info array for an individual parameter,
+	 *                                     as received from the PassedParemeters class.
+	 *
+	 * @return void
+	 */
+	private function check_string_has_no_html_wrapper( $matched_content, $param_name, $param_info ) {
+		// Strip surrounding quotes.
+		$content_without_quotes = trim( TextStrings::stripQuotes( $param_info['clean'] ) );
+
 		$reader = new XMLReader();
 		$reader->XML( $content_without_quotes, 'UTF-8', \LIBXML_NOERROR | \LIBXML_ERR_NONE | \LIBXML_NOWARNING );
 
@@ -696,106 +747,169 @@ protected function check_text( $context ) {
 
 		// Does the entire string only consist of this HTML node?
 		if ( $reader->readOuterXml() === $content_without_quotes ) {
-			$this->phpcsFile->addWarning( 'Strings should not be wrapped in HTML', $stack_ptr, 'NoHtmlWrappedStrings' );
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+
+			$this->phpcsFile->addWarning(
+				'Translatable string should not be wrapped in HTML. Found: %s',
+				$first_non_empty,
+				'NoHtmlWrappedStrings',
+				array( $param_info['clean'] )
+			);
+		}
+	}
+
+	/**
+	 * Check for inconsistencies in the placeholders between single and plural form of the translatable text string.
+	 *
+	 * @since 3.0.0 - The parameter names and expected format for the $param_info_single
+	 *                and the $param_info_plural parameters has changed.
+	 *              - The method visibility has been changed from `protected` to `private`.
+	 *
+	 * @param int   $stackPtr          The position of the function call token in the stack.
+	 * @param array $param_info_single Parameter info array for the `$single` parameter,
+	 *                                 as received from the PassedParemeters class.
+	 * @param array $param_info_plural Parameter info array for the `$plural` parameter,
+	 *                                 as received from the PassedParemeters class.
+	 *
+	 * @return void
+	 */
+	private function compare_single_and_plural_arguments( $stackPtr, $param_info_single, $param_info_plural ) {
+		$single_content = $param_info_single['clean'];
+		$plural_content = $param_info_plural['clean'];
+
+		preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $single_content, $single_placeholders );
+		$single_placeholders = $single_placeholders[0];
+
+		preg_match_all( self::SPRINTF_PLACEHOLDER_REGEX, $plural_content, $plural_placeholders );
+		$plural_placeholders = $plural_placeholders[0];
+
+		// English conflates "singular" with "only one", described in the codex:
+		// https://codex.wordpress.org/I18n_for_WordPress_Developers#Plurals .
+		if ( \count( $single_placeholders ) < \count( $plural_placeholders ) ) {
+			$error_string           = 'Missing singular placeholder, needed for some languages. See https://codex.wordpress.org/I18n_for_WordPress_Developers#Plurals';
+			$first_non_empty_single = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info_single['start'], ( $param_info_single['end'] + 1 ), true );
+
+			$this->phpcsFile->addError( $error_string, $first_non_empty_single, 'MissingSingularPlaceholder' );
+			return;
+		}
+
+		// Reordering is fine, but mismatched placeholders is probably wrong.
+		sort( $single_placeholders, \SORT_NATURAL );
+		sort( $plural_placeholders, \SORT_NATURAL );
+
+		if ( $single_placeholders !== $plural_placeholders ) {
+			$this->phpcsFile->addWarning( 'Mismatched placeholders is probably an error', $stackPtr, 'MismatchedPlaceholders' );
 		}
 	}
 
 	/**
 	 * Check for the presence of a translators comment if one of the text strings contains a placeholder.
 	 *
-	 * @param int   $stack_ptr The position of the gettext call token in the stack.
-	 * @param array $args      The function arguments.
+	 * @since 3.0.0 - The parameter names and expected format for the $parameters parameter has changed.
+	 *              - The method visibility has been changed from `protected` to `private`.
+	 *
+	 * @param int    $stackPtr        The position of the gettext call token in the stack.
+	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param array  $parameters      Array with information about the parameters.
+	 *
 	 * @return void
 	 */
-	protected function check_for_translator_comment( $stack_ptr, $args ) {
-		foreach ( $args as $arg ) {
-			if ( false === \in_array( $arg['arg_name'], array( 'text', 'single', 'plural' ), true ) ) {
+	private function check_for_translator_comment( $stackPtr, $matched_content, $parameters ) {
+		$needs_translators_comment = false;
+
+		foreach ( $parameters as $param_name => $param_info ) {
+			if ( false === \in_array( $param_name, array( 'text', 'single', 'singular', 'plural' ), true ) ) {
 				continue;
 			}
 
-			if ( empty( $arg['tokens'] ) ) {
+			if ( false === $param_info || false === $param_info['is_string_literal'] ) {
 				continue;
 			}
 
-			foreach ( $arg['tokens'] as $token ) {
-				if ( empty( $token['content'] ) ) {
-					continue;
-				}
+			if ( preg_match( self::SPRINTF_PLACEHOLDER_REGEX, $param_info['clean'], $placeholders ) === 1 ) {
+				$needs_translators_comment = true;
+				break;
+			}
+		}
 
-				if ( preg_match( self::SPRINTF_PLACEHOLDER_REGEX, $token['content'], $placeholders ) < 1 ) {
-					// No placeholders found.
-					continue;
-				}
+		if ( false === $needs_translators_comment ) {
+			// No text string with placeholders found, no translation comment needed.
+			return;
+		}
 
-				$previous_comment = $this->phpcsFile->findPrevious( Tokens::$commentTokens, ( $stack_ptr - 1 ) );
+		$previous_comment = $this->phpcsFile->findPrevious( Tokens::$commentTokens, ( $stackPtr - 1 ) );
 
-				if ( false !== $previous_comment ) {
-					/*
-					 * Check that the comment is either on the line before the gettext call or
-					 * if it's not, that there is only whitespace between.
-					 */
-					$correctly_placed = false;
+		if ( false !== $previous_comment ) {
+			/*
+			 * Check that the comment is either on the line before the gettext call or
+			 * if it's not, that there is only whitespace between.
+			 */
+			$correctly_placed = false;
 
-					if ( ( $this->tokens[ $previous_comment ]['line'] + 1 ) === $this->tokens[ $stack_ptr ]['line'] ) {
-						$correctly_placed = true;
-					} else {
-						$next_non_whitespace = $this->phpcsFile->findNext( \T_WHITESPACE, ( $previous_comment + 1 ), $stack_ptr, true );
-						if ( false === $next_non_whitespace || $this->tokens[ $next_non_whitespace ]['line'] === $this->tokens[ $stack_ptr ]['line'] ) {
-							// No non-whitespace found or next non-whitespace is on same line as gettext call.
-							$correctly_placed = true;
+			if ( ( $this->tokens[ $previous_comment ]['line'] + 1 ) === $this->tokens[ $stackPtr ]['line'] ) {
+				$correctly_placed = true;
+			} else {
+				$next_non_whitespace = $this->phpcsFile->findNext( \T_WHITESPACE, ( $previous_comment + 1 ), $stackPtr, true );
+				if ( false === $next_non_whitespace || $this->tokens[ $next_non_whitespace ]['line'] === $this->tokens[ $stackPtr ]['line'] ) {
+					// No non-whitespace found or next non-whitespace is on same line as gettext call.
+					$correctly_placed = true;
+				}
+				unset( $next_non_whitespace );
+			}
+
+			/*
+			 * Check that the comment starts with 'translators:'.
+			 */
+			if ( true === $correctly_placed ) {
+				if ( \T_COMMENT === $this->tokens[ $previous_comment ]['code'] ) {
+					$comment_text = trim( $this->tokens[ $previous_comment ]['content'] );
+
+					// If it's multi-line /* */ comment, collect all the parts.
+					if ( '*/' === substr( $comment_text, -2 ) && '/*' !== substr( $comment_text, 0, 2 ) ) {
+						for ( $i = ( $previous_comment - 1 ); 0 <= $i; $i-- ) {
+							if ( \T_COMMENT !== $this->tokens[ $i ]['code'] ) {
+								break;
+							}
+
+							$comment_text = trim( $this->tokens[ $i ]['content'] ) . $comment_text;
 						}
-						unset( $next_non_whitespace );
 					}
 
-					/*
-					 * Check that the comment starts with 'translators:'.
-					 */
-					if ( true === $correctly_placed ) {
-
-						if ( \T_COMMENT === $this->tokens[ $previous_comment ]['code'] ) {
-							$comment_text = trim( $this->tokens[ $previous_comment ]['content'] );
+					if ( true === $this->is_translators_comment( $comment_text ) ) {
+						// Comment is ok.
+						return;
+					}
+				}
 
-							// If it's multi-line /* */ comment, collect all the parts.
-							if ( '*/' === substr( $comment_text, -2 ) && '/*' !== substr( $comment_text, 0, 2 ) ) {
-								for ( $i = ( $previous_comment - 1 ); 0 <= $i; $i-- ) {
-									if ( \T_COMMENT !== $this->tokens[ $i ]['code'] ) {
-										break;
-									}
+				if ( \T_DOC_COMMENT_CLOSE_TAG === $this->tokens[ $previous_comment ]['code'] ) {
+					// If it's docblock comment (wrong style) make sure that it's a translators comment.
+					if ( isset( $this->tokens[ $previous_comment ]['comment_opener'] ) ) {
+						$db_start = $this->tokens[ $previous_comment ]['comment_opener'];
+					} else {
+						$db_start = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_OPEN_TAG, ( $previous_comment - 1 ) );
+					}
 
-									$comment_text = trim( $this->tokens[ $i ]['content'] ) . $comment_text;
-								}
-							}
+					$db_first_text = $this->phpcsFile->findNext( \T_DOC_COMMENT_STRING, ( $db_start + 1 ), $previous_comment );
 
-							if ( true === $this->is_translators_comment( $comment_text ) ) {
-								// Comment is ok.
-								return;
-							}
-						} elseif ( \T_DOC_COMMENT_CLOSE_TAG === $this->tokens[ $previous_comment ]['code'] ) {
-							// If it's docblock comment (wrong style) make sure that it's a translators comment.
-							$db_start      = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_OPEN_TAG, ( $previous_comment - 1 ) );
-							$db_first_text = $this->phpcsFile->findNext( \T_DOC_COMMENT_STRING, ( $db_start + 1 ), $previous_comment );
-
-							if ( true === $this->is_translators_comment( $this->tokens[ $db_first_text ]['content'] ) ) {
-								$this->phpcsFile->addWarning(
-									'A "translators:" comment must be a "/* */" style comment. Docblock comments will not be picked up by the tools to generate a ".pot" file.',
-									$stack_ptr,
-									'TranslatorsCommentWrongStyle'
-								);
-								return;
-							}
-						}
+					if ( true === $this->is_translators_comment( $this->tokens[ $db_first_text ]['content'] ) ) {
+						$this->phpcsFile->addWarning(
+							'A "translators:" comment must be a "/* */" style comment. Docblock comments will not be picked up by the tools to generate a ".pot" file.',
+							$stackPtr,
+							'TranslatorsCommentWrongStyle'
+						);
+						return;
 					}
 				}
-
-				// Found placeholders but no translators comment.
-				$this->phpcsFile->addWarning(
-					'A gettext call containing placeholders was found, but was not accompanied by a "translators:" comment on the line above to clarify the meaning of the placeholders.',
-					$stack_ptr,
-					'MissingTranslatorsComment'
-				);
-				return;
 			}
 		}
+
+		// Found placeholders but no translators comment.
+		$this->phpcsFile->addWarning(
+			'A function call to %s() with texts containing placeholders was found, but was not accompanied by a "translators:" comment on the line above to clarify the meaning of the placeholders.',
+			$stackPtr,
+			'MissingTranslatorsComment',
+			array( $matched_content )
+		);
 	}
 
 	/**
@@ -804,6 +918,7 @@ protected function check_for_translator_comment( $stack_ptr, $args ) {
 	 * @since 0.11.0
 	 *
 	 * @param string $content Comment string content.
+	 *
 	 * @return bool
 	 */
 	private function is_translators_comment( $content ) {
@@ -812,5 +927,4 @@ private function is_translators_comment( $content ) {
 		}
 		return false;
 	}
-
 }
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index f3fcc9120a..056282c2a9 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -223,5 +223,25 @@ __( "{$foo['bar']->baz()()}", 'my-slug' );
 __( "${foo->bar}", 'my-slug' );
 __( "${foo["${bar['baz']}"]}", 'my-slug' );
 
+// Safeguard defensive coding.
+__( /* comment */, 'my-slug' ); // Bad, missing first param (parse error).
+
+// phpcs:set WordPress.WP.I18n text_domain[] default
+
+// Safeguard that a comment after a "default" text domain is not removed.
+__( 'String default text domain.', 'default' /*comment*/ ); // Warning, text domain can be omitted.
+
+// Test mismatched placeholders.
+_n_noop( 'I have %1$d cat and %2$d dog.' ); // Bad, missing $plural argument, ignore for single/plural placeholder check.
+_n_noop( 'I have %1$d cat and %2$d dog.', $plural ); // Bad, non singular string $plural argument, ignore for single/plural placeholder check.
+_n_noop( 'I have %1$d cat and %2$d dog.', $plural . $text ); // Bad, non singular string $plural argument, ignore for single/plural placeholder check.
+
+_n_noop( 'I have %1$d cat and %2$d dog.', 'I have %1$d cats and %2$d dog.' ); // Ok.
+_n_noop( 'I have %2$d cat and %1$d dog.', 'I have %1$d cats and %2$d dog.' ); // Ok, or at least not something we flag.
+_n_noop( 'I have %1$d cat and %3$d dog.', 'I have %1$d cats and %2$d dog.' ); // Bad, different placeholders used in single vs plural text.
+_n_noop( 'I have %d cat, %d dog and %d canaries.', 'I have %d cats, %d dog and canaries.' ); // Bad, mismatched placeholders count.
+_n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
+_n_noop( 'I have %1$d cat, %2$d dog and %2$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 81ec6a4b95..8499e96179 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -223,5 +223,25 @@ __( "{$foo['bar']->baz()()}", 'my-slug' );
 __( "${foo->bar}", 'my-slug' );
 __( "${foo["${bar['baz']}"]}", 'my-slug' );
 
+// Safeguard defensive coding.
+__( /* comment */, 'my-slug' ); // Bad, missing first param (parse error).
+
+// phpcs:set WordPress.WP.I18n text_domain[] default
+
+// Safeguard that a comment after a "default" text domain is not removed.
+__( 'String default text domain.' /*comment*/ ); // Warning, text domain can be omitted.
+
+// Test mismatched placeholders.
+_n_noop( 'I have %1$d cat and %2$d dog.' ); // Bad, missing $plural argument, ignore for single/plural placeholder check.
+_n_noop( 'I have %1$d cat and %2$d dog.', $plural ); // Bad, non singular string $plural argument, ignore for single/plural placeholder check.
+_n_noop( 'I have %1$d cat and %2$d dog.', $plural . $text ); // Bad, non singular string $plural argument, ignore for single/plural placeholder check.
+
+_n_noop( 'I have %1$d cat and %2$d dog.', 'I have %1$d cats and %2$d dog.' ); // Ok.
+_n_noop( 'I have %2$d cat and %1$d dog.', 'I have %1$d cats and %2$d dog.' ); // Ok, or at least not something we flag.
+_n_noop( 'I have %1$d cat and %3$d dog.', 'I have %1$d cats and %2$d dog.' ); // Bad, different placeholders used in single vs plural text.
+_n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched placeholders count.
+_n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
+_n_noop( 'I have %1$d cat, %2$d dog and %2$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.2.inc b/WordPress/Tests/WP/I18nUnitTest.2.inc
index eac6892a4d..ad8c0f94ff 100644
--- a/WordPress/Tests/WP/I18nUnitTest.2.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.2.inc
@@ -107,4 +107,7 @@ _e(); // Bad.
 // phpcs:ignore Standard.Category.Sniff -- testing that the PHPCS annotations are handled correctly.
 printf( __( 'There are %1$d monkeys in the %2$s', 'my-slug' ), intval( $number ), esc_html( $string ) ); // Bad.
 
+__( $notStringLiteral, 'my-slug' ); // Ignore for translators comment, $text not single string literal.
+__( 'text %s' . 'more text', 'my-slug' ); // Ignore for translators comment, $text not single string literal.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index c5c7de870d..d3bfd0ec94 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -125,11 +125,18 @@ public function getErrorList( $testFile = '' ) {
 					222 => 1,
 					223 => 1,
 					224 => 1,
+					227 => 1,
+					235 => 1,
+					236 => 1,
+					237 => 1,
+					242 => 2,
 				);
 
 			case 'I18nUnitTest.2.inc':
 				return array(
 					104 => 2,
+					110 => 1,
+					111 => 1,
 				);
 
 			case 'I18nUnitTest.3.inc':
@@ -163,10 +170,6 @@ public function getWarningList( $testFile = '' ) {
 				return array(
 					69  => 1,
 					70  => 1,
-					100 => 1,
-					101 => 1,
-					102 => 1,
-					103 => 1,
 					154 => 1,
 					158 => 1,
 					159 => 1,
@@ -176,6 +179,11 @@ public function getWarningList( $testFile = '' ) {
 					194 => 1,
 					198 => 1,
 					199 => 1,
+					232 => 1,
+					241 => 1,
+					242 => 1,
+					243 => 1,
+					244 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 93d6b663b254559858fea4ae5e781eeceeb09ea1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 22:35:19 +0100
Subject: [PATCH 467/822] WP/I18n: add tests with PHP 8.0+ named parameters

The changes made in the refactor (previous commit) means that function calls using named parameters, as supported since PHP 8.0, should now be handled correctly by the sniff.

This commit adds unit tests to the sniff to verify and safeguard this.
---
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 41 +++++++++++++++++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 41 +++++++++++++++++++++
 WordPress/Tests/WP/I18nUnitTest.2.inc       | 15 ++++++++
 WordPress/Tests/WP/I18nUnitTest.3.inc       |  6 +++
 WordPress/Tests/WP/I18nUnitTest.php         | 18 +++++++++
 5 files changed, 121 insertions(+)

diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 056282c2a9..a4e320138b 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -243,5 +243,46 @@ _n_noop( 'I have %d cat, %d dog and %d canaries.', 'I have %d cats, %d dog and c
 _n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
 _n_noop( 'I have %1$d cat, %2$d dog and %2$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
 
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ * Each of these function calls uses named parameters with an unconventional param order to test this properly.
+ */
+// phpcs:set WordPress.WP.I18n text_domain[] my-slug
+translate( domain: 'my-slug', text: 'translate me', extra: 'default' ); // Bad: too many arguments + use of translate().
+__( domain: 'my-slug' ); // Bad: missing $text argument.
+__( single: 'translate me', domain: 'my-slug' ); // Bad: missing $text argument (invalid 'single' named arg).
+esc_attr__(
+	domain: 'my-slug',
+	text: 'translate
+me multi line', // OK, multi-line text string.
+);
+esc_html__(
+	domain: PLUGIN_TEXTDOMAIN, // Bad: not single text string literal.
+	text: 'translate ' . 'me', // Bad: not single text string literal.
+);
+_e(
+	domain: 'my-slug',
+	text: $translateMe, // Bad: not single text string literal.
+);
+esc_attr_e(
+	domain: 'my-slug',
+	text: "translate
+$me multi line", // Bad: interpolated variable found.
+);
+esc_html_e(
+	domain: 'different-slug', // Bad: wrong text domain.
+	text: 'translate me',
+);
+esc_html_x(
+	context: 'context',
+	domain: 'my-slug',
+	text: 'trans %s late %1$s me', // Bad: mixing ordered and non-ordered placeholders.
+);
+_x( context: 'context', text: 'translate %s me %s', domain:  'my-slug' ); // Bad: multiple placeholders, but no ordering.
+_ex( domain: 'my-slug', text: '%s', context: 'context', ); // Bad: no translatable content.
+esc_attr_x( domain: 'my-slug', context: 'context', text: '<div>translate me</div>', ); // Bad: wrapped in HTML.
+_n( number: $i, domain: 'my-slug', single: 'translate me', plural: 'translate %s me' ); // Bad: missing singular placeholder.
+_nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translate %1$s me', context: 'context', ); // Bad: mismatch between single/plural placeholders.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 8499e96179..144f87790c 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -243,5 +243,46 @@ _n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d
 _n_noop( 'I have %1$d cat, %2$d dog and %3$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
 _n_noop( 'I have %1$d cat, %2$d dog and %2$d canaries.', 'I have %1$d cats, %2$d dog and canaries.' ); // Bad, mismatched numbered placeholders count.
 
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ * Each of these function calls uses named parameters with an unconventional param order to test this properly.
+ */
+// phpcs:set WordPress.WP.I18n text_domain[] my-slug
+translate( domain: 'my-slug', text: 'translate me', extra: 'default' ); // Bad: too many arguments + use of translate().
+__( domain: 'my-slug' ); // Bad: missing $text argument.
+__( single: 'translate me', domain: 'my-slug' ); // Bad: missing $text argument (invalid 'single' named arg).
+esc_attr__(
+	domain: 'my-slug',
+	text: 'translate
+me multi line', // OK, multi-line text string.
+);
+esc_html__(
+	domain: PLUGIN_TEXTDOMAIN, // Bad: not single text string literal.
+	text: 'translate ' . 'me', // Bad: not single text string literal.
+);
+_e(
+	domain: 'my-slug',
+	text: $translateMe, // Bad: not single text string literal.
+);
+esc_attr_e(
+	domain: 'my-slug',
+	text: "translate
+$me multi line", // Bad: interpolated variable found.
+);
+esc_html_e(
+	domain: 'different-slug', // Bad: wrong text domain.
+	text: 'translate me',
+);
+esc_html_x(
+	context: 'context',
+	domain: 'my-slug',
+	text: 'trans %s late %1$s me', // Bad: mixing ordered and non-ordered placeholders.
+);
+_x( context: 'context', text: 'translate %1$s me %2$s', domain:  'my-slug' ); // Bad: multiple placeholders, but no ordering.
+_ex( domain: 'my-slug', text: '%s', context: 'context', ); // Bad: no translatable content.
+esc_attr_x( domain: 'my-slug', context: 'context', text: '<div>translate me</div>', ); // Bad: wrapped in HTML.
+_n( number: $i, domain: 'my-slug', single: 'translate me', plural: 'translate %s me' ); // Bad: missing singular placeholder.
+_nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translate %1$s me', context: 'context', ); // Bad: mismatch between single/plural placeholders.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.2.inc b/WordPress/Tests/WP/I18nUnitTest.2.inc
index ad8c0f94ff..dd5c246215 100644
--- a/WordPress/Tests/WP/I18nUnitTest.2.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.2.inc
@@ -110,4 +110,19 @@ printf( __( 'There are %1$d monkeys in the %2$s', 'my-slug' ), intval( $number )
 __( $notStringLiteral, 'my-slug' ); // Ignore for translators comment, $text not single string literal.
 __( 'text %s' . 'more text', 'my-slug' ); // Ignore for translators comment, $text not single string literal.
 
+
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+/* translators: %d: number of cats. */
+_n_noop( domain: 'my-slug', singular: 'I have %d cat.', plural: "I have %d cats.", ); // OK.
+
+esc_attr_e( domain: 'my-slug', translate: 'Text to translate to %1$d languages.' ); // Bad, missing $text param, missing translators comment is ignored.
+
+_n_noop(  // Bad, missing translators comment.
+	domain: 'my-slug',
+	plural: "I have %d cats.",
+	singular: 'I have %d cat.',
+);
+
 // phpcs:set WordPress.WP.I18n text_domain[]
diff --git a/WordPress/Tests/WP/I18nUnitTest.3.inc b/WordPress/Tests/WP/I18nUnitTest.3.inc
index bac1dadca7..afcc9fe5fa 100644
--- a/WordPress/Tests/WP/I18nUnitTest.3.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.3.inc
@@ -19,3 +19,9 @@ __( 'string', "something-$domain" ); // Bad, shouldn't use variable for domain.
 
 __( 'string', 'something-else' ); // Bad, text domain mismatch.
 __( 'string', "something-else" ); // Bad, text domain mismatch.
+
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+__( domain: 'something', text: 'string', ); // OK.
+__( domain: 'something-else', text: 'string', ); // Bad, text domain mismatch.
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index d3bfd0ec94..486e209c3d 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -130,6 +130,18 @@ public function getErrorList( $testFile = '' ) {
 					236 => 1,
 					237 => 1,
 					242 => 2,
+					251 => 1,
+					252 => 1,
+					253 => 1,
+					260 => 1,
+					261 => 1,
+					265 => 1,
+					269 => 1,
+					273 => 1,
+					279 => 1,
+					281 => 1,
+					282 => 1,
+					284 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':
@@ -137,6 +149,7 @@ public function getErrorList( $testFile = '' ) {
 					104 => 2,
 					110 => 1,
 					111 => 1,
+					120 => 1,
 				);
 
 			case 'I18nUnitTest.3.inc':
@@ -151,6 +164,7 @@ public function getErrorList( $testFile = '' ) {
 					18 => 1,
 					20 => 1,
 					21 => 1,
+					27 => 1,
 				);
 
 			default:
@@ -184,6 +198,9 @@ public function getWarningList( $testFile = '' ) {
 					242 => 1,
 					243 => 1,
 					244 => 1,
+					251 => 1,
+					283 => 1,
+					285 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':
@@ -195,6 +212,7 @@ public function getWarningList( $testFile = '' ) {
 					74  => 1,
 					85  => 1,
 					108 => 1,
+					122 => 1,
 				);
 
 			default:

From ffcfe6fae0b677392c5167f15445988bac255685 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 23:47:45 +0100
Subject: [PATCH 468/822] WP/I18n: add tests with PHP 7.3+ trailing commas in
 function calls

The `SuperfluousDefaultTextDomain` fixer already handled this correctly. This commit just adds some tests to safeguard this.
---
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 6 ++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 6 ++++++
 WordPress/Tests/WP/I18nUnitTest.php         | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index a4e320138b..a43d0ad5be 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -284,5 +284,11 @@ esc_attr_x( domain: 'my-slug', context: 'context', text: '<div>translate me</div
 _n( number: $i, domain: 'my-slug', single: 'translate me', plural: 'translate %s me' ); // Bad: missing singular placeholder.
 _nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translate %1$s me', context: 'context', ); // Bad: mismatch between single/plural placeholders.
 
+// Safeguard that the SuperfluousDefaultTextDomain fixer handles trailing commas correctly.
+// Note: if the original code contained a trailing comma, it is fine for the fixed code to also contain a trailing comma.
+// phpcs:set WordPress.WP.I18n text_domain[] default
+__( 'translate me', 'default', ); // Bad: superfluous domain (positional with trailing comma).
+__( 'translate me', 'default' /*comment*/, ); // Bad: superfluous domain (positional with trailing comma and comment).
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 144f87790c..e1129082ac 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -284,5 +284,11 @@ esc_attr_x( domain: 'my-slug', context: 'context', text: '<div>translate me</div
 _n( number: $i, domain: 'my-slug', single: 'translate me', plural: 'translate %s me' ); // Bad: missing singular placeholder.
 _nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translate %1$s me', context: 'context', ); // Bad: mismatch between single/plural placeholders.
 
+// Safeguard that the SuperfluousDefaultTextDomain fixer handles trailing commas correctly.
+// Note: if the original code contained a trailing comma, it is fine for the fixed code to also contain a trailing comma.
+// phpcs:set WordPress.WP.I18n text_domain[] default
+__( 'translate me', ); // Bad: superfluous domain (positional with trailing comma).
+__( 'translate me' /*comment*/, ); // Bad: superfluous domain (positional with trailing comma and comment).
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 486e209c3d..140a876ca6 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -201,6 +201,8 @@ public function getWarningList( $testFile = '' ) {
 					251 => 1,
 					283 => 1,
 					285 => 1,
+					290 => 1,
+					291 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 8009bbe618cfc48e060b5d7f91bed9af1b2f4094 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 23:48:13 +0100
Subject: [PATCH 469/822] WP/I18n: fix `SuperfluousDefaultTextDomain` auto-fix
 code to allow for named params

The auto-fixer for the `SuperfluousDefaultTextDomain` warning attempts to remove a complete parameter, though it will bow out from auto-fixing when there is a comment in the tokens which would be removed.

This auto-fixer code and the code to determine whether an auto-fix is possible, now needs adjusting to allow for function calls with named parameters as otherwise the fixer could cause parse errors.
* The parameter label and the `:` also needs to be removed.
* If the named parameter is the first parameter, there will not be a preceding comma, but we will need to remove the comma behind it.
* The range of tokens which needs to be checked for comments to determine whether the error is auto-fixable needs to be expanded.

This commit makes those changes.

Includes additional unit tests to safeguard the fixes.
---
 WordPress/Sniffs/WP/I18nSniff.php           | 27 ++++++++++++++++++---
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 11 +++++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 11 +++++++++
 WordPress/Tests/WP/I18nUnitTest.php         |  7 ++++++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 543fb55f60..43205fc925 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -578,8 +578,28 @@ private function check_textdomain_matches( $matched_content, $param_name, $param
 
 			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
 
-			$before_param = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $first_non_empty - 1 ), null, true );
-			if ( \T_COMMA === $this->tokens[ $before_param ]['code'] ) {
+			// Prevent removing comments when auto-fixing.
+			$remove_from = ( $param_info['start'] - 1 );
+			$remove_to   = $first_non_empty;
+
+			if ( isset( $param_info['name_token'] ) ) {
+				$remove_from = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $param_info['name_token'] - 1 ), null, true );
+				if ( \T_OPEN_PARENTHESIS === $this->tokens[ $remove_from ]['code'] ) {
+					++$remove_from; // Don't remove the open parenthesis.
+
+					/*
+					 * Named param as first param in the function call, if we fix this, we need to
+					 * remove the comma _after_ the parameter as well to prevent creating a parse error.
+					 */
+					$remove_to = $param_info['end'];
+					if ( \T_COMMA === $this->tokens[ ( $param_info['end'] + 1 ) ]['code'] ) {
+						++$remove_to; // Include the comma.
+					}
+				}
+			}
+
+			// Now, make sure there are no comments in the tokens we want to remove.
+			if ( $this->phpcsFile->findNext( Tokens::$commentTokens, $remove_from, ( $remove_to + 1 ) ) === false ) {
 				$fixable = true;
 			}
 
@@ -590,9 +610,8 @@ private function check_textdomain_matches( $matched_content, $param_name, $param
 
 			$fix = $this->phpcsFile->addFixableWarning( $error, $first_non_empty, $error_code, $data );
 			if ( true === $fix ) {
-				// Remove preceeding comma, whitespace and the text domain token.
 				$this->phpcsFile->fixer->beginChangeset();
-				for ( $i = $before_param; $i <= $first_non_empty; $i++ ) {
+				for ( $i = $remove_from; $i <= $remove_to; $i++ ) {
 					$this->phpcsFile->fixer->replaceToken( $i, '' );
 				}
 				$this->phpcsFile->fixer->endChangeset();
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index a43d0ad5be..fb868471b1 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -290,5 +290,16 @@ _nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translat
 __( 'translate me', 'default', ); // Bad: superfluous domain (positional with trailing comma).
 __( 'translate me', 'default' /*comment*/, ); // Bad: superfluous domain (positional with trailing comma and comment).
 
+// Safeguard handling of named params by the SuperfluousDefaultTextDomain fixer.
+__( text: 'translate me', domain: 'default' ); // Bad: superfluous domain.
+__( text: 'translate me', domain: 'default', ); // Bad: superfluous domain (with trailing comma).
+_n_noop( domain: 'default', singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
+_nx_noop( singular: 'translate me', domain: 'default' /*comment*/, plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
+
+// These should not be auto-fixable as we don't want to remove the comment.
+__( text: 'translate me', domain: /*comment*/ 'default' ); // Bad: superfluous domain.
+_n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
+_nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index e1129082ac..35963c7d69 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -290,5 +290,16 @@ _nx( number: $i, domain: 'my-slug', plural: 'translate %s me', single: 'translat
 __( 'translate me', ); // Bad: superfluous domain (positional with trailing comma).
 __( 'translate me' /*comment*/, ); // Bad: superfluous domain (positional with trailing comma and comment).
 
+// Safeguard handling of named params by the SuperfluousDefaultTextDomain fixer.
+__( text: 'translate me' ); // Bad: superfluous domain.
+__( text: 'translate me', ); // Bad: superfluous domain (with trailing comma).
+_n_noop( singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
+_nx_noop( singular: 'translate me' /*comment*/, plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
+
+// These should not be auto-fixable as we don't want to remove the comment.
+__( text: 'translate me', domain: /*comment*/ 'default' ); // Bad: superfluous domain.
+_n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
+_nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:set WordPress.WP.I18n check_translator_comments true
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 140a876ca6..80d8ffac87 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -203,6 +203,13 @@ public function getWarningList( $testFile = '' ) {
 					285 => 1,
 					290 => 1,
 					291 => 1,
+					294 => 1,
+					295 => 1,
+					296 => 1,
+					297 => 1,
+					300 => 1,
+					301 => 1,
+					302 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 31064cf7a49931c0cf165b923ac0a86c20b2e4b4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 09:22:51 +0100
Subject: [PATCH 470/822] WP/I18n: remove the public
 `check_translator_comments` property

The `$check_translator_comments` property was introduced in WPCS `0.11.0` via PR 742 mostly to make our own lives easier managing the test case files.
It allowed the pre-existing test case file `1` to remain largely unchanged, while the errors for translators comments were tested in a new test case file `2`.

At the time, the ability to use modular ignore annotations, i.e. `// phpcs:disable Sniffcode`, did not exist yet.

As those now _do_ exist and the minimum supported PHPCS version is beyond the version in which support for the modular ignore annotations was introduced, we can use those instead in the test case files and no longer need the property.

For end-users, the use of the property has always been discouraged as they could exclude the error codes in their ruleset instead, so the impact of this change for end-users is expected to be minimal.

The removal of the property should be annotated in the wiki when it is being updated for the release of WPCS 3.0.0. Related 1917.
---
 WordPress/Sniffs/WP/I18nSniff.php           | 16 +---------------
 WordPress/Tests/WP/I18nUnitTest.1.inc       |  4 ++--
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed |  4 ++--
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 43205fc925..77b462057f 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -122,18 +122,6 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 		'_nx_noop'                       => 'noopnumber_context',
 	);
 
-	/**
-	 * Toggle whether or not to check for translators comments for text string containing placeholders.
-	 *
-	 * Intended to make this part of the sniff unit testable, but can be used by end-users too,
-	 * though they can just as easily disable this via the sniff code.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @var bool
-	 */
-	public $check_translator_comments = true;
-
 	/**
 	 * Whether or not the `default` text domain is one of the allowed text domains.
 	 *
@@ -411,9 +399,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		/*
 		 * Check if a translators comments is necessary and if so, if it exists.
 		 */
-		if ( true === $this->check_translator_comments ) {
-			$this->check_for_translator_comment( $stackPtr, $matched_content, $parameter_details );
-		}
+		$this->check_for_translator_comment( $stackPtr, $matched_content, $parameter_details );
 	}
 
 	/**
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index fb868471b1..d0a3ad25b7 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -1,6 +1,6 @@
 <?php
 
-// phpcs:set WordPress.WP.I18n check_translator_comments false
+// phpcs:disable WordPress.WP.I18n.MissingTranslatorsComment -- Translator comment issues are tested in test case file 2.
 
 __( 'string' ); // OK - no text domain known, so not checked.
 __( 'string', 'something' ); // OK - no text domain known, so not checked.
@@ -302,4 +302,4 @@ _n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'trans
 _nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
 
 // phpcs:set WordPress.WP.I18n text_domain[]
-// phpcs:set WordPress.WP.I18n check_translator_comments true
+// phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 35963c7d69..40164db35b 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -1,6 +1,6 @@
 <?php
 
-// phpcs:set WordPress.WP.I18n check_translator_comments false
+// phpcs:disable WordPress.WP.I18n.MissingTranslatorsComment -- Translator comment issues are tested in test case file 2.
 
 __( 'string' ); // OK - no text domain known, so not checked.
 __( 'string', 'something' ); // OK - no text domain known, so not checked.
@@ -302,4 +302,4 @@ _n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'trans
 _nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
 
 // phpcs:set WordPress.WP.I18n text_domain[]
-// phpcs:set WordPress.WP.I18n check_translator_comments true
+// phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment

From 14ac13f32850491b3be7237e48f10a475204220e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 18 Mar 2023 01:29:47 +0100
Subject: [PATCH 471/822] WP/I18n: bug fix - fixer for `UnorderedPlaceholders*`
 could mangle text string

As things were, the fixer for the `UnorderedPlaceholders*` error, would replace the first non-empty token in the parameter. While this is fine in the majority of cases, this would lead to a mangled text string in the `fixed` file for multi-line text strings.

Fixed now.

Includes unit test safeguarding the fix.
---
 WordPress/Sniffs/WP/I18nSniff.php           | 10 ++++++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc       |  6 ++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed |  6 ++++++
 WordPress/Tests/WP/I18nUnitTest.php         |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 77b462057f..97bec3531e 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -669,9 +669,19 @@ private function check_placeholders_in_string( $matched_content, $param_name, $p
 			);
 
 			if ( true === $fix ) {
+				$this->phpcsFile->fixer->beginChangeset();
+
 				$fixed_str = preg_replace( $replace_regexes, $replacements, $content, 1 );
 
 				$this->phpcsFile->fixer->replaceToken( $first_non_empty, $fixed_str );
+
+				$i = ( $first_non_empty + 1 );
+				while ( $i <= $param_info['end'] && isset( Tokens::$stringTokens[ $this->tokens[ $i ]['code'] ] ) ) {
+					$this->phpcsFile->fixer->replaceToken( $i, '' );
+					++$i;
+				}
+
+				$this->phpcsFile->fixer->endChangeset();
 			}
 		}
 	}
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index d0a3ad25b7..35d4562062 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -301,5 +301,11 @@ __( text: 'translate me', domain: /*comment*/ 'default' ); // Bad: superfluous d
 _n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
 _nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
 
+// Safeguard bug fix: replacing placeholders in multi-line text strings.
+_nx( 'I have
+%d cat and %d dog.', 'I have
+%d cats and %d dogs.', $number, 'Not
+really.' ); // Bad, multiple arguments should be numbered.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 40164db35b..7d02a57d89 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -301,5 +301,11 @@ __( text: 'translate me', domain: /*comment*/ 'default' ); // Bad: superfluous d
 _n_noop( domain: 'default' /*comment*/, singular: 'translate me', plural: 'translate me', ); // Bad: superfluous domain.
 _nx_noop( singular: 'translate me', domain /*comment*/: 'default', plural: 'translate me', context: 'context', ); // Bad: superfluous domain.
 
+// Safeguard bug fix: replacing placeholders in multi-line text strings.
+_nx( 'I have
+%1$d cat and %2$d dog.', 'I have
+%1$d cats and %2$d dogs.', $number, 'Not
+really.' ); // Bad, multiple arguments should be numbered.
+
 // phpcs:set WordPress.WP.I18n text_domain[]
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 80d8ffac87..da26f62e99 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -142,6 +142,8 @@ public function getErrorList( $testFile = '' ) {
 					281 => 1,
 					282 => 1,
 					284 => 1,
+					305 => 1,
+					306 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From f39e7a15ec5cc4fb6ba138fb54f344cdb1ff2de4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 19 Mar 2023 00:20:05 +0100
Subject: [PATCH 472/822] WP/I18n: new error: passing empty string as text
 domain

Issue 1948 flagged an issue which, while rare, should still be flagged.

The default value for the `$domain` parameter for nearly all translation functions is (currently) `'default'`, with the exceptions being `_n_noop()` and `_nx_noop()`, where the default value is `null`.

If a function call would pass an empty string as the `$domain`, this would previously already be flagged if the end-user had set one or more valid `text_domain`s in their ruleset.

However, if no `text_domain` was set in the ruleset, this would not be flagged by the sniff and as an empty string would overrule the default value for the functions, in effect, the text string would become untranslatable as there is no text domain and the functions would no longer fall back to the WP native `'default'` text domain.

I haven't checked if/when these default values were changed in Core, but that shouldn't really matter anyway as, as things currently are, passing an empty text string as the `$domain` is problematic and should be flagged.

Fixed now.
The behaviour for when a  valid `text_domain` was set in the ruleset remains unchanged.

Includes unit test.

Fixes 1948
---
 WordPress/Sniffs/WP/I18nSniff.php           | 17 ++++++++++++++++-
 WordPress/Tests/WP/I18nUnitTest.1.inc       |  6 ++++++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed |  6 ++++++
 WordPress/Tests/WP/I18nUnitTest.php         |  2 ++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 97bec3531e..8b85327ecd 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -361,7 +361,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 				continue;
 			}
 
-			if ( 'domain' === $param_name && ! empty( $this->text_domain ) ) {
+			if ( 'domain' === $param_name ) {
 				$this->check_textdomain_matches( $matched_content, $param_name, $param_info );
 			}
 
@@ -544,6 +544,21 @@ private function check_argument_is_string_literal( $stackPtr, $matched_content,
 	private function check_textdomain_matches( $matched_content, $param_name, $param_info ) {
 		$stripped_content = TextStrings::stripQuotes( $param_info['clean'] );
 
+		if ( empty( $this->text_domain ) && '' === $stripped_content ) {
+			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
+
+			$this->phpcsFile->addError(
+				'The passed $domain should never be an empty string. Either pass a text domain or remove the parameter.',
+				$first_non_empty,
+				'EmptyTextDomain'
+			);
+		}
+
+		if ( empty( $this->text_domain ) ) {
+			// Nothing more to do, the other checks all depend on a text domain being known.
+			return;
+		}
+
 		if ( ! \in_array( $stripped_content, $this->text_domain, true ) ) {
 			$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
 
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 35d4562062..84826a0eea 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -307,5 +307,11 @@ _nx( 'I have
 %d cats and %d dogs.', $number, 'Not
 really.' ); // Bad, multiple arguments should be numbered.
 
+// Show an error when the text domain is an empty string.
+esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
+
+// Issue #1948 - Show an error when the text domain is an empty string and no text domain has been passed.
 // phpcs:set WordPress.WP.I18n text_domain[]
+esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 7d02a57d89..60a5ba0541 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -307,5 +307,11 @@ _nx( 'I have
 %1$d cats and %2$d dogs.', $number, 'Not
 really.' ); // Bad, multiple arguments should be numbered.
 
+// Show an error when the text domain is an empty string.
+esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
+
+// Issue #1948 - Show an error when the text domain is an empty string and no text domain has been passed.
 // phpcs:set WordPress.WP.I18n text_domain[]
+esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index da26f62e99..ee45944f60 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -144,6 +144,8 @@ public function getErrorList( $testFile = '' ) {
 					284 => 1,
 					305 => 1,
 					306 => 1,
+					311 => 1,
+					315 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 968ff8c94b2fdaf25129ebd1ef2e812e49fed937 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 08:05:24 +0200
Subject: [PATCH 473/822] WP/EnqueuedResourceParameters: fix handling of an
 edge case

Includes test.
---
 WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php   | 3 +++
 WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc | 3 +++
 WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php | 1 +
 3 files changed, 7 insertions(+)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index a1d78344ef..d2370f1b5b 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -135,6 +135,9 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$error_ptr = $stackPtr;
 		if ( false !== $version_param ) {
 			$error_ptr = $this->phpcsFile->findNext( Tokens::$emptyTokens, $version_param['start'], ( $version_param['end'] + 1 ), true );
+			if ( false === $error_ptr ) {
+				$error_ptr = $version_param['start'];
+			}
 		}
 
 		if ( false === $version_param || 'null' === $version_param['clean'] ) {
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
index 49b54822e5..b9c5d46614 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.inc
@@ -83,3 +83,6 @@ wp_register_script( 'someScript-js', $url, [], 0_0.0_0, true ); // Error - 0, fa
 
 // Safeguard handling of PHP 8.1 explicit octals.
 wp_register_script( 'someScript-js', $url, [], 0o0, true ); // Error - 0, false or NULL are not allowed.
+
+// Live coding/parse error.
+wp_register_style( src: 'https://example.com/someScript.js', ver: /*to do*/, handle: 'someScript-js', );
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index aaf9ba40e5..17ad318abd 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -39,6 +39,7 @@ public function getErrorList() {
 			61 => 1,
 			82 => 1,
 			85 => 1,
+			88 => 1,
 		);
 	}
 

From 5b0f4f91a3b1fede7682abe2bd3b9e1067a94484 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:15:42 +0200
Subject: [PATCH 474/822] SnakeCaseHelper: fix typo in regex

---
 WordPress/Helpers/SnakeCaseHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index a510486785..a6bf69dd74 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -43,7 +43,7 @@ final class SnakeCaseHelper {
 	public static function get_suggestion( $name ) {
 		$suggested = preg_replace( '`(?<!_|^)([A-Z])`', '_$1', $name );
 
-		if ( preg_match( '`^[a-z0-9_]+$i`', $suggested ) === 1 ) {
+		if ( preg_match( '`^[a-z0-9_]+$`i', $suggested ) === 1 ) {
 			// If the name only contains ASCII characters, we can safely lowercase it.
 			$suggested = strtolower( $suggested );
 		} elseif ( function_exists( 'mb_strtolower' ) ) {

From 12e7ea70159ca42b41f44b26d5ddb8e08a39a9e7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:07:48 +0200
Subject: [PATCH 475/822] WPDBTrait: add some extra tests

... to cover some previously uncovered code paths/code patterns.
---
 WordPress/Tests/DB/PreparedSQLUnitTest.1.inc | 8 ++++++++
 WordPress/Tests/DB/PreparedSQLUnitTest.2.inc | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
index 97a85f1843..0eb8f28a81 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
@@ -135,5 +135,13 @@ $wpdb->query( $wpdb->prepare( 'SELECT * FROM ' . $notwpdb?->posts . " WHERE post
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 10_000 . ";" ); // OK.
 $wpdb->query( "SELECT * FROM $wpdb->posts WHERE value = " . 0o34 . ";" ); // OK.
 
+// Not a method call.
+$wpdb = new WPDB();
+$foo = $wpdb->propertyAccess;
+echo $wpdb::CONSTANT_NAME;
+
+// Not an identifyable method call.
+$wpdb->{$methodName}('query');
+
 // Don't throw an error during live coding.
 wpdb::prepare( "SELECT * FROM $wpdb->posts
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc
index c454a31048..dd5e80e730 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.2.inc
@@ -7,3 +7,7 @@ $wpdb->query( <<<EOT
 		WHERE ID = {$foo};
 	EOT
 ); // Bad.
+
+// Live coding.
+// This needs to be the last test in a file.
+$wpdb->

From 498b747ad1bc60141e868294d8cdf6a74eafa472 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:27:07 +0200
Subject: [PATCH 476/822] CodeAnalysis/AssignmentInTernaryCondition: add extra
 test

... for parse error edge case / to cover some previously uncovered code paths/code patterns.
---
 .../CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
index 575ba29e81..158068e7f1 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.inc
@@ -55,3 +55,7 @@ $mode = ( $a->prop = 'on' ) ? 'on' : 'off'; // Bad.
 
 // Safeguard recognition of PHP 7.4+ null coalesce equals.
 $mode = ( $a ??= 'on' ) ? 'on' : 'off';
+
+// Live coding/parse error.
+// This has to be the last test in the file.
+$var = $a = $foo ) ? 'on' : 'off';

From c9c5b842dec967c1bf03f582f5ce068a2bb3f528 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:37:25 +0200
Subject: [PATCH 477/822] Files/FileName: add some extra tests

... to cover some previously uncovered code paths/code patterns.
---
 WordPress/Tests/Files/FileNameUnitTest.php           |  1 +
 .../PHPCSAnnotations/disable-non-matching-enable.inc | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/PHPCSAnnotations/disable-non-matching-enable.inc

diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 6ea01ae9d0..29deb6403e 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -65,6 +65,7 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		'partial-file-disable.inc'                   => 1,
 		'rule-disable.inc'                           => 0,
 		'wordpress-disable.inc'                      => 0,
+		'disable-non-matching-enable.inc'            => 0,
 
 		/*
 		 * In /FileNameUnitTests/TestFiles.
diff --git a/WordPress/Tests/Files/FileNameUnitTests/PHPCSAnnotations/disable-non-matching-enable.inc b/WordPress/Tests/Files/FileNameUnitTests/PHPCSAnnotations/disable-non-matching-enable.inc
new file mode 100644
index 0000000000..d6fbc18920
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/PHPCSAnnotations/disable-non-matching-enable.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @phpcs:disable WordPress
+ */
+
+class My_Class {}
+
+// phpcs:enable PSR2
+
+// phpcs:enable WordPress.Category
+
+// phpcs:enable WordPress.Files.NotFileNameSniff

From 7bf8c42152b07f672e6f008704f6e8c5774bda78 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:46:35 +0200
Subject: [PATCH 478/822] WP/CapitalPDangit: add extra test

... for an edge case / to cover some previously uncovered code paths/code patterns.
---
 WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc       | 3 +++
 WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
index 221f24d39b..93b02751a0 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
@@ -228,3 +228,6 @@ enum My_Wordpress_Enum {} // Bad.
  */
 namespace My\Class\WordPress;
 echo Some\Enum\WordPress::ENUM_CONSTANT;
+
+// Safeguard that the sniff doesn't act on anonymous classes.
+$anon = new class() {};
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
index eea9232474..5828bd6a93 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
@@ -228,3 +228,6 @@ enum My_Wordpress_Enum {} // Bad.
  */
 namespace My\Class\WordPress;
 echo Some\Enum\WordPress::ENUM_CONSTANT;
+
+// Safeguard that the sniff doesn't act on anonymous classes.
+$anon = new class() {};

From c25028920c9c0c7b36a048b3f2df280adaf74335 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:51:51 +0200
Subject: [PATCH 479/822] WP/DeprecatedParameterValues: add extra test

... for an edge case / to cover some previously uncovered code paths/code patterns.
---
 WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
index cd1fefec92..dea283209a 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.inc
@@ -49,3 +49,6 @@ get_option(default: $default, option: 'comment_whitelist');
 update_option('blacklist_keys', $value);
 update_option('comment_whitelist', $value);
 update_option(autoload: true, value: $value, option: 'blacklist_keys');
+
+// Live coding/parse error.
+get_bloginfo( show: /*to do*/, );

From 983f61501d6dae21c6b35569728b0f00d5a8d93f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:30:41 +0200
Subject: [PATCH 480/822] Sniff::get_last_ptr_on_line(): remove function

...as it appears to be unused in WPCS.
---
 WordPress/Sniff.php | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index c92b0e15f4..b316aae525 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -459,32 +459,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Get the last pointer in a line.
-	 *
-	 * @since 0.4.0
-	 *
-	 * @param integer $stackPtr The position of the current token in the stack passed
-	 *                          in $tokens.
-	 *
-	 * @return integer Position of the last pointer on that line.
-	 */
-	protected function get_last_ptr_on_line( $stackPtr ) {
-
-		$tokens      = $this->tokens;
-		$currentLine = $tokens[ $stackPtr ]['line'];
-		$nextPtr     = ( $stackPtr + 1 );
-
-		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ]['line'] === $currentLine ) {
-			++$nextPtr;
-			// Do nothing, we just want the last token of the line.
-		}
-
-		// We've made it to the next line, back up one to the last in the previous line.
-		// We do this for micro-optimization of the above loop.
-		return ( $nextPtr - 1 );
-	}
-
 	/**
 	 * Check if a token is inside of an isset(), empty() or array_key_exists() statement.
 	 *

From e01762b1fbf550ac0b2924db20e7b5acb8af8361 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 12 Sep 2019 16:15:49 +0200
Subject: [PATCH 481/822] Tests: allow for recording code coverage + add
 `@covers` tags

... to all unit test files, as well as enable strict coverage recording.

Includes:
* PHPUnit config: add code coverage configuration.
    By default, when there is a code coverage configuration and Xdebug is enabled, code coverage will be generated.
    Note: generating code coverage is slow.
* Git ignore the `build` directory as created by PHPUnit to store the log files (as set up in the config file).
* Composer: add coverage script and adjust the test script.
    * When running the "normal" `run-tests`, no code coverage will be created.
    * To run the tests with code coverage, the new `coverage` script has been added.

When running PHPUnit locally, I'd recommend copying the `phpunit.xml.dist` file to `phpunit.xml` and replacing the `clover` logging with the following to allow for locally using the HTML report:
```xml
        <log type="coverage-html" target="./build/coverage-html/"/>
```

NOte: this commit does not set up code coverage checking for PRs via an external service like Coveralls or CodeCov, though I imagine we could set this up in the future as the WP organisation already has a CodeCov account (we'd need to check if we can or need permission).
---
 .gitignore                                    |  3 ++-
 .../ArrayDeclarationSpacingUnitTest.php       |  2 ++
 .../Tests/Arrays/ArrayIndentationUnitTest.php |  2 ++
 .../ArrayKeySpacingRestrictionsUnitTest.php   |  2 ++
 .../Arrays/CommaAfterArrayItemUnitTest.php    |  2 ++
 .../MultipleStatementAlignmentUnitTest.php    |  2 ++
 .../AssignmentInTernaryConditionUnitTest.php  |  2 ++
 .../EscapedNotTranslatedUnitTest.php          |  2 ++
 .../Tests/DB/DirectDatabaseQueryUnitTest.php  |  2 ++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  2 ++
 WordPress/Tests/DB/PreparedSQLUnitTest.php    |  2 ++
 .../Tests/DB/RestrictedClassesUnitTest.php    |  2 ++
 .../Tests/DB/RestrictedFunctionsUnitTest.php  |  2 ++
 WordPress/Tests/DB/SlowDBQueryUnitTest.php    |  2 ++
 .../DateTime/CurrentTimeTimestampUnitTest.php |  2 ++
 .../DateTime/RestrictedFunctionsUnitTest.php  |  2 ++
 WordPress/Tests/Files/FileNameUnitTest.php    |  2 ++
 .../PrefixAllGlobalsUnitTest.php              |  2 ++
 .../ValidFunctionNameUnitTest.php             |  2 ++
 .../ValidHookNameUnitTest.php                 |  2 ++
 .../ValidPostTypeSlugUnitTest.php             |  2 ++
 .../ValidVariableNameUnitTest.php             |  2 ++
 .../PHP/DevelopmentFunctionsUnitTest.php      |  2 ++
 .../PHP/DiscouragedPHPFunctionsUnitTest.php   |  2 ++
 WordPress/Tests/PHP/DontExtractUnitTest.php   |  2 ++
 WordPress/Tests/PHP/IniSetUnitTest.php        |  2 ++
 .../Tests/PHP/NoSilencedErrorsUnitTest.php    |  2 ++
 .../Tests/PHP/POSIXFunctionsUnitTest.php      |  2 ++
 .../Tests/PHP/PregQuoteDelimiterUnitTest.php  |  2 ++
 .../PHP/RestrictedPHPFunctionsUnitTest.php    |  2 ++
 WordPress/Tests/PHP/StrictInArrayUnitTest.php |  2 ++
 WordPress/Tests/PHP/TypeCastsUnitTest.php     |  2 ++
 .../Tests/PHP/YodaConditionsUnitTest.php      |  2 ++
 .../Tests/Security/EscapeOutputUnitTest.php   |  2 ++
 .../Security/NonceVerificationUnitTest.php    |  2 ++
 .../Tests/Security/PluginMenuSlugUnitTest.php |  2 ++
 .../Tests/Security/SafeRedirectUnitTest.php   |  2 ++
 .../ValidatedSanitizedInputUnitTest.php       |  2 ++
 .../Utils/I18nTextDomainFixerUnitTest.php     |  2 ++
 .../Tests/WP/AlternativeFunctionsUnitTest.php |  2 ++
 WordPress/Tests/WP/CapabilitiesUnitTest.php   |  2 ++
 WordPress/Tests/WP/CapitalPDangitUnitTest.php |  2 ++
 WordPress/Tests/WP/ClassNameCaseUnitTest.php  |  2 ++
 WordPress/Tests/WP/CronIntervalUnitTest.php   |  2 ++
 .../Tests/WP/DeprecatedClassesUnitTest.php    |  2 ++
 .../Tests/WP/DeprecatedFunctionsUnitTest.php  |  2 ++
 .../WP/DeprecatedParameterValuesUnitTest.php  |  2 ++
 .../Tests/WP/DeprecatedParametersUnitTest.php |  2 ++
 .../Tests/WP/DiscouragedConstantsUnitTest.php |  2 ++
 .../Tests/WP/DiscouragedFunctionsUnitTest.php |  2 ++
 .../WP/EnqueuedResourceParametersUnitTest.php |  2 ++
 .../Tests/WP/EnqueuedResourcesUnitTest.php    |  2 ++
 .../WP/GlobalVariablesOverrideUnitTest.php    |  2 ++
 WordPress/Tests/WP/I18nUnitTest.php           |  2 ++
 WordPress/Tests/WP/PostsPerPageUnitTest.php   |  2 ++
 .../CastStructureSpacingUnitTest.php          |  2 ++
 .../ControlStructureSpacingUnitTest.php       |  2 ++
 .../ObjectOperatorSpacingUnitTest.php         |  2 ++
 .../WhiteSpace/OperatorSpacingUnitTest.php    |  2 ++
 composer.json                                 |  6 +++++-
 phpunit.xml.dist                              | 21 ++++++++++++++++++-
 61 files changed, 143 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bfec4c3c30..9e9c75d11d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-vendor
+vendor/
 composer.lock
+build/
 phpunit.xml
 phpcs.xml
 .phpcs.xml
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index 482c22490c..ea45ae434e 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayDeclarationSpacingSniff
  */
 final class ArrayDeclarationSpacingUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
index 3291de971a..950c4b2506 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayIndentationSniff
  */
 final class ArrayIndentationUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 8414f8ac31..2f871ad3db 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayKeySpacingRestrictionsSniff
  */
 final class ArrayKeySpacingRestrictionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
index 19741593b9..dd80994f62 100644
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
+++ b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Arrays\CommaAfterArrayItemSniff
  */
 final class CommaAfterArrayItemUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
index 84aeb96181..075df264a2 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
@@ -21,6 +21,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Arrays\MultipleStatementAlignmentSniff
  */
 final class MultipleStatementAlignmentUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index 2c6d4eb998..dbba1575e4 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\CodeAnalysis\AssignmentInTernaryConditionSniff
  */
 final class AssignmentInTernaryConditionUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
index 6caee59867..245ae7f17e 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   2.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\CodeAnalysis\EscapedNotTranslatedSniff
  */
 final class EscapedNotTranslatedUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 4d425b392b..aa76e463ac 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\DirectDatabaseQuerySniff
  */
 final class DirectDatabaseQueryUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 61decb7521..7c133a554a 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLPlaceholdersSniff
  */
 final class PreparedSQLPlaceholdersUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 5ff2c8f616..aa15964c48 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.8.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLSniff
  */
 final class PreparedSQLUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 05a522e9de..f9365a9441 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -20,6 +20,8 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedClassesSniff
  */
 final class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index e37298a136..521c39df4f 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedFunctionsSniff
  */
 final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 62753ee481..82b1c9aaae 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DB\SlowDBQuerySniff
  */
 final class SlowDBQueryUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
index e1eae57eb0..44984710c5 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   2.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DateTime\CurrentTimeTimestampSniff
  */
 final class CurrentTimeTimestampUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
index 53fdbbd2ca..97a90bed48 100644
--- a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   2.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\DateTime\RestrictedFunctionsSniff
  */
 final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 29deb6403e..e29d57099a 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -19,6 +19,8 @@
  * @since   2013-06-11
  * @since   0.11.0     Actually added tests ;-)
  * @since   0.13.0     Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Files\FileNameSniff
  */
 final class FileNameUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 3cd0128329..cef6b3c362 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\PrefixAllGlobalsSniff
  */
 final class PrefixAllGlobalsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 49a787b68d..f9632c6166 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidFunctionNameSniff
  */
 final class ValidFunctionNameUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index ddaabad882..65e724c0d4 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidHookNameSniff
  */
 final class ValidHookNameUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index a20c4f2e24..9e9298a56e 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   2.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidPostTypeSlugSniff
  */
 final class ValidPostTypeSlugUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index c5b4ec547a..9b56994feb 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidVariableNameSniff
  */
 final class ValidVariableNameUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
index 67da444d39..efc4b9c919 100644
--- a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\DevelopmentFunctionsSniff
  */
 final class DevelopmentFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
index bd8c5aad27..019996f116 100644
--- a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\DiscouragedPHPFunctionsSniff
  */
 final class DiscouragedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
index c86ab344d8..45d63f6de0 100644
--- a/WordPress/Tests/PHP/DontExtractUnitTest.php
+++ b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\DontExtractSniff
  */
 final class DontExtractUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index abca628317..573c24c430 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since 2.1.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\IniSetSniff
  */
 final class IniSetUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
index 0867ed8419..b4ee45892a 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.1.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\NoSilencedErrorsSniff
  */
 final class NoSilencedErrorsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
index bfadfe6b35..c24ceda461 100644
--- a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\POSIXFunctionsSniff
  */
 final class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
index fe84b6f445..dcb0948838 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\PregQuoteDelimiterSniff
  */
 final class PregQuoteDelimiterUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
index 8ed0c52e94..ea4aa098ce 100644
--- a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.14.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\RestrictedPHPFunctionsSniff
  */
 final class RestrictedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index c8174a3595..6f5225a65a 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\StrictInArraySniff
  */
 final class StrictInArrayUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index db837c8b97..de2dd0d5ad 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since 1.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\TypeCastsSniff
  */
 final class TypeCastsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/PHP/YodaConditionsUnitTest.php b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
index cd87e263a9..eac33f7a8a 100644
--- a/WordPress/Tests/PHP/YodaConditionsUnitTest.php
+++ b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\PHP\YodaConditionsSniff
  */
 final class YodaConditionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 6054315a7c..3e460950aa 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -19,6 +19,8 @@
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Security\EscapeOutputSniff
  */
 final class EscapeOutputUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 4f164d0d33..2fb94c8da5 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.5.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Security\NonceVerificationSniff
  */
 final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index 8555d23212..b77830614e 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Security\PluginMenuSlugSniff
  */
 final class PluginMenuSlugUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
index b42d75b9fa..0cf00822e3 100644
--- a/WordPress/Tests/Security/SafeRedirectUnitTest.php
+++ b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Security\SafeRedirectSniff
  */
 final class SafeRedirectUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 1337bbe669..290c0903cd 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */
 final class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index e89b04bf50..dd0c6dc488 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -18,6 +18,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.2.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\Utils\I18nTextDomainFixerSniff
  */
 final class I18nTextDomainFixerUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 497b4682ad..dd847fd008 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\AlternativeFunctionsSniff
  */
 final class AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index 38ae5f4f0d..ca26338aa4 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -17,6 +17,8 @@
  *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\CapabilitiesSniff
  */
 final class CapabilitiesUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index c222ac3725..2c61e7e715 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\CapitalPDangitSniff
  */
 final class CapitalPDangitUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
index c91b007160..c7a7108a81 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.php
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since 3.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\ClassNameCaseSniff
  */
 final class ClassNameCaseUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index a77d930230..06a9cbf389 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -19,6 +19,8 @@
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\CronIntervalSniff
  */
 final class CronIntervalUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index 73a34b6388..c6da2e5634 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedClassesSniff
  */
 final class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index d7c44ab65e..700fb821fe 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedFunctionsSniff
  */
 final class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 50d104ec7f..8866c29979 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedParameterValuesSniff
  */
 final class DeprecatedParameterValuesUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index 78aa55d753..4372783b03 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedParametersSniff
  */
 final class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index cadcffd534..605c5cf49a 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -16,6 +16,8 @@
  *
  * @package WPCS\WordPressCodingStandards
  * @since   0.14.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedConstantsSniff
  */
 final class DiscouragedConstantsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 814a9b9cae..fbb88b14e1 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedFunctionsSniff
  */
 final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index 17ad318abd..59d91d0c44 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since   1.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\EnqueuedResourceParametersSniff
  */
 final class EnqueuedResourceParametersUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index 83b735b9ce..0eae7f1bc8 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\EnqueuedResourcesSniff
  */
 final class EnqueuedResourcesUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index de2194ccdc..e867623e08 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -20,6 +20,8 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
  *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\GlobalVariablesOverrideSniff
  */
 final class GlobalVariablesOverrideUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index ee45944f60..be011054f9 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\I18nSniff
  */
 final class I18nUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 7a302347fa..ef848320d2 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -21,6 +21,8 @@
  * @since   1.0.0  This sniff has been split into two, with the check for high pagination
  *                 limit being part of the WP category, and the check for pagination
  *                 disabling being part of the VIP category.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WP\PostsPerPageSniff
  */
 final class PostsPerPageUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
index f46131110a..90ca0000dd 100644
--- a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   0.3.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\CastStructureSpacingSniff
  */
 final class CastStructureSpacingUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index e7e8494a45..1cd2bde66c 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -18,6 +18,8 @@
  *
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\ControlStructureSpacingSniff
  */
 final class ControlStructureSpacingUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
index 52a3776022..cd6d22955f 100644
--- a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -17,6 +17,8 @@
  * @package WPCS\WordPressCodingStandards
  *
  * @since 3.0.0
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff
  */
 final class ObjectOperatorSpacingUnitTest extends AbstractSniffUnitTest {
 
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index 09aa9efec3..aa60ee4cd6 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -20,6 +20,8 @@
  * @since   0.12.0     Now only tests the WPCS specific addition of T_BOOLEAN_NOT.
  *                     The rest of the sniff is unit tested upstream.
  * @since   0.13.0     Class name changed: this class is now namespaced.
+ *
+ * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\OperatorSpacingSniff
  */
 final class OperatorSpacingUnitTest extends AbstractSniffUnitTest {
 
diff --git a/composer.json b/composer.json
index cf1c2ccb23..db34b5ff6c 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,9 @@
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
 		],
 		"run-tests": [
+			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php --no-coverage"
+		],
+		"coverage": [
 			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
 		],
 		"check-complete": [
@@ -67,7 +70,8 @@
 		"lint": "Lint PHP files against parse errors.",
 		"check-cs": "Run the PHPCS script against the entire codebase.",
 		"fix-cs": "Run the PHPCBF script to fix all the autofixable violations on the codebase.",
-		"run-tests": "Run all the unit tests for the WordPress Coding Standards sniffs.",
+		"run-tests": "Run all the unit tests for the WordPress Coding Standards sniffs without code coverage.",
+		"coverage": "Run all the unit tests for the WordPress Coding Standards sniffs with code coverage.",
 		"check-complete": "Check if all the sniffs have tests.",
 		"check-complete-strict": "Check if all the sniffs have unit tests and XML documentation.",
 		"check-all": "Run all checks (lint, phpcs, feature completeness) and tests."
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4bd81b342a..34c93a6263 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,7 +5,8 @@
 	backupGlobals="true"
 	bootstrap="./Tests/bootstrap.php"
 	beStrictAboutTestsThatDoNotTestAnything="false"
-	colors="true">
+	colors="true"
+	forceCoversAnnotation="true">
 
 	<testsuites>
 		<testsuite name="WordPress">
@@ -13,4 +14,22 @@
 		</testsuite>
 	</testsuites>
 
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false">
+			<file>./WordPress/Sniff.php</file>
+			<file>./WordPress/PHPCSHelper.php</file>
+			<file>./WordPress/AbstractArrayAssignmentRestrictionsSniff.php</file>
+			<file>./WordPress/AbstractClassRestrictionsSniff.php</file>
+			<file>./WordPress/AbstractFunctionParameterSniff.php</file>
+			<file>./WordPress/AbstractFunctionRestrictionsSniff.php</file>
+			<directory>./WordPress/Sniffs/</directory>
+			<directory>./WordPress/Helpers/</directory>
+		</whitelist>
+	</filter>
+
+	<logging>
+		<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+		<log type="coverage-clover" target="build/logs/clover.xml"/>
+	</logging>
+
 </phpunit>

From 391caeab14bacc0ce1ae55f2b27f4600c4ee2580 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Apr 2023 16:29:28 +0200
Subject: [PATCH 482/822] Tests: add `@covers` tags for Helpers

As the `Helpers` in WPCS do not have dedicated tests, but are tested via the sniffs using them, I'm adding `@covers` tags for these to select sniffs.

At a later point in time, we can revisit whether or not to add dedicated tests for the Helpers.
---
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php              | 1 +
 WordPress/Tests/DB/PreparedSQLUnitTest.php                      | 1 +
 WordPress/Tests/DB/RestrictedClassesUnitTest.php                | 1 +
 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php  | 1 +
 WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php | 1 +
 WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php     | 1 +
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php | 1 +
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php    | 1 +
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.php             | 1 +
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php          | 1 +
 10 files changed, 10 insertions(+)

diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index aa76e463ac..349e20991c 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\RulesetPropertyHelper
  * @covers \WordPressCS\WordPress\Sniffs\DB\DirectDatabaseQuerySniff
  */
 final class DirectDatabaseQueryUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index aa15964c48..d707ac3960 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\WPDBTrait
  * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLSniff
  */
 final class PreparedSQLUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index f9365a9441..1623e68682 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -21,6 +21,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
  *
+ * @covers \WordPressCS\WordPress\Helpers\RulesetPropertyHelper
  * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedClassesSniff
  */
 final class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index cef6b3c362..03408c53e1 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.12.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\Helpers\IsUnitTestTrait
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\PrefixAllGlobalsSniff
  */
 final class PrefixAllGlobalsUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index f9632c6166..9213827917 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -19,6 +19,7 @@
  * @since   2013-06-11
  * @since   0.13.0     Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\Helpers\DeprecationHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidFunctionNameSniff
  */
 final class ValidFunctionNameUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index 65e724c0d4..ff0b7e5093 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\Helpers\WPHookHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidHookNameSniff
  */
 final class ValidHookNameUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 9b56994feb..e69b1dd8f5 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\Helpers\SnakeCaseHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidVariableNameSniff
  */
 final class ValidVariableNameUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 290c0903cd..ab4574aff0 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\VariableHelper
  * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */
 final class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index dd847fd008..ffe0e4acc1 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait
  * @covers \WordPressCS\WordPress\Sniffs\WP\AlternativeFunctionsSniff
  */
 final class AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index e867623e08..23fa6d1f9f 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
  *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
  *
+ * @covers \WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper
  * @covers \WordPressCS\WordPress\Sniffs\WP\GlobalVariablesOverrideSniff
  */
 final class GlobalVariablesOverrideUnitTest extends AbstractSniffUnitTest {

From 617224515785d89a6ce227e67ef3505c164119ef Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Apr 2023 16:36:14 +0200
Subject: [PATCH 483/822] Tests: add `@covers` tags for abstract base sniff
 classes

As the abstract sniff base classes in WPCS do not have dedicated tests, but are tested via the sniffs using them, I'm adding `@covers` tags for these to select sniffs.

As the majority of these will at some point in the future be replaced by (fully tested) abstracts from PHPCSUtils, I'm not concerned with adding dedicated tests for these, so this will do until they are deprecated/removed.
---
 WordPress/Tests/DB/RestrictedClassesUnitTest.php    | 1 +
 WordPress/Tests/DB/SlowDBQueryUnitTest.php          | 1 +
 WordPress/Tests/PHP/StrictInArrayUnitTest.php       | 1 +
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php | 1 +
 WordPress/Tests/WP/PostsPerPageUnitTest.php         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 1623e68682..1ee99d0840 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -21,6 +21,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
  *
+ * @covers \WordPressCS\WordPress\AbstractClassRestrictionsSniff
  * @covers \WordPressCS\WordPress\Helpers\RulesetPropertyHelper
  * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedClassesSniff
  */
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 82b1c9aaae..94aa230564 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  *
+ * @covers \WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\DB\SlowDBQuerySniff
  */
 final class SlowDBQueryUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index 6f5225a65a..c430d94a34 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.9.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\AbstractFunctionParameterSniff
  * @covers \WordPressCS\WordPress\Sniffs\PHP\StrictInArraySniff
  */
 final class StrictInArrayUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index fbb88b14e1..93827ee355 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -19,6 +19,7 @@
  * @since   0.11.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedFunctionsSniff
  */
 final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index ef848320d2..42ea579a78 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -22,6 +22,7 @@
  *                 limit being part of the WP category, and the check for pagination
  *                 disabling being part of the VIP category.
  *
+ * @covers \WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\WP\PostsPerPageSniff
  */
 final class PostsPerPageUnitTest extends AbstractSniffUnitTest {

From 34f1ada14d00c78c63489f0a41fc4d994040891b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:48:04 +0200
Subject: [PATCH 484/822] Move `is_class_object_call()` utility method to
 dedicated `ContextHelper`

The `is_class_object_call()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_class_object_call()` method to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

The method has also been renamed to `has_object_operator_before()` as it doesn't actually check if something is a (method) _call_, just that something OO (method, constant, property) is being accessed.

Related to 1465

This method is tested via the `WordPress.WP.DiscouragedFunctions` sniff.
---
 .../AbstractFunctionRestrictionsSniff.php     |  3 +-
 WordPress/Helpers/ContextHelper.php           | 59 +++++++++++++++++++
 WordPress/Sniff.php                           | 33 +----------
 .../Security/NonceVerificationSniff.php       |  3 +-
 .../WP/GlobalVariablesOverrideSniff.php       |  3 +-
 .../Tests/WP/DiscouragedFunctionsUnitTest.inc |  9 ++-
 .../Tests/WP/DiscouragedFunctionsUnitTest.php |  4 +-
 7 files changed, 78 insertions(+), 36 deletions(-)
 create mode 100644 WordPress/Helpers/ContextHelper.php

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index fbde666ae0..9c42343292 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -219,7 +220,7 @@ public function is_targetted_token( $stackPtr ) {
 		}
 
 		// Exclude function definitions, class methods, and namespaced calls.
-		if ( $this->is_class_object_call( $stackPtr ) === true ) {
+		if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $stackPtr ) === true ) {
 			return false;
 		}
 
diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
new file mode 100644
index 0000000000..b45855972b
--- /dev/null
+++ b/WordPress/Helpers/ContextHelper.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Helper utilities for checking the context in which a token is used.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The methods in this class were previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ */
+final class ContextHelper {
+
+	/**
+	 * Check if a particular token acts - statically or non-statically - on an object.
+	 *
+	 * @internal Note: this may still mistake a namespaced function imported via a `use` statement for
+	 * a global function!
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool
+	 */
+	public static function has_object_operator_before( File $phpcsFile, $stackPtr ) {
+		$before = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
+		if ( false === $before ) {
+			return false;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+		if ( \T_OBJECT_OPERATOR !== $tokens[ $before ]['code']
+			&& \T_DOUBLE_COLON !== $tokens[ $before ]['code']
+		) {
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index b316aae525..90366447b8 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -16,6 +16,7 @@
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 
 /**
@@ -507,34 +508,6 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check if a particular token is a (static or non-static) call to a class method or property.
-	 *
-	 * @internal Note: this may still mistake a namespaced function imported via a `use` statement for
-	 * a global function!
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool
-	 */
-	protected function is_class_object_call( $stackPtr ) {
-		$before = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-
-		if ( false === $before ) {
-			return false;
-		}
-
-		if ( \T_OBJECT_OPERATOR !== $this->tokens[ $before ]['code']
-			&& \T_DOUBLE_COLON !== $this->tokens[ $before ]['code']
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Check if a particular token is prefixed with a namespace.
 	 *
@@ -637,7 +610,7 @@ protected function is_in_function_call( $stackPtr, $valid_functions, $global_fun
 			/*
 			 * Now, make sure it is a global function.
 			 */
-			if ( $this->is_class_object_call( $prev_non_empty ) === true ) {
+			if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $prev_non_empty ) === true ) {
 				continue;
 			}
 
@@ -1026,7 +999,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						continue 2;
 					}
 
-					if ( $this->is_class_object_call( $i ) === true ) {
+					if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $i ) === true ) {
 						// Method call.
 						continue 2;
 					}
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index ed8d1fc6a5..7bc5ecdb9d 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\MessageHelper;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -269,7 +270,7 @@ private function has_nonce_check( $stackPtr ) {
 				/*
 				 * Now, make sure it is a call to a global function.
 				 */
-				if ( $this->is_class_object_call( $i ) === true ) {
+				if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $i ) === true ) {
 					continue;
 				}
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 35d2538bb7..fcb7a8273d 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -17,6 +17,7 @@
 use PHPCSUtils\Utils\Parentheses;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
@@ -393,7 +394,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			}
 
 			// Don't throw false positives for static class properties.
-			if ( $this->is_class_object_call( $ptr ) === true ) {
+			if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $ptr ) === true ) {
 				continue;
 			}
 
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index bc2d09b250..ba312ec6ae 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -1,5 +1,12 @@
 <?php
 
 query_posts(); // Warning, use WP_Query instead.
-
 wp_reset_query(); // Warning, use wp_reset_postdata instead.
+
+/*
+ * Tests which are more specifically for the AbstractFunctionRestrictionsSniff class and Helper methods.
+ */
+
+// Ensure the sniff doesn't act on methods calls.
+$obj->query_posts(); // OK, not the global function.
+MyClass::wp_reset_query(); // OK, not the global function.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 93827ee355..d30f11cc10 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::has_object_operator_before
  * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedFunctionsSniff
  */
 final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
@@ -41,8 +42,7 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array(
 			3 => 1,
-			5 => 1,
+			4 => 1,
 		);
 	}
-
 }

From 40d5ac932e0c3d1e13ea2e02080a183fdca40940 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 13:14:34 +0200
Subject: [PATCH 485/822] ContextHelper::has_object_operator_before():
 simplify/use PHPCSUtils/support PHP 8.0 nullsafe object operator

* A non-inline HTML token will always have another non-empty token before it, if nothing else, the PHP open tag, so checking if `$before` is `false` is redundant.
* Implement use of the `Collections::objectOperators()` token group, which includes the PHP 8.0+ nullsafe object operator.

_Note: this automatically adds support for the nullsafe object operator to all sniffs using this method, either directly or indirectly._

Includes test via the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/Helpers/ContextHelper.php                | 14 +++-----------
 .../Tests/WP/DiscouragedFunctionsUnitTest.inc      |  1 +
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index b45855972b..dae6af6755 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 
 /**
  * Helper utilities for checking the context in which a token is used.
@@ -42,18 +43,9 @@ final class ContextHelper {
 	 * @return bool
 	 */
 	public static function has_object_operator_before( File $phpcsFile, $stackPtr ) {
-		$before = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-		if ( false === $before ) {
-			return false;
-		}
-
 		$tokens = $phpcsFile->getTokens();
-		if ( \T_OBJECT_OPERATOR !== $tokens[ $before ]['code']
-			&& \T_DOUBLE_COLON !== $tokens[ $before ]['code']
-		) {
-			return false;
-		}
+		$before = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
-		return true;
+		return isset( Collections::objectOperators()[ $tokens[ $before ]['code'] ] );
 	}
 }
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index ba312ec6ae..2693377ea4 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -10,3 +10,4 @@ wp_reset_query(); // Warning, use wp_reset_postdata instead.
 // Ensure the sniff doesn't act on methods calls.
 $obj->query_posts(); // OK, not the global function.
 MyClass::wp_reset_query(); // OK, not the global function.
+$obj?->query_posts(); // OK, not the global function.

From 02672aff73be2c654d78ecb076e6c441ed473b32 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 13:30:03 +0200
Subject: [PATCH 486/822] Move `is_token_namespaced()` utility method to
 dedicated `ContextHelper`

The `is_token_namespaced()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_token_namespaced()` method to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Related to 1465

This method is tested via the `WordPress.WP.DiscouragedFunctions` sniff.
---
 .../AbstractFunctionRestrictionsSniff.php     |  2 +-
 WordPress/Helpers/ContextHelper.php           | 40 +++++++++++++++++
 WordPress/Sniff.php                           | 43 ++-----------------
 .../Security/NonceVerificationSniff.php       |  2 +-
 .../Sniffs/WP/DiscouragedConstantsSniff.php   |  5 ++-
 .../Tests/WP/DiscouragedFunctionsUnitTest.inc |  7 +++
 .../Tests/WP/DiscouragedFunctionsUnitTest.php |  6 ++-
 7 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 9c42343292..e3ac2b1185 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -224,7 +224,7 @@ public function is_targetted_token( $stackPtr ) {
 			return false;
 		}
 
-		if ( $this->is_token_namespaced( $stackPtr ) === true ) {
+		if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $stackPtr ) === true ) {
 			return false;
 		}
 
diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index dae6af6755..2fdc468012 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -48,4 +48,44 @@ public static function has_object_operator_before( File $phpcsFile, $stackPtr )
 
 		return isset( Collections::objectOperators()[ $tokens[ $before ]['code'] ] );
 	}
+
+	/**
+	 * Check if a particular token is prefixed with a namespace.
+	 *
+	 * @internal This will give a false positive if the file is not namespaced and the token is prefixed
+	 * with `namespace\`.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool
+	 */
+	public static function is_token_namespaced( File $phpcsFile, $stackPtr ) {
+		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
+		if ( false === $prev ) {
+			return false;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+		if ( \T_NS_SEPARATOR !== $tokens[ $prev ]['code'] ) {
+			return false;
+		}
+
+		$before_prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
+		if ( false === $before_prev ) {
+			return false;
+		}
+
+		if ( \T_STRING !== $tokens[ $before_prev ]['code']
+			&& \T_NAMESPACE !== $tokens[ $before_prev ]['code']
+		) {
+			return false;
+		}
+
+		return true;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 90366447b8..fbd654b9c2 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -508,43 +508,6 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check if a particular token is prefixed with a namespace.
-	 *
-	 * @internal This will give a false positive if the file is not namespaced and the token is prefixed
-	 * with `namespace\`.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool
-	 */
-	protected function is_token_namespaced( $stackPtr ) {
-		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-
-		if ( false === $prev ) {
-			return false;
-		}
-
-		if ( \T_NS_SEPARATOR !== $this->tokens[ $prev ]['code'] ) {
-			return false;
-		}
-
-		$before_prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
-		if ( false === $before_prev ) {
-			return false;
-		}
-
-		if ( \T_STRING !== $this->tokens[ $before_prev ]['code']
-			&& \T_NAMESPACE !== $this->tokens[ $before_prev ]['code']
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Check if a token is (part of) a parameter for a function call to a select list of functions.
 	 *
@@ -614,7 +577,7 @@ protected function is_in_function_call( $stackPtr, $valid_functions, $global_fun
 				continue;
 			}
 
-			if ( $this->is_token_namespaced( $prev_non_empty ) === true ) {
+			if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $prev_non_empty ) === true ) {
 				continue;
 			}
 
@@ -1004,7 +967,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 						continue 2;
 					}
 
-					if ( $this->is_token_namespaced( $i ) === true ) {
+					if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $i ) === true ) {
 						// Namespaced function call.
 						continue 2;
 					}
@@ -1180,7 +1143,7 @@ public function is_use_of_global_constant( $stackPtr ) {
 			return false;
 		}
 
-		if ( $this->is_token_namespaced( $stackPtr ) === true ) {
+		if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $stackPtr ) === true ) {
 			// Namespaced constant of the same name.
 			return false;
 		}
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 7bc5ecdb9d..957e1eebdc 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -274,7 +274,7 @@ private function has_nonce_check( $stackPtr ) {
 					continue;
 				}
 
-				if ( $this->is_token_namespaced( $i ) === true ) {
+				if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $i ) === true ) {
 					continue;
 				}
 
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 729272ece0..4d6bb403a1 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -9,13 +9,14 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 
 /**
  * Warns against usage of discouraged WP CONSTANTS and recommends alternatives.
@@ -140,7 +141,7 @@ public function process_arbitrary_tstring( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->is_token_namespaced( $stackPtr ) === true ) {
+		if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $stackPtr ) === true ) {
 			// Namespaced constant of the same name.
 			return;
 		}
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 2693377ea4..62b8a3678c 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -11,3 +11,10 @@ wp_reset_query(); // Warning, use wp_reset_postdata instead.
 $obj->query_posts(); // OK, not the global function.
 MyClass::wp_reset_query(); // OK, not the global function.
 $obj?->query_posts(); // OK, not the global function.
+
+// Ensure the sniff doesn't act on namespaced calls.
+MyNamespace\query_posts(); // OK, not the global function.
+namespace\query_posts(); // OK, not the global function.
+
+// ... but does act on fully qualified function calls.
+\query_posts(); // Warning.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index d30f11cc10..4b46ca0933 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -21,6 +21,7 @@
  *
  * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::has_object_operator_before
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_token_namespaced
  * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedFunctionsSniff
  */
 final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
@@ -41,8 +42,9 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			3 => 1,
-			4 => 1,
+			3  => 1,
+			4  => 1,
+			20 => 1,
 		);
 	}
 }

From 16da3dbe8065723b1db2cb7d4b5e238e75eec656 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 13:32:40 +0200
Subject: [PATCH 487/822] ContextHelper::is_token_namespaced(): minor
 simplifications

* A non-inline HTML token will always have another non-empty token before it, if nothing else, the PHP open tag, so checking if `$prev` is `false` is redundant.
* Same for the second time this is done, as the same applies for the `T_NS_SEPARATOR` token.
---
 WordPress/Helpers/ContextHelper.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 2fdc468012..19994c422c 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -65,21 +65,14 @@ public static function has_object_operator_before( File $phpcsFile, $stackPtr )
 	 * @return bool
 	 */
 	public static function is_token_namespaced( File $phpcsFile, $stackPtr ) {
-		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-		if ( false === $prev ) {
-			return false;
-		}
-
 		$tokens = $phpcsFile->getTokens();
-		if ( \T_NS_SEPARATOR !== $tokens[ $prev ]['code'] ) {
-			return false;
-		}
+		$prev   = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
-		$before_prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
-		if ( false === $before_prev ) {
+		if ( \T_NS_SEPARATOR !== $tokens[ $prev ]['code'] ) {
 			return false;
 		}
 
+		$before_prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true );
 		if ( \T_STRING !== $tokens[ $before_prev ]['code']
 			&& \T_NAMESPACE !== $tokens[ $before_prev ]['code']
 		) {

From 547a0d1657a5d3655929781e1f0dc278ca4ab1ea Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 13:55:11 +0200
Subject: [PATCH 488/822] NamingConventions/ValidVariableName: use
 ContextHelper::has_object_operator_before()

This was previously not possible as the sniff extends an upstream PHPCS sniff and didn't have access to the methods in the `Sniff` class.
---
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 8e14268e0c..14f8991932 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -12,10 +12,10 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff as PHPCS_AbstractVariableSniff;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use PHPCSUtils\Utils\Variables;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\SnakeCaseHelper;
 
@@ -154,9 +154,8 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 			}
 		}
 
-		$in_class     = false;
-		$obj_operator = $phpcs_file->findPrevious( Tokens::$emptyTokens, ( $stack_ptr - 1 ), null, true );
-		if ( isset( Collections::objectOperators()[ $tokens[ $obj_operator ]['code'] ] ) ) {
+		$in_class = false;
+		if ( ContextHelper::has_object_operator_before( $phpcs_file, $stack_ptr ) === true ) {
 			// The variable lives within a class, and is referenced like
 			// this: MyClass::$_variable or $class->variable.
 			$in_class = true;

From f3461c6f9efd7375cf70bdbee9057898088cc86a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:15:46 +0200
Subject: [PATCH 489/822] NamingConventions/ValidVariableName: normalize
 parameter names

This is the only file in which snake_case parameter names are being used for the typical `$phpcsFile` and `$stackPtr` parameters.

This makes synching the file with upstream and otherwise editing the code counter-intuitive.

This commit normalizes the parameter names to use the expected case.
---
 .../ValidVariableNameSniff.php                | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 14f8991932..a61c420f1e 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -102,38 +102,38 @@ final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcs_file The file being scanned.
-	 * @param int                         $stack_ptr  The position of the current token in the
-	 *                                                stack passed in $tokens.
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
 	 *
 	 * @return void
 	 */
-	protected function processVariable( File $phpcs_file, $stack_ptr ) {
-		$tokens = $phpcs_file->getTokens();
+	protected function processVariable( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
 
 		// If it's a php reserved var, then its ok.
-		if ( Variables::isPHPReservedVarName( $tokens[ $stack_ptr ]['content'] ) ) {
+		if ( Variables::isPHPReservedVarName( $tokens[ $stackPtr ]['content'] ) ) {
 			return;
 		}
 
 		// Merge any custom variables with the defaults.
 		$this->merge_allow_lists();
 
-		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+		$var_name = ltrim( $tokens[ $stackPtr ]['content'], '$' );
 
 		// Likewise if it is a mixed-case var used by WordPress core.
 		if ( isset( $this->wordpress_mixed_case_vars[ $var_name ] ) ) {
 			return;
 		}
 
-		$obj_operator = $phpcs_file->findNext( Tokens::$emptyTokens, ( $stack_ptr + 1 ), null, true );
+		$obj_operator = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 		if ( \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code']
 			|| \T_NULLSAFE_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code']
 		) {
 			// Check to see if we are using a variable from an object.
-			$var = $phpcs_file->findNext( Tokens::$emptyTokens, ( $obj_operator + 1 ), null, true );
+			$var = $phpcsFile->findNext( Tokens::$emptyTokens, ( $obj_operator + 1 ), null, true );
 			if ( \T_STRING === $tokens[ $var ]['code'] ) {
-				$bracket = $phpcs_file->findNext( Tokens::$emptyTokens, ( $var + 1 ), null, true );
+				$bracket = $phpcsFile->findNext( Tokens::$emptyTokens, ( $var + 1 ), null, true );
 				if ( \T_OPEN_PARENTHESIS !== $tokens[ $bracket ]['code'] ) {
 					$obj_var_name = $tokens[ $var ]['content'];
 
@@ -148,14 +148,14 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 							$obj_var_name,
 							$suggested_name,
 						);
-						$phpcs_file->addError( $error, $var, 'UsedPropertyNotSnakeCase', $data );
+						$phpcsFile->addError( $error, $var, 'UsedPropertyNotSnakeCase', $data );
 					}
 				}
 			}
 		}
 
 		$in_class = false;
-		if ( ContextHelper::has_object_operator_before( $phpcs_file, $stack_ptr ) === true ) {
+		if ( ContextHelper::has_object_operator_before( $phpcsFile, $stackPtr ) === true ) {
 			// The variable lives within a class, and is referenced like
 			// this: MyClass::$_variable or $class->variable.
 			$in_class = true;
@@ -176,7 +176,7 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 					$var_name,
 					$suggested_name,
 				);
-				$phpcs_file->addError( $error, $stack_ptr, $error_name, $data );
+				$phpcsFile->addError( $error, $stackPtr, $error_name, $data );
 			}
 		}
 	}
@@ -184,23 +184,23 @@ protected function processVariable( File $phpcs_file, $stack_ptr ) {
 	/**
 	 * Processes class member variables.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcs_file The file being scanned.
-	 * @param int                         $stack_ptr  The position of the current token in the
-	 *                                                stack passed in $tokens.
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
 	 *
 	 * @return void
 	 */
-	protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
+	protected function processMemberVar( File $phpcsFile, $stackPtr ) {
 		// Make sure this is actually an OO property and not an OO method parameter or illegal property declaration.
-		if ( Scopes::isOOProperty( $phpcs_file, $stack_ptr ) === false ) {
+		if ( Scopes::isOOProperty( $phpcsFile, $stackPtr ) === false ) {
 			return;
 		}
 
 		// Merge any custom variables with the defaults.
 		$this->merge_allow_lists();
 
-		$tokens   = $phpcs_file->getTokens();
-		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+		$tokens   = $phpcsFile->getTokens();
+		$var_name = ltrim( $tokens[ $stackPtr ]['content'], '$' );
 
 		if ( isset( $this->allowed_mixed_case_member_var_names[ $var_name ] ) ) {
 			return;
@@ -213,24 +213,24 @@ protected function processMemberVar( File $phpcs_file, $stack_ptr ) {
 				$var_name,
 				$suggested_name,
 			);
-			$phpcs_file->addError( $error, $stack_ptr, 'PropertyNotSnakeCase', $data );
+			$phpcsFile->addError( $error, $stackPtr, 'PropertyNotSnakeCase', $data );
 		}
 	}
 
 	/**
 	 * Processes the variables found within a double quoted string.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcs_file The file being scanned.
-	 * @param int                         $stack_ptr  The position of the double quoted
-	 *                                                string.
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the double quoted
+	 *                                               string.
 	 *
 	 * @return void
 	 */
-	protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
-		$tokens = $phpcs_file->getTokens();
+	protected function processVariableInString( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
 
 		// There will always be embeds if the processVariableInString() was called.
-		$embeds = TextStrings::getEmbeds( $tokens[ $stack_ptr ]['content'] );
+		$embeds = TextStrings::getEmbeds( $tokens[ $stackPtr ]['content'] );
 
 		// Merge any custom variables with the defaults.
 		$this->merge_allow_lists();
@@ -259,7 +259,7 @@ protected function processVariableInString( File $phpcs_file, $stack_ptr ) {
 						$var_name,
 						$suggested_name,
 					);
-					$phpcs_file->addError( $error, $stack_ptr, 'InterpolatedVariableNotSnakeCase', $data );
+					$phpcsFile->addError( $error, $stackPtr, 'InterpolatedVariableNotSnakeCase', $data );
 				}
 			}
 		}

From 6d6106f0f236b7de65a691140d040b7a159580c7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 14:14:10 +0200
Subject: [PATCH 490/822] Move `is_in_function_call()` utility method to
 dedicated `ContextHelper`

The `is_in_function_call()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_in_function_call()` method to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Includes adding a type declaration for the `$valid_functions` parameter.

Related to 1465

This method will be tested via the `WordPress.Security.NonceVerification` sniff (via pre-existing and a few new tests).
---
 WordPress/Helpers/ContextHelper.php           | 82 +++++++++++++++++
 WordPress/Sniff.php                           | 89 ++-----------------
 .../Security/NonceVerificationSniff.php       |  2 +-
 WordPress/Sniffs/WP/CapitalPDangitSniff.php   |  3 +-
 WordPress/Sniffs/WP/CronIntervalSniff.php     |  5 +-
 .../Security/NonceVerificationUnitTest.inc    | 12 +++
 .../Security/NonceVerificationUnitTest.php    |  3 +
 7 files changed, 108 insertions(+), 88 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 19994c422c..8ddbb29c4e 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -81,4 +81,86 @@ public static function is_token_namespaced( File $phpcsFile, $stackPtr ) {
 
 		return true;
 	}
+
+	/**
+	 * Check if a token is (part of) a parameter for a function call to a select list of functions.
+	 *
+	 * This is useful, for instance, when trying to determine the context a variable is used in.
+	 *
+	 * For example: this function could be used to determine if the variable `$foo` is used
+	 * in a global function call to the function `is_foo()`.
+	 * In that case, a call to this function would return the stackPtr to the T_STRING `is_foo`
+	 * for code like: `is_foo( $foo, 'some_other_param' )`, while it would return `false` for
+	 * the following code `is_bar( $foo, 'some_other_param' )`.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
+	 * @param int                         $stackPtr        The index of the token in the stack.
+	 * @param array                       $valid_functions List of valid function names.
+	 *                                                     Note: The keys to this array should be the function names
+	 *                                                     in lowercase. Values are irrelevant.
+	 * @param bool                        $global_function Optional. Whether to make sure that the function call is
+	 *                                                     to a global function. If `false`, calls to methods, be it static
+	 *                                                     `Class::method()` or via an object `$obj->method()`, and
+	 *                                                     namespaced function calls, like `MyNS\function_name()` will
+	 *                                                     also be accepted.
+	 *                                                     Defaults to `true`.
+	 * @param bool                        $allow_nested    Optional. Whether to allow for nested function calls within the
+	 *                                                     call to this function.
+	 *                                                     I.e. when checking whether a token is within a function call
+	 *                                                     to `strtolower()`, whether to accept `strtolower( trim( $var ) )`
+	 *                                                     or only `strtolower( $var )`.
+	 *                                                     Defaults to `false`.
+	 *
+	 * @return int|bool Stack pointer to the function call T_STRING token or false otherwise.
+	 */
+	public static function is_in_function_call( File $phpcsFile, $stackPtr, array $valid_functions, $global_function = true, $allow_nested = false ) {
+		$tokens = $phpcsFile->getTokens();
+		if ( ! isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			return false;
+		}
+
+		$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
+		if ( false === $allow_nested ) {
+			$nested_parenthesis = array_reverse( $nested_parenthesis, true );
+		}
+
+		foreach ( $nested_parenthesis as $open => $close ) {
+			$prev_non_empty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open - 1 ), null, true );
+			if ( false === $prev_non_empty || \T_STRING !== $tokens[ $prev_non_empty ]['code'] ) {
+				continue;
+			}
+
+			if ( isset( $valid_functions[ strtolower( $tokens[ $prev_non_empty ]['content'] ) ] ) === false ) {
+				if ( false === $allow_nested ) {
+					// Function call encountered, but not to one of the allowed functions.
+					return false;
+				}
+
+				continue;
+			}
+
+			if ( false === $global_function ) {
+				return $prev_non_empty;
+			}
+
+			/*
+			 * Now, make sure it is a global function.
+			 */
+			if ( self::has_object_operator_before( $phpcsFile, $prev_non_empty ) === true ) {
+				continue;
+			}
+
+			if ( self::is_token_namespaced( $phpcsFile, $prev_non_empty ) === true ) {
+				continue;
+			}
+
+			return $prev_non_empty;
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index fbd654b9c2..e1a8ad89d3 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -497,7 +497,7 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 			'key_exists'       => true, // Alias.
 		);
 
-		$functionPtr = $this->is_in_function_call( $stackPtr, $valid_functions );
+		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
 		if ( false !== $functionPtr ) {
 			$second_param = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2 );
 			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
@@ -508,85 +508,6 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check if a token is (part of) a parameter for a function call to a select list of functions.
-	 *
-	 * This is useful, for instance, when trying to determine the context a variable is used in.
-	 *
-	 * For example: this function could be used to determine if the variable `$foo` is used
-	 * in a global function call to the function `is_foo()`.
-	 * In that case, a call to this function would return the stackPtr to the T_STRING `is_foo`
-	 * for code like: `is_foo( $foo, 'some_other_param' )`, while it would return `false` for
-	 * the following code `is_bar( $foo, 'some_other_param' )`.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int   $stackPtr        The index of the token in the stack.
-	 * @param array $valid_functions List of valid function names.
-	 *                               Note: The keys to this array should be the function names
-	 *                               in lowercase. Values are irrelevant.
-	 * @param bool  $global_function Optional. Whether to make sure that the function call is
-	 *                               to a global function. If `false`, calls to methods, be it static
-	 *                               `Class::method()` or via an object `$obj->method()`, and
-	 *                               namespaced function calls, like `MyNS\function_name()` will
-	 *                               also be accepted.
-	 *                               Defaults to `true`.
-	 * @param bool  $allow_nested    Optional. Whether to allow for nested function calls within the
-	 *                               call to this function.
-	 *                               I.e. when checking whether a token is within a function call
-	 *                               to `strtolower()`, whether to accept `strtolower( trim( $var ) )`
-	 *                               or only `strtolower( $var )`.
-	 *                               Defaults to `false`.
-	 *
-	 * @return int|bool Stack pointer to the function call T_STRING token or false otherwise.
-	 */
-	protected function is_in_function_call( $stackPtr, $valid_functions, $global_function = true, $allow_nested = false ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			return false;
-		}
-
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-		if ( false === $allow_nested ) {
-			$nested_parenthesis = array_reverse( $nested_parenthesis, true );
-		}
-
-		foreach ( $nested_parenthesis as $open => $close ) {
-
-			$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open - 1 ), null, true, null, true );
-			if ( false === $prev_non_empty || \T_STRING !== $this->tokens[ $prev_non_empty ]['code'] ) {
-				continue;
-			}
-
-			if ( isset( $valid_functions[ strtolower( $this->tokens[ $prev_non_empty ]['content'] ) ] ) === false ) {
-				if ( false === $allow_nested ) {
-					// Function call encountered, but not to one of the allowed functions.
-					return false;
-				}
-
-				continue;
-			}
-
-			if ( false === $global_function ) {
-				return $prev_non_empty;
-			}
-
-			/*
-			 * Now, make sure it is a global function.
-			 */
-			if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $prev_non_empty ) === true ) {
-				continue;
-			}
-
-			if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $prev_non_empty ) === true ) {
-				continue;
-			}
-
-			return $prev_non_empty;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if a token is inside of an is_...() statement.
 	 *
@@ -602,7 +523,7 @@ protected function is_in_type_test( $stackPtr ) {
 		 * The return can never be `0` as there will always be a PHP open tag before the
 		 * function call.
 		 */
-		return (bool) $this->is_in_function_call( $stackPtr, $this->typeTestFunctions );
+		return (bool) ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->typeTestFunctions );
 	}
 
 	/**
@@ -708,7 +629,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		$valid_functions += $this->unslashingFunctions;
 		$valid_functions += $this->arrayWalkingFunctions;
 
-		$functionPtr = $this->is_in_function_call( $stackPtr, $valid_functions );
+		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
 
 		// If this isn't a call to one of the valid functions, it sure isn't a sanitizing function.
 		if ( false === $functionPtr ) {
@@ -730,7 +651,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 			$valid_functions = array_diff_key( $valid_functions, $this->unslashingFunctions );
 
 			// Check is any of the remaining (sanitizing) functions is used.
-			$higherFunctionPtr = $this->is_in_function_call( $functionPtr, $valid_functions );
+			$higherFunctionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $functionPtr, $valid_functions );
 
 			// If there is no other valid function being used, this value is unsanitized.
 			if ( false === $higherFunctionPtr ) {
@@ -1067,7 +988,7 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 	 *              array-value comparison function.
 	 */
 	protected function is_in_array_comparison( $stackPtr ) {
-		$function_ptr = $this->is_in_function_call( $stackPtr, $this->arrayCompareFunctions, true, true );
+		$function_ptr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->arrayCompareFunctions, true, true );
 		if ( false === $function_ptr ) {
 			return false;
 		}
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 957e1eebdc..e7a6dc4114 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -204,7 +204,7 @@ private function has_nonce_check( $stackPtr ) {
 			|| $this->is_in_type_test( $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| $this->is_in_array_comparison( $stackPtr )
-			|| $this->is_in_function_call( $stackPtr, $this->unslashingFunctions ) !== false
+			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->unslashingFunctions ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
 		) {
 			$allow_nonce_after = true;
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 27a38bebd3..678ea7dfcd 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -13,6 +13,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -209,7 +210,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		// Ignore constant declarations via define().
-		if ( $this->is_in_function_call( $stackPtr, array( 'define' => true ), true, true ) ) {
+		if ( ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, array( 'define' => true ), true, true ) ) {
 			return;
 		}
 
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 84d1792b49..055eccf02a 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -9,7 +9,6 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
@@ -17,6 +16,8 @@
 use PHPCSUtils\Utils\Numbers;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Flag cron schedules less than 15 minutes.
@@ -94,7 +95,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		// Check if the text was found within a function call to add_filter().
-		$functionPtr = $this->is_in_function_call( $stackPtr, $this->valid_functions );
+		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->valid_functions );
 		if ( false === $functionPtr ) {
 			return;
 		}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index e3a12f28e2..c4e49c974d 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -301,3 +301,15 @@ function function_containing_nested_closure() {
 	};
 }
 
+// Tests specifically for the ContextHelper::is_in_function_call().
+function disallow_custom_unslash_before_noncecheck_via_method() {
+	$var = MyClass::stripslashes_from_strings_only( $_POST['foo'] ); // Bad.
+	wp_verify_nonce( $var );
+	echo $var;
+}
+
+function disallow_custom_unslash_before_noncecheck_via_namespaced_function() {
+	$var = MyNamespace\stripslashes_from_strings_only( $_POST['foo'] ); // Bad.
+	wp_verify_nonce( $var );
+	echo $var;
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 2fb94c8da5..3cf402baee 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_function_call
  * @covers \WordPressCS\WordPress\Sniffs\Security\NonceVerificationSniff
  */
 final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
@@ -56,6 +57,8 @@ public function getErrorList() {
 			202 => 1,
 			252 => 1,
 			269 => 1,
+			306 => 1,
+			312 => 1,
 		);
 	}
 

From 74c0a2f226b345db1ead1709a93a4eec5665b96c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 17:01:53 +0200
Subject: [PATCH 491/822] Move `is_in_type_test()` utility method to dedicated
 `ContextHelper`

The `is_in_type_test()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_in_type_test()` method and the associated `$typeTestFunctions` property to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Related to 1465

This method will be tested via the `WordPress.Security.NonceVerification` sniff (via pre-existing tests).
---
 WordPress/Helpers/ContextHelper.php           | 55 +++++++++++++++++++
 WordPress/Sniff.php                           | 50 -----------------
 .../Security/NonceVerificationSniff.php       |  2 +-
 .../Security/ValidatedSanitizedInputSniff.php |  3 +-
 .../Security/NonceVerificationUnitTest.php    |  1 +
 5 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 8ddbb29c4e..79e8d4e6f7 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -27,6 +27,40 @@
  */
 final class ContextHelper {
 
+	/**
+	 * List of PHP native functions to test the type of a variable.
+	 *
+	 * Using these functions is safe in combination with superglobals without
+	 * unslashing or sanitization.
+	 *
+	 * They should, however, not be regarded as unslashing or sanitization functions.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The property visibility was changed from `protected` to `private static`.
+	 *
+	 * @var array
+	 */
+	private static $typeTestFunctions = array(
+		'is_array'     => true,
+		'is_bool'      => true,
+		'is_callable'  => true,
+		'is_countable' => true,
+		'is_double'    => true,
+		'is_float'     => true,
+		'is_int'       => true,
+		'is_integer'   => true,
+		'is_iterable'  => true,
+		'is_long'      => true,
+		'is_null'      => true,
+		'is_numeric'   => true,
+		'is_object'    => true,
+		'is_real'      => true,
+		'is_resource'  => true,
+		'is_scalar'    => true,
+		'is_string'    => true,
+	);
+
 	/**
 	 * Check if a particular token acts - statically or non-statically - on an object.
 	 *
@@ -163,4 +197,25 @@ public static function is_in_function_call( File $phpcsFile, $stackPtr, array $v
 
 		return false;
 	}
+
+	/**
+	 * Check if a token is inside of an is_...() statement.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool Whether the token is being type tested.
+	 */
+	public static function is_in_type_test( File $phpcsFile, $stackPtr ) {
+		/*
+		 * Casting the potential integer stack pointer return value to boolean here is fine.
+		 * The return can never be `0` as there will always be a PHP open tag before the
+		 * function call.
+		 */
+		return (bool) self::is_in_function_call( $phpcsFile, $stackPtr, self::$typeTestFunctions );
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e1a8ad89d3..37542e8019 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -249,38 +249,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'wp_unslash'                     => true,
 	);
 
-	/**
-	 * List of PHP native functions to test the type of a variable.
-	 *
-	 * Using these functions is safe in combination with superglobals without
-	 * unslashing or sanitization.
-	 *
-	 * They should, however, not be regarded as unslashing or sanitization functions.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @var array
-	 */
-	protected $typeTestFunctions = array(
-		'is_array'     => true,
-		'is_bool'      => true,
-		'is_callable'  => true,
-		'is_countable' => true,
-		'is_double'    => true,
-		'is_float'     => true,
-		'is_int'       => true,
-		'is_integer'   => true,
-		'is_iterable'  => true,
-		'is_long'      => true,
-		'is_null'      => true,
-		'is_numeric'   => true,
-		'is_object'    => true,
-		'is_real'      => true,
-		'is_resource'  => true,
-		'is_scalar'    => true,
-		'is_string'    => true,
-	);
-
 	/**
 	 * Token which when they preceed code indicate the value is safely casted.
 	 *
@@ -508,24 +476,6 @@ protected function is_in_isset_or_empty( $stackPtr ) {
 		return false;
 	}
 
-	/**
-	 * Check if a token is inside of an is_...() statement.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool Whether the token is being type tested.
-	 */
-	protected function is_in_type_test( $stackPtr ) {
-		/*
-		 * Casting the potential integer stack pointer return value to boolean here is fine.
-		 * The return can never be `0` as there will always be a PHP open tag before the
-		 * function call.
-		 */
-		return (bool) ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->typeTestFunctions );
-	}
-
 	/**
 	 * Check if something is only being sanitized.
 	 *
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index e7a6dc4114..bf3a44f36c 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -201,7 +201,7 @@ private function has_nonce_check( $stackPtr ) {
 
 		$allow_nonce_after = false;
 		if ( $this->is_in_isset_or_empty( $stackPtr )
-			|| $this->is_in_type_test( $stackPtr )
+			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| $this->is_in_array_comparison( $stackPtr )
 			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->unslashingFunctions ) !== false
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 8067714a43..dc3a6fc619 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -177,7 +178,7 @@ function( $embed ) {
 		}
 
 		// If this variable is being tested with one of the `is_..()` functions, sanitization isn't needed.
-		if ( $this->is_in_type_test( $stackPtr ) ) {
+		if ( ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 3cf402baee..ea3ad7ceb5 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_function_call
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_type_test
  * @covers \WordPressCS\WordPress\Sniffs\Security\NonceVerificationSniff
  */
 final class NonceVerificationUnitTest extends AbstractSniffUnitTest {

From a0b8892cd344241ddf1a252f749390108e83a854 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 17:21:51 +0200
Subject: [PATCH 492/822] Move `is_in_isset_or_empty()` utility method to
 dedicated `ContextHelper`

The `is_in_isset_or_empty()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_in_isset_or_empty()` method to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Related to 1465

This method will be tested via the `WordPress.Security.NonceVerification` sniff (via pre-existing and new tests).
---
 WordPress/Helpers/ContextHelper.php           | 52 +++++++++++++++++++
 WordPress/Sniff.php                           | 48 -----------------
 .../Security/NonceVerificationSniff.php       |  2 +-
 .../Security/ValidatedSanitizedInputSniff.php |  2 +-
 .../Security/NonceVerificationUnitTest.inc    | 29 +++++++++++
 .../Security/NonceVerificationUnitTest.php    |  3 ++
 6 files changed, 86 insertions(+), 50 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 79e8d4e6f7..b675d78052 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\PassedParameters;
 
 /**
  * Helper utilities for checking the context in which a token is used.
@@ -218,4 +219,55 @@ public static function is_in_type_test( File $phpcsFile, $stackPtr ) {
 		 */
 		return (bool) self::is_in_function_call( $phpcsFile, $stackPtr, self::$typeTestFunctions );
 	}
+
+	/**
+	 * Check if a token is inside of an isset(), empty() or array_key_exists() statement.
+	 *
+	 * @since 0.5.0
+	 * @since 2.1.0 Now checks for the token being used as the array parameter
+	 *              in function calls to array_key_exists() and key_exists() as well.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool Whether the token is inside an isset() or empty() statement.
+	 */
+	public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+		if ( ! isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			return false;
+		}
+
+		$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
+
+		end( $nested_parenthesis );
+		$open_parenthesis = key( $nested_parenthesis );
+
+		$previous_non_empty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open_parenthesis - 1 ), null, true, null, true );
+		if ( false === $previous_non_empty ) {
+			return false;
+		}
+
+		$previous_code = $tokens[ $previous_non_empty ]['code'];
+		if ( \T_ISSET === $previous_code || \T_EMPTY === $previous_code ) {
+			return true;
+		}
+
+		$valid_functions = array(
+			'array_key_exists' => true,
+			'key_exists'       => true, // Alias.
+		);
+
+		$functionPtr = self::is_in_function_call( $phpcsFile, $stackPtr, $valid_functions );
+		if ( false !== $functionPtr ) {
+			$second_param = PassedParameters::getParameter( $phpcsFile, $functionPtr, 2 );
+			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 37542e8019..87d8303b0c 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -428,54 +428,6 @@ protected function init( File $phpcsFile ) {
 		$this->tokens    = $phpcsFile->getTokens();
 	}
 
-	/**
-	 * Check if a token is inside of an isset(), empty() or array_key_exists() statement.
-	 *
-	 * @since 0.5.0
-	 * @since 2.1.0 Now checks for the token being used as the array parameter
-	 *              in function calls to array_key_exists() and key_exists() as well.
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool Whether the token is inside an isset() or empty() statement.
-	 */
-	protected function is_in_isset_or_empty( $stackPtr ) {
-
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			return false;
-		}
-
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-
-		end( $nested_parenthesis );
-		$open_parenthesis = key( $nested_parenthesis );
-
-		$previous_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open_parenthesis - 1 ), null, true, null, true );
-		if ( false === $previous_non_empty ) {
-			return false;
-		}
-
-		$previous_code = $this->tokens[ $previous_non_empty ]['code'];
-		if ( \T_ISSET === $previous_code || \T_EMPTY === $previous_code ) {
-			return true;
-		}
-
-		$valid_functions = array(
-			'array_key_exists' => true,
-			'key_exists'       => true, // Alias.
-		);
-
-		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
-		if ( false !== $functionPtr ) {
-			$second_param = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, 2 );
-			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if something is only being sanitized.
 	 *
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index bf3a44f36c..3e551dc30b 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -200,7 +200,7 @@ private function has_nonce_check( $stackPtr ) {
 		}
 
 		$allow_nonce_after = false;
-		if ( $this->is_in_isset_or_empty( $stackPtr )
+		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| $this->is_in_array_comparison( $stackPtr )
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index dc3a6fc619..c34a84f8eb 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -126,7 +126,7 @@ function( $embed ) {
 		}
 
 		// This superglobal is being validated.
-		if ( $this->is_in_isset_or_empty( $stackPtr ) ) {
+		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index c4e49c974d..d330c9481f 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -313,3 +313,32 @@ function disallow_custom_unslash_before_noncecheck_via_namespaced_function() {
 	wp_verify_nonce( $var );
 	echo $var;
 }
+
+// Tests specifically for the ContextHelper::is_in_isset_or_empty().
+function allow_in_array_key_exists_before_noncecheck() {
+	if (array_key_exists('foo', $_POST) === false) { // OK.
+		return;
+	}
+
+	wp_verify_nonce( 'some_action' );
+}
+
+function allow_in_key_exists_before_noncecheck() {
+	if (key_exists('foo', $_POST['subset']) === false) { // OK.
+		return;
+	}
+
+	wp_verify_nonce( 'some_action' );
+}
+
+function disallow_in_custom_key_exists_before_noncecheck() {
+	if (My\key_exists('foo', $_POST['subset']) === false) { // Bad.
+		return;
+	}
+
+	if ($obj?->array_key_exists('foo', $_POST['subset']) === false) { // Bad.
+		return;
+	}
+
+	wp_verify_nonce( 'some_action' );
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index ea3ad7ceb5..ada93d3c50 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -22,6 +22,7 @@
  *
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_function_call
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_type_test
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_isset_or_empty
  * @covers \WordPressCS\WordPress\Sniffs\Security\NonceVerificationSniff
  */
 final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
@@ -60,6 +61,8 @@ public function getErrorList() {
 			269 => 1,
 			306 => 1,
 			312 => 1,
+			335 => 1,
+			339 => 1,
 		);
 	}
 

From dd6e0e1d0f903e90feb934589e76bbba95939816 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 17:50:43 +0200
Subject: [PATCH 493/822] ContextHelper::is_in_isset_or_empty(): move functions
 array to property

... instead of re-defining it each time the function is called.
---
 WordPress/Helpers/ContextHelper.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index b675d78052..df72157bd1 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -62,6 +62,18 @@ final class ContextHelper {
 		'is_string'    => true,
 	);
 
+	/**
+	 * List of PHP native functions to check if an array index exists.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array
+	 */
+	private static $key_exists_functions = array(
+		'array_key_exists' => true,
+		'key_exists'       => true, // Alias.
+	);
+
 	/**
 	 * Check if a particular token acts - statically or non-statically - on an object.
 	 *
@@ -255,12 +267,7 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 			return true;
 		}
 
-		$valid_functions = array(
-			'array_key_exists' => true,
-			'key_exists'       => true, // Alias.
-		);
-
-		$functionPtr = self::is_in_function_call( $phpcsFile, $stackPtr, $valid_functions );
+		$functionPtr = self::is_in_function_call( $phpcsFile, $stackPtr, self::$key_exists_functions );
 		if ( false !== $functionPtr ) {
 			$second_param = PassedParameters::getParameter( $phpcsFile, $functionPtr, 2 );
 			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {

From 2db54c6efcc4b2e54dc6afbd34394ab59d7d8a09 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 17:27:54 +0200
Subject: [PATCH 494/822] ContextHelper::is_in_isset_or_empty(): use PHPCSUtils

... to simplify the determination of whether a token is within a call to `isset()` or `empty()`.
---
 WordPress/Helpers/ContextHelper.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index df72157bd1..4964a4c6ea 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Parentheses;
 use PHPCSUtils\Utils\PassedParameters;
 
 /**
@@ -247,23 +248,7 @@ public static function is_in_type_test( File $phpcsFile, $stackPtr ) {
 	 * @return bool Whether the token is inside an isset() or empty() statement.
 	 */
 	public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
-		$tokens = $phpcsFile->getTokens();
-		if ( ! isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			return false;
-		}
-
-		$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
-
-		end( $nested_parenthesis );
-		$open_parenthesis = key( $nested_parenthesis );
-
-		$previous_non_empty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open_parenthesis - 1 ), null, true, null, true );
-		if ( false === $previous_non_empty ) {
-			return false;
-		}
-
-		$previous_code = $tokens[ $previous_non_empty ]['code'];
-		if ( \T_ISSET === $previous_code || \T_EMPTY === $previous_code ) {
+		if ( Parentheses::lastOwnerIn( $phpcsFile, $stackPtr, array( \T_ISSET, \T_EMPTY ) ) !== false ) {
 			return true;
 		}
 

From df3c4c2c2f7b9690a9bff8a890324f8c9b5b1812 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 17:46:47 +0200
Subject: [PATCH 495/822] ContextHelper::is_in_isset_or_empty(): add support
 for PHP 8.0 named parameters

Includes tests in the `WordPress.Security.NonceVerification` test file.
---
 WordPress/Helpers/ContextHelper.php           | 10 ++++++++--
 .../Security/NonceVerificationUnitTest.inc    | 20 +++++++++++++++++++
 .../Security/NonceVerificationUnitTest.php    |  2 ++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 4964a4c6ea..56c34c3cfc 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -254,8 +254,14 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 
 		$functionPtr = self::is_in_function_call( $phpcsFile, $stackPtr, self::$key_exists_functions );
 		if ( false !== $functionPtr ) {
-			$second_param = PassedParameters::getParameter( $phpcsFile, $functionPtr, 2 );
-			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
+			/*
+			 * Both functions being checked have the same parameters. If the function list would
+			 * be expanded, this needs to be revisited.
+			 */
+			$array_param = PassedParameters::getParameter( $phpcsFile, $functionPtr, 2, 'array' );
+			if ( false !== $array_param
+				&& ( $stackPtr >= $array_param['start'] && $stackPtr <= $array_param['end'] )
+			) {
 				return true;
 			}
 		}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index d330c9481f..af7734fa39 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -342,3 +342,23 @@ function disallow_in_custom_key_exists_before_noncecheck() {
 
 	wp_verify_nonce( 'some_action' );
 }
+
+function disallow_in_array_key_exists_before_noncecheck_when_not_in_array_param() {
+	if ( array_key_exists( $_POST, $GLOBALS ) === false ) { // Bad (not that it makes sense anyhow).
+		return;
+	}
+
+	if ( array_key_exists( arrays: $_POST, key: 'foo', ) === false ) { // Bad (typo in param label).
+		return;
+	}
+
+	wp_verify_nonce( 'some_action' );
+}
+
+function allow_in_array_key_exists_before_noncecheck_with_named_params() {
+	if (array_key_exists( array: $_POST, key: 'foo', ) === false) { // OK.
+		return;
+	}
+
+	wp_verify_nonce( 'some_action' );
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index ada93d3c50..7e34eaec7e 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -63,6 +63,8 @@ public function getErrorList() {
 			312 => 1,
 			335 => 1,
 			339 => 1,
+			347 => 1,
+			351 => 1,
 		);
 	}
 

From 94842f825084b26842221772a7fb6ef2c8174ca9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 18:12:09 +0200
Subject: [PATCH 496/822] Move `is_safe_casted()` utility method to dedicated
 `ContextHelper`

The `is_safe_casted()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_safe_casted()` method and the associated `$safe_casts` property to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Related to 1465

This method will be tested via the `WordPress.DB.PreparedSQL` sniff (via pre-existing tests).
---
 WordPress/Helpers/ContextHelper.php           | 46 +++++++++++++++++++
 WordPress/Sniff.php                           | 45 +-----------------
 WordPress/Sniffs/DB/PreparedSQLSniff.php      |  3 +-
 .../Sniffs/Security/EscapeOutputSniff.php     |  3 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.php    |  1 +
 5 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 56c34c3cfc..b2c17d498b 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -29,6 +29,22 @@
  */
 final class ContextHelper {
 
+	/**
+	 * Tokens which when they preceed code indicate the value is safely casted.
+	 *
+	 * @since 1.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The property visibility was changed from `protected` to `public static`.
+	 *
+	 * @var array
+	 */
+	public static $safe_casts = array(
+		\T_INT_CAST    => true,
+		\T_DOUBLE_CAST => true,
+		\T_BOOL_CAST   => true,
+		\T_UNSET_CAST  => true,
+	);
+
 	/**
 	 * List of PHP native functions to test the type of a variable.
 	 *
@@ -268,4 +284,34 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 
 		return false;
 	}
+
+	/**
+	 * Check if something is being casted to a safe value.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool Whether the token being casted.
+	 */
+	public static function is_safe_casted( File $phpcsFile, $stackPtr ) {
+		// Get the last non-empty token.
+		$prev = $phpcsFile->findPrevious(
+			Tokens::$emptyTokens,
+			( $stackPtr - 1 ),
+			null,
+			true
+		);
+
+		if ( false === $prev ) {
+			return false;
+		}
+
+		// Check if it is a safe cast.
+		$tokens = $phpcsFile->getTokens();
+		return isset( self::$safe_casts[ $tokens[ $prev ]['code'] ] );
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 87d8303b0c..8190c33c3a 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -249,20 +249,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'wp_unslash'                     => true,
 	);
 
-	/**
-	 * Token which when they preceed code indicate the value is safely casted.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @var array
-	 */
-	protected $safe_casts = array(
-		\T_INT_CAST    => true,
-		\T_DOUBLE_CAST => true,
-		\T_BOOL_CAST   => true,
-		\T_UNSET_CAST  => true,
-	);
-
 	/**
 	 * List of array functions which apply a callback to the array.
 	 *
@@ -452,7 +438,7 @@ protected function is_only_sanitized( $stackPtr ) {
 
 		// At this point we're expecting the value to have not been casted. If it
 		// was, it wasn't *only* casted, because it's also in a function.
-		if ( $this->is_safe_casted( $stackPtr ) ) {
+		if ( ContextHelper::is_safe_casted( $this->phpcsFile, $stackPtr ) ) {
 			return false;
 		}
 
@@ -461,33 +447,6 @@ protected function is_only_sanitized( $stackPtr ) {
 		return ( \count( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) === 1 );
 	}
 
-	/**
-	 * Check if something is being casted to a safe value.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool Whether the token being casted.
-	 */
-	protected function is_safe_casted( $stackPtr ) {
-
-		// Get the last non-empty token.
-		$prev = $this->phpcsFile->findPrevious(
-			Tokens::$emptyTokens,
-			( $stackPtr - 1 ),
-			null,
-			true
-		);
-
-		if ( false === $prev ) {
-			return false;
-		}
-
-		// Check if it is a safe cast.
-		return isset( $this->safe_casts[ $this->tokens[ $prev ]['code'] ] );
-	}
-
 	/**
 	 * Check if something is being sanitized.
 	 *
@@ -502,7 +461,7 @@ protected function is_safe_casted( $stackPtr ) {
 	protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 
 		// First we check if it is being casted to a safe value.
-		if ( $this->is_safe_casted( $stackPtr ) ) {
+		if ( ContextHelper::is_safe_casted( $this->phpcsFile, $stackPtr ) ) {
 			return true;
 		}
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 4da8cab299..6eac5e67b1 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
 
@@ -201,7 +202,7 @@ function ( $symbol ) {
 					continue;
 				}
 
-				if ( $this->is_safe_casted( $this->i ) ) {
+				if ( ContextHelper::is_safe_casted( $this->phpcsFile, $this->i ) ) {
 					continue;
 				}
 			}
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 6db0010f24..dd78849a19 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -375,7 +376,7 @@ public function process_token( $stackPtr ) {
 			$watch = false;
 
 			// Allow int/double/bool casted variables.
-			if ( isset( $this->safe_casts[ $this->tokens[ $i ]['code'] ] ) ) {
+			if ( isset( ContextHelper::$safe_casts[ $this->tokens[ $i ]['code'] ] ) ) {
 				$in_cast = true;
 				continue;
 			}
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index d707ac3960..b59c140c14 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_safe_casted
  * @covers \WordPressCS\WordPress\Helpers\WPDBTrait
  * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLSniff
  */

From 3a93195cf0982bf64b5a76cca3bfc800ba33fe90 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 18:14:28 +0200
Subject: [PATCH 497/822] ContextHelper::is_safe_casted(): minor simplification

A non-inline HTML token will always have another non-empty token before it, if nothing else, the PHP open tag, so checking if `$prev` is `false` is redundant.
---
 WordPress/Helpers/ContextHelper.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index b2c17d498b..8bc1a91ace 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -298,20 +298,9 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 	 * @return bool Whether the token being casted.
 	 */
 	public static function is_safe_casted( File $phpcsFile, $stackPtr ) {
-		// Get the last non-empty token.
-		$prev = $phpcsFile->findPrevious(
-			Tokens::$emptyTokens,
-			( $stackPtr - 1 ),
-			null,
-			true
-		);
-
-		if ( false === $prev ) {
-			return false;
-		}
-
-		// Check if it is a safe cast.
 		$tokens = $phpcsFile->getTokens();
+		$prev   = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+
 		return isset( self::$safe_casts[ $tokens[ $prev ]['code'] ] );
 	}
 }

From 00dcc63f3241545d05205a40836f73270800eae7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:41:32 +0200
Subject: [PATCH 498/822] WP/I18n: allow for new PHP 8.0+ `[s]printf()`
 placeholders

PHP 8.0 silently (not mentioned in migration guide, changelog etc - I only discovered it by accident via a small note in the manual) introduced two new placeholder characters for the `*printf()` range of functions.

This commit updates the regexes used in the `WordPress.WP.I18n` sniff to allow them to recognize those characters as placeholders which should be examined.

Includes unit tests.

Ref: https://www.php.net/manual/en/function.sprintf.php
---
 WordPress/Sniffs/WP/I18nSniff.php           | 4 ++--
 WordPress/Tests/WP/I18nUnitTest.1.inc       | 3 +++
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed | 3 +++
 WordPress/Tests/WP/I18nUnitTest.php         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 8b85327ecd..4c97f934b9 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -63,7 +63,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 				[0-9]+                     # Width specifier.
 				(?:\.(?:[ 0]|\'.)?[0-9]+)? # Optional precision specifier with optional padding character.
 			)
-			[bcdeEfFgGosuxX]           # Type specifier.
+			[bcdeEfFgGhHosuxX]           # Type specifier.
 		)
 	)/x';
 
@@ -85,7 +85,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 			[0-9]+                     # Width specifier.
 			(?:\.(?:[ 0]|\'.)?[0-9]+)? # Optional precision specifier with optional padding character.
 		)
-		[bcdeEfFgGosuxX]           # Type specifier.
+		[bcdeEfFgGhHosuxX]           # Type specifier.
 	)/x';
 
 	/**
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index 84826a0eea..c322877b00 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -314,4 +314,7 @@ esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
 // phpcs:set WordPress.WP.I18n text_domain[]
 esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
 
+// PHP 8.0+: safeguard handling of newly introduced placeholders.
+__( 'There are %1$h monkeys in the %H', 'my-slug' ); // Bad: multiple arguments should be numbered.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 60a5ba0541..15390d3cfb 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -314,4 +314,7 @@ esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
 // phpcs:set WordPress.WP.I18n text_domain[]
 esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
 
+// PHP 8.0+: safeguard handling of newly introduced placeholders.
+__( 'There are %1$h monkeys in the %H', 'my-slug' ); // Bad: multiple arguments should be numbered.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index be011054f9..99c214afd9 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -148,6 +148,7 @@ public function getErrorList( $testFile = '' ) {
 					306 => 1,
 					311 => 1,
 					315 => 1,
+					318 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':

From 60eeefacd801ffbf31f2958c44b7d23ddf02579d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 18:38:33 +0200
Subject: [PATCH 499/822] Move `is_in_array_comparison()` utility method to
 dedicated `ContextHelper`

The `is_in_array_comparison()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_in_array_comparison()` method and the associated `$arrayCompareFunctions` property to the new `WordPressCS\WordPress\Helpers\ContextHelper` class and starts using that class in the relevant sniffs.

Related to 1465

This method will be tested via the `WordPress.Security.NonceVerification` sniff (via pre-existing and new tests).
---
 WordPress/Helpers/ContextHelper.php           | 50 +++++++++++++++++++
 WordPress/Sniff.php                           | 44 ----------------
 .../Security/NonceVerificationSniff.php       |  2 +-
 .../Security/ValidatedSanitizedInputSniff.php |  2 +-
 .../Security/NonceVerificationUnitTest.inc    | 15 ++++++
 .../Security/NonceVerificationUnitTest.php    |  6 ++-
 6 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 8bc1a91ace..3fc2285d8c 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -91,6 +91,24 @@ final class ContextHelper {
 		'key_exists'       => true, // Alias.
 	);
 
+	/**
+	 * Array functions to compare a $needle to a predefined set of values.
+	 *
+	 * If the value is set to an integer, the function needs to have at least that
+	 * many parameters for it to be considered as a comparison.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The property visibility was changed from `protected` to `private static`.
+	 *
+	 * @var array <string function name> => <true|int>
+	 */
+	private static $arrayCompareFunctions = array(
+		'in_array'     => true,
+		'array_search' => true,
+		'array_keys'   => 2,
+	);
+
 	/**
 	 * Check if a particular token acts - statically or non-statically - on an object.
 	 *
@@ -303,4 +321,36 @@ public static function is_safe_casted( File $phpcsFile, $stackPtr ) {
 
 		return isset( self::$safe_casts[ $tokens[ $prev ]['code'] ] );
 	}
+
+	/**
+	 * Check if a token is inside of an array-value comparison function.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool Whether the token is (part of) a parameter to an
+	 *              array-value comparison function.
+	 */
+	public static function is_in_array_comparison( File $phpcsFile, $stackPtr ) {
+		$function_ptr = self::is_in_function_call( $phpcsFile, $stackPtr, self::$arrayCompareFunctions, true, true );
+		if ( false === $function_ptr ) {
+			return false;
+		}
+
+		$tokens        = $phpcsFile->getTokens();
+		$function_name = $tokens[ $function_ptr ]['content'];
+		if ( true === self::$arrayCompareFunctions[ $function_name ] ) {
+			return true;
+		}
+
+		if ( PassedParameters::getParameterCount( $phpcsFile, $function_ptr ) >= self::$arrayCompareFunctions[ $function_name ] ) {
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 8190c33c3a..8416a6516d 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -268,22 +268,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'map_deep'  => 2,
 	);
 
-	/**
-	 * Array functions to compare a $needle to a predefined set of values.
-	 *
-	 * If the value is set to an integer, the function needs to have at least that
-	 * many parameters for it to be considered as a comparison.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @var array <string function name> => <true|int>
-	 */
-	protected $arrayCompareFunctions = array(
-		'in_array'     => true,
-		'array_search' => true,
-		'array_keys'   => 2,
-	);
-
 	/**
 	 * Functions that format strings.
 	 *
@@ -838,34 +822,6 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 		return false;
 	}
 
-	/**
-	 * Check if a token is inside of an array-value comparison function.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool Whether the token is (part of) a parameter to an
-	 *              array-value comparison function.
-	 */
-	protected function is_in_array_comparison( $stackPtr ) {
-		$function_ptr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->arrayCompareFunctions, true, true );
-		if ( false === $function_ptr ) {
-			return false;
-		}
-
-		$function_name = $this->tokens[ $function_ptr ]['content'];
-		if ( true === $this->arrayCompareFunctions[ $function_name ] ) {
-			return true;
-		}
-
-		if ( PassedParameters::getParameterCount( $this->phpcsFile, $function_ptr ) >= $this->arrayCompareFunctions[ $function_name ] ) {
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Determine whether an arbitrary T_STRING token is the use of a global constant.
 	 *
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 3e551dc30b..ef33fb3fb6 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -203,7 +203,7 @@ private function has_nonce_check( $stackPtr ) {
 		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
-			|| $this->is_in_array_comparison( $stackPtr )
+			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->unslashingFunctions ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
 		) {
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index c34a84f8eb..f6994bb7e4 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -188,7 +188,7 @@ function( $embed ) {
 		}
 
 		// If this is a comparison using the array comparison functions, sanitization isn't needed.
-		if ( $this->is_in_array_comparison( $stackPtr ) ) {
+		if ( ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index af7734fa39..0a770054f7 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -362,3 +362,18 @@ function allow_in_array_key_exists_before_noncecheck_with_named_params() {
 
 	wp_verify_nonce( 'some_action' );
 }
+
+// Tests specifically for the ContextHelper::is_in_array_comparison().
+function allow_for_array_comparison_in_condition() {
+	if ( array_keys( $_GET['actions'], 'my_action', true ) ) { // OK.
+		check_admin_referer( 'foo' );
+		foo();
+	}
+}
+
+function disallow_for_non_array_comparison_in_condition() {
+	if ( array_keys( $_GET['actions'] ) ) { // Bad.
+		check_admin_referer( 'foo' );
+		foo();
+	}
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 7e34eaec7e..b9c81790a2 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -23,6 +23,7 @@
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_function_call
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_type_test
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_isset_or_empty
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_array_comparison
  * @covers \WordPressCS\WordPress\Sniffs\Security\NonceVerificationSniff
  */
 final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
@@ -74,7 +75,8 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		return array();
+		return array(
+			375 => 1,
+		);
 	}
-
 }

From 3266b927acba6497779194fd56ce744ebe698150 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 18:47:04 +0200
Subject: [PATCH 500/822] ContextHelper::is_in_array_comparison(): bug fix for
 case-insensitivity

Function names are case-insensitive. The `ContextHelper::is_in_function_call()` method already handles this correctly, but the `ContextHelper::is_in_array_comparison()` method did not, which could result in `Undefined array key` error notices.

Tested by adjusting one of the tests.
---
 WordPress/Helpers/ContextHelper.php                    | 2 +-
 WordPress/Tests/Security/NonceVerificationUnitTest.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 3fc2285d8c..018023853c 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -342,7 +342,7 @@ public static function is_in_array_comparison( File $phpcsFile, $stackPtr ) {
 		}
 
 		$tokens        = $phpcsFile->getTokens();
-		$function_name = $tokens[ $function_ptr ]['content'];
+		$function_name = strtolower( $tokens[ $function_ptr ]['content'] );
 		if ( true === self::$arrayCompareFunctions[ $function_name ] ) {
 			return true;
 		}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index 0a770054f7..f030af1a20 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -365,7 +365,7 @@ function allow_in_array_key_exists_before_noncecheck_with_named_params() {
 
 // Tests specifically for the ContextHelper::is_in_array_comparison().
 function allow_for_array_comparison_in_condition() {
-	if ( array_keys( $_GET['actions'], 'my_action', true ) ) { // OK.
+	if ( Array_Keys( $_GET['actions'], 'my_action', true ) ) { // OK.
 		check_admin_referer( 'foo' );
 		foo();
 	}

From 75410b40c1838d973468d9c16f8f8b5df3c38f4f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:10:06 +0200
Subject: [PATCH 501/822] ContextHelper::is_in_array_comparison(): add support
 for PHP 8.0 named parameters

With named parameters, the function call may have two parameters, without the required `$filter_value` param being one of them. Would make for an invalid function call, but that's not the concern of this sniff.

Fixed now by looking for a specific named parameter.

Includes tests in the `WordPress.Security.NonceVerification` test file (which include PHP 7.3+ trailing commas in function calls).
---
 WordPress/Helpers/ContextHelper.php               | 15 ++++++++++-----
 .../Tests/Security/NonceVerificationUnitTest.inc  | 14 ++++++++++++++
 .../Tests/Security/NonceVerificationUnitTest.php  |  1 +
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 018023853c..757479e46d 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -94,19 +94,22 @@ final class ContextHelper {
 	/**
 	 * Array functions to compare a $needle to a predefined set of values.
 	 *
-	 * If the value is set to an integer, the function needs to have at least that
-	 * many parameters for it to be considered as a comparison.
+	 * If the value is set to an array, the parameter specified in the array is
+	 * required for the function call to be considered as a comparison.
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The property visibility was changed from `protected` to `private static`.
 	 *
-	 * @var array <string function name> => <true|int>
+	 * @var array <string function name> => <true|array>
 	 */
 	private static $arrayCompareFunctions = array(
 		'in_array'     => true,
 		'array_search' => true,
-		'array_keys'   => 2,
+		'array_keys'   => array(
+			'position' => 2,
+			'name'     => 'filter_value',
+		),
 	);
 
 	/**
@@ -347,7 +350,9 @@ public static function is_in_array_comparison( File $phpcsFile, $stackPtr ) {
 			return true;
 		}
 
-		if ( PassedParameters::getParameterCount( $phpcsFile, $function_ptr ) >= self::$arrayCompareFunctions[ $function_name ] ) {
+		$target_param = self::$arrayCompareFunctions[ $function_name ];
+		$found_param  = PassedParameters::getParameter( $phpcsFile, $function_ptr, $target_param['position'], $target_param['name'] );
+		if ( false !== $found_param ) {
 			return true;
 		}
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index f030af1a20..a7da9675dd 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -377,3 +377,17 @@ function disallow_for_non_array_comparison_in_condition() {
 		foo();
 	}
 }
+
+function allow_for_array_comparison_in_condition_with_named_params() {
+	if ( array_keys( filter_value: 'my_action', array: $_GET['actions'], strict: true, ) ) { // OK.
+		check_admin_referer( 'foo' );
+		foo();
+	}
+}
+
+function disallow_for_non_array_comparison_in_condition_with_named_params() {
+	if ( array_keys( strict: true, array: $_GET['actions'], ) ) { // Bad, missing $filter_value param. Invalid function call, but not our concern.
+		check_admin_referer( 'foo' );
+		foo();
+	}
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index b9c81790a2..edcc509cb0 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -77,6 +77,7 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array(
 			375 => 1,
+			389 => 1,
 		);
 	}
 }

From ca754daea89db4e9b59878438a14c3b7b8a4da88 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:31:57 +0200
Subject: [PATCH 502/822] Move `get_list_variables()` utility method to
 dedicated `ListHelper`

The `get_list_variables()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `get_list_variables()` method to the new `WordPressCS\WordPress\Helpers\ListHelper` class and starts using that class in the relevant sniff.

The functionality in this new class will likely be replaced at some point in the future by functions from PHPCSUtils.

Related to 1465

This method will be tested via the `WordPress.WP.GlobalVariablesOverride` sniff (via pre-existing tests).
---
 WordPress/Helpers/ListHelper.php              | 103 ++++++++++++++++++
 WordPress/Sniff.php                           |  67 ------------
 .../PrefixAllGlobalsSniff.php                 |   3 +-
 .../WP/GlobalVariablesOverrideSniff.php       |   5 +-
 .../WP/GlobalVariablesOverrideUnitTest.php    |   1 +
 5 files changed, 109 insertions(+), 70 deletions(-)
 create mode 100644 WordPress/Helpers/ListHelper.php

diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
new file mode 100644
index 0000000000..098ddd9ff8
--- /dev/null
+++ b/WordPress/Helpers/ListHelper.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\Lists;
+
+/**
+ * Helper utilities for checking the context in which a token is used.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class ListHelper {
+
+	/**
+	 * Get a list of the token pointers to the variables being assigned to in a list statement.
+	 *
+	 * @internal No need to take special measures for nested lists. Nested or not,
+	 * each list part can only contain one variable being written to.
+	 *
+	 * @since 2.2.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
+	 * @param int                         $stackPtr        The position of the T_LIST or T_OPEN_SHORT_ARRAY
+	 *                                                     token in the stack.
+	 * @param array                       $list_open_close Optional. Array containing the token pointers to
+	 *                                                     the list opener and closer.
+	 *
+	 * @return array Array with the stack pointers to the variables or an empty
+	 *               array when not a (short) list.
+	 */
+	public static function get_list_variables( File $phpcsFile, $stackPtr, $list_open_close = array() ) {
+		$tokens = $phpcsFile->getTokens();
+
+		if ( \T_LIST !== $tokens[ $stackPtr ]['code']
+			&& \T_OPEN_SHORT_ARRAY !== $tokens[ $stackPtr ]['code']
+		) {
+			return array();
+		}
+
+		if ( empty( $list_open_close ) ) {
+			$list_open_close = Lists::getOpenClose( $phpcsFile, $stackPtr );
+			if ( false === $list_open_close ) {
+				// Not a (short) list.
+				return array();
+			}
+		}
+
+		$var_pointers = array();
+		$current      = $list_open_close['opener'];
+		$closer       = $list_open_close['closer'];
+		$last         = false;
+		do {
+			++$current;
+			$next_comma = $phpcsFile->findNext( \T_COMMA, $current, $closer );
+			if ( false === $next_comma ) {
+				$next_comma = $closer;
+				$last       = true;
+			}
+
+			// Skip over the "key" part in keyed lists.
+			$arrow = $phpcsFile->findNext( \T_DOUBLE_ARROW, $current, $next_comma );
+			if ( false !== $arrow ) {
+				$current = ( $arrow + 1 );
+			}
+
+			/*
+			 * Each list item can only have one variable to which an assignment is being made.
+			 * This can be an array with a (variable) index, but that doesn't matter, we're only
+			 * concerned with the actual variable.
+			 */
+			$var = $phpcsFile->findNext( \T_VARIABLE, $current, $next_comma );
+			if ( false !== $var ) {
+				// Not an empty list item.
+				$var_pointers[] = $var;
+			}
+
+			$current = $next_comma;
+
+		} while ( false === $last );
+
+		return $var_pointers;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 8190c33c3a..eada830c87 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -968,71 +968,4 @@ public function is_use_of_global_constant( $stackPtr ) {
 
 		return true;
 	}
-
-	/**
-	 * Get a list of the token pointers to the variables being assigned to in a list statement.
-	 *
-	 * @internal No need to take special measures for nested lists. Nested or not,
-	 * each list part can only contain one variable being written to.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param int   $stackPtr        The position of the T_LIST or T_OPEN_SHORT_ARRAY
-	 *                               token in the stack.
-	 * @param array $list_open_close Optional. Array containing the token pointers to
-	 *                               the list opener and closer.
-	 *
-	 * @return array Array with the stack pointers to the variables or an empty
-	 *               array when not a (short) list.
-	 */
-	protected function get_list_variables( $stackPtr, $list_open_close = array() ) {
-		if ( \T_LIST !== $this->tokens[ $stackPtr ]['code']
-			&& \T_OPEN_SHORT_ARRAY !== $this->tokens[ $stackPtr ]['code']
-		) {
-			return array();
-		}
-
-		if ( empty( $list_open_close ) ) {
-			$list_open_close = Lists::getOpenClose( $this->phpcsFile, $stackPtr );
-			if ( false === $list_open_close ) {
-				// Not a (short) list.
-				return array();
-			}
-		}
-
-		$var_pointers = array();
-		$current      = $list_open_close['opener'];
-		$closer       = $list_open_close['closer'];
-		$last         = false;
-		do {
-			++$current;
-			$next_comma = $this->phpcsFile->findNext( \T_COMMA, $current, $closer );
-			if ( false === $next_comma ) {
-				$next_comma = $closer;
-				$last       = true;
-			}
-
-			// Skip over the "key" part in keyed lists.
-			$arrow = $this->phpcsFile->findNext( \T_DOUBLE_ARROW, $current, $next_comma );
-			if ( false !== $arrow ) {
-				$current = ( $arrow + 1 );
-			}
-
-			/*
-			 * Each list item can only have one variable to which an assignment is being made.
-			 * This can be an array with a (variable) index, but that doesn't matter, we're only
-			 * concerned with the actual variable.
-			 */
-			$var = $this->phpcsFile->findNext( \T_VARIABLE, $current, $next_comma );
-			if ( false !== $var ) {
-				// Not an empty list item.
-				$var_pointers[] = $var;
-			}
-
-			$current = $next_comma;
-
-		} while ( false === $last );
-
-		return $var_pointers;
-	}
 }
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 72a174e23f..ca15a34dbe 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -27,6 +27,7 @@
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\DeprecationHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Helpers\ListHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
@@ -789,7 +790,7 @@ protected function process_list_assignment( $stackPtr ) {
 			return;
 		}
 
-		$var_pointers = $this->get_list_variables( $stackPtr, $list_open_close );
+		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr, $list_open_close );
 		foreach ( $var_pointers as $ptr ) {
 			$this->process_variable_assignment( $ptr, true );
 		}
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index fcb7a8273d..1890c78311 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -19,6 +19,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Helpers\ListHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper;
 use WordPressCS\WordPress\Sniff;
@@ -179,7 +180,7 @@ protected function process_list_assignment( $stackPtr ) {
 			return;
 		}
 
-		$var_pointers = $this->get_list_variables( $stackPtr, $list_open_close );
+		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr, $list_open_close );
 		foreach ( $var_pointers as $ptr ) {
 			$this->process_variable_assignment( $ptr, true );
 		}
@@ -367,7 +368,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 					continue;
 				}
 
-				$var_pointers = $this->get_list_variables( $ptr, $list_open_close );
+				$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $ptr, $list_open_close );
 				foreach ( $var_pointers as $ptr ) {
 					$var_name = $this->tokens[ $ptr ]['content'];
 					if ( '$GLOBALS' === $var_name ) {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index 23fa6d1f9f..f063f11c13 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
  *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ListHelper
  * @covers \WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper
  * @covers \WordPressCS\WordPress\Sniffs\WP\GlobalVariablesOverrideSniff
  */

From 22de9af2095811f30435b6942fda504c2a0563e2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 18 Apr 2023 11:49:21 +0200
Subject: [PATCH 503/822] ListHelper::get_list_variables(): use PHPCSUtils /
 prevent false positives on complex list item keys

Use the PHPCSUtils `Lists::getAssignments()` method to parse a list to its individual items.

Notes:
* As `Lists::getAssignments()` method only expects the list stack pointer, the `$list_open_close` parameter is no longer needed and has been removed.
* With the method now being stand-alone, it would still be good to validate the received token is usable before passing it off to `Lists::getAssignments()`, so some defensive coding has been put in place to do so.
* Even so, the call to `Lists::getAssignments()` still has to be wrapped in a `try`/`catch` as it will throw an exception for live coding/unfinished list structures.

While working on this, I realized there was still a bug in PHPCSUtils. I've fixed that now and the fix is included in the PHPCSUtils `1.0.5` release.
---
 WordPress/Helpers/ListHelper.php              | 74 +++++++++----------
 WordPress/Sniff.php                           |  1 -
 .../PrefixAllGlobalsSniff.php                 |  2 +-
 .../WP/GlobalVariablesOverrideSniff.php       |  4 +-
 .../WP/GlobalVariablesOverrideUnitTest.1.inc  | 21 ++++++
 composer.json                                 |  2 +-
 6 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index 098ddd9ff8..4078aa2423 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -9,7 +9,9 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
+use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Lists;
 
 /**
@@ -38,65 +40,59 @@ final class ListHelper {
 	 * @since 2.2.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$list_open_close` parameter was dropped.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
-	 * @param int                         $stackPtr        The position of the T_LIST or T_OPEN_SHORT_ARRAY
-	 *                                                     token in the stack.
-	 * @param array                       $list_open_close Optional. Array containing the token pointers to
-	 *                                                     the list opener and closer.
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the T_LIST or T_OPEN_SHORT_ARRAY
+	 *                                               token in the stack.
 	 *
 	 * @return array Array with the stack pointers to the variables or an empty
 	 *               array when not a (short) list.
 	 */
-	public static function get_list_variables( File $phpcsFile, $stackPtr, $list_open_close = array() ) {
+	public static function get_list_variables( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
-		if ( \T_LIST !== $tokens[ $stackPtr ]['code']
-			&& \T_OPEN_SHORT_ARRAY !== $tokens[ $stackPtr ]['code']
+		// Is this one of the tokens this function handles ?
+		if ( isset( Collections::listOpenTokensBC()[ $tokens[ $stackPtr ]['code'] ] ) === false ) {
+			return array();
+		}
+
+		if ( isset( Collections::shortArrayListOpenTokensBC()[ $tokens[ $stackPtr ]['code'] ] )
+			&& Lists::isShortList( $phpcsFile, $stackPtr ) === false
 		) {
 			return array();
 		}
 
-		if ( empty( $list_open_close ) ) {
-			$list_open_close = Lists::getOpenClose( $phpcsFile, $stackPtr );
-			if ( false === $list_open_close ) {
-				// Not a (short) list.
-				return array();
-			}
+		try {
+			$assignments = Lists::getAssignments( $phpcsFile, $stackPtr );
+		} catch ( RuntimeException $e ) {
+			// Parse error/live coding.
+			return array();
 		}
 
 		$var_pointers = array();
-		$current      = $list_open_close['opener'];
-		$closer       = $list_open_close['closer'];
-		$last         = false;
-		do {
-			++$current;
-			$next_comma = $phpcsFile->findNext( \T_COMMA, $current, $closer );
-			if ( false === $next_comma ) {
-				$next_comma = $closer;
-				$last       = true;
+
+		foreach ( $assignments as $assign ) {
+			if ( true === $assign['is_empty'] ) {
+				continue;
 			}
 
-			// Skip over the "key" part in keyed lists.
-			$arrow = $phpcsFile->findNext( \T_DOUBLE_ARROW, $current, $next_comma );
-			if ( false !== $arrow ) {
-				$current = ( $arrow + 1 );
+			if ( true === $assign['is_nested_list'] ) {
+				/*
+				 * Recurse into the nested list and get the variables.
+				 * No need to `catch` any errors as only lists can be nested in lists.
+				 */
+				$var_pointers += self::get_list_variables( $phpcsFile, $assign['assignment_token'] );
+				continue;
 			}
 
 			/*
-			 * Each list item can only have one variable to which an assignment is being made.
-			 * This can be an array with a (variable) index, but that doesn't matter, we're only
-			 * concerned with the actual variable.
+			 * Ok, so this must be a "normal" assignment in the list.
+			 * Set the variable pointer both as the key as well as the value, so we can use array join
+			 * for nested lists (above).
 			 */
-			$var = $phpcsFile->findNext( \T_VARIABLE, $current, $next_comma );
-			if ( false !== $var ) {
-				// Not an empty list item.
-				$var_pointers[] = $var;
-			}
-
-			$current = $next_comma;
-
-		} while ( false === $last );
+			$var_pointers[ $assign['assignment_token'] ] = $assign['assignment_token'];
+		}
 
 		return $var_pointers;
 	}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index eada830c87..84c02267bb 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -12,7 +12,6 @@
 use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ca15a34dbe..03e72181af 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -790,7 +790,7 @@ protected function process_list_assignment( $stackPtr ) {
 			return;
 		}
 
-		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr, $list_open_close );
+		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr );
 		foreach ( $var_pointers as $ptr ) {
 			$this->process_variable_assignment( $ptr, true );
 		}
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 1890c78311..408a0ebf4c 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -180,7 +180,7 @@ protected function process_list_assignment( $stackPtr ) {
 			return;
 		}
 
-		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr, $list_open_close );
+		$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $stackPtr );
 		foreach ( $var_pointers as $ptr ) {
 			$this->process_variable_assignment( $ptr, true );
 		}
@@ -368,7 +368,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 					continue;
 				}
 
-				$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $ptr, $list_open_close );
+				$var_pointers = ListHelper::get_list_variables( $this->phpcsFile, $ptr );
 				foreach ( $var_pointers as $ptr ) {
 					$var_name = $this->tokens[ $ptr ]['content'];
 					if ( '$GLOBALS' === $var_name ) {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index fa95298116..981d1127bc 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -294,3 +294,24 @@ enum Suit: string implements Colorful {
 		[$mode] = $array; // Bad, global variable in function scope.
 	}
 }
+
+/*
+ * Safeguard against false positives in combination with PHP 7.1 keyed lists which can have bloody anything as keys... *sigh*
+ * The below are all Okay: not assignment to a WP global var, but use of the WP global var in a key or as the array key for an assignment.
+ * Includes test with PHP 7.3 reference assignments.
+ */
+list(
+	$map->getKey($type, $urls) => $not_a_wp_global,
+	array( $tab, $tabs ) => &$not_a_wp_global['key'][$tab],
+	get($year, $day) => $not_a_wp_global[$year]
+) = $array;
+[
+	$map->getKey($type, $urls) => $not_a_wp_global['key'][$tab],
+	array( $tab, $tabs ) => $not_a_wp_global,
+	get($year, $day) => &$not_a_wp_global[$year]
+] = $array;
+
+// Live coding/parse error.
+// This has to be the last test in the file!
+list( $tab, $tabs
+
diff --git a/composer.json b/composer.json
index db34b5ff6c..7b5534930e 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"php": ">=5.4",
 		"ext-filter": "*",
 		"squizlabs/php_codesniffer": "^3.7.2",
-		"phpcsstandards/phpcsutils": "^1.0",
+		"phpcsstandards/phpcsutils": "^1.0.5",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},
 	"require-dev": {

From d65f89362383224a3b71427306cecd687e4c85f8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:17:00 +0200
Subject: [PATCH 504/822] AbstractFunctionRestrictionsSniff: add test for
 non-listed function

... to ensure the abstract sniff doesn't act on functions which are not our target.

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
_These tests are deliberately placed in this sniff as a) it doesn't have a WP version component, so the test file wouldn't need to be reorganized and b) the sniff is not likely to move to PHPCSExtra as it is WP specific._
---
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 62b8a3678c..2764359986 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -18,3 +18,6 @@ namespace\query_posts(); // OK, not the global function.
 
 // ... but does act on fully qualified function calls.
 \query_posts(); // Warning.
+
+// Ensure the sniff doesn't act on functions not listed in the target functions array.
+query_post(); // OK, not one of the target functions.

From b2f0e13c1776b5ea46888b619aa4891a779b15fc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:16:13 +0100
Subject: [PATCH 505/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): remove some
 redundant code

1. The sniff only listens to `T_STRING`, so the check for a token code mismatch would never be `true`.
    Note: there are other abstracts which extend from this one, which do listen to other tokens, but those have their own `is_targetted_token()` method.
2. A `T_STRING` token will always have another non-empty token before it, if nothing else, the PHP open tag, so checking if `$prev` is `false` is redundant.
---
 .../AbstractFunctionRestrictionsSniff.php     | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index e3ac2b1185..bfe4730be3 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -214,11 +214,6 @@ public function process_token( $stackPtr ) {
 	 * @return bool
 	 */
 	public function is_targetted_token( $stackPtr ) {
-
-		if ( \T_STRING !== $this->tokens[ $stackPtr ]['code'] ) {
-			return false;
-		}
-
 		// Exclude function definitions, class methods, and namespaced calls.
 		if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $stackPtr ) === true ) {
 			return false;
@@ -229,17 +224,16 @@ public function is_targetted_token( $stackPtr ) {
 		}
 
 		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-		if ( false !== $prev ) {
-			// Skip sniffing on function, class definitions or for function aliases in use statements.
-			$skipped = array(
-				\T_FUNCTION        => \T_FUNCTION,
-				\T_CLASS           => \T_CLASS,
-				\T_AS              => \T_AS, // Use declaration alias.
-			);
-
-			if ( isset( $skipped[ $this->tokens[ $prev ]['code'] ] ) ) {
-				return false;
-			}
+
+		// Skip sniffing on function, class definitions or for function aliases in use statements.
+		$skipped = array(
+			\T_FUNCTION        => \T_FUNCTION,
+			\T_CLASS           => \T_CLASS,
+			\T_AS              => \T_AS, // Use declaration alias.
+		);
+
+		if ( isset( $skipped[ $this->tokens[ $prev ]['code'] ] ) ) {
+			return false;
 		}
 
 		// Check if this could even be a function call.

From 533a3046de8ea3e9d1ac4f026f8f960ae34c000c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:38:39 +0100
Subject: [PATCH 506/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): add tests with OO
 declarations

... to safeguard that the sniff skips out early for OO structure declarations and make sure that all OO structures are taking into account.

This shouldn't be a problem anymore since PHPCS 3.7.0, but just making sure.

Includes renaming the variable containing the array of tokens to skip out on.

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/AbstractFunctionRestrictionsSniff.php     | 12 ++++++------
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index bfe4730be3..8d1e6ef30f 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -225,14 +225,14 @@ public function is_targetted_token( $stackPtr ) {
 
 		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
-		// Skip sniffing on function, class definitions or for function aliases in use statements.
-		$skipped = array(
-			\T_FUNCTION        => \T_FUNCTION,
-			\T_CLASS           => \T_CLASS,
-			\T_AS              => \T_AS, // Use declaration alias.
+		// Skip sniffing on function, OO definitions or for function aliases in use statements.
+		$invalid_tokens  = Tokens::$ooScopeTokens;
+		$invalid_tokens += array(
+			\T_FUNCTION => \T_FUNCTION,
+			\T_AS       => \T_AS, // Use declaration alias.
 		);
 
-		if ( isset( $skipped[ $this->tokens[ $prev ]['code'] ] ) ) {
+		if ( isset( $invalid_tokens[ $this->tokens[ $prev ]['code'] ] ) ) {
 			return false;
 		}
 
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 2764359986..7f90e4a6cb 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -21,3 +21,9 @@ namespace\query_posts(); // OK, not the global function.
 
 // Ensure the sniff doesn't act on functions not listed in the target functions array.
 query_post(); // OK, not one of the target functions.
+
+// Ignore, not a function call.
+class WP_Reset_Query {}
+interface Query_Posts {}
+trait WP_Reset_Query {}
+enum Query_Posts {}

From a3fbe256541a39f1c48b535cb2a3c51dfb1d1f40 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 11:58:02 +0200
Subject: [PATCH 507/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): add tests with
 import use declarations

... to safeguard that the sniff does not act on class imports, does act on function imports, but does not act on aliases for imports.

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 6 ++++++
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 7f90e4a6cb..5c2e28c309 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -27,3 +27,9 @@ class WP_Reset_Query {}
 interface Query_Posts {}
 trait WP_Reset_Query {}
 enum Query_Posts {}
+
+// Ensure the sniff flags function `use` statements, but not class `use` statements or aliases.
+use Query_Posts; // OK.
+use function wp_reset_query; // Warning.
+use function wp_reset_query as myFunction; // Warning.
+use function someOtherFunction as wp_reset_query; // OK, alias, not our target.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 4b46ca0933..3ccfe7473b 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -45,6 +45,8 @@ public function getWarningList() {
 			3  => 1,
 			4  => 1,
 			20 => 1,
+			33 => 1,
+			34 => 1,
 		);
 	}
 }

From 62526bc35435136cda05e94a0b1f11c60eeca8a4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:21:20 +0200
Subject: [PATCH 508/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): add test with live
 coding/parse error

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 5c2e28c309..9771b368be 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -33,3 +33,7 @@ use Query_Posts; // OK.
 use function wp_reset_query; // Warning.
 use function wp_reset_query as myFunction; // Warning.
 use function someOtherFunction as wp_reset_query; // OK, alias, not our target.
+
+// Live coding/parse error.
+// This has to be the last test in the file!!!
+\query_posts

From d5ead2efe8e283d6ae0f08c103163351ac0e15c5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:22:44 +0100
Subject: [PATCH 509/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): bug fix - false
 positive on function declaration returning by reference

Includes test in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/AbstractFunctionRestrictionsSniff.php     | 5 ++++-
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 8d1e6ef30f..ae46e0cb4e 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -223,7 +223,10 @@ public function is_targetted_token( $stackPtr ) {
 			return false;
 		}
 
-		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+		$search                   = Tokens::$emptyTokens;
+		$search[ \T_BITWISE_AND ] = \T_BITWISE_AND;
+
+		$prev = $this->phpcsFile->findPrevious( $search, ( $stackPtr - 1 ), null, true );
 
 		// Skip sniffing on function, OO definitions or for function aliases in use statements.
 		$invalid_tokens  = Tokens::$ooScopeTokens;
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 9771b368be..9e6512ae8b 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -34,6 +34,9 @@ use function wp_reset_query; // Warning.
 use function wp_reset_query as myFunction; // Warning.
 use function someOtherFunction as wp_reset_query; // OK, alias, not our target.
 
+// Bug fix: prevent false positive for functions declared to return by reference.
+function &query_posts() {} // OK, function declaration, not function use.
+
 // Live coding/parse error.
 // This has to be the last test in the file!!!
 \query_posts

From bb1e9a68a10e0039178d1b0a774613dd5dc9d67d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:22:09 +0200
Subject: [PATCH 510/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): bug fix - false
 positive for class instantiation

... when the class has the same name as a targetted function.

Includes test in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/AbstractFunctionRestrictionsSniff.php     | 1 +
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index ae46e0cb4e..0c1d7d0bbc 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -232,6 +232,7 @@ public function is_targetted_token( $stackPtr ) {
 		$invalid_tokens  = Tokens::$ooScopeTokens;
 		$invalid_tokens += array(
 			\T_FUNCTION => \T_FUNCTION,
+			\T_NEW      => \T_NEW,
 			\T_AS       => \T_AS, // Use declaration alias.
 		);
 
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 9e6512ae8b..fb9c404e71 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -34,8 +34,9 @@ use function wp_reset_query; // Warning.
 use function wp_reset_query as myFunction; // Warning.
 use function someOtherFunction as wp_reset_query; // OK, alias, not our target.
 
-// Bug fix: prevent false positive for functions declared to return by reference.
+// Bug fixes: prevent false positives for functions declared to return by reference or class instantiations.
 function &query_posts() {} // OK, function declaration, not function use.
+$obj = new WP_Reset_Query(); // OK, class instantiation, not function call.
 
 // Live coding/parse error.
 // This has to be the last test in the file!!!

From 1f31c4be72264869ad30eb0c4252a456cb6c1afa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 20 Mar 2023 23:10:55 +0100
Subject: [PATCH 511/822] 
 AbstractFunctionRestrictionsSniff::is_targetted_token(): prevent false
 positives on PHP 8.0+ attributes

`T_STRING` tokens in PHP 8.0+ attributes are either class names or possibly constant names (as a parameter for the class instantiation).
They are never function calls (as things are).

This commit ensures that `T_STRING` tokens in attributes are not confused with function calls.

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/AbstractFunctionRestrictionsSniff.php     | 6 ++++++
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 0c1d7d0bbc..8ebd5e031c 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -223,6 +224,11 @@ public function is_targetted_token( $stackPtr ) {
 			return false;
 		}
 
+		if ( Context::inAttribute( $this->phpcsFile, $stackPtr ) ) {
+			// Class instantiation or constant in attribute, not function call.
+			return false;
+		}
+
 		$search                   = Tokens::$emptyTokens;
 		$search[ \T_BITWISE_AND ] = \T_BITWISE_AND;
 
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index fb9c404e71..65a42e86d2 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -38,6 +38,12 @@ use function someOtherFunction as wp_reset_query; // OK, alias, not our target.
 function &query_posts() {} // OK, function declaration, not function use.
 $obj = new WP_Reset_Query(); // OK, class instantiation, not function call.
 
+// Prevent false positives on class instantiations in PHP 8.0+ attributes.
+class AttributesShouldBeIgnored {
+	#[WP_Reset_Query()]
+	public function foo() {}
+}
+
 // Live coding/parse error.
 // This has to be the last test in the file!!!
 \query_posts

From 6f6013c2d88e3238d89a6e22d2064fa48b0a7a15 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:11:56 +0200
Subject: [PATCH 512/822] AbstractFunctionRestrictionsSniff::process_token():
 add tests for the `exclude` property

Tests have been added to the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 .../Tests/WP/DiscouragedFunctionsUnitTest.inc  | 18 ++++++++++++++++++
 .../Tests/WP/DiscouragedFunctionsUnitTest.php  |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 65a42e86d2..7dd7131268 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -44,6 +44,24 @@ class AttributesShouldBeIgnored {
 	public function foo() {}
 }
 
+/*
+ * Test exclude property.
+ */
+// Exclude one group:
+// phpcs:set WordPress.WP.DiscouragedFunctions exclude[] query_posts
+query_posts(); // OK, excluded group.
+\wp_reset_query(); // Warning.
+
+// Exclude all groups:
+// phpcs:set WordPress.WP.DiscouragedFunctions exclude[] query_posts,wp_reset_query
+query_posts(); // OK, excluded group.
+wp_reset_query(); // OK, excluded group.
+
+// Reset group exclusions.
+// phpcs:set WordPress.WP.DiscouragedFunctions exclude[]
+\query_posts(); // Warning.
+
+
 // Live coding/parse error.
 // This has to be the last test in the file!!!
 \query_posts
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 3ccfe7473b..6706385ed7 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -47,6 +47,8 @@ public function getWarningList() {
 			20 => 1,
 			33 => 1,
 			34 => 1,
+			53 => 1,
+			62 => 1,
 		);
 	}
 }

From a30c7e7a06acf33f05705235adce5c32df859784 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:43:13 +0200
Subject: [PATCH 513/822] AbstractFunctionRestrictionsSniff: add test with
 empty functions group

This test is added to the `WordPress.DB.RestrictedFunctions` test class as we need to test the sniff with both the `$unittest_groups` property set and not set, so we need to use a second class to test the abstract properly.

The `WordPress.DB.RestrictedFunctions` sniff was chosen deliberately as it is one of the few function related sniff which use the `'allow'` key, which will allow us to test the correct handling of that key as well.
---
 .../Tests/DB/RestrictedFunctionsUnitTest.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index 521c39df4f..ecd0de5968 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Tests\DB;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
  * Unit test class for the DB_RestrictedFunctions sniff.
@@ -19,10 +20,39 @@
  * @since   0.10.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
+ * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedFunctionsSniff
  */
 final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 
+	/**
+	 * Add a number of extra restricted functions to unit test the abstract
+	 * AbstractFunctionRestrictionsSniff class.
+	 *
+	 * @before
+	 */
+	protected function enhanceGroups() {
+		parent::setUp();
+
+		AbstractFunctionRestrictionsSniff::$unittest_groups = array(
+			'test-empty-funtions-array' => array(
+				'type'      => 'error',
+				'message'   => 'Detected usage of %s.',
+				'functions' => array(),
+			),
+		);
+	}
+
+	/**
+	 * Reset the $groups property.
+	 *
+	 * @after
+	 */
+	protected function resetGroups() {
+		AbstractFunctionRestrictionsSniff::$unittest_groups = array();
+		parent::tearDown();
+	}
+
 	/**
 	 * Returns the lines where errors should occur.
 	 *

From c2eee38f122b785ecf02e2bcca9a5f1300379bfe Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:55:34 +0200
Subject: [PATCH 514/822] AbstractFunctionRestrictionsSniff: bug fix - function
 names should be compared case-insensitively

While WP natively doesn't use non-snakecase function names, the abstract may be used by external sniffs, so should handle both snake_case as well as camelCase/camelCaps methos correctly.

This commit ensures that the names of the functions in each group, as well as the names of the function in a potential `'allow'` key are handled case-insensitively.

Includes tests via the `WordPress.DB.RestrictedFunctions` sniff.
---
 .../AbstractFunctionRestrictionsSniff.php     | 20 ++++++++++++++-----
 .../Tests/DB/RestrictedFunctionsUnitTest.inc  |  6 ++++++
 .../Tests/DB/RestrictedFunctionsUnitTest.php  |  8 ++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 8ebd5e031c..0746e7078d 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -155,13 +155,23 @@ protected function setup_groups( $key ) {
 		foreach ( $this->groups as $groupName => $group ) {
 			if ( empty( $group[ $key ] ) ) {
 				unset( $this->groups[ $groupName ] );
-			} else {
-				$items       = array_map( array( $this, 'prepare_name_for_regex' ), $group[ $key ] );
-				$all_items[] = $items;
-				$items       = implode( '|', $items );
+				continue;
+			}
+
+			// Lowercase the items and potential allows as the comparisons should be done case-insensitively.
+			// Note: this disregards non-ascii names, but as we don't have any of those, that is okay for now.
+			$items                              = array_map( 'strtolower', $group[ $key ] );
+			$this->groups[ $groupName ][ $key ] = $items;
 
-				$this->groups[ $groupName ]['regex'] = sprintf( $this->regex_pattern, $items );
+			if ( ! empty( $group['allow'] ) ) {
+				$this->groups[ $groupName ]['allow'] = array_change_key_case( $group['allow'], \CASE_LOWER );
 			}
+
+			$items       = array_map( array( $this, 'prepare_name_for_regex' ), $items );
+			$all_items[] = $items;
+			$items       = implode( '|', $items );
+
+			$this->groups[ $groupName ]['regex'] = sprintf( $this->regex_pattern, $items );
 		}
 
 		if ( empty( $this->groups ) ) {
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc
index 6286e32def..bb976bf8fe 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc
@@ -82,9 +82,15 @@ maxdb_stat();
 
 // WP Native function which was named a bit unfortunately.
 mysql_to_rfc3339(); // Ok.
+Mysql_to_RFC3339(); // Ok, comparison should be done case insensitively.
 
 // Other WP Native functions which shouldn't give a problem anyway.
 mysql2date(); // Ok.
 wp_check_mysql_version(); // Ok.
 wp_check_php_mysql_version(); // Ok.
 WP_Date_Query::build_mysql_datetime(); // Ok.
+
+// Verify the "allow" key in the function groups is handled case-insensitively.
+myFictionFunction(); // Bad.
+myFictional(); // OK.
+Myfictional(); // OK.
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index ecd0de5968..6d1d2a9e0f 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -40,6 +40,12 @@ protected function enhanceGroups() {
 				'message'   => 'Detected usage of %s.',
 				'functions' => array(),
 			),
+			'test_allow-key-handled-case-insensitively' => array(
+				'type'      => 'error',
+				'message'   => 'Detected usage of %s.',
+				'functions' => array( 'myFiction*' ),
+				'allow'     => array( 'myFictional' => true ),
+			),
 		);
 	}
 
@@ -106,6 +112,8 @@ public function getErrorList() {
 			74 => 1,
 			75 => 1,
 			76 => 1,
+
+			94 => 1,
 		);
 	}
 

From f639417a0a8e7bd3887e9931e59b09968c56ac47 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Apr 2023 14:00:40 +0200
Subject: [PATCH 515/822] AbstractFunctionRestrictionsSniff: add test with PHP
 8.1+ first class callables

... to ensure the abstract sniff will cause those to be flagged as well.

Tested via tests in the test file for the `WordPress.WP.DiscouragedFunctions` sniff.
---
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc | 2 ++
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
index 7dd7131268..5e952933d2 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -61,6 +61,8 @@ wp_reset_query(); // OK, excluded group.
 // phpcs:set WordPress.WP.DiscouragedFunctions exclude[]
 \query_posts(); // Warning.
 
+// Safeguard that a function used as a PHP 8.1+ first class callable is also flagged.
+call_user_func( query_posts(...), $param ); // Warning.
 
 // Live coding/parse error.
 // This has to be the last test in the file!!!
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 6706385ed7..c5bf9a64b8 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -49,6 +49,7 @@ public function getWarningList() {
 			34 => 1,
 			53 => 1,
 			62 => 1,
+			65 => 1,
 		);
 	}
 }

From 53b24318ad5730e03971a43dcf1e754e692fe7a7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 10 Jan 2023 18:09:44 +0100
Subject: [PATCH 516/822] 
 AbstractClassRestrictionsSniff::get_namespaced_classname(): efficiency tweak

Instead of doing a preliminary search for the `T_NAMESPACE` token, just let the PHPCSUtils `Namespaces::determineNamespace()` method handle the namespace determination.

Finding the previous `T_NAMESPACE` token can be quite token walking intensive as if the token isn't used, it would mean walking all the way back to the start of the file before `false` is returned.

While the PHPCSUtils method will also do this, it will do this in a much more efficient and precise manner. Additionally, it will cache the results, meaning that it will only do this token walking once per file per PHPCS run (at most).
---
 WordPress/AbstractClassRestrictionsSniff.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 22a0609cd7..486157e080 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -226,22 +226,14 @@ protected function get_namespaced_classname( $classname, $search_from ) {
 			$classname = substr( $classname, 10 );
 		}
 
-		$namespace_keyword = $this->phpcsFile->findPrevious( \T_NAMESPACE, $search_from );
-		if ( false === $namespace_keyword ) {
+		$namespace = Namespaces::determineNamespace( $this->phpcsFile, $search_from );
+		if ( '' === $namespace ) {
 			// No namespace keyword found at all, so global namespace.
 			$classname = '\\' . $classname;
 		} else {
-			$namespace = Namespaces::determineNamespace( $this->phpcsFile, $search_from );
-
-			if ( ! empty( $namespace ) ) {
-				$classname = '\\' . $namespace . '\\' . $classname;
-			} else {
-				// No actual namespace found, so global namespace.
-				$classname = '\\' . $classname;
-			}
+			$classname = '\\' . $namespace . '\\' . $classname;
 		}
 
 		return $classname;
 	}
-
 }

From 81b5d70765f2c85633563d9ac270a22af2199a7c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 16:04:32 +0200
Subject: [PATCH 517/822] 
 AbstractClassRestrictionsSniff::get_namespaced_classname(): bug fix -
 namespace operator is case-insensitive

The `namespace` keyword as an operator was not being recognized correctly when not in lowercase, while PHP treats the keyword insensitively, so so should the sniff.

Fixed now.

Includes unit test.
---
 WordPress/AbstractClassRestrictionsSniff.php       | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 3 +++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 486157e080..e83a4ac2d3 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -222,7 +222,7 @@ protected function get_namespaced_classname( $classname, $search_from ) {
 		}
 
 		// Remove the namespace keyword if used.
-		if ( 0 === strpos( $classname, 'namespace\\' ) ) {
+		if ( 0 === stripos( $classname, 'namespace\\' ) ) {
 			$classname = substr( $classname, 10 );
 		}
 
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 60d70609bb..af8b53c4ec 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -64,3 +64,6 @@ $db9 = new \My\DBlayer; // Error.
 
 echo mysqli::$affected_rows; // Error.
 class YourMysqliC extends \mysqli {} // Error.
+
+// Bug fix: namespace keyword as operator is case-insensitive.
+class YourMysqliC extends NameSpace\mysqli {} // Error.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 1ee99d0840..c14146b76e 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -96,6 +96,7 @@ public function getErrorList( $testFile = '' ) {
 					63 => 1,
 					65 => 1,
 					66 => 1,
+					69 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From 105f9660757d48fe6c7ba109f8acc25fb372d6e7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:12:10 +0200
Subject: [PATCH 518/822] AbstractClassRestrictionsSniff::is_targetted_token():
 bug fix - false positives icw hierarchy keywords

When a hierarchy keyword or a variable would be before the double colon, the sniff would potential walk too far back and identify an unrelated `T_STRING` token as the class name.

Includes unit tests (which would throw two errors on each line without the fix).

Fixes 2184
---
 WordPress/AbstractClassRestrictionsSniff.php       |  8 +++++++-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index e83a4ac2d3..c7c0515430 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Namespaces;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -136,7 +137,12 @@ public function is_targetted_token( $stackPtr ) {
 		}
 
 		if ( \T_DOUBLE_COLON === $token['code'] ) {
-			$nameEnd   = $this->phpcsFile->findPrevious( \T_STRING, ( $stackPtr - 1 ) );
+			$nameEnd = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+			if ( \T_STRING !== $this->tokens[ $nameEnd ]['code'] ) {
+				// Hierarchy keyword or object stored in variable.
+				return false;
+			}
+
 			$nameStart = ( $this->phpcsFile->findPrevious( array( \T_STRING, \T_NS_SEPARATOR, \T_NAMESPACE ), ( $nameEnd - 1 ), null, true, null, true ) + 1 );
 			$length    = ( $nameEnd - ( $nameStart - 1 ) );
 			$classname = $this->phpcsFile->getTokensAsString( $nameStart, $length );
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index af8b53c4ec..e62465be8c 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -67,3 +67,13 @@ class YourMysqliC extends \mysqli {} // Error.
 
 // Bug fix: namespace keyword as operator is case-insensitive.
 class YourMysqliC extends NameSpace\mysqli {} // Error.
+
+// Issue #2184 Prevent false positives when searching for the class name before a double colon.
+class NotOurTarget extends SomethingElse {
+	public function doSomething() {
+		echo mysqli();
+		if (self::$property === static::$property
+			|| $obj::$property === parent::$property
+		) {}
+	}
+}

From c814320ae01ea722e12ebe2363c5a9f56bbf9654 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 14:55:38 +0200
Subject: [PATCH 519/822] AbstractClassRestrictionsSniff::is_targetted_token():
 use PHPCSUtils [1]

... for the name determination based on a `::`.

Note: the condition checking for `T_NS_SEPARATOR` is not necessary as the `get_namespaced_classname()` method checks this as well and will return straight away in that case.
---
 WordPress/AbstractClassRestrictionsSniff.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index c7c0515430..e1f5159112 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -10,6 +10,8 @@
 namespace WordPressCS\WordPress;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\Namespaces;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -143,13 +145,9 @@ public function is_targetted_token( $stackPtr ) {
 				return false;
 			}
 
-			$nameStart = ( $this->phpcsFile->findPrevious( array( \T_STRING, \T_NS_SEPARATOR, \T_NAMESPACE ), ( $nameEnd - 1 ), null, true, null, true ) + 1 );
-			$length    = ( $nameEnd - ( $nameStart - 1 ) );
-			$classname = $this->phpcsFile->getTokensAsString( $nameStart, $length );
-
-			if ( \T_NS_SEPARATOR !== $this->tokens[ $nameStart ]['code'] ) {
-				$classname = $this->get_namespaced_classname( $classname, ( $nameStart - 1 ) );
-			}
+			$nameStart = ( $this->phpcsFile->findPrevious( Collections::namespacedNameTokens(), ( $nameEnd - 1 ), null, true ) + 1 );
+			$classname = GetTokensAsString::noEmpties( $this->phpcsFile, $nameStart, $nameEnd );
+			$classname = $this->get_namespaced_classname( $classname, ( $nameStart - 1 ) );
 		}
 
 		// Stop if we couldn't determine a classname.

From 813b83394d8e8db5fa186659e35939a771801d9b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:24:59 +0200
Subject: [PATCH 520/822] AbstractClassRestrictionsSniff::is_targetted_token():
 bug fix - false negative on class instantiation ending on close tag

Includes unit test.
---
 WordPress/AbstractClassRestrictionsSniff.php       | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 5 +++++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index e1f5159112..aaf8ae7dc8 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -125,7 +125,7 @@ public function is_targetted_token( $stackPtr ) {
 
 		if ( \in_array( $token['code'], array( \T_NEW, \T_EXTENDS, \T_IMPLEMENTS ), true ) ) {
 			if ( \T_NEW === $token['code'] ) {
-				$nameEnd = ( $this->phpcsFile->findNext( array( \T_OPEN_PARENTHESIS, \T_WHITESPACE, \T_SEMICOLON, \T_OBJECT_OPERATOR ), ( $stackPtr + 2 ) ) - 1 );
+				$nameEnd = ( $this->phpcsFile->findNext( array( \T_OPEN_PARENTHESIS, \T_WHITESPACE, \T_SEMICOLON, \T_OBJECT_OPERATOR, \T_CLOSE_TAG ), ( $stackPtr + 2 ) ) - 1 );
 			} else {
 				$nameEnd = ( $this->phpcsFile->findNext( array( \T_CLOSE_CURLY_BRACKET, \T_WHITESPACE ), ( $stackPtr + 2 ) ) - 1 );
 			}
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index e62465be8c..33d505c4d4 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -77,3 +77,8 @@ class NotOurTarget extends SomethingElse {
 		) {}
 	}
 }
+
+// Bug fix: false negative when an object instantiation ends on a PHP close tag without whitespace.
+$db1 = new mysqli?><!-- Error. -->
+<div>Something</div>
+<?php
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index c14146b76e..4e931a7442 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -97,6 +97,7 @@ public function getErrorList( $testFile = '' ) {
 					65 => 1,
 					66 => 1,
 					69 => 1,
+					82 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From fbce869ea68f5f9546439c60a6a53fd249321d84 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:33:36 +0200
Subject: [PATCH 521/822] AbstractClassRestrictionsSniff::is_targetted_token():
 bug fix - false negative on class instantiation with method chaining

Note: the `->` or `?->` object operators can only be used in this context if the `new ...` is wrapped in parentheses, so the `T_OBJECT_OPERATOR` was redundant in the search.

Includes unit tests.
---
 WordPress/AbstractClassRestrictionsSniff.php       | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 4 ++++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php   | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index aaf8ae7dc8..5c2f08367d 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -125,7 +125,7 @@ public function is_targetted_token( $stackPtr ) {
 
 		if ( \in_array( $token['code'], array( \T_NEW, \T_EXTENDS, \T_IMPLEMENTS ), true ) ) {
 			if ( \T_NEW === $token['code'] ) {
-				$nameEnd = ( $this->phpcsFile->findNext( array( \T_OPEN_PARENTHESIS, \T_WHITESPACE, \T_SEMICOLON, \T_OBJECT_OPERATOR, \T_CLOSE_TAG ), ( $stackPtr + 2 ) ) - 1 );
+				$nameEnd = ( $this->phpcsFile->findNext( array( \T_OPEN_PARENTHESIS, \T_WHITESPACE, \T_SEMICOLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_TAG ), ( $stackPtr + 2 ) ) - 1 );
 			} else {
 				$nameEnd = ( $this->phpcsFile->findNext( array( \T_CLOSE_CURLY_BRACKET, \T_WHITESPACE ), ( $stackPtr + 2 ) ) - 1 );
 			}
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 33d505c4d4..ab9fd7868b 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -82,3 +82,7 @@ class NotOurTarget extends SomethingElse {
 $db1 = new mysqli?><!-- Error. -->
 <div>Something</div>
 <?php
+
+// Bug fix: prevent false negatives on object instantiation with chaining.
+$db10 = (new PDO)->exec(); // Error.
+$db11 = (new PDO)?->exec(); // Error.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 4e931a7442..85687e43c8 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -98,6 +98,8 @@ public function getErrorList( $testFile = '' ) {
 					66 => 1,
 					69 => 1,
 					82 => 1,
+					87 => 1,
+					88 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From e7d3676bcb461361c63f92f6891018a16d4b8d11 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:35:54 +0200
Subject: [PATCH 522/822] AbstractClassRestrictionsSniff: add an extra test

---
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 3 +++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index ab9fd7868b..63f5f0ba8b 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -86,3 +86,6 @@ $db1 = new mysqli?><!-- Error. -->
 // Bug fix: prevent false negatives on object instantiation with chaining.
 $db10 = (new PDO)->exec(); // Error.
 $db11 = (new PDO)?->exec(); // Error.
+
+// Safeguard handling of class which extends and implements.
+class MyMysqliWithArrayAccess extends mysqli implements ArrayAccess {} // Error.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 85687e43c8..533a02c426 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -100,6 +100,7 @@ public function getErrorList( $testFile = '' ) {
 					82 => 1,
 					87 => 1,
 					88 => 1,
+					91 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From 8a1cb3ca8420da92e24071a725eb6c738ebf4950 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 15:16:31 +0200
Subject: [PATCH 523/822] AbstractClassRestrictionsSniff::is_targetted_token():
 bug fix - sniff does not bow out early on hierarchy keywords

The abstract class turns every found name into a fully qualified name, so, as things are, the hierarchy keywords would be prefixed with a `\` too, so the `in_array()` comparison would never match.

While this doesn't lead to false positives, it should still be fixed for performance reasons.

Fixed now.

Includes unit test.
---
 WordPress/AbstractClassRestrictionsSniff.php       | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 5c2f08367d..392d668898 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -156,7 +156,7 @@ public function is_targetted_token( $stackPtr ) {
 		}
 
 		// Nothing to do if one of the hierarchy keywords - 'parent', 'self' or 'static' - is used.
-		if ( \in_array( $classname, array( 'parent', 'self', 'static' ), true ) ) {
+		if ( \in_array( $classname, array( '\parent', '\self', '\static' ), true ) ) {
 			return false;
 		}
 
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 63f5f0ba8b..0f1fc1e292 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -89,3 +89,8 @@ $db11 = (new PDO)?->exec(); // Error.
 
 // Safeguard handling of class which extends and implements.
 class MyMysqliWithArrayAccess extends mysqli implements ArrayAccess {} // Error.
+
+// Safeguard handling of new with hierarchy keywords.
+$obj = new self();
+$obj = new parent();
+$obj = new static();

From 9373c210dec49ac9fe62810898fec0bf72109a82 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 15:18:50 +0200
Subject: [PATCH 524/822] AbstractClassRestrictionsSniff::is_targetted_token():
 bug fix - hierarchy keywords are case-insensitive

... so should be matched in a case-insensitive manner.

While this doesn't lead to false positives, it should still be fixed for performance reasons.

Fixed now.

Includes (adjusted) unit tests.
---
 WordPress/AbstractClassRestrictionsSniff.php       | 2 +-
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 392d668898..128fc86c68 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -156,7 +156,7 @@ public function is_targetted_token( $stackPtr ) {
 		}
 
 		// Nothing to do if one of the hierarchy keywords - 'parent', 'self' or 'static' - is used.
-		if ( \in_array( $classname, array( '\parent', '\self', '\static' ), true ) ) {
+		if ( \in_array( strtolower( $classname ), array( '\parent', '\self', '\static' ), true ) ) {
 			return false;
 		}
 
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 0f1fc1e292..083d6c3c84 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -92,5 +92,5 @@ class MyMysqliWithArrayAccess extends mysqli implements ArrayAccess {} // Error.
 
 // Safeguard handling of new with hierarchy keywords.
 $obj = new self();
-$obj = new parent();
-$obj = new static();
+$obj = new Parent();
+$obj = new STATIC();

From d5daba18bcb4d684eb0e18804cccb796f3f17946 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 15:24:36 +0200
Subject: [PATCH 525/822] AbstractClassRestrictionsSniff::is_targetted_token():
 use PHPCSUtils [2]

... for the name determination based on a `new ...` etc.

Note: the condition checking for `T_NS_SEPARATOR` is not necessary as the `get_namespaced_classname()` method checks this as well and will return straight away in that case.
---
 WordPress/AbstractClassRestrictionsSniff.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 128fc86c68..bd3b7aa949 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -130,12 +130,8 @@ public function is_targetted_token( $stackPtr ) {
 				$nameEnd = ( $this->phpcsFile->findNext( array( \T_CLOSE_CURLY_BRACKET, \T_WHITESPACE ), ( $stackPtr + 2 ) ) - 1 );
 			}
 
-			$length    = ( $nameEnd - ( $stackPtr + 1 ) );
-			$classname = $this->phpcsFile->getTokensAsString( ( $stackPtr + 2 ), $length );
-
-			if ( \T_NS_SEPARATOR !== $this->tokens[ ( $stackPtr + 2 ) ]['code'] ) {
-				$classname = $this->get_namespaced_classname( $classname, ( $stackPtr - 1 ) );
-			}
+			$classname = GetTokensAsString::noEmpties( $this->phpcsFile, ( $stackPtr + 2 ), $nameEnd );
+			$classname = $this->get_namespaced_classname( $classname, ( $stackPtr - 1 ) );
 		}
 
 		if ( \T_DOUBLE_COLON === $token['code'] ) {

From 909cb786e9a52dc47923a67ea2cadedb14ab0b9a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 15:49:02 +0200
Subject: [PATCH 526/822] AbstractClassRestrictionsSniff::is_targetted_token():
 add tests with PHP 7.0+ anonymous classes

---
 .../Tests/DB/RestrictedClassesUnitTest.1.inc  |  7 +++
 .../Tests/DB/RestrictedClassesUnitTest.php    | 61 ++++++++++---------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 083d6c3c84..9d78faafa1 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -94,3 +94,10 @@ class MyMysqliWithArrayAccess extends mysqli implements ArrayAccess {} // Error.
 $obj = new self();
 $obj = new Parent();
 $obj = new STATIC();
+
+// Safeguard handling of PHP 7.0+ anonymous classes.
+$anon = new class {
+	public function PDO() {} // OK.
+};
+
+$anon = new class extends PDOStatement {}; // Error.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 533a02c426..f371b2e381 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -71,36 +71,37 @@ public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
 			case 'RestrictedClassesUnitTest.1.inc':
 				return array(
-					17 => 1,
-					18 => 1,
-					19 => 1,
-					20 => 1,
-					22 => 1,
-					23 => 1,
-					24 => 1,
-					25 => 1,
-					26 => 1,
-					27 => 1,
-					29 => 1,
-					30 => 1,
-					32 => 1,
-					33 => 1,
-					35 => 1,
-					36 => 1,
-					37 => 1,
-					39 => 1,
-					40 => 1,
-					42 => 1,
-					51 => 1,
-					52 => 1,
-					63 => 1,
-					65 => 1,
-					66 => 1,
-					69 => 1,
-					82 => 1,
-					87 => 1,
-					88 => 1,
-					91 => 1,
+					17  => 1,
+					18  => 1,
+					19  => 1,
+					20  => 1,
+					22  => 1,
+					23  => 1,
+					24  => 1,
+					25  => 1,
+					26  => 1,
+					27  => 1,
+					29  => 1,
+					30  => 1,
+					32  => 1,
+					33  => 1,
+					35  => 1,
+					36  => 1,
+					37  => 1,
+					39  => 1,
+					40  => 1,
+					42  => 1,
+					51  => 1,
+					52  => 1,
+					63  => 1,
+					65  => 1,
+					66  => 1,
+					69  => 1,
+					82  => 1,
+					87  => 1,
+					88  => 1,
+					91  => 1,
+					103 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From ae0b2ddcc806f8e7bdd70ed4b48f7c6c023a1e70 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 29 Apr 2023 15:49:40 +0200
Subject: [PATCH 527/822] AbstractClassRestrictionsSniff::is_targetted_token():
 add tests with PHP 8.1+ enums

... which can also `implement`.
---
 WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc | 3 +++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
index 9d78faafa1..4b8a5e325f 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.1.inc
@@ -101,3 +101,6 @@ $anon = new class {
 };
 
 $anon = new class extends PDOStatement {}; // Error.
+
+// PHP 8.1: enums can implement.
+enum MysqliEnum implements mysqli {} // Error.
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index f371b2e381..40fc100654 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -102,6 +102,7 @@ public function getErrorList( $testFile = '' ) {
 					88  => 1,
 					91  => 1,
 					103 => 1,
+					106 => 1,
 				);
 
 			case 'RestrictedClassesUnitTest.2.inc':

From 107adb2e3ed84167da91987ff263c3e4d0fb6d2d Mon Sep 17 00:00:00 2001
From: Craig Francis <craig@craigfrancis.co.uk>
Date: Mon, 1 May 2023 03:02:23 +0100
Subject: [PATCH 528/822] Support '%i' placeholders for escaping Identifiers
 (e.g. table/field names)

https://core.trac.wordpress.org/changeset/55151
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 63 +++++++++++++++--
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 67 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    | 40 +++++++++++
 3 files changed, 163 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 7d5e0f2235..59944007c6 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
 use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
 
@@ -19,7 +20,7 @@
  * Check for incorrect use of the $wpdb->prepare method.
  *
  * Check the following issues:
- * - The only placeholders supported are: %d, %f (%F) and %s and their variations.
+ * - The only placeholders supported are: %d, %f (%F), %s, %i, and their variations.
  * - Literal % signs need to be properly escaped as `%%`.
  * - Simple placeholders (%d, %f, %F, %s) should be left unquoted in the query string.
  * - Complex placeholders - numbered and formatted variants - will not be quoted
@@ -37,13 +38,19 @@
  * @link https://developer.wordpress.org/reference/classes/wpdb/prepare/
  * @link https://core.trac.wordpress.org/changeset/41496
  * @link https://core.trac.wordpress.org/changeset/41471
+ * @link https://core.trac.wordpress.org/changeset/55151
  *
  * @package WPCS\WordPressCodingStandards
  *
- * @since   0.14.0
+ * @since 0.14.0
+ * @since 3.0.0 Support for the %i placeholder has been added
+ *
+ * @uses  \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class PreparedSQLPlaceholdersSniff extends Sniff {
 
+	use MinimumWPVersionTrait;
+
 	use WPDBTrait;
 
 	/**
@@ -76,7 +83,7 @@ final class PreparedSQLPlaceholdersSniff extends Sniff {
 				[0-9]+                     # Width specifier.
 				(?:\.(?:[ 0]|\'.)?[0-9]+)? # Optional precision specifier with optional padding character.
 			)
-			[dfFs]                     # Type specifier.
+			[dfFsi]                    # Type specifier.
 		)
 	)';
 
@@ -97,7 +104,7 @@ final class PreparedSQLPlaceholdersSniff extends Sniff {
 			(?!                        # Negative look ahead.
 				%[^%]                       # Not a correct literal % (%%).
 				|
-				%%[dfFs]                    # Nor a correct literal % (%%), followed by a simple placeholder.
+				%%[dfFsi]                   # Nor a correct literal % (%%), followed by a simple placeholder.
 			)
 			(?:[0-9]+\\\\??\$)?+       # Optional ordering of the placeholders.
 			[+-]?+                     # Optional sign specifier.
@@ -112,7 +119,7 @@ final class PreparedSQLPlaceholdersSniff extends Sniff {
 				[0-9]++                     # Width specifier.
 				(?:\.(?:[ 0]|\'.)?[0-9]+)?+ # Optional precision specifier with optional padding character.
 			)
-			(?![dfFs])                 # Negative look ahead: not one of the supported placeholders.
+			(?![dfFsi])                # Negative look ahead: not one of the supported placeholders.
 			(?:[^ \'"]*|$)             # but something else instead.
 		)
 	)`x';
@@ -171,6 +178,8 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
+		$this->set_minimum_wp_version();
+
 		if ( ! $this->is_wpdb_method_call( $this->phpcsFile, $stackPtr, $this->target_methods ) ) {
 			return;
 		}
@@ -399,7 +408,8 @@ function ( $symbol ) {
 			}
 
 			/*
-			 * Analyse the query for quoted placeholders.
+			 * Analyse the query for single/double quoted simple value placeholders
+			 * Identifiers are checked separately.
 			 */
 			$regex = '`(' . $regex_quote . ')%[dfFs]\1`';
 			if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
@@ -416,6 +426,28 @@ function ( $symbol ) {
 				unset( $match, $matches );
 			}
 
+			/*
+			 * Analyse the query for quoted identifier placeholders.
+			 */
+			if ( version_compare( $this->minimum_wp_version, '6.2', '>=' ) ) {
+				$regex = '/(' . $regex_quote . '|`)(?<placeholder>' . self::PREPARE_PLACEHOLDER_REGEX . ')\1/x';
+				if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
+					if ( ! empty( $matches ) ) {
+						foreach ( $matches['placeholder'] as $index => $match ) {
+							if ( 'i' === substr( $match, -1 ) ) {
+								$this->phpcsFile->addError(
+									'Placeholders used for identifiers (%%i) in the query string in $wpdb->prepare() are always quoted automagically. Please remove the surrounding quotes. Found: %s',
+									$i,
+									'QuotedIdentifierPlaceholder',
+									array( $matches[0][ $index ] )
+								);
+							}
+						}
+					}
+					unset( $index, $match, $matches );
+				}
+			}
+
 			/*
 			 * Analyse the query for unquoted complex placeholders.
 			 */
@@ -423,7 +455,7 @@ function ( $symbol ) {
 			if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
 				if ( ! empty( $matches[0] ) ) {
 					foreach ( $matches[0] as $match ) {
-						if ( preg_match( '`%[dfFs]`', $match ) !== 1 ) {
+						if ( preg_match( '`^%[dfFsi]$`', $match ) !== 1 && substr( $match, -1 ) !== 'i' ) { // Identifiers must always be unquoted.
 							$this->phpcsFile->addWarning(
 								'Complex placeholders used for values in the query string in $wpdb->prepare() will NOT be quoted automagically. Found: %s.',
 								$i,
@@ -612,6 +644,12 @@ protected function analyse_sprintf( $sprintf_params ) {
 	 *
 	 * This pattern presumes unquoted placeholders!
 	 *
+	 * Identifiers (%i) are not supported, as this function is designed to work
+	 * with `IN()`, which contains a list of values. In the future, it should
+	 * be possible to simplify code using the implode/array_fill pattern to
+	 * use a variable number of identifiers, e.g. `CONCAT(%...i)`,
+	 * https://core.trac.wordpress.org/ticket/54042
+	 *
 	 * @since 0.14.0
 	 *
 	 * @param int $implode_token The stackPtr to the implode function call.
@@ -652,6 +690,17 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
+		if ( "'%i'" === $array_fill_params[3]['raw']
+			|| '"%i"' === $array_fill_params[3]['raw']
+		) {
+			$this->phpcsFile->addError(
+				'The %i placeholder cannot be used within SQL `IN()` clauses.',
+				$implode_token,
+				'IdentifierWithinIN'
+			);
+			return false;
+		}
+
 		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_params[3]['raw'] );
 	}
 
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 60cdc8b008..634a971c80 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -207,3 +207,70 @@ $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->wp_options WHERE option_name L
 $where .= $wpdb->prepare( " AND `name` LIKE '%%%%" . '%s' . "%%%%' ", $args['name'] ); // Bad x 2.
 
 $wpdb->query($wpdb->prepare("delete from wp_postmeta where post_id = $target_postId AND meta_key like 'google_snippets'")); // Bad, the PreparedSQL sniff will also kick in and throw an error about `$target_postId`.
+
+// phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version 6.2
+
+$wpdb->prepare( 'WHERE %i = %s', $field, $value ); // OK.
+$wpdb->prepare( 'WHERE %i = %s', $value ); // ReplacementsWrongNumber.
+$wpdb->prepare( 'WHERE %i = %x', $field, $value ); // UnsupportedPlaceholder & ReplacementsWrongNumber.
+$wpdb->prepare( 'WHERE %i = %2$s', $field, $value ); // UnquotedComplexPlaceholder.
+$wpdb->prepare( 'WHERE %i = %10s', $field, $value ); // UnquotedComplexPlaceholder.
+$wpdb->prepare( 'WHERE %i = %2$-10s', $field, $value ); // UnquotedComplexPlaceholder.
+
+$wpdb->prepare( 'WHERE %i = "%s"', $field, $value ); // QuotedSimplePlaceholder.
+$wpdb->prepare( 'WHERE "%i" = %s', $field, $value ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( "WHERE \"%i\" = %s", $field, $value ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( "WHERE '%i' = %s", $field, $value ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE \'%i\' = %s', $field, $value ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `%i` = %s', $field, $value ); // QuotedIdentifierPlaceholder.
+
+$wpdb->prepare( "WHERE '%10i' IS NULL", $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE "%10i" IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE \'%1$i\' IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( "WHERE \"%10i\" IS NULL", $field ); // QuotedIdentifierPlaceholder.
+
+$wpdb->prepare( 'WHERE %1$i IS NULL', $field ); // OK.
+$wpdb->prepare( 'WHERE %10i IS NULL', $field ); // OK.
+$wpdb->prepare( 'WHERE % i IS NULL', $field ); // UnescapedLiteral & UnfinishedPrepare (while this is valid, should avoid).
+$wpdb->prepare( 'WHERE %1$-10i IS NULL', $field ); // OK.
+$wpdb->prepare( 'WHERE %1$-10.3i IS NULL', $field ); // OK.
+$wpdb->prepare( 'WHERE %1$+10.3i IS NULL', $field ); // OK.
+$wpdb->prepare( 'WHERE %1$ 10.3i IS NULL', $field ); // UnsupportedPlaceholder (parsed as "%1$", which is valid, but should avoid).
+$wpdb->prepare( 'WHERE %1$010.3i IS NULL', $field ); // OK.
+$wpdb->prepare( "WHERE %1$'x10.3i IS NULL", $field ); // OK.
+
+$wpdb->prepare( 'WHERE %.2i IS NULL', 'a``b' ); // Currently ignore, but it might cause a problem (most likely a parse error) "WHERE `a`` IS NULL".
+
+$wpdb->prepare( 'WHERE `%1$i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `%10i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `% i` IS NULL', $field ); // UnescapedLiteral & UnfinishedPrepare (if RegEx matched, then it should be QuotedIdentifierPlaceholder).
+$wpdb->prepare( 'WHERE `%1$-10i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `%1$-10.3i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `%1$+10.3i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'WHERE `%1$ 10.3i` IS NULL', $field ); // QuotedIdentifierPlaceholder, and UnsupportedPlaceholder (parsed as "%1$", which is valid, but should avoid).
+$wpdb->prepare( 'WHERE `%1$010.3i` IS NULL', $field ); // QuotedIdentifierPlaceholder.
+$wpdb->prepare( "WHERE `%1$'x10.3i` IS NULL", $field ); // QuotedIdentifierPlaceholder.
+
+$wpdb->prepare( 'SELECT ID FROM `%2$i` WHERE `%1$i` = "%3$s"', $field, $wpdb->posts, $value ); // QuotedIdentifierPlaceholder (x2).
+
+$wpdb->prepare( 'SELECT ID FROM %i.%i WHERE %i = "false"', $db, $table, $field ); // OK.
+
+$wpdb->prepare(
+	sprintf(
+		'xxx IN (%s)',
+		implode( ',', array_fill( 0, count($fields), '%i' ) )
+	),
+	$fields
+); // ReplacementsWrongNumber + IdentifierWithinIN.
+
+$wpdb->prepare( '
+	xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' ) ) . ' )',
+	$fields
+); // IdentifierWithinIN.
+
+$wpdb->prepare( '
+	xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), "%i" ) ) . ' )',
+	$fields
+); // IdentifierWithinIN.
+
+// phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 7c133a554a..898429e25e 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -60,6 +60,38 @@ public function getErrorList() {
 			205 => 1,
 			207 => 2,
 			209 => 1,
+
+			215 => 1, // UnsupportedPlaceholder.
+
+			220 => 1, // QuotedSimplePlaceholder.
+			221 => 1, // QuotedSimplePlaceholder.
+			222 => 1, // QuotedSimplePlaceholder.
+			223 => 1, // QuotedSimplePlaceholder.
+			224 => 1, // QuotedSimplePlaceholder.
+			225 => 1, // QuotedSimplePlaceholder.
+
+			227 => 1, // QuotedIdentifierPlaceholder.
+			228 => 1, // QuotedIdentifierPlaceholder.
+			229 => 1, // QuotedIdentifierPlaceholder.
+			230 => 1, // QuotedIdentifierPlaceholder.
+
+			234 => 1, // UnescapedLiteral.
+			238 => 1, // UnsupportedPlaceholder.
+
+			244 => 1, // QuotedIdentifierPlaceholder.
+			245 => 1, // QuotedIdentifierPlaceholder.
+			246 => 1, // UnescapedLiteral.
+			247 => 1, // QuotedIdentifierPlaceholder.
+			248 => 1, // QuotedIdentifierPlaceholder.
+			249 => 1, // QuotedIdentifierPlaceholder.
+			250 => 2, // QuotedIdentifierPlaceholder.
+			251 => 1, // QuotedIdentifierPlaceholder.
+			252 => 1, // QuotedIdentifierPlaceholder.
+
+			254 => 2, // QuotedIdentifierPlaceholder x2.
+			261 => 1, // IdentifierWithinIN.
+			267 => 1, // IdentifierWithinIN.
+			272 => 1, // IdentifierWithinIN.
 		);
 	}
 
@@ -95,6 +127,14 @@ public function getWarningList() {
 			160 => 2,
 			161 => 2,
 			177 => 1,
+			214 => 1,
+			215 => 1,
+			216 => 1,
+			217 => 1,
+			218 => 1,
+			234 => 1, // UnfinishedPrepare.
+			246 => 1, // UnfinishedPrepare.
+			258 => 1, // ReplacementsWrongNumber.
 		);
 	}
 

From 3eec01fda6ecaafc04ba66430ca31d18540e665a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 10 May 2023 04:28:56 +0200
Subject: [PATCH 529/822] Core: replace the Generic `EndFileNewline` sniff with
 the PSR2 one

PHP_CodeSniffer contains two sniffs which enforce that a file ends on a new line character:
* `Generic.Files.EndFileNewline`
* `PSR2.Files.EndFileNewline`

The `Generic` sniff _only_ checks if there is a new line character.

The `PSR2` sniff checks the same, but additionally also checks there is only one new line character (blank line) at the end of the file.
The checks in the `PSR2` sniff have distinct error codes, so plugins/themes who do not want to enforce the "single blank line" rule can choose to exclude it from their custom ruleset.
Additionally, both checks in the `PSR2` sniff have auto-fixers available.

The `Core` ruleset already contains the `Generic.Files.EndFileNewline` sniff.
I'm now proposing to switch the `Generic` sniff out in favour of the slightly stricter `PSR2` version.
---
 WordPress-Core/ruleset.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 6927ac395c..bf8b6938d4 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -705,8 +705,8 @@
 		</properties>
 	</rule>
 
-	<!-- All files should end with a new line. -->
-	<rule ref="Generic.Files.EndFileNewline"/>
+	<!-- All files should end with a new line, but only one. -->
+	<rule ref="PSR2.Files.EndFileNewline"/>
 
 	<!-- No whitespace should come before semicolons. -->
 	<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>

From 2985440453d41597f4870f1cd02c5aa24ad2b731 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 27 May 2023 21:22:07 +0200
Subject: [PATCH 530/822] Tests: fix unintentional (parse/compile) errors in
 test case files

---
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc  | 4 ++--
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.inc   | 4 ++--
 .../Tests/NamingConventions/ValidVariableNameUnitTest.inc   | 2 +-
 WordPress/Tests/Security/NonceVerificationUnitTest.inc      | 2 +-
 .../Tests/Security/ValidatedSanitizedInputUnitTest.inc      | 4 ++--
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc     | 2 +-
 .../Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed     | 2 +-
 WordPress/Tests/WP/CapabilitiesUnitTest.1.inc               | 1 +
 WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc             | 4 ++--
 WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed       | 4 ++--
 WordPress/Tests/WP/ClassNameCaseUnitTest.inc                | 4 ++--
 WordPress/Tests/WP/CronIntervalUnitTest.inc                 | 2 +-
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc    | 2 +-
 WordPress/Tests/WP/I18nUnitTest.1.inc                       | 6 +++---
 WordPress/Tests/WP/I18nUnitTest.1.inc.fixed                 | 6 +++---
 WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc      | 6 +++---
 .../Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed      | 6 +++---
 17 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 8cf713258c..83e41136b0 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -376,7 +376,7 @@ function acronymFunction() {
 
 // Issue #1311 - allow for overrulable WP Core constants.
 define( 'FORCE_SSL_ADMIN', true );
-const SCRIPT_DEBUG = $develop_src;
+const SCRIPT_DEBUG = true;
 
 // Allow for hook name prefixes with less conventional separators.
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] test-this,myplugin\
@@ -558,7 +558,7 @@ function acronym_null_coalesce_equals() {
 }
 
 // Safeguard that property assignments using the PHP 8.0+ nullsafe object operator do not trigger false positives.
-$acronym_object??->property = 10;
+$acronym_object?->property = 10;
 
 /*
  * Safeguard support for function calls using PHP 8.0+ named parameters.
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
index 7aca57807e..6a06ba3cab 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -52,7 +52,7 @@ class Its_A_Kind_Of_Magic {
 	function __sleep() {} // Ok.
 	function __wakeup() {} // Ok.
 	function __toString() {} // Ok.
-	function __set_state() {} // Ok.
+	static function __set_state($properties) {} // Ok.
 	function __clone() {} // Ok.
 	function __invoke() {} // Ok.
 	function __debugInfo() {} // Ok.
@@ -148,7 +148,7 @@ class Deprecated {
 
 class PHP74Magic {
 	function __serialize() {} // OK.
-	function __unserialize() {} // OK.
+	function __unserialize($data) {} // OK.
 }
 
 class More_Nested {
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 22b258c33b..5d11999c09 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -11,7 +11,7 @@ class MyClass {
 	var $_varName = 'hello'; // Bad.
 
 	public $varNamf  = 'hello'; // Bad.
-	public bool $var_namf = 'hello';
+	public bool $var_namf = true;
 	public $varnamf  = 'hello';
 	public $_varNamf = 'hello'; // Bad.
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index a7da9675dd..3a30d0d6aa 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -235,7 +235,7 @@ function allow_for_nonce_check_within_switch() {
 }
 
 function allow_for_array_compare_before_noncecheck() {
-	if ( array_search( array( 'subscribe', 'unsubscribe', $_POST['action'], true ) // OK.
+	if ( array_search( array( 'subscribe', 'unsubscribe' ), $_POST['action'], true ) // OK.
 		&& wp_verify_nonce( $_POST['newsletter_nonce'] )
 	) {}
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
index 2ee10c881c..c7199eebf7 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
@@ -228,9 +228,9 @@ function test_more_safe_functions() {
 
 function test_allow_array_key_exists_alias() {
 	if ( key_exists( 'my_field1', $_POST ) ) {
-	$id = (int) $_POST['my_field1']; // OK.
+		$id = (int) $_POST['my_field1']; // OK.
+	}
 }
-
 function test_correct_multi_level_array_validation() {
 	if ( isset( $_POST['toplevel']['sublevel'] ) ) {
 		$id = (int) $_POST['toplevel']; // OK, if a subkey exists, the top level key *must* also exist.
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
index c6b450259c..22035dca15 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc
@@ -223,7 +223,7 @@ function foo() {
 // Missing domain parameter.
 _n( plural: $plural, single: $single ); // Error.
 esc_attr_x(
-	context : $context
+	context : $context,
 	text    : $text,
 );
 
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
index 7fac6cdf5f..1b01c02c4b 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.4.inc.fixed
@@ -228,7 +228,7 @@ function foo() {
 // Missing domain parameter.
 _n( plural: $plural, single: $single ); // Error.
 esc_attr_x(
-	context : $context
+	context : $context,
 	text    : $text,
 );
 
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
index b17784dbb6..ab1fdb9c41 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.1.inc
@@ -114,4 +114,5 @@ $obj->current_user_can( 'foo_bar' ); // Ok. We're not checking for method calls.
 My\NamespaceS\add_posts_page( 'page_title', 'menu_title', 'administrator', 'menu_slug', 'function' ); // Ok. We're not checking namespaced functions.
 
 // Parse error, should be handled correctly by bowing out.
+// This must be the last test in the file!
 add_posts_page( 'page_title',
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
index 93b02751a0..2f12d2f804 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc
@@ -185,7 +185,7 @@ EOD;
 define( 'WORDPRESS_SOMETHING', 'wordpress' ); // OK.
 class TestMe {
 	public const MY_CONST = 123,
-		ANOTHER => array( 'a' => 'b' ),
+		ANOTHER = array( 'a' => 'b' ),
 		WORDPRESS_SOMETHING = 'wordpress'; // OK (complex declaration to make sure start of statement is detected correctly).
 }
 
@@ -200,7 +200,7 @@ echo namespace\function_name(); // OK - operator.
 namespace Foo\WordPress\Bar; // OK.
 namespace My_WordPress_Plugin; // OK.
 
-namespace Foo\Bar\Wordpress\; // Bad.
+namespace Foo\Bar\Wordpress; // Bad.
 namespace Foo\word_presss\Bar; // Bad.
 namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
 
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
index 5828bd6a93..bab1c4b13c 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.1.inc.fixed
@@ -185,7 +185,7 @@ EOD;
 define( 'WORDPRESS_SOMETHING', 'wordpress' ); // OK.
 class TestMe {
 	public const MY_CONST = 123,
-		ANOTHER => array( 'a' => 'b' ),
+		ANOTHER = array( 'a' => 'b' ),
 		WORDPRESS_SOMETHING = 'wordpress'; // OK (complex declaration to make sure start of statement is detected correctly).
 }
 
@@ -200,7 +200,7 @@ echo namespace\function_name(); // OK - operator.
 namespace Foo\WordPress\Bar; // OK.
 namespace My_WordPress_Plugin; // OK.
 
-namespace Foo\Bar\Wordpress\; // Bad.
+namespace Foo\Bar\Wordpress; // Bad.
 namespace Foo\word_presss\Bar; // Bad.
 namespace My_Wordpresss_Plugin\Foo\Bar; // Bad.
 
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.inc b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
index eccde3b20a..1c540dc656 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.inc
@@ -28,7 +28,7 @@ WP_Customize_New_Menu_Control::foo();
 $obj = new getID3;
 class MyMailer extends PHPMailer\PHPMailer\PHPMailer {}
 $obj = new Requests_Cookie_Jar();
-$anon = class extends SimplePie_IRI {};
+$anon = new class extends SimplePie_IRI {};
 
 
 /*
@@ -46,7 +46,7 @@ WP_Customize_NEW_Menu_Control::foo();
 $obj = new GetID3();
 class MyMailer extends PhpMailer\PhpMailer\PhpMailer {}
 $obj = new Requests_cookie_jar();
-$anon = class extends SimplePie_Iri {};
+$anon = new class extends SimplePie_Iri {};
 
 
 /*
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.inc b/WordPress/Tests/WP/CronIntervalUnitTest.inc
index 57b51d14ad..e9541f49d2 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.inc
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.inc
@@ -142,7 +142,7 @@ add_filter( 'cron_schedules', function ( $schedules ) {
 
 Custom::add_filter( 'cron_schedules', array( $class, $method ) ); // OK, not the WP function.
 add_filter( 'some_hook', array( $place, 'cron_schedules' ) ); // OK, not the hook we're looking for.
-add_filter( function() { return get_hook_name('cron_schedules'); }(), array( $class, $method ) ); // OK, nested in another function call.
+add_filter( (function() { return get_hook_name('cron_schedules'); })(), array( $class, $method ) ); // OK, nested in another function call.
 
 // Deal correctly with the time calculations within parentheses.
 add_filter( 'cron_schedules', function ( $schedules ) {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index 981d1127bc..da9d002194 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -55,7 +55,7 @@ add_filter( 'comments_open', function( $open, $post_id ) {
 	return 'page' === $page->post_type;
 }, 10, 2 );
 
-$closure = function() { $page = 'test' }; // Ok, check against cross-contaminiation from within a closure.
+$closure = function() { $page = 'test'; }; // Ok, check against cross-contaminiation from within a closure.
 
 // Allow overriding globals in functions within unit test classes.
 // https://github.com/WordPress/WordPress-Coding-Standards/issues/300#issuecomment-158778606
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
index c322877b00..6256e6d84a 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -195,9 +195,9 @@ __( '<foo>Foo</foo>', 'my-slug' ); // Good
 
 // Strings wrapped in `<a href="...">...</a>` aren't flagged, since the link target might require localization.
 __( '<a href="https://wordpress.org">WordPress</a>', 'my-slug' ); // Good
-__( '<a id="anchor">translatable text</a>', 'my-slug' ) // Bad, since no href
-__( '<a>translatable text</a>', 'my-slug' ) // Bad, since no href
-__( '<a href="%s">translatable text</a>', 'my-slug' ) // Good
+__( '<a id="anchor">translatable text</a>', 'my-slug' ); // Bad, since no href
+__( '<a>translatable text</a>', 'my-slug' ); // Bad, since no href
+__( '<a href="%s">translatable text</a>', 'my-slug' ); // Good
 
 // Strings containing malformed XML, to make sure we're able to parse them. No warnings should be thrown.
 __( '<div>text to translate', 'my-slug' );
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
index 15390d3cfb..b23e9b6192 100644
--- a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -195,9 +195,9 @@ __( '<foo>Foo</foo>', 'my-slug' ); // Good
 
 // Strings wrapped in `<a href="...">...</a>` aren't flagged, since the link target might require localization.
 __( '<a href="https://wordpress.org">WordPress</a>', 'my-slug' ); // Good
-__( '<a id="anchor">translatable text</a>', 'my-slug' ) // Bad, since no href
-__( '<a>translatable text</a>', 'my-slug' ) // Bad, since no href
-__( '<a href="%s">translatable text</a>', 'my-slug' ) // Good
+__( '<a id="anchor">translatable text</a>', 'my-slug' ); // Bad, since no href
+__( '<a>translatable text</a>', 'my-slug' ); // Bad, since no href
+__( '<a href="%s">translatable text</a>', 'my-slug' ); // Good
 
 // Strings containing malformed XML, to make sure we're able to parse them. No warnings should be thrown.
 __( '<div>text to translate', 'my-slug' );
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
index a95f1fcdc3..896cf6bf37 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -39,9 +39,9 @@ if ( $a === $b xor $b === $c ) {}
 // Logical operators: Too little space.
 if ( $a === $b&&$b === $c ) {}
 if ( $a === $b||$b === $c ) {}
-if ( $a === {$b}and$b === $c ) {}
-if ( $a === {$b}or$b === $c ) {}
-if ( $a === {$b}xor$b === $c ) {}
+if ( $a === ($b)and$b === $c ) {}
+if ( $a === ($b)or$b === $c ) {}
+if ( $a === ($b)xor$b === $c ) {}
 
 // Logical operators: Too much space.
 if ( $a === $b     &&     $b === $c ) {}
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
index bf88a139da..c7bbddf9f5 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
@@ -39,9 +39,9 @@ if ( $a === $b xor $b === $c ) {}
 // Logical operators: Too little space.
 if ( $a === $b && $b === $c ) {}
 if ( $a === $b || $b === $c ) {}
-if ( $a === {$b} and $b === $c ) {}
-if ( $a === {$b} or $b === $c ) {}
-if ( $a === {$b} xor $b === $c ) {}
+if ( $a === ($b) and $b === $c ) {}
+if ( $a === ($b) or $b === $c ) {}
+if ( $a === ($b) xor $b === $c ) {}
 
 // Logical operators: Too much space.
 if ( $a === $b && $b === $c ) {}

From 1a051965203b9ffee7cc5965034874cd4aec1527 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 27 May 2023 21:22:12 +0200
Subject: [PATCH 531/822] Tests: use unique function names

.. to make it easier to do a parse/compile error check on test case files.
---
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc  | 4 ++--
 .../Tests/NamingConventions/ValidVariableNameUnitTest.inc   | 2 +-
 WordPress/Tests/Security/NonceVerificationUnitTest.inc      | 6 +++---
 WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc      | 2 +-
 .../Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 83e41136b0..96677caecc 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -164,7 +164,7 @@ $_POST['something'] = 'value';
 do_action_deprecated( 'set_current_user' ); // Deprecated hook, ignored.
 
 // WP global variables, override warning is handled by another sniff.
-function acronym_do_something() {
+function acronym_do_another_thing() {
 	global $post;
 	$post = 'value';
 	$GLOBALS['post'] = 'value';
@@ -511,7 +511,7 @@ function aa_do_something(){}
 
 // The following line mimicks an empty prefix value.
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] ,
-function aa_do_something(){}
+function aaa_do_something(){}
 
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] 😊
 function 😊_do_something(){}
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
index 5d11999c09..437c005899 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
@@ -208,7 +208,7 @@ function has_params( $without_default, $with_default = 'default' ) {} // OK.
 $closure = function ( $without_default, $with_default = 'default' ) {}; // OK.
 $arrow = fn ( $without_default, $with_default = 'default' ) => 10; // OK.
 
-function has_params( $withoutDefault, $withDefault = 'default' ) {} // Bad x 2.
+function has_params_too( $withoutDefault, $withDefault = 'default' ) {} // Bad x 2.
 $closure = function ( $withoutDefault, $withDefault = 'default' ) {}; // Bad x 2.
 $arrow = fn ( $withoutDefault, $withDefault = 'default' ) => 10; // Bad x 2.
 
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
index 3a30d0d6aa..d1a865ce63 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.inc
@@ -265,12 +265,12 @@ function allow_for_unslash_in_sanitization() {
 	echo $var;
 }
 
-function dont_allow_bypass_nonce_via_sanitization() {
+function dont_allow_bypass_nonce_via_sanitization_bad() {
 	$var = sanitize_text_field( $_POST['foo'] ); // Bad.
 	echo $var;
 }
 
-function dont_allow_bypass_nonce_via_sanitization() {
+function dont_allow_bypass_nonce_via_sanitization_good() {
 	$var = sanitize_text_field( $_POST['foo'] ); // OK.
 	wp_verify_nonce( $var );
 	echo $var;
@@ -364,7 +364,7 @@ function allow_in_array_key_exists_before_noncecheck_with_named_params() {
 }
 
 // Tests specifically for the ContextHelper::is_in_array_comparison().
-function allow_for_array_comparison_in_condition() {
+function allow_for_array_comparison_in_condition_non_lowercase_function_call() {
 	if ( Array_Keys( $_GET['actions'], 'my_action', true ) ) { // OK.
 		check_admin_referer( 'foo' );
 		foo();
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
index 896cf6bf37..e58abf8cd0 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -69,7 +69,7 @@ if ( $a === $b or
 function foo( int|float $param ) : string|false {}
 
 // Safeguard that the "&" in PHP 8.1 intersection types is disregarded.
-function foo( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
+function fooBar( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
 
 // Safeguard handling of union type separator for readonly properties.
 class Foo {
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
index c7bbddf9f5..43ab5ae914 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
@@ -69,7 +69,7 @@ if ( $a === $b or
 function foo( int|float $param ) : string|false {}
 
 // Safeguard that the "&" in PHP 8.1 intersection types is disregarded.
-function foo( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
+function fooBar( TypeA&namespace\TypeB $param ) : \TypeC&Partially\Qualified {}
 
 // Safeguard handling of union type separator for readonly properties.
 class Foo {

From 1dc9d7fdca2a5e45133f6da5d17ab0b8f4e7023d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 22 May 2023 19:03:37 +0200
Subject: [PATCH 532/822] WP/EnqueuedResources: bring back try/catch

Commit dec9d40b33939678ed57ae88e977b5fe7198a55b, which was part of PR 2176 removed this `try/catch` and while it shouldn't be needed anymore for valid code, it _could_ still be needed for code containing parse errors.

This commit doesn't completely revert the previous commit, but does bring the try/catch back to prevent this situation.

Includes unit test safeguarding the fix.
---
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php     | 10 ++++++++--
 WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 261aff2795..1220d826d8 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
@@ -53,8 +54,13 @@ public function process_token( $stackPtr ) {
 		$end_ptr = $stackPtr;
 		$content = $this->tokens[ $stackPtr ]['content'];
 		if ( \T_INLINE_HTML !== $this->tokens[ $stackPtr ]['code'] ) {
-			$end_ptr = TextStrings::getEndOfCompleteTextString( $this->phpcsFile, $stackPtr );
-			$content = TextStrings::getCompleteTextString( $this->phpcsFile, $stackPtr );
+			try {
+				$end_ptr = TextStrings::getEndOfCompleteTextString( $this->phpcsFile, $stackPtr );
+				$content = TextStrings::getCompleteTextString( $this->phpcsFile, $stackPtr );
+			} catch ( RuntimeException $e ) {
+				// Parse error/live coding.
+				return;
+			}
 		}
 
 		if ( preg_match_all( '# rel=\\\\?[\'"]?stylesheet\\\\?[\'"]?#', $content, $matches, \PREG_OFFSET_CAPTURE ) > 0 ) {
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc
index 153dd290a3..33a17d123a 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.1.inc
@@ -53,3 +53,6 @@ echo '<script type="text/javascript"
 // Test multi-line text string with multiple issues.
 echo '<link rel="stylesheet" href="https://someurl/somefile1.css"/>
 	<link rel="stylesheet" href="https://someurl/somefile2.css"/>';
+
+// Safeguard the handling of a particular type of parse error (forgotten concat operator).
+echo 'not a text we need to worry' 'about anyway, but we shouldn\'t see an uncaught runtime exception because of it';

From 96b04940da5c27783c392e99ca88f34b945a317b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 22 May 2023 18:25:16 +0200
Subject: [PATCH 533/822] GH Actions: fix fixer conflict check

While checking something else, I came across a notice in the GH Actions logs showing that the fixer conflict check was failing.

Some backtracing shows that it has been failing for the past five months since PR 2132 was merged - see: https://github.com/WordPress/WordPress-Coding-Standards/actions/runs/3643130487

Unfortunately, the way the script was set up, this failure was not showing and not failing the builds.

The changes I'm proposing now will fix that.

I've also made sure that once the current fixer conflicts are fixed, the build will properly succeed again: https://github.com/jrfnl/WordPress-Coding-Standards/actions/runs/5048089688/jobs/9055836148

Next up: fix the fixer conflicts and whatever other errors have crept in since the build originally started failing....
---
 .github/workflows/basic-qa.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index eb3cc03eb6..3b28f48f5c 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -146,7 +146,15 @@ jobs:
       # If only fixable errors are found, the exit code will be 1, which can be interpreted as success.
       - name: Test for fixer conflicts (fixes expected)
         if: ${{ matrix.phpcs_version == 'dev-master' }}
+        id: phpcbf
         continue-on-error: true
         run: |
+          set +e
           $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary
-          if [ $? -eq 1 ]; then exit 0; fi
+          exitcode="$?"
+          echo "EXITCODE=$exitcode" >> $GITHUB_OUTPUT
+          exit "$exitcode"
+
+      - name: Fail the build on fixer conflicts and other errors
+        if: ${{ steps.phpcbf.outputs.EXITCODE != 0 && steps.phpcbf.outputs.EXITCODE != 1 }}
+        run: exit ${{ steps.phpcbf.outputs.EXITCODE }}

From 700864c560fd4a16d0915c863390c0da22ea1c32 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 28 May 2023 22:19:08 +0200
Subject: [PATCH 534/822] GH Actions: temporarily ignore one test case file for
 the fixer conflict check

... until upstream PR squizlabs/PHP_CodeSniffer 3833 has been merged.

This will allow for the fixer conflict check to be enabled again already and to prevent new issues from being introduced.
---
 .github/workflows/basic-qa.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 3b28f48f5c..15bcfc518b 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -144,13 +144,15 @@ jobs:
       # Test for fixer conflicts by running the auto-fixers of the complete WPCS over the test case files.
       # This is not an exhaustive test, but should give an early indication for typical fixer conflicts.
       # If only fixable errors are found, the exit code will be 1, which can be interpreted as success.
+      #
+      # Note: the ValidVariableNameUnitTest.inc file is temporarily ignored until upstream PHPCS PR 3833 has been merged.
       - name: Test for fixer conflicts (fixes expected)
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         id: phpcbf
         continue-on-error: true
         run: |
           set +e
-          $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary
+          $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary --ignore=/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
           exitcode="$?"
           echo "EXITCODE=$exitcode" >> $GITHUB_OUTPUT
           exit "$exitcode"

From bb89bb9839831417629b5e9fa81a5c293485962a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 13 Jun 2023 14:26:32 +0200
Subject: [PATCH 535/822] Core: add section about namespace declaration rules
 with select new sniffs

> ### Namespace declarations
>
> Each part of a namespace name should consist of capitalized words separated by underscores.
>
> Namespace declarations should have exactly one blank line before the declaration and at least one blank line after.
>
> There should be only one namespace declaration per file, and it should be at the top of the file. Namespace declarations using curly brace syntax are not allowed. Explicit global namespace declaration (namespace declaration without name) are also not allowed.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Namespace declarations section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#namespace-declarations
* WordPress/wpcs-docs 97
* WordPress/WordPress-Coding-Standards 1763
* PHPCSStandards/PHPCSExtra 4
* PHPCSStandards/PHPCSExtra 6
* PHPCSStandards/PHPCSExtra 50

Notes:
* The "Each part of a namespace name should consist of capitalized words separated by underscores" rule needs a new dedicated sniff.
    An issue will need to be opened about this in WPCS. The corresponding issue in PHPCSExtra is PHPCSStandards/PHPCSExtra 231
* The "Namespace declarations should have exactly one blank line before the declaration and at least one blank line after" will probably also need a new sniff.
    My research shows the following:
    - The `PSR2.Namespaces.NamespaceDeclaration` sniff, which is included in `Extra` can _sort of_ cover the "after" part, as in: it check for exactly one blank line after, which is close to, but not exactly what we want.
    - The `PSR12.Files.FileHeader` sniff can check both "before" and "after", but will also, again, check for exactly one blank line.
        The problem with that sniff is that it currently is "all or nothing", it does not have modular error codes, so we cannot ignore some other things from that sniff (requires blank line between PHP open tag and file docblock), which makes it problematic to include the sniff.
        If upstream PR squizlabs/PHP_CodeSniffer 2729 would (finally) be merged, we could reconsider adding that sniff though.
* As for the "... it (the namespace declaration) should be at the top of the file" rule. I do not believe we need to actively check for this.
    With the "only one namespace declaration per file" rule being enforced, placing the namespace declaration anywhere else than at the top of the file would be a parse error.

Other notes:
* The "namespace keyword should be lowercase" part, as mentioned in the Make post, is already covered by the `Generic.PHP.LowerCaseKeyword` sniff.
* The "There should be exactly one space between the namespace keyword and the start of the namespace name" part, as mentioned in the Make post, is already covered by the `Generic.WhiteSpace.LanguageConstructSpacing` sniff, which was moved to `Core` in 2097.
* The "namespace names in a namespace declaration should not start with a leading backslash \", as well as the "There should be no whitespace or comments within the name part of the namespace declaration.", as mentioned in the Make post, are things which can (and should) be flagged by PHPCompatibility 10.0.

Closes 1763
---
 WordPress-Core/ruleset.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index bf8b6938d4..ee3bad0504 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -412,6 +412,29 @@
 	<!-- Covered by the Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterReference error code. -->
 
 
+	<!--
+	#############################################################################
+	Handbook: Declare Statements, Namespace, and Import Statements - Namespace declarations.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#namespace-declarations
+	#############################################################################
+	-->
+	<!-- Rule: Each part of a namespace name should consist of capitalized words separated by underscores. -->
+
+	<!-- Rule: Namespace declarations should have exactly one blank line before the declaration and at least one blank line after. -->
+
+	<!-- Covers rule: There should be only one namespace declaration per file... -->
+	<rule ref="Universal.Namespaces.OneDeclarationPerFile"/>
+
+	<!-- Rule: ... and it should be at the top of the file.
+		 Note: with only one namespace declaration, it not being at the top of the file would be a parse error. -->
+
+	<!-- Covers rule: Namespace declarations using curly brace syntax are not allowed. -->
+	<rule ref="Universal.Namespaces.DisallowCurlyBraceSyntax"/>
+
+	<!-- Covers rule: Explicit global namespace declaration (namespace declaration without name) are also not allowed. -->
+	<rule ref="Universal.Namespaces.DisallowDeclarationWithoutName"/>
+
+
 	<!--
 	#############################################################################
 	Handbook: Object-Oriented Programming - Only One Object Structure (Class/Interface/Trait) per File.

From d214471e170b7ba1e5c2a7b747edcbed4d8ed2e2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:49:38 +0200
Subject: [PATCH 536/822] Move `is_use_of_global_constant()` utility method to
 dedicated `ConstantsHelper`

The `is_use_of_global_constant()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_use_of_global_constant()` method to the new `WordPressCS\WordPress\Helpers\ConstantsHelper` class and starts using that class in the relevant sniff.

Related to 1465

The functionality in this new class will very likely be replaced at some point in the future by functions from PHPCSUtils.

This method will be tested via the `WordPress.Security.EscapeOutput` sniff (via pre-existing tests).
---
 WordPress/Helpers/ConstantsHelper.php         | 141 ++++++++++++++++++
 WordPress/Sniff.php                           | 104 -------------
 .../Sniffs/Security/EscapeOutputSniff.php     |   3 +-
 .../Tests/Security/EscapeOutputUnitTest.php   |   1 +
 4 files changed, 144 insertions(+), 105 deletions(-)
 create mode 100644 WordPress/Helpers/ConstantsHelper.php

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
new file mode 100644
index 0000000000..a4fdf5c37a
--- /dev/null
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Scopes;
+use WordPressCS\WordPress\Helpers\ContextHelper;
+
+/**
+ * Helper utilities for checking the context in which a token is used.
+ *
+ * ---------------------------------------------------------------------------------------------
+ * This class is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * {@internal The functionality in this class will likely be replaced at some point in
+ * the future by functions from PHPCSUtils.}
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class ConstantsHelper {
+
+	/**
+	 * Determine whether an arbitrary T_STRING token is the use of a global constant.
+	 *
+	 * @since 1.0.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method was changed to be `static`.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the function call token.
+	 *
+	 * @return bool
+	 */
+	public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if ( ! isset( $tokens[ $stackPtr ] ) ) {
+			return false;
+		}
+
+		// Is this one of the tokens this function handles ?
+		if ( \T_STRING !== $tokens[ $stackPtr ]['code'] ) {
+			return false;
+		}
+
+		$next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		if ( false !== $next
+			&& ( \T_OPEN_PARENTHESIS === $tokens[ $next ]['code']
+				|| \T_DOUBLE_COLON === $tokens[ $next ]['code'] )
+		) {
+			// Function call or declaration.
+			return false;
+		}
+
+		// Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
+		$tokens_to_ignore = array(
+			'T_NAMESPACE'       => true,
+			'T_USE'             => true,
+			'T_CLASS'           => true,
+			'T_TRAIT'           => true,
+			'T_INTERFACE'       => true,
+			'T_EXTENDS'         => true,
+			'T_IMPLEMENTS'      => true,
+			'T_NEW'             => true,
+			'T_FUNCTION'        => true,
+			'T_DOUBLE_COLON'    => true,
+			'T_OBJECT_OPERATOR' => true,
+			'T_INSTANCEOF'      => true,
+			'T_INSTEADOF'       => true,
+			'T_GOTO'            => true,
+			'T_AS'              => true,
+			'T_PUBLIC'          => true,
+			'T_PROTECTED'       => true,
+			'T_PRIVATE'         => true,
+		);
+
+		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+		if ( false !== $prev
+			&& isset( $tokens_to_ignore[ $tokens[ $prev ]['type'] ] )
+		) {
+			// Not the use of a constant.
+			return false;
+		}
+
+		if ( ContextHelper::is_token_namespaced( $phpcsFile, $stackPtr ) === true ) {
+			// Namespaced constant of the same name.
+			return false;
+		}
+
+		if ( false !== $prev
+			&& \T_CONST === $tokens[ $prev ]['code']
+			&& Scopes::isOOConstant( $phpcsFile, $prev )
+		) {
+			// Class constant declaration of the same name.
+			return false;
+		}
+
+		/*
+		 * Deal with a number of variations of use statements.
+		 */
+		for ( $i = $stackPtr; $i > 0; $i-- ) {
+			if ( $tokens[ $i ]['line'] !== $tokens[ $stackPtr ]['line'] ) {
+				break;
+			}
+		}
+
+		$firstOnLine = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+		if ( false !== $firstOnLine && \T_USE === $tokens[ $firstOnLine ]['code'] ) {
+			$nextOnLine = $phpcsFile->findNext( Tokens::$emptyTokens, ( $firstOnLine + 1 ), null, true );
+			if ( false !== $nextOnLine ) {
+				if ( \T_STRING === $tokens[ $nextOnLine ]['code']
+					&& 'const' === $tokens[ $nextOnLine ]['content']
+				) {
+					$hasNsSep = $phpcsFile->findNext( \T_NS_SEPARATOR, ( $nextOnLine + 1 ), $stackPtr );
+					if ( false !== $hasNsSep ) {
+						// Namespaced const (group) use statement.
+						return false;
+					}
+				} else {
+					// Not a const use statement.
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index a91542ceb0..c64d9d32c7 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -13,7 +13,6 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
-use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
@@ -820,107 +819,4 @@ protected function is_validated( $stackPtr, $array_keys = array(), $in_condition
 
 		return false;
 	}
-
-	/**
-	 * Determine whether an arbitrary T_STRING token is the use of a global constant.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int $stackPtr The position of the function call token.
-	 *
-	 * @return bool
-	 */
-	public function is_use_of_global_constant( $stackPtr ) {
-		// Check for the existence of the token.
-		if ( ! isset( $this->tokens[ $stackPtr ] ) ) {
-			return false;
-		}
-
-		// Is this one of the tokens this function handles ?
-		if ( \T_STRING !== $this->tokens[ $stackPtr ]['code'] ) {
-			return false;
-		}
-
-		$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-		if ( false !== $next
-			&& ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
-				|| \T_DOUBLE_COLON === $this->tokens[ $next ]['code'] )
-		) {
-			// Function call or declaration.
-			return false;
-		}
-
-		// Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
-		$tokens_to_ignore = array(
-			'T_NAMESPACE'       => true,
-			'T_USE'             => true,
-			'T_CLASS'           => true,
-			'T_TRAIT'           => true,
-			'T_INTERFACE'       => true,
-			'T_EXTENDS'         => true,
-			'T_IMPLEMENTS'      => true,
-			'T_NEW'             => true,
-			'T_FUNCTION'        => true,
-			'T_DOUBLE_COLON'    => true,
-			'T_OBJECT_OPERATOR' => true,
-			'T_INSTANCEOF'      => true,
-			'T_INSTEADOF'       => true,
-			'T_GOTO'            => true,
-			'T_AS'              => true,
-			'T_PUBLIC'          => true,
-			'T_PROTECTED'       => true,
-			'T_PRIVATE'         => true,
-		);
-
-		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-		if ( false !== $prev
-			&& isset( $tokens_to_ignore[ $this->tokens[ $prev ]['type'] ] )
-		) {
-			// Not the use of a constant.
-			return false;
-		}
-
-		if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $stackPtr ) === true ) {
-			// Namespaced constant of the same name.
-			return false;
-		}
-
-		if ( false !== $prev
-			&& \T_CONST === $this->tokens[ $prev ]['code']
-			&& Scopes::isOOConstant( $this->phpcsFile, $prev )
-		) {
-			// Class constant declaration of the same name.
-			return false;
-		}
-
-		/*
-		 * Deal with a number of variations of use statements.
-		 */
-		for ( $i = $stackPtr; $i > 0; $i-- ) {
-			if ( $this->tokens[ $i ]['line'] !== $this->tokens[ $stackPtr ]['line'] ) {
-				break;
-			}
-		}
-
-		$firstOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
-		if ( false !== $firstOnLine && \T_USE === $this->tokens[ $firstOnLine ]['code'] ) {
-			$nextOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $firstOnLine + 1 ), null, true );
-			if ( false !== $nextOnLine ) {
-				if ( \T_STRING === $this->tokens[ $nextOnLine ]['code']
-					&& 'const' === $this->tokens[ $nextOnLine ]['content']
-				) {
-					$hasNsSep = $this->phpcsFile->findNext( \T_NS_SEPARATOR, ( $nextOnLine + 1 ), $stackPtr );
-					if ( false !== $hasNsSep ) {
-						// Namespaced const (group) use statement.
-						return false;
-					}
-				} else {
-					// Not a const use statement.
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
 }
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index dd78849a19..938191abc4 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -14,6 +14,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\ConstantsHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -339,7 +340,7 @@ public function process_token( $stackPtr ) {
 			// Handle safe PHP native constants.
 			if ( \T_STRING === $this->tokens[ $i ]['code']
 				&& isset( $this->safe_php_constants[ $this->tokens[ $i ]['content'] ] )
-				&& $this->is_use_of_global_constant( $i )
+				&& ConstantsHelper::is_use_of_global_constant( $this->phpcsFile, $i )
 			) {
 				continue;
 			}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 3e460950aa..5705654459 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0     Class name changed: this class is now namespaced.
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ConstantsHelper::is_use_of_global_constant
  * @covers \WordPressCS\WordPress\Sniffs\Security\EscapeOutputSniff
  */
 final class EscapeOutputUnitTest extends AbstractSniffUnitTest {

From f05b55b471f53cc78a9f45f432d829e752293e65 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:04:34 +0200
Subject: [PATCH 537/822] ConstantsHelper::is_use_of_global_constant():
 simplify/implement PHPCSUtils

The `$tokens_to_ignore` array was set up using token types (strings) instead of token constants as some of the tokens would not always be available in all supported PHP/PHPCS combinations.

This is no longer needed now PHPCS 3.7.1 is the minimum supported PHPCS version.

This commit:
* Changes the token types to token codes.
* Simplifies the array by leveraging pre-existing token arrays.
    - `T_CLASS`, `T_TRAIT` and `T_INTERFACE` are replaced by `Tokens::$ooScopeTokens`, which also includes the PHP 8.1 `T_ENUM` token.
    - `T_DOUBLE_COLON` and `T_OBJECT_OPERATOR` are replaced by `Collections::objectOperators()`, which also includes the PHP 8.0 `T_NULLSAFE_OBJECT_OPERATOR` token.
    - `T_PUBLIC`, `T_PROTECTED` and `T_PRIVATE` are replaced by `Tokens::$scopeModifiers`.

The PHPCompatibility standard has the same method and the method is expected to be moved at some point to PHPCSUtils.
PHPCompatibility also has dedicated tests for this method, so I'm not adding tests at this time for `T_ENUM` and `T_NULLSAFE_OBJECT_OPERATOR` support.

See: PHPCompatibility/PHPCompatibility 1439
---
 WordPress/Helpers/ConstantsHelper.php | 36 ++++++++++++---------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index a4fdf5c37a..d454858371 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 
@@ -66,30 +67,25 @@ public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
 		}
 
 		// Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
-		$tokens_to_ignore = array(
-			'T_NAMESPACE'       => true,
-			'T_USE'             => true,
-			'T_CLASS'           => true,
-			'T_TRAIT'           => true,
-			'T_INTERFACE'       => true,
-			'T_EXTENDS'         => true,
-			'T_IMPLEMENTS'      => true,
-			'T_NEW'             => true,
-			'T_FUNCTION'        => true,
-			'T_DOUBLE_COLON'    => true,
-			'T_OBJECT_OPERATOR' => true,
-			'T_INSTANCEOF'      => true,
-			'T_INSTEADOF'       => true,
-			'T_GOTO'            => true,
-			'T_AS'              => true,
-			'T_PUBLIC'          => true,
-			'T_PROTECTED'       => true,
-			'T_PRIVATE'         => true,
+		$tokens_to_ignore  = array(
+			\T_NAMESPACE       => true,
+			\T_USE             => true,
+			\T_EXTENDS         => true,
+			\T_IMPLEMENTS      => true,
+			\T_NEW             => true,
+			\T_FUNCTION        => true,
+			\T_INSTANCEOF      => true,
+			\T_INSTEADOF       => true,
+			\T_GOTO            => true,
+			\T_AS              => true,
 		);
+		$tokens_to_ignore += Tokens::$ooScopeTokens;
+		$tokens_to_ignore += Collections::objectOperators();
+		$tokens_to_ignore += Tokens::$scopeModifiers;
 
 		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 		if ( false !== $prev
-			&& isset( $tokens_to_ignore[ $tokens[ $prev ]['type'] ] )
+			&& isset( $tokens_to_ignore[ $tokens[ $prev ]['code'] ] )
 		) {
 			// Not the use of a constant.
 			return false;

From ac402cf472db561bdcec2112fc472b9d7bc184b5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:10:38 +0200
Subject: [PATCH 538/822] ConstantsHelper::is_use_of_global_constant(): minor
 simplification

A non-inline HTML token will always have another non-empty token before it, if nothing else, the PHP open tag, so checking if `$prev` is `false` is redundant.
---
 WordPress/Helpers/ConstantsHelper.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index d454858371..5236329f98 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -84,9 +84,7 @@ public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
 		$tokens_to_ignore += Tokens::$scopeModifiers;
 
 		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-		if ( false !== $prev
-			&& isset( $tokens_to_ignore[ $tokens[ $prev ]['code'] ] )
-		) {
+		if ( isset( $tokens_to_ignore[ $tokens[ $prev ]['code'] ] ) ) {
 			// Not the use of a constant.
 			return false;
 		}
@@ -96,8 +94,7 @@ public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
 			return false;
 		}
 
-		if ( false !== $prev
-			&& \T_CONST === $tokens[ $prev ]['code']
+		if ( \T_CONST === $tokens[ $prev ]['code']
 			&& Scopes::isOOConstant( $phpcsFile, $prev )
 		) {
 			// Class constant declaration of the same name.

From 913decc43b2783e271d9ac7cacc4290ca0357120 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Jun 2023 16:42:33 +0200
Subject: [PATCH 539/822] Move escaping functions related functionality to
 dedicated `EscapingFunctionsTrait`

The escaping function lists are only used by a small set of sniffs, so are better placed in a dedicated trait.

The choice for a `trait` over a `class` is due to the `public` properties allowing for adding additional functions to these lists.

Moving both the base function lists + the `public` properties to the same trait will allow us to encapsulate all the functionality related to the use of these lists in one place.

The `$escapingFunctions` and the `$autoEscapedFunctions` properties, containing the base lists, have also been made `private`.

Checking whether or not something is an escaping function should now be done by calling the `EscapingFunctionsTrait::is_escaping_function()` and/or the `EscapingFunctionsTrait::is_auto_escaped_function()` methods.

Related to 1465
---
 WordPress/Helpers/EscapingFunctionsTrait.php  | 252 ++++++++++++++++++
 WordPress/Sniff.php                           | 116 --------
 .../Sniffs/Security/EscapeOutputSniff.php     |  45 +---
 .../Tests/Security/EscapeOutputUnitTest.php   |   1 +
 4 files changed, 257 insertions(+), 157 deletions(-)
 create mode 100644 WordPress/Helpers/EscapingFunctionsTrait.php

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
new file mode 100644
index 0000000000..f8a3352ec0
--- /dev/null
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+
+/**
+ * Helper functions and function lists for checking whether an escaping function is being used.
+ *
+ * Any sniff class which incorporates this trait will automatically support the
+ * following `public` properties which can be changed from within a custom ruleset:
+ * - `customEscapingFunctions`.
+ * - `customAutoEscapedFunctions`
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The properties this trait were previously contained partially in the
+ *                `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
+ *                class and have been moved here.
+ */
+trait EscapingFunctionsTrait {
+
+	/**
+	 * Custom list of functions which escape values for display.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 *
+	 * @var string|string[]
+	 */
+	public $customEscapingFunctions = array();
+
+	/**
+	 * Custom list of functions whose return values are pre-escaped for display.
+	 *
+	 * @since 0.3.0
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 *
+	 * @var string|string[]
+	 */
+	public $customAutoEscapedFunctions = array();
+
+	/**
+	 * Functions that escape values for display.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private.
+	 *
+	 * @var array
+	 */
+	private $escapingFunctions = array(
+		'absint'                     => true,
+		'esc_attr__'                 => true,
+		'esc_attr_e'                 => true,
+		'esc_attr_x'                 => true,
+		'esc_attr'                   => true,
+		'esc_html__'                 => true,
+		'esc_html_e'                 => true,
+		'esc_html_x'                 => true,
+		'esc_html'                   => true,
+		'esc_js'                     => true,
+		'esc_sql'                    => true,
+		'esc_textarea'               => true,
+		'esc_url_raw'                => true,
+		'esc_url'                    => true,
+		'filter_input'               => true,
+		'filter_var'                 => true,
+		'floatval'                   => true,
+		'highlight_string'           => true,
+		'intval'                     => true,
+		'json_encode'                => true,
+		'like_escape'                => true,
+		'number_format'              => true,
+		'rawurlencode'               => true,
+		'sanitize_hex_color'         => true,
+		'sanitize_hex_color_no_hash' => true,
+		'sanitize_html_class'        => true,
+		'sanitize_key'               => true,
+		'sanitize_user_field'        => true,
+		'tag_escape'                 => true,
+		'urlencode_deep'             => true,
+		'urlencode'                  => true,
+		'wp_json_encode'             => true,
+		'wp_kses_allowed_html'       => true,
+		'wp_kses_data'               => true,
+		'wp_kses_post'               => true,
+		'wp_kses'                    => true,
+	);
+
+	/**
+	 * Functions whose output is automatically escaped for display.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private.
+	 *
+	 * @var array
+	 */
+	private $autoEscapedFunctions = array(
+		'allowed_tags'              => true,
+		'bloginfo'                  => true,
+		'body_class'                => true,
+		'calendar_week_mod'         => true,
+		'category_description'      => true,
+		'checked'                   => true,
+		'comment_class'             => true,
+		'count'                     => true,
+		'disabled'                  => true,
+		'do_shortcode'              => true,
+		'do_shortcode_tag'          => true,
+		'get_archives_link'         => true,
+		'get_attachment_link'       => true,
+		'get_avatar'                => true,
+		'get_bookmark_field'        => true,
+		'get_calendar'              => true,
+		'get_comment_author_link'   => true,
+		'get_current_blog_id'       => true,
+		'get_delete_post_link'      => true,
+		'get_search_form'           => true,
+		'get_search_query'          => true,
+		'get_the_author_link'       => true,
+		'get_the_author'            => true,
+		'get_the_date'              => true,
+		'get_the_ID'                => true,
+		'get_the_post_thumbnail'    => true,
+		'get_the_term_list'         => true,
+		'post_type_archive_title'   => true,
+		'readonly'                  => true,
+		'selected'                  => true,
+		'single_cat_title'          => true,
+		'single_month_title'        => true,
+		'single_post_title'         => true,
+		'single_tag_title'          => true,
+		'single_term_title'         => true,
+		'tag_description'           => true,
+		'term_description'          => true,
+		'the_author'                => true,
+		'the_date'                  => true,
+		'the_title_attribute'       => true,
+		'walk_nav_menu_tree'        => true,
+		'wp_dropdown_categories'    => true,
+		'wp_dropdown_users'         => true,
+		'wp_generate_tag_cloud'     => true,
+		'wp_get_archives'           => true,
+		'wp_get_attachment_image'   => true,
+		'wp_get_attachment_link'    => true,
+		'wp_link_pages'             => true,
+		'wp_list_authors'           => true,
+		'wp_list_bookmarks'         => true,
+		'wp_list_categories'        => true,
+		'wp_list_comments'          => true,
+		'wp_login_form'             => true,
+		'wp_loginout'               => true,
+		'wp_nav_menu'               => true,
+		'wp_register'               => true,
+		'wp_tag_cloud'              => true,
+		'wp_title'                  => true,
+	);
+
+	/**
+	 * Cache of previously added custom functions.
+	 *
+	 * Prevents having to do the same merges over and over again.
+	 *
+	 * @since 0.4.0
+	 * @since 0.11.0 - Changed from public static to protected non-static.
+	 *               - Changed the format from simple bool to array.
+	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this class.
+	 *               - Visibility changed from protected to private.
+	 *
+	 * @var array
+	 */
+	private $addedCustomEscapingFunctions = array(
+		'escape'     => array(),
+		'autoescape' => array(),
+	);
+
+	/**
+	 * Combined list of WP native and custom escaping functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array
+	 */
+	private $allEscapingFunctions = array();
+
+	/**
+	 * Combined list of WP native and custom auto-escaping functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array
+	 */
+	private $allAutoEscapedFunctions = array();
+
+	/**
+	 * Check if a particular function is regarded as an escaping function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_escaping_function( $functionName ) {
+		if ( array() === $this->allEscapingFunctions
+			|| $this->customEscapingFunctions !== $this->addedCustomEscapingFunctions['escape']
+		) {
+			$this->allEscapingFunctions = RulesetPropertyHelper::merge_custom_array(
+				$this->customEscapingFunctions,
+				$this->escapingFunctions
+			);
+
+			$this->addedCustomEscapingFunctions['escape'] = $this->customEscapingFunctions;
+		}
+
+		return isset( $this->allEscapingFunctions[ $functionName ] );
+	}
+
+	/**
+	 * Check if a particular function is regarded as an auto-escaped function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_auto_escaped_function( $functionName ) {
+		if ( array() === $this->allAutoEscapedFunctions
+			|| $this->customAutoEscapedFunctions !== $this->addedCustomEscapingFunctions['autoescape']
+		) {
+			$this->allAutoEscapedFunctions = RulesetPropertyHelper::merge_custom_array(
+				$this->customAutoEscapedFunctions,
+				$this->autoEscapedFunctions
+			);
+
+			$this->addedCustomEscapingFunctions['autoescape'] = $this->customAutoEscapedFunctions;
+		}
+
+		return isset( $this->allAutoEscapedFunctions[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index c64d9d32c7..0c15429f08 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -38,122 +38,6 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	/**
-	 * Functions that escape values for display.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $escapingFunctions = array(
-		'absint'                     => true,
-		'esc_attr__'                 => true,
-		'esc_attr_e'                 => true,
-		'esc_attr_x'                 => true,
-		'esc_attr'                   => true,
-		'esc_html__'                 => true,
-		'esc_html_e'                 => true,
-		'esc_html_x'                 => true,
-		'esc_html'                   => true,
-		'esc_js'                     => true,
-		'esc_sql'                    => true,
-		'esc_textarea'               => true,
-		'esc_url_raw'                => true,
-		'esc_url'                    => true,
-		'filter_input'               => true,
-		'filter_var'                 => true,
-		'floatval'                   => true,
-		'highlight_string'           => true,
-		'intval'                     => true,
-		'json_encode'                => true,
-		'like_escape'                => true,
-		'number_format'              => true,
-		'rawurlencode'               => true,
-		'sanitize_hex_color'         => true,
-		'sanitize_hex_color_no_hash' => true,
-		'sanitize_html_class'        => true,
-		'sanitize_key'               => true,
-		'sanitize_user_field'        => true,
-		'tag_escape'                 => true,
-		'urlencode_deep'             => true,
-		'urlencode'                  => true,
-		'wp_json_encode'             => true,
-		'wp_kses_allowed_html'       => true,
-		'wp_kses_data'               => true,
-		'wp_kses_post'               => true,
-		'wp_kses'                    => true,
-	);
-
-	/**
-	 * Functions whose output is automatically escaped for display.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $autoEscapedFunctions = array(
-		'allowed_tags'              => true,
-		'bloginfo'                  => true,
-		'body_class'                => true,
-		'calendar_week_mod'         => true,
-		'category_description'      => true,
-		'checked'                   => true,
-		'comment_class'             => true,
-		'count'                     => true,
-		'disabled'                  => true,
-		'do_shortcode'              => true,
-		'do_shortcode_tag'          => true,
-		'get_archives_link'         => true,
-		'get_attachment_link'       => true,
-		'get_avatar'                => true,
-		'get_bookmark_field'        => true,
-		'get_calendar'              => true,
-		'get_comment_author_link'   => true,
-		'get_current_blog_id'       => true,
-		'get_delete_post_link'      => true,
-		'get_search_form'           => true,
-		'get_search_query'          => true,
-		'get_the_author_link'       => true,
-		'get_the_author'            => true,
-		'get_the_date'              => true,
-		'get_the_ID'                => true,
-		'get_the_post_thumbnail'    => true,
-		'get_the_term_list'         => true,
-		'post_type_archive_title'   => true,
-		'readonly'                  => true,
-		'selected'                  => true,
-		'single_cat_title'          => true,
-		'single_month_title'        => true,
-		'single_post_title'         => true,
-		'single_tag_title'          => true,
-		'single_term_title'         => true,
-		'tag_description'           => true,
-		'term_description'          => true,
-		'the_author'                => true,
-		'the_date'                  => true,
-		'the_title_attribute'       => true,
-		'walk_nav_menu_tree'        => true,
-		'wp_dropdown_categories'    => true,
-		'wp_dropdown_users'         => true,
-		'wp_generate_tag_cloud'     => true,
-		'wp_get_archives'           => true,
-		'wp_get_attachment_image'   => true,
-		'wp_get_attachment_link'    => true,
-		'wp_link_pages'             => true,
-		'wp_list_authors'           => true,
-		'wp_list_bookmarks'         => true,
-		'wp_list_categories'        => true,
-		'wp_list_comments'          => true,
-		'wp_login_form'             => true,
-		'wp_loginout'               => true,
-		'wp_nav_menu'               => true,
-		'wp_register'               => true,
-		'wp_tag_cloud'              => true,
-		'wp_title'                  => true,
-	);
-
 	/**
 	 * Functions that sanitize values.
 	 *
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 938191abc4..0a12db7953 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -15,6 +15,7 @@
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
+use WordPressCS\WordPress\Helpers\EscapingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -36,23 +37,7 @@
  */
 class EscapeOutputSniff extends Sniff {
 
-	/**
-	 * Custom list of functions which escape values for output.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customEscapingFunctions = array();
-
-	/**
-	 * Custom list of functions whose return values are pre-escaped for output.
-	 *
-	 * @since 0.3.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customAutoEscapedFunctions = array();
+	use EscapingFunctionsTrait;
 
 	/**
 	 * Custom list of functions which print output incorporating the passed values.
@@ -88,8 +73,6 @@ class EscapeOutputSniff extends Sniff {
 	 * @var array
 	 */
 	protected $addedCustomFunctions = array(
-		'escape'     => array(),
-		'autoescape' => array(),
 		'sanitize'   => array(),
 		'print'      => array(),
 	);
@@ -439,8 +422,8 @@ public function process_token( $stackPtr ) {
 				// If this is a safe function, we don't flag it.
 				if (
 					$is_formatting_function
-					|| isset( $this->autoEscapedFunctions[ $functionName ] )
-					|| isset( $this->escapingFunctions[ $functionName ] )
+					|| $this->is_escaping_function( $functionName )
+					|| $this->is_auto_escaped_function( $functionName )
 				) {
 					continue;
 				}
@@ -480,26 +463,6 @@ public function process_token( $stackPtr ) {
 	 * @return void
 	 */
 	protected function mergeFunctionLists() {
-		if ( $this->customEscapingFunctions !== $this->addedCustomFunctions['escape'] ) {
-			$customEscapeFunctions = RulesetPropertyHelper::merge_custom_array( $this->customEscapingFunctions, array(), false );
-
-			$this->escapingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$customEscapeFunctions,
-				$this->escapingFunctions
-			);
-
-			$this->addedCustomFunctions['escape'] = $this->customEscapingFunctions;
-		}
-
-		if ( $this->customAutoEscapedFunctions !== $this->addedCustomFunctions['autoescape'] ) {
-			$this->autoEscapedFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customAutoEscapedFunctions,
-				$this->autoEscapedFunctions
-			);
-
-			$this->addedCustomFunctions['autoescape'] = $this->customAutoEscapedFunctions;
-		}
-
 		if ( $this->customPrintingFunctions !== $this->addedCustomFunctions['print'] ) {
 
 			$this->printingFunctions = RulesetPropertyHelper::merge_custom_array(
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5705654459..3b0fdd842d 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ConstantsHelper::is_use_of_global_constant
+ * @covers \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait
  * @covers \WordPressCS\WordPress\Sniffs\Security\EscapeOutputSniff
  */
 final class EscapeOutputUnitTest extends AbstractSniffUnitTest {

From d9196f4bb8e8c8a6920827d2fffae8525a09acd0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Jun 2023 17:03:59 +0200
Subject: [PATCH 540/822] Move printing functions related functionality to
 dedicated `PrintingFunctionsTrait`

The printing function list is only used by a small set of sniffs, so are better placed in a dedicated trait.

The choice for a `trait` over a `class` is due to the `public` property allowing for adding additional functions to the list.

Moving both the base function list + the `public` property to the same trait will allow us to encapsulate all the functionality related to the use of this list in one place.

The `$printingFunctions` property, containing the base lists, has also been made `private`.

Checking whether or not something is a printing function should now be done by calling the `PrintingFunctionsTrait::is_printing_function()` method.

Related to 1465
---
 WordPress/Helpers/PrintingFunctionsTrait.php  | 112 ++++++++++++++++++
 WordPress/Sniff.php                           |  25 ----
 .../Sniffs/Security/EscapeOutputSniff.php     |  52 +-------
 .../Tests/Security/EscapeOutputUnitTest.php   |   1 +
 4 files changed, 116 insertions(+), 74 deletions(-)
 create mode 100644 WordPress/Helpers/PrintingFunctionsTrait.php

diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
new file mode 100644
index 0000000000..7fc87f74fd
--- /dev/null
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+
+/**
+ * Helper functions and function lists for checking whether a function prints output.
+ *
+ * Any sniff class which incorporates this trait will automatically support the
+ * following `public` property which can be changed from within a custom ruleset:
+ * - `customPrintingFunctions`.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The properties in this trait were previously contained partially in the
+ *                `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
+ *                class and have been moved here.
+ */
+trait PrintingFunctionsTrait {
+
+	/**
+	 * Custom list of functions which print output incorporating the passed values.
+	 *
+	 * @since 0.4.0
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 *
+	 * @var string|string[]
+	 */
+	public $customPrintingFunctions = array();
+
+	/**
+	 * Functions which print output incorporating the values passed to them.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private.
+	 *
+	 * @var array
+	 */
+	private $printingFunctions = array(
+		'_deprecated_argument'    => true,
+		'_deprecated_constructor' => true,
+		'_deprecated_file'        => true,
+		'_deprecated_function'    => true,
+		'_deprecated_hook'        => true,
+		'_doing_it_wrong'         => true,
+		'_e'                      => true,
+		'_ex'                     => true,
+		'printf'                  => true,
+		'trigger_error'           => true,
+		'user_error'              => true,
+		'vprintf'                 => true,
+		'wp_die'                  => true,
+		'wp_dropdown_pages'       => true,
+	);
+
+	/**
+	 * Cache of previously added custom functions.
+	 *
+	 * Prevents having to do the same merges over and over again.
+	 *
+	 * @since 0.4.0
+	 * @since 0.11.0 - Changed from public static to protected non-static.
+	 *               - Changed the format from simple bool to array.
+	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this class.
+	 *               - Visibility changed from protected to private.
+	 *
+	 * @var array
+	 */
+	private $addedCustomPrintingFunctions = array();
+
+	/**
+	 * Combined list of WP/PHP native and custom printing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array
+	 */
+	private $allPrintingFunctions = array();
+
+	/**
+	 * Check if a particular function is regarded as a printing function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_printing_function( $functionName ) {
+		if ( array() === $this->allPrintingFunctions
+			|| $this->customPrintingFunctions !== $this->addedCustomPrintingFunctions
+		) {
+			$this->allPrintingFunctions = RulesetPropertyHelper::merge_custom_array(
+				$this->customPrintingFunctions,
+				$this->printingFunctions
+			);
+
+			$this->addedCustomPrintingFunctions = $this->customPrintingFunctions;
+		}
+
+		return isset( $this->allPrintingFunctions[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 0c15429f08..37ae569d63 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -176,31 +176,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'wp_sprintf'  => true,
 	);
 
-	/**
-	 * Functions which print output incorporating the values passed to them.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $printingFunctions = array(
-		'_deprecated_argument'    => true,
-		'_deprecated_constructor' => true,
-		'_deprecated_file'        => true,
-		'_deprecated_function'    => true,
-		'_deprecated_hook'        => true,
-		'_doing_it_wrong'         => true,
-		'_e'                      => true,
-		'_ex'                     => true,
-		'printf'                  => true,
-		'trigger_error'           => true,
-		'user_error'              => true,
-		'vprintf'                 => true,
-		'wp_die'                  => true,
-		'wp_dropdown_pages'       => true,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 0a12db7953..8ffa8801bb 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -13,9 +13,9 @@
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
-use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
 use WordPressCS\WordPress\Helpers\EscapingFunctionsTrait;
+use WordPressCS\WordPress\Helpers\PrintingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -38,15 +38,7 @@
 class EscapeOutputSniff extends Sniff {
 
 	use EscapingFunctionsTrait;
-
-	/**
-	 * Custom list of functions which print output incorporating the passed values.
-	 *
-	 * @since 0.4.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customPrintingFunctions = array();
+	use PrintingFunctionsTrait;
 
 	/**
 	 * Printing functions that incorporate unsafe values.
@@ -61,22 +53,6 @@ class EscapeOutputSniff extends Sniff {
 		'_ex' => 'echo esc_html_x() or echo esc_attr_x()',
 	);
 
-	/**
-	 * Cache of previously added custom functions.
-	 *
-	 * Prevents having to do the same merges over and over again.
-	 *
-	 * @since 0.4.0
-	 * @since 0.11.0 - Changed from public static to protected non-static.
-	 *               - Changed the format from simple bool to array.
-	 *
-	 * @var array
-	 */
-	protected $addedCustomFunctions = array(
-		'sanitize'   => array(),
-		'print'      => array(),
-	);
-
 	/**
 	 * List of names of the tokens representing PHP magic constants.
 	 *
@@ -163,8 +139,6 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		$this->mergeFunctionLists();
-
 		$function = $this->tokens[ $stackPtr ]['content'];
 
 		// Find the opening parenthesis (if present; T_ECHO might not have it).
@@ -173,7 +147,7 @@ public function process_token( $stackPtr ) {
 		// If function, not T_ECHO nor T_PRINT.
 		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
 			// Skip if it is a function but is not one of the printing functions.
-			if ( ! isset( $this->printingFunctions[ $this->tokens[ $stackPtr ]['content'] ] ) ) {
+			if ( ! $this->is_printing_function( $this->tokens[ $stackPtr ]['content'] ) ) {
 				return;
 			}
 
@@ -454,24 +428,4 @@ public function process_token( $stackPtr ) {
 
 		return $end_of_statement;
 	}
-
-	/**
-	 * Merge custom functions provided via a custom ruleset with the defaults, if we haven't already.
-	 *
-	 * @since 0.11.0 Split out from the `process()` method.
-	 *
-	 * @return void
-	 */
-	protected function mergeFunctionLists() {
-		if ( $this->customPrintingFunctions !== $this->addedCustomFunctions['print'] ) {
-
-			$this->printingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customPrintingFunctions,
-				$this->printingFunctions
-			);
-
-			$this->addedCustomFunctions['print'] = $this->customPrintingFunctions;
-		}
-	}
-
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 3b0fdd842d..187d0e7b92 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -22,6 +22,7 @@
  *
  * @covers \WordPressCS\WordPress\Helpers\ConstantsHelper::is_use_of_global_constant
  * @covers \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait
+ * @covers \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait
  * @covers \WordPressCS\WordPress\Sniffs\Security\EscapeOutputSniff
  */
 final class EscapeOutputUnitTest extends AbstractSniffUnitTest {

From 68d973251047d2bf9af0a0178bc1d74306700ca2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:57:07 +0200
Subject: [PATCH 541/822] Minor doc tweaks

Follow up on 2249 and 2250.
---
 WordPress/Helpers/EscapingFunctionsTrait.php  | 26 +++++++++----------
 WordPress/Helpers/PrintingFunctionsTrait.php  | 14 +++++-----
 .../Sniffs/Security/EscapeOutputSniff.php     |  4 +++
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index f8a3352ec0..d66ba2992f 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -20,7 +20,7 @@
  * - `customAutoEscapedFunctions`
  *
  * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The properties this trait were previously contained partially in the
+ * @since   3.0.0 The properties in this trait were previously contained partially in the
  *                `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
  *                class and have been moved here.
  */
@@ -30,9 +30,9 @@ trait EscapingFunctionsTrait {
 	 * Custom list of functions which escape values for display.
 	 *
 	 * @since 0.5.0
-	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this trait.
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customEscapingFunctions = array();
 
@@ -40,9 +40,9 @@ trait EscapingFunctionsTrait {
 	 * Custom list of functions whose return values are pre-escaped for display.
 	 *
 	 * @since 0.3.0
-	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this trait.
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customAutoEscapedFunctions = array();
 
@@ -51,10 +51,10 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @since 0.5.0
 	 * @since 0.11.0 Changed from public static to protected non-static.
-	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 * @since 3.0.0 - Moved from the Sniff class to this trait.
 	 *              - Visibility changed from protected to private.
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $escapingFunctions = array(
 		'absint'                     => true,
@@ -100,10 +100,10 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @since 0.5.0
 	 * @since 0.11.0 Changed from public static to protected non-static.
-	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 * @since 3.0.0 - Moved from the Sniff class to this trait.
 	 *              - Visibility changed from protected to private.
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $autoEscapedFunctions = array(
 		'allowed_tags'              => true,
@@ -174,10 +174,10 @@ trait EscapingFunctionsTrait {
 	 * @since 0.4.0
 	 * @since 0.11.0 - Changed from public static to protected non-static.
 	 *               - Changed the format from simple bool to array.
-	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this class.
+	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this trait.
 	 *               - Visibility changed from protected to private.
 	 *
-	 * @var array
+	 * @var array<string, string[]>
 	 */
 	private $addedCustomEscapingFunctions = array(
 		'escape'     => array(),
@@ -189,7 +189,7 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $allEscapingFunctions = array();
 
@@ -198,7 +198,7 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $allAutoEscapedFunctions = array();
 
diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
index 7fc87f74fd..a3a525878b 100644
--- a/WordPress/Helpers/PrintingFunctionsTrait.php
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -29,9 +29,9 @@ trait PrintingFunctionsTrait {
 	 * Custom list of functions which print output incorporating the passed values.
 	 *
 	 * @since 0.4.0
-	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this class.
+	 * @since 3.0.0 Moved from the EscapeOutput Sniff class to this trait.
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customPrintingFunctions = array();
 
@@ -40,10 +40,10 @@ trait PrintingFunctionsTrait {
 	 *
 	 * @since 0.5.0
 	 * @since 0.11.0 Changed from public static to protected non-static.
-	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 * @since 3.0.0 - Moved from the Sniff class to this trait.
 	 *              - Visibility changed from protected to private.
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $printingFunctions = array(
 		'_deprecated_argument'    => true,
@@ -70,10 +70,10 @@ trait PrintingFunctionsTrait {
 	 * @since 0.4.0
 	 * @since 0.11.0 - Changed from public static to protected non-static.
 	 *               - Changed the format from simple bool to array.
-	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this class.
+	 * @since 3.0.0  - Moved from the EscapeOutput Sniff class to this trait.
 	 *               - Visibility changed from protected to private.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	private $addedCustomPrintingFunctions = array();
 
@@ -82,7 +82,7 @@ trait PrintingFunctionsTrait {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $allPrintingFunctions = array();
 
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 8ffa8801bb..28f8d51d47 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -34,6 +34,10 @@
  *                 echo tags `<?=`.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `XSS` category to the `Security` category.
+ *
+ * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customEscapingFunctions
+ * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customAutoEscapedFunctions
+ * @uses    \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait::$customPrintingFunctions
  */
 class EscapeOutputSniff extends Sniff {
 

From 33ce06b3f34b64f504f1a306a4d011d3f93453f7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:10:14 +0200
Subject: [PATCH 542/822] Core: add section about import use statement rules
 with select new sniffs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> ### Using import use statements
>
> Using import `use` statements allows you to refer to constants, functions, classes, interfaces, namespaces, enums and traits that live outside of the current namespace.
>
> Import `use` statements should be at the top of the file and follow the (optional) `namespace` declaration. They should follow a specific order based on the **type** of the import:
>
> 1. `use` statements for namespaces, classes, interfaces, traits and enums
> 2. `use` statements for functions
> 3. `use` statements for constants
>
> Aliases can be used to prevent name collisions (two classes in different namespaces using the same class name).
> When using aliases, make sure the aliases follow the WordPress naming convention and are unique.
>
> The following examples showcase the correct and incorrect usage of import use statements regarding things like spacing, groupings, leading backslashes, etc.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Import use statement section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#using-import-use-statements
* WordPress/wpcs-docs 98
* PHPCSStandards/PHPCSExtra 46
* PHPCSStandards/PHPCSExtra 58

Notes:
* The "Import use statements should be at the top of a file and should directly follow the (optional) namespace declaration." rule is _sort of_ covered by the `PSR12.Files.FileHeader.IncorrectOrder` sniff.
    This sniff will flag incorrect order when a `use` statement is part of the file header, but will **not** pick up on `use` statements which are not at the top of the file.
* The "There should be exactly one blank line before the first import use statement of each type and at least one blank line after the last import use statement." will probably need a new sniff.
    My research shows the following:
    - The `PSR12.Files.FileHeader` sniff can check both "before" and "after", but will check for exactly one blank line.
        The problem with that sniff is that it currently is "all or nothing", it does not have modular error codes for the various file headers sections for the blank line check, so we cannot ignore some other things from that sniff (requires blank line between PHP open tag and file docblock), which makes it problematic to include the sniff.
        If upstream PR squizlabs/PHP_CodeSniffer 2729 would (finally) be merged, we could reconsider adding that sniff though.
* The "There should be exactly one space after each keyword." rule is currently only checked for the `use` keyword via the `Generic.WhiteSpace.LanguageConstructSpacing` sniff, which was moved to `Core` in 2097.
    PHPCSExtra 1.1.0 will contain a new `Universal.UseStatements.KeywordSpacing` sniff which can check the spacing around the `function`, `const` and `as` keywords.
* The "Alias names should comply with the existing WordPress naming conventions for class/function/constant names." rule will need a new dedicated sniff.
    An issue will need to be opened about this in WPCS. The corresponding issue in PHPCSExtra is PHPCSStandards/PHPCSExtra 232
* The "Only set an alias when using a different name." rule as mentioned in the Make post is currently not checked.
    PHPCSExtra 1.1.0 will contain a new `Universal.UseStatements.NoUselessAliases` sniff which will be able to check this.
* The "When using group use statements ... There should be one statement for each type – OO constructs (classes/interfaces/traits), functions, constants. The various types should not be combined in one group use statement." rule as mentioned in the Make post is currently not checked.
    PHPCSExtra 1.1.0 will contain a new `Universal.UseStatements.DisallowMixedGroupUse` sniff which will be able to check this.
* As for the formatting rules for group use statements: there are currently no sniffs available for this, so a new sniff is needed to check this.

Other notes:
* The "There should be no whitespace or comments within the name part of a use declaration.", as mentioned in the Make post, can (and should) be flagged by PHPCompatibility 10.0.
---
 WordPress-Core/ruleset.xml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index ee3bad0504..ee3be945eb 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -425,8 +425,9 @@
 	<!-- Covers rule: There should be only one namespace declaration per file... -->
 	<rule ref="Universal.Namespaces.OneDeclarationPerFile"/>
 
-	<!-- Rule: ... and it should be at the top of the file.
+	<!-- Covers rule: ... and it should be at the top of the file.
 		 Note: with only one namespace declaration, it not being at the top of the file would be a parse error. -->
+	<!-- When in the file header, covered by PSR12.Files.FileHeader.IncorrectOrder. -->
 
 	<!-- Covers rule: Namespace declarations using curly brace syntax are not allowed. -->
 	<rule ref="Universal.Namespaces.DisallowCurlyBraceSyntax"/>
@@ -435,6 +436,35 @@
 	<rule ref="Universal.Namespaces.DisallowDeclarationWithoutName"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Declare Statements, Namespace, and Import Statements - Using import use statements.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#using-import-use-statements
+	#############################################################################
+	-->
+	<!-- Covers rule: Import use statements should be at the top of the file and follow the (optional) namespace declaration. -->
+	<rule ref="PSR12.Files.FileHeader.IncorrectOrder"/>
+
+	<!-- Covers rule: Import use statements should follow a specific order based on the type of the import:
+		 1. use statements for namespaces, classes, interfaces, traits and enums
+		 2. use statements for functions
+		 3. use statements for constants -->
+	<!-- Not yet covered: use statements which are not part of the file header. -->
+	<rule ref="PSR12.Files.FileHeader.IncorrectGrouping"/>
+
+	<!-- Rule: When using aliases, make sure the aliases follow the WordPress naming convention and are unique. -->
+
+	<!-- Rule: (example based rules, group use formatting, spacing around keywords) -->
+	<!-- Spacing after "use" keyword: covered by the Generic.WhiteSpace.LanguageConstructSpacing sniff. -->
+
+	<!-- Implied through the examples: Names in an import use statement should not start with a leading backslash. -->
+	<rule ref="Universal.UseStatements.NoLeadingBackslash"/>
+
+	<!-- Implied through the examples: The use, function, const and as keywords should be lowercase.
+		 For the "use" and "as" keywords, this is covered via the Generic.PHP.LowerCaseKeyword sniff. -->
+	<rule ref="Universal.UseStatements.LowercaseFunctionConst"/>
+
+
 	<!--
 	#############################################################################
 	Handbook: Object-Oriented Programming - Only One Object Structure (Class/Interface/Trait) per File.

From 03b10a58bd37492faf436680f2d8fcbeba8777c2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Jun 2023 17:38:54 +0200
Subject: [PATCH 543/822] Move formatting functions related functionality to
 dedicated `FormattingFunctionsHelper`

The formatting function list is only used by a small set of sniffs, so are better placed in a dedicated class.

The `$formattingFunctions` property has also been made `private static`.

Checking whether or not something is a formatting function should now be done by calling the `FormattingFunctionsHelper::is_formatting_function()` method.

Related to 1465
---
 .../Helpers/FormattingFunctionsHelper.php     | 61 +++++++++++++++++++
 WordPress/Sniff.php                           | 26 --------
 WordPress/Sniffs/DB/PreparedSQLSniff.php      |  3 +-
 .../Sniffs/Security/EscapeOutputSniff.php     |  3 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.php    |  1 +
 5 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 WordPress/Helpers/FormattingFunctionsHelper.php

diff --git a/WordPress/Helpers/FormattingFunctionsHelper.php b/WordPress/Helpers/FormattingFunctionsHelper.php
new file mode 100644
index 0000000000..babfada020
--- /dev/null
+++ b/WordPress/Helpers/FormattingFunctionsHelper.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper functions and function lists for checking whether a function is a formatting function.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class FormattingFunctionsHelper {
+
+	/**
+	 * Functions that format strings.
+	 *
+	 * These functions are often used for formatting values just before output, and
+	 * it is common practice to escape the individual parameters passed to them as
+	 * needed instead of escaping the entire result. This is especially true when the
+	 * string being formatted contains HTML, which makes escaping the full result
+	 * more difficult.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private and property made static.
+	 *
+	 * @var array<string, bool>
+	 */
+	private static $formattingFunctions = array(
+		'antispambot' => true,
+		'array_fill'  => true,
+		'ent2ncr'     => true,
+		'implode'     => true,
+		'join'        => true,
+		'nl2br'       => true,
+		'sprintf'     => true,
+		'vsprintf'    => true,
+		'wp_sprintf'  => true,
+	);
+
+	/**
+	 * Check if a particular function is regarded as a formatting function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public static function is_formatting_function( $functionName ) {
+		return isset( self::$formattingFunctions[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 37ae569d63..9757c93e8d 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -150,32 +150,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'map_deep'  => 2,
 	);
 
-	/**
-	 * Functions that format strings.
-	 *
-	 * These functions are often used for formatting values just before output, and
-	 * it is common practice to escape the individual parameters passed to them as
-	 * needed instead of escaping the entire result. This is especially true when the
-	 * string being formatted contains HTML, which makes escaping the full result
-	 * more difficult.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $formattingFunctions = array(
-		'antispambot' => true,
-		'array_fill'  => true,
-		'ent2ncr'     => true,
-		'implode'     => true,
-		'join'        => true,
-		'nl2br'       => true,
-		'sprintf'     => true,
-		'vsprintf'    => true,
-		'wp_sprintf'  => true,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 6eac5e67b1..582cd9cc81 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -13,6 +13,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\FormattingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\WPDBTrait;
 use WordPressCS\WordPress\Sniff;
 
@@ -225,7 +226,7 @@ function ( $symbol ) {
 						$this->i = $this->tokens[ $opening_paren ]['parenthesis_closer'];
 						continue;
 					}
-				} elseif ( isset( $this->formattingFunctions[ $this->tokens[ $this->i ]['content'] ] ) ) {
+				} elseif ( FormattingFunctionsHelper::is_formatting_function( $this->tokens[ $this->i ]['content'] ) ) {
 					continue;
 				}
 			}
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 8ffa8801bb..48c18ea8d2 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -15,6 +15,7 @@
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
 use WordPressCS\WordPress\Helpers\EscapingFunctionsTrait;
+use WordPressCS\WordPress\Helpers\FormattingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\PrintingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -345,7 +346,7 @@ public function process_token( $stackPtr ) {
 				$ptr                    = $i;
 				$functionName           = $this->tokens[ $i ]['content'];
 				$function_opener        = $this->phpcsFile->findNext( \T_OPEN_PARENTHESIS, ( $i + 1 ), null, false, null, true );
-				$is_formatting_function = isset( $this->formattingFunctions[ $functionName ] );
+				$is_formatting_function = FormattingFunctionsHelper::is_formatting_function( $functionName );
 
 				if ( false !== $function_opener ) {
 
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index b59c140c14..88e5a23ef9 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_safe_casted
+ * @covers \WordPressCS\WordPress\Helpers\FormattingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\WPDBTrait
  * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLSniff
  */

From fd580cf059ff5ef92edc0c496cd1bcb0d598e9ce Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:51:12 +0200
Subject: [PATCH 544/822] Core: add new sniff to check formatting of OO
 declaration statement

See 2254 for a detailed discussion of all options considered.

Fixes 2254
---
 WordPress-Core/ruleset.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index ee3be945eb..52ec1c2d32 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -778,6 +778,18 @@
 	<!-- Class opening braces should be on the same line as the statement. -->
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>
 
+	<!-- Implied via examples: one space after keywords in class declaration, class declaration on one line,
+		 close brace on line by itself and no blank lines between OO structure body and close brace. -->
+	<rule ref="PSR2.Classes.ClassDeclaration"/>
+	<rule ref="PSR2.Classes.ClassDeclaration.OpenBraceNewLine">
+		<!-- WP expects open brace on same line as class keyword. -->
+		<severity>0</severity>
+	</rule>
+	<rule ref="PSR2.Classes.ClassDeclaration.OpenBraceWrongLine">
+		<!-- WP expects open brace on same line as class keyword. -->
+		<severity>0</severity>
+	</rule>
+
 	<!-- References to self in a class should be lower-case and not have extraneous spaces,
 		 per implicit conventions in the core codebase; the NotUsed code refers to using the
 		 fully-qualified class name instead of self, for which there are instances in core. -->

From 619173bcb13b1db1d939a73d75fbcc3f9c1f8e82 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:56:25 +0200
Subject: [PATCH 545/822] CS: fix up own codebase to comply with class rules

---
 Tests/RulesetCheck/class-ruleset-test.inc                       | 1 -
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php          | 1 -
 WordPress/AbstractFunctionRestrictionsSniff.php                 | 1 -
 WordPress/Helpers/IsUnitTestTrait.php                           | 1 -
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php        | 1 -
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php               | 1 -
 WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php    | 1 -
 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php            | 1 -
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php     | 1 -
 WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php     | 1 -
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php                | 1 -
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php            | 1 -
 WordPress/Sniffs/DB/PreparedSQLSniff.php                        | 1 -
 WordPress/Sniffs/DB/RestrictedClassesSniff.php                  | 1 -
 WordPress/Sniffs/DB/RestrictedFunctionsSniff.php                | 1 -
 WordPress/Sniffs/DB/SlowDBQuerySniff.php                        | 1 -
 WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php          | 1 -
 WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php              | 1 -
 WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php           | 1 -
 WordPress/Sniffs/PHP/DontExtractSniff.php                       | 1 -
 WordPress/Sniffs/PHP/POSIXFunctionsSniff.php                    | 1 -
 WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php            | 1 -
 WordPress/Sniffs/PHP/TypeCastsSniff.php                         | 1 -
 WordPress/Sniffs/PHP/YodaConditionsSniff.php                    | 1 -
 WordPress/Sniffs/Security/NonceVerificationSniff.php            | 1 -
 WordPress/Sniffs/Security/PluginMenuSlugSniff.php               | 1 -
 WordPress/Sniffs/Security/SafeRedirectSniff.php                 | 1 -
 WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php      | 1 -
 WordPress/Sniffs/WP/CapabilitiesSniff.php                       | 1 -
 WordPress/Sniffs/WP/CapitalPDangitSniff.php                     | 1 -
 WordPress/Sniffs/WP/CronIntervalSniff.php                       | 1 -
 WordPress/Sniffs/WP/DeprecatedClassesSniff.php                  | 1 -
 WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php                | 1 -
 WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php          | 1 -
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php               | 1 -
 WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php               | 1 -
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php            | 1 -
 WordPress/Sniffs/WP/PostsPerPageSniff.php                       | 1 -
 WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php       | 1 -
 WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php    | 1 -
 WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php            | 1 -
 WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php      | 1 -
 WordPress/Tests/Arrays/ArrayIndentationUnitTest.php             | 1 -
 WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php  | 1 -
 WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php          | 1 -
 WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php   | 1 -
 WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php   | 1 -
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php          | 1 -
 WordPress/Tests/DB/RestrictedClassesUnitTest.php                | 1 -
 WordPress/Tests/DB/RestrictedFunctionsUnitTest.php              | 1 -
 WordPress/Tests/DB/SlowDBQueryUnitTest.php                      | 1 -
 WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php        | 1 -
 WordPress/Tests/Files/FileNameUnitTest.php                      | 1 -
 WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php  | 1 -
 WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php | 1 -
 WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php            | 1 -
 WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php         | 1 -
 WordPress/Tests/PHP/DontExtractUnitTest.php                     | 1 -
 WordPress/Tests/PHP/POSIXFunctionsUnitTest.php                  | 1 -
 WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php          | 1 -
 WordPress/Tests/PHP/YodaConditionsUnitTest.php                  | 1 -
 WordPress/Tests/Security/EscapeOutputUnitTest.php               | 1 -
 WordPress/Tests/Security/SafeRedirectUnitTest.php               | 1 -
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php    | 1 -
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php           | 1 -
 WordPress/Tests/WP/DeprecatedClassesUnitTest.php                | 1 -
 WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php              | 1 -
 WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php        | 1 -
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php          | 1 -
 WordPress/Tests/WP/I18nUnitTest.php                             | 1 -
 WordPress/Tests/WP/PostsPerPageUnitTest.php                     | 1 -
 WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php     | 1 -
 WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php  | 1 -
 WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php          | 1 -
 74 files changed, 74 deletions(-)

diff --git a/Tests/RulesetCheck/class-ruleset-test.inc b/Tests/RulesetCheck/class-ruleset-test.inc
index 42af57dd25..86cc3770cc 100644
--- a/Tests/RulesetCheck/class-ruleset-test.inc
+++ b/Tests/RulesetCheck/class-ruleset-test.inc
@@ -110,5 +110,4 @@ class Ruleset_Test {
 		end:
 		echo 'This is a goto - it needs to be here to prevent parse errors';
 	}
-
 }
diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 82e5238db3..223b5e1bfa 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -240,5 +240,4 @@ public function process_token( $stackPtr ) {
 	 *                       with custom error message passed to ->process().
 	 */
 	abstract public function callback( $key, $val, $line, $group );
-
 }
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 0746e7078d..d9f1c1774e 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -356,5 +356,4 @@ protected function prepare_name_for_regex( $function_name ) {
 
 		return $function_name;
 	}
-
 }
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index a0636d7b26..e4a0869b92 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -178,5 +178,4 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 
 		return false;
 	}
-
 }
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 6cab1ae48b..f6d2fb873b 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -466,5 +466,4 @@ protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
 			$end_of_last_item = $end_of_this_item;
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 0661baa627..2fc990c44a 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -545,5 +545,4 @@ protected function fix_alignment_error( $ptr, $new_indent ) {
 			$this->phpcsFile->fixer->replaceToken( ( $ptr - 1 ), $new_indent );
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 04035457ef..6e4170d8aa 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -173,5 +173,4 @@ public function process_token( $stackPtr ) {
 			}
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
index 24e619cccc..c1376b3df0 100644
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
@@ -309,5 +309,4 @@ public function process_token( $stackPtr ) {
 			}
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index d3a86894f1..482889ff01 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -580,5 +580,4 @@ protected function validate_align_multiline_items() {
 		// Reset to the default if an invalid value was received.
 		$this->alignMultilineItems = 'always';
 	}
-
 }
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 00cd83b68c..cca0a8c50d 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -87,5 +87,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			$data
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index c7ce36980b..eb92cd565f 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -297,5 +297,4 @@ protected function mergeFunctionLists() {
 			$this->addedCustomFunctions['cachedelete'] = $this->customCacheDeleteFunctions;
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 7d5e0f2235..eff3a2b643 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -654,5 +654,4 @@ protected function analyse_implode( $implode_token ) {
 
 		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_params[3]['raw'] );
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 582cd9cc81..194953584e 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -241,5 +241,4 @@ function ( $symbol ) {
 
 		return $this->end;
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/RestrictedClassesSniff.php b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
index 2c4dd33426..c82fda81db 100644
--- a/WordPress/Sniffs/DB/RestrictedClassesSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
@@ -56,5 +56,4 @@ public function getGroups() {
 
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
index 7bdaa0e520..de46d596d6 100644
--- a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
@@ -62,5 +62,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index 6f4c0c2af2..e57409eb1d 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -58,5 +58,4 @@ public function getGroups() {
 	public function callback( $key, $val, $line, $group ) {
 		return true;
 	}
-
 }
diff --git a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
index b09fed969a..4a31a4bbd6 100644
--- a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
@@ -58,5 +58,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
index 5239078245..a41ca2d168 100644
--- a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
@@ -62,5 +62,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
index 8f224880e8..e32e28709c 100644
--- a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
@@ -99,5 +99,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/DontExtractSniff.php b/WordPress/Sniffs/PHP/DontExtractSniff.php
index 63fdf37f8c..33ca9b48c3 100644
--- a/WordPress/Sniffs/PHP/DontExtractSniff.php
+++ b/WordPress/Sniffs/PHP/DontExtractSniff.php
@@ -51,5 +51,4 @@ public function getGroups() {
 
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
index d998fe12c4..71957f210f 100644
--- a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
@@ -72,5 +72,4 @@ public function getGroups() {
 
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
index 52c76398f8..c3296a1661 100644
--- a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
@@ -44,5 +44,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 74bf70ae8f..7c29af2e79 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -89,5 +89,4 @@ public function process_token( $stackPtr ) {
 				break;
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index 821a68d1d2..81cf7e7fba 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -123,5 +123,4 @@ public function process_token( $stackPtr ) {
 
 		$this->phpcsFile->addError( 'Use Yoda Condition checks, you must.', $stackPtr, 'NotYoda' );
 	}
-
 }
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index ef33fb3fb6..f714f46c07 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -324,5 +324,4 @@ protected function mergeFunctionLists() {
 			$this->addedCustomFunctions['unslashsanitize'] = $this->customUnslashingSanitizingFunctions;
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index b816b4c951..7f9fdacfe9 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -124,5 +124,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			}
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/Security/SafeRedirectSniff.php b/WordPress/Sniffs/Security/SafeRedirectSniff.php
index ac0ab9fc33..7aa8b9778e 100644
--- a/WordPress/Sniffs/Security/SafeRedirectSniff.php
+++ b/WordPress/Sniffs/Security/SafeRedirectSniff.php
@@ -44,5 +44,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index f6994bb7e4..1132f3c278 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -231,5 +231,4 @@ protected function mergeFunctionLists() {
 			$this->addedCustomFunctions['unslashsanitize'] = $this->customUnslashingSanitizingFunctions;
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 01e750d0e2..583a9e5160 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -477,5 +477,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			)
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 678ea7dfcd..80938639dd 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -309,5 +309,4 @@ protected function retrieve_misspellings( $match_stack ) {
 
 		return $misspelled;
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index 055eccf02a..b67b9e7bf6 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -318,5 +318,4 @@ public function confused( $stackPtr ) {
 			'ChangeDetected'
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 072b77a4fe..b79ac75e1d 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -121,5 +121,4 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$data
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 1243fb40b2..c58390b665 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1550,5 +1550,4 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$data
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 8c37254247..fbe0d8a376 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -288,5 +288,4 @@ protected function process_parameter( $matched_content, $parameter, $parameter_a
 			$data
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 4d6bb403a1..40a0ad14bb 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -237,5 +237,4 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			);
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
index a8cc1ca0b1..18d338173f 100644
--- a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
@@ -53,5 +53,4 @@ public function getGroups() {
 			),
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 408a0ebf4c..c0a13b6f44 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -435,5 +435,4 @@ protected function add_error( $stackPtr, $data = array() ) {
 			$data
 		);
 	}
-
 }
diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index 942c65b835..30a4ec3104 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -74,5 +74,4 @@ public function callback( $key, $val, $line, $group ) {
 
 		return false;
 	}
-
 }
diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index b0e0c285f5..bf381c23a7 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -58,5 +58,4 @@ public function process_token( $stackPtr ) {
 			}
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 82822be62d..c95dc859fc 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -575,5 +575,4 @@ public function process_token( $stackPtr ) {
 			}
 		}
 	}
-
 }
diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index f7125bc0c0..b6d9c65709 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -59,5 +59,4 @@ public function register() {
 
 		return $tokens;
 	}
-
 }
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index ea45ae434e..f613e70fae 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -111,5 +111,4 @@ public function getErrorList( $testFile = '' ) {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
index 950c4b2506..40f093ff25 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
@@ -161,5 +161,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 2f871ad3db..5e9046ef9e 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -72,5 +72,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
index dd80994f62..33d99a69a6 100644
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
+++ b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
@@ -88,5 +88,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
index 075df264a2..f00dd19969 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
@@ -170,5 +170,4 @@ public function getWarningList() {
 			570 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
index 245ae7f17e..22a98a9613 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
@@ -43,5 +43,4 @@ public function getWarningList() {
 			8 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 7c133a554a..a8d39416d1 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -97,5 +97,4 @@ public function getWarningList() {
 			177 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index 40fc100654..f062b9e31f 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -162,5 +162,4 @@ public function getErrorList( $testFile = '' ) {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index 6d1d2a9e0f..43e68f8012 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -125,5 +125,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 94aa230564..78112fd45a 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -48,5 +48,4 @@ public function getWarningList() {
 			19 => 2,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
index 97a90bed48..f46d099aec 100644
--- a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -42,5 +42,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index e29d57099a..13909316cf 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -158,5 +158,4 @@ public function getErrorList( $testFile = '' ) {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 03408c53e1..444754d96d 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -166,5 +166,4 @@ public function getWarningList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 				return array();
 		}
 	}
-
 }
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index e69b1dd8f5..467924b686 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -110,5 +110,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
index efc4b9c919..4fe6a62f9a 100644
--- a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -56,5 +56,4 @@ public function getWarningList() {
 			34 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
index 019996f116..639ff11f09 100644
--- a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
@@ -64,5 +64,4 @@ public function getWarningList() {
 			39 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
index 45d63f6de0..7079ce6e73 100644
--- a/WordPress/Tests/PHP/DontExtractUnitTest.php
+++ b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -43,5 +43,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
index c24ceda461..738c85e7d7 100644
--- a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
@@ -48,5 +48,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
index ea4aa098ce..cc3ac3e63e 100644
--- a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -41,5 +41,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/PHP/YodaConditionsUnitTest.php b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
index eac33f7a8a..98bd027f86 100644
--- a/WordPress/Tests/PHP/YodaConditionsUnitTest.php
+++ b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
@@ -60,5 +60,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 187d0e7b92..86f553b7d0 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -106,5 +106,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
index 0cf00822e3..faac0d90aa 100644
--- a/WordPress/Tests/Security/SafeRedirectUnitTest.php
+++ b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -41,5 +41,4 @@ public function getWarningList() {
 			3 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index ab4574aff0..e3212bfbc8 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -97,5 +97,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index dd0c6dc488..4da81a10df 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -197,5 +197,4 @@ public function getWarningList( $testFile = '' ) {
 				return array();
 		}
 	}
-
 }
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index c6da2e5634..f993d053a4 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -47,5 +47,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 700fb821fe..3baf2a909d 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -105,5 +105,4 @@ public function getWarningList() {
 
 		return $warnings;
 	}
-
 }
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 8866c29979..2685e41a49 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -65,5 +65,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index f063f11c13..f7f62834fd 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -104,5 +104,4 @@ public function getErrorList( $testFile = '' ) {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 99c214afd9..925eae6d93 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -235,5 +235,4 @@ public function getWarningList( $testFile = '' ) {
 				return array();
 		}
 	}
-
 }
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 42ea579a78..442ae259cd 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -53,5 +53,4 @@ public function getWarningList() {
 			29 => 1,
 		);
 	}
-
 }
diff --git a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
index 90ca0000dd..1b80f7e0aa 100644
--- a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
@@ -48,5 +48,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 1cd2bde66c..58e7cf7265 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -96,5 +96,4 @@ public function getErrorList( $testFile = '' ) {
 	public function getWarningList() {
 		return array();
 	}
-
 }
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index aa60ee4cd6..8fa8dddd3c 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -55,5 +55,4 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
-
 }

From 36ac851887210ec7ada56b555891d0483e5a1ffa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:11:55 +0200
Subject: [PATCH 546/822] WP/CapitalPDangit: use more modular error codes

This splits the `Misspelled` error code into two distinct error codes to allow for more modular ignoring of issues.

The new error codes are based on the context in which the misspelling is found (similar to other modular codes already in place, like `MisspelledNamespaceName`):
* `MisspelledInText`
* `MisspelledInComment`

As per the discussion in 1942.
---
 WordPress/Sniffs/WP/CapitalPDangitSniff.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 678ea7dfcd..7c27184386 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -266,10 +266,15 @@ public function process_token( $stackPtr ) {
 				return;
 			}
 
+			$code = 'MisspelledInText';
+			if ( isset( Tokens::$commentTokens[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+				$code = 'MisspelledInComment';
+			}
+
 			$fix = $this->phpcsFile->addFixableWarning(
 				'Please spell "WordPress" correctly. Found %s misspelling(s): %s',
 				$stackPtr,
-				'Misspelled',
+				$code,
 				array(
 					\count( $misspelled ),
 					implode( ', ', $misspelled ),

From 3d4fcf5e0e4128fcb56ad49961fb3609c5c256e8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:12:48 +0200
Subject: [PATCH 547/822] Move "array walking" functions related functionality
 to dedicated `ArrayWalkingFunctionsHelper`

The "array walking" function list is only used by a small set of sniffs, so are better placed in a dedicated class.

The `$arrayWalkingFunctions` property has also been made `private static`.

Checking whether or not something is an "array walking" function should now be done by calling the `ArrayWalkingFunctionsHelper::is_array_walking_function()` method.

Related to 1465
---
 .../Helpers/ArrayWalkingFunctionsHelper.php   | 65 +++++++++++++++++++
 WordPress/Sniff.php                           | 26 ++------
 .../Sniffs/Security/EscapeOutputSniff.php     |  5 +-
 .../Tests/Security/EscapeOutputUnitTest.php   |  1 +
 .../ValidatedSanitizedInputUnitTest.php       |  1 +
 5 files changed, 74 insertions(+), 24 deletions(-)
 create mode 100644 WordPress/Helpers/ArrayWalkingFunctionsHelper.php

diff --git a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
new file mode 100644
index 0000000000..b684302d98
--- /dev/null
+++ b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper functions and function lists for checking whether a function applies a callback to an array.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class ArrayWalkingFunctionsHelper {
+
+	/**
+	 * List of array functions which apply a callback to the array.
+	 *
+	 * These are often used for sanitization/escaping an array variable.
+	 *
+	 * Note: functions which alter the array by reference are not listed here on purpose.
+	 * These cannot easily be used for sanitization as they can't be combined with unslashing.
+	 * Similarly, they cannot be used for late escaping as the return value is a boolean, not
+	 * the altered array.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private and property made static.
+	 *
+	 * @var array <string function name> => <int parameter position of the callback parameter>
+	 */
+	private static $arrayWalkingFunctions = array(
+		'array_map' => 1,
+		'map_deep'  => 2,
+	);
+
+	/**
+	 * Retrieve a list of the supported "array walking" functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array<string, int>
+	 */
+	public static function get_array_walking_functions() {
+		return self::$arrayWalkingFunctions;
+	}
+
+	/**
+	 * Check if a particular function is an "array walking" function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public static function is_array_walking_function( $functionName ) {
+		return isset( self::$arrayWalkingFunctions[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 9757c93e8d..00c82ee4e2 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -14,6 +14,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 
@@ -131,25 +132,6 @@ abstract class Sniff implements PHPCS_Sniff {
 		'wp_unslash'                     => true,
 	);
 
-	/**
-	 * List of array functions which apply a callback to the array.
-	 *
-	 * These are often used for sanitization/escaping an array variable.
-	 *
-	 * Note: functions which alter the array by reference are not listed here on purpose.
-	 * These cannot easily be used for sanitization as they can't be combined with unslashing.
-	 * Similarly, they cannot be used for late escaping as the return value is a boolean, not
-	 * the altered array.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @var array <string function name> => <int parameter position of the callback parameter>
-	 */
-	protected $arrayWalkingFunctions = array(
-		'array_map' => 1,
-		'map_deep'  => 2,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
@@ -303,7 +285,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		$valid_functions  = $this->sanitizingFunctions;
 		$valid_functions += $this->unslashingSanitizingFunctions;
 		$valid_functions += $this->unslashingFunctions;
-		$valid_functions += $this->arrayWalkingFunctions;
+		$valid_functions += ArrayWalkingFunctionsHelper::get_array_walking_functions();
 
 		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
 
@@ -342,10 +324,10 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		}
 
 		// Arrays might be sanitized via an array walking function using a callback.
-		if ( isset( $this->arrayWalkingFunctions[ $functionName ] ) ) {
+		if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
 
 			// Get the callback parameter.
-			$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, $this->arrayWalkingFunctions[ $functionName ] );
+			$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, ArrayWalkingFunctionsHelper::get_array_walking_functions()[ $functionName ] );
 
 			if ( ! empty( $callback ) ) {
 				/*
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 157291a54c..b8a0e1ac02 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
 use WordPressCS\WordPress\Helpers\EscapingFunctionsTrait;
@@ -354,13 +355,13 @@ public function process_token( $stackPtr ) {
 
 				if ( false !== $function_opener ) {
 
-					if ( isset( $this->arrayWalkingFunctions[ $functionName ] ) ) {
+					if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
 
 						// Get the callback parameter.
 						$callback = PassedParameters::getParameter(
 							$this->phpcsFile,
 							$ptr,
-							$this->arrayWalkingFunctions[ $functionName ]
+							ArrayWalkingFunctionsHelper::get_array_walking_functions()[ $functionName ]
 						);
 
 						if ( ! empty( $callback ) ) {
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 187d0e7b92..de100808d5 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0     Class name changed: this class is now namespaced.
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\ConstantsHelper::is_use_of_global_constant
  * @covers \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait
  * @covers \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index ab4574aff0..941253ac53 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -20,6 +20,7 @@
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
+ * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\VariableHelper
  * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */

From 51e5625d9903d0da888066d84270b20f8985a1bc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:57:21 +0200
Subject: [PATCH 548/822] ArrayWalkingFunctionsHelper: add support for PHP 8.0+
 named parameters

* Transform the `$arrayWalkingFunctions` array to a multi-dimensional array to allow for it to include information about parameter names.
* Add new `get_callback_parameter()` method to retrieve the parameter information using the PHPCSUtils `PassedParameters` functionality.
* Adjust the sniff code retrieving a parameter from these functions to use this new method.
* Adjust the `get_array_walking_functions()` method to still return a single-dimensional array.

Includes additional unit tests.
---
 .../Helpers/ArrayWalkingFunctionsHelper.php   | 53 +++++++++++++++++--
 WordPress/Sniff.php                           |  2 +-
 .../Sniffs/Security/EscapeOutputSniff.php     |  6 +--
 .../Tests/Security/EscapeOutputUnitTest.inc   | 12 +++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  4 ++
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
index b684302d98..97f1c24d46 100644
--- a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
+++ b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
@@ -9,6 +9,9 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
+use PHP_CodeSniffer\Files\File;
+use PHPCSUtils\Utils\PassedParameters;
+
 /**
  * Helper functions and function lists for checking whether a function applies a callback to an array.
  *
@@ -31,12 +34,20 @@ final class ArrayWalkingFunctionsHelper {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility changed from protected to private and property made static.
+	 *              - The value has changed from an integer to an array containing the integer
+	 *                parameter position + its name.
 	 *
-	 * @var array <string function name> => <int parameter position of the callback parameter>
+	 * @var array<string, array>
 	 */
 	private static $arrayWalkingFunctions = array(
-		'array_map' => 1,
-		'map_deep'  => 2,
+		'array_map' => array(
+			'position' => 1,
+			'name'     => 'callback',
+		),
+		'map_deep'  => array(
+			'position' => 2,
+			'name'     => 'callback',
+		),
 	);
 
 	/**
@@ -44,10 +55,10 @@ final class ArrayWalkingFunctionsHelper {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @return array<string, int>
+	 * @return array<string, bool>
 	 */
 	public static function get_array_walking_functions() {
-		return self::$arrayWalkingFunctions;
+		return \array_fill_keys( \array_keys( self::$arrayWalkingFunctions ), true );
 	}
 
 	/**
@@ -62,4 +73,36 @@ public static function get_array_walking_functions() {
 	public static function is_array_walking_function( $functionName ) {
 		return isset( self::$arrayWalkingFunctions[ $functionName ] );
 	}
+
+	/**
+	 * Retrieve the parameter information for the callback parameter for an array walking function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param int                         $stackPtr  The position of function call name token.
+	 *
+	 * @return array|false Array with information on the callback parameter.
+	 *                     Or `FALSE` if the parameter is not found.
+	 *                     See the PHPCSUtils PassedParameters::getParameters() documentation
+	 *                     for the format of the returned (single-dimensional) array.
+	 */
+	public static function get_callback_parameter( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
+		$functionName = $tokens[ $stackPtr ]['content'];
+		if ( isset( self::$arrayWalkingFunctions[ $functionName ] ) === false ) {
+			return false;
+		}
+
+		return PassedParameters::getParameter(
+			$phpcsFile,
+			$stackPtr,
+			self::$arrayWalkingFunctions[ $functionName ]['position'],
+			self::$arrayWalkingFunctions[ $functionName ]['name']
+		);
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 00c82ee4e2..2634cf5375 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -327,7 +327,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
 
 			// Get the callback parameter.
-			$callback = PassedParameters::getParameter( $this->phpcsFile, $functionPtr, ArrayWalkingFunctionsHelper::get_array_walking_functions()[ $functionName ] );
+			$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $this->phpcsFile, $functionPtr );
 
 			if ( ! empty( $callback ) ) {
 				/*
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index b8a0e1ac02..4eed80f46d 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -358,11 +358,7 @@ public function process_token( $stackPtr ) {
 					if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
 
 						// Get the callback parameter.
-						$callback = PassedParameters::getParameter(
-							$this->phpcsFile,
-							$ptr,
-							ArrayWalkingFunctionsHelper::get_array_walking_functions()[ $functionName ]
-						);
+						$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $this->phpcsFile, $ptr );
 
 						if ( ! empty( $callback ) ) {
 							/*
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index 9698ce56b7..5b618fb78e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -305,3 +305,15 @@ _deprecated_file(); // Ignore.
 echo antispambot( 'john.doe@mysite.com' ); // OK.
 echo antispambot( esc_html( $email ) ); // OK.
 echo antispambot( $email ); // Bad.
+
+/*
+ * Safeguard support for PHP 8.0+ named parameters for array walking functions.
+ */
+echo implode( '<br>', map_deep( callback: 'esc_html', value: $items ) ); // Ok.
+echo implode( '<br>', map_deep( value: $items ) ); // Bad, missing callback param, so escaping can not be verified.
+echo implode( '<br>', map_deep( call_back: 'esc_html', value: $items ) ); // Bad, wrong param name, so escaping can not be verified.
+echo implode( '<br>', map_deep( callback: 'foo', value: $items, ) ); // Bad, non-escaping function as callback.
+
+// Note: named params not supported due to the `...$arrays` in array_map()`, but that's not the concern of this sniff.
+echo implode( '<br>', array_map( array: $items, callback: 'esc_html', ) ); // Ok.
+echo implode( '<br>', array_map( array: $items, callback: 'foo', ) ); // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index de100808d5..e80e1d8d3e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -96,6 +96,10 @@ public function getErrorList() {
 			294 => 1,
 			297 => 1,
 			307 => 1,
+			313 => 1,
+			314 => 1,
+			315 => 1,
+			319 => 1,
 		);
 	}
 

From 0340cfc9fa03b57504a64bfc7cb6dc4e76da4dcc Mon Sep 17 00:00:00 2001
From: Juliette <663378+jrfnl@users.noreply.github.com>
Date: Fri, 23 Jun 2023 17:16:48 +0200
Subject: [PATCH 549/822] Move sanitization functions related functionality to
 dedicated `SanitizingFunctionsTrait` (#2259)

Move sanitization functions related functionality to dedicated `SanitizingFunctionsTrait`

The sanitization function lists are only used by a small set of sniffs, so are better placed in a dedicated trait.

The choice for a `trait` over a `class` is due to the `public` properties allowing for adding additional functions to the lists.

Moving both the base function lists + the `public` properties to the same trait will allow us to encapsulate all the functionality related to the use of these lists in one place.

The `$sanitizingFunctions` and the `$unslashingSanitizingFunctions` property, containing the base lists, have also been made `private`.

Checking whether or not something is a sanitization function should now be done by calling the `SanitizingFunctionsTrait::is_sanitizing_function()` or the `SanitizingFunctionsTrait::is_sanitizing_and_unslashing_function()` method.

Related to #1465
---
 .../Helpers/SanitizingFunctionsTrait.php      | 238 ++++++++++++++++++
 WordPress/Sniff.php                           |  89 +------
 .../Security/NonceVerificationSniff.php       |  40 +--
 .../Security/ValidatedSanitizedInputSniff.php |  64 -----
 .../ValidatedSanitizedInputUnitTest.php       |   1 +
 5 files changed, 246 insertions(+), 186 deletions(-)
 create mode 100644 WordPress/Helpers/SanitizingFunctionsTrait.php

diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizingFunctionsTrait.php
new file mode 100644
index 0000000000..f51d3f4e09
--- /dev/null
+++ b/WordPress/Helpers/SanitizingFunctionsTrait.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+
+/**
+ * Helper functions and function lists for checking whether a sanitizing function is being used.
+ *
+ * Any sniff class which incorporates this trait will automatically support the
+ * following `public` properties which can be changed from within a custom ruleset:
+ * - `customSanitizingFunctions`.
+ * - `customUnslashingSanitizingFunctions`
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The properties in this trait were previously contained partially in the
+ *                `WordPressCS\WordPress\Sniff` class and partially in the `NonceVerificationSniff`
+ *                and the `ValidatedSanitizedInputSniff` classes and have been moved here.
+ */
+trait SanitizingFunctionsTrait {
+
+	/**
+	 * Custom list of functions that sanitize the values passed to them.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 Moved from the NonceVerification and the ValidatedSanitizedInput sniff classes to this trait.
+	 *
+	 * @var string[]
+	 */
+	public $customSanitizingFunctions = array();
+
+	/**
+	 * Custom sanitizing functions that implicitly unslash the values passed to them.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 Moved from the NonceVerification and the ValidatedSanitizedInput sniff classes to this trait.
+	 *
+	 * @var string[]
+	 */
+	public $customUnslashingSanitizingFunctions = array();
+
+	/**
+	 * Functions that sanitize values.
+	 *
+	 * This list is complementary to the `$unslashingSanitizingFunctions`
+	 * list.
+	 * Sanitizing functions should be added to this list if they do *not*
+	 * implicitly unslash data and to the `$unslashingsanitizingFunctions`
+	 * list if they do.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  - Moved from the Sniff class to this trait.
+	 *               - Visibility changed from protected to private.
+	 *
+	 * @var array<string, bool>
+	 */
+	private $sanitizingFunctions = array(
+		'_wp_handle_upload'          => true,
+		'esc_url_raw'                => true,
+		'filter_input'               => true,
+		'filter_var'                 => true,
+		'hash_equals'                => true,
+		'is_email'                   => true,
+		'number_format'              => true,
+		'sanitize_bookmark_field'    => true,
+		'sanitize_bookmark'          => true,
+		'sanitize_email'             => true,
+		'sanitize_file_name'         => true,
+		'sanitize_hex_color_no_hash' => true,
+		'sanitize_hex_color'         => true,
+		'sanitize_html_class'        => true,
+		'sanitize_meta'              => true,
+		'sanitize_mime_type'         => true,
+		'sanitize_option'            => true,
+		'sanitize_sql_orderby'       => true,
+		'sanitize_term_field'        => true,
+		'sanitize_term'              => true,
+		'sanitize_text_field'        => true,
+		'sanitize_textarea_field'    => true,
+		'sanitize_title_for_query'   => true,
+		'sanitize_title_with_dashes' => true,
+		'sanitize_title'             => true,
+		'sanitize_user_field'        => true,
+		'sanitize_user'              => true,
+		'validate_file'              => true,
+		'wp_handle_sideload'         => true,
+		'wp_handle_upload'           => true,
+		'wp_kses_allowed_html'       => true,
+		'wp_kses_data'               => true,
+		'wp_kses_post'               => true,
+		'wp_kses'                    => true,
+		'wp_parse_id_list'           => true,
+		'wp_redirect'                => true,
+		'wp_safe_redirect'           => true,
+		'wp_sanitize_redirect'       => true,
+		'wp_strip_all_tags'          => true,
+	);
+
+	/**
+	 * Sanitizing functions that implicitly unslash the data passed to them.
+	 *
+	 * This list is complementary to the `$sanitizingFunctions` list.
+	 * Sanitizing functions should be added to this list if they also
+	 * implicitely unslash data and to the `$sanitizingFunctions` list
+	 * if they don't.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  - Moved from the Sniff class to this trait.
+	 *               - Visibility changed from protected to private.
+	 *
+	 * @var array<string, bool>
+	 */
+	private $unslashingSanitizingFunctions = array(
+		'absint'       => true,
+		'boolval'      => true,
+		'count'        => true,
+		'doubleval'    => true,
+		'floatval'     => true,
+		'intval'       => true,
+		'sanitize_key' => true,
+		'sizeof'       => true,
+	);
+
+	/**
+	 * Cache of previously added custom functions.
+	 *
+	 * Prevents having to do the same merges over and over again.
+	 *
+	 * @since 0.4.0
+	 * @since 0.11.0 - Changed from public static to protected non-static.
+	 *               - Changed the format from simple bool to array.
+	 * @since 3.0.0  - Moved from the NonceVerification and the ValidatedSanitizedInput sniff classes to this class.
+	 *               - Visibility changed from protected to private.
+	 *
+	 * @var array<string, string[]>
+	 */
+	private $addedCustomSanitizingFunctions = array(
+		'sanitize'        => array(),
+		'unslashsanitize' => array(),
+	);
+
+	/**
+	 * Combined list of WP/PHP native and custom sanitizing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	private $allSanitizingFunctions = array();
+
+	/**
+	 * Combined list of WP/PHP native and custom sanitizing and unslashing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	private $allUnslashingSanitizingFunctions = array();
+
+	/**
+	 * Retrieve a list of all known sanitizing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	public function get_sanitizing_functions() {
+		if ( array() === $this->allSanitizingFunctions
+			|| $this->customSanitizingFunctions !== $this->addedCustomSanitizingFunctions['sanitize']
+		) {
+			$this->allSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
+				$this->customSanitizingFunctions,
+				$this->sanitizingFunctions
+			);
+
+			$this->addedCustomSanitizingFunctions['sanitize'] = $this->customSanitizingFunctions;
+		}
+
+		return $this->allSanitizingFunctions;
+	}
+
+	/**
+	 * Retrieve a list of all known sanitizing and unslashing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	public function get_sanitizing_and_unslashing_functions() {
+		if ( array() === $this->allUnslashingSanitizingFunctions
+			|| $this->customUnslashingSanitizingFunctions !== $this->addedCustomSanitizingFunctions['unslashsanitize']
+		) {
+			$this->allUnslashingSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
+				$this->customUnslashingSanitizingFunctions,
+				$this->unslashingSanitizingFunctions
+			);
+
+			$this->addedCustomSanitizingFunctions['unslashsanitize'] = $this->customUnslashingSanitizingFunctions;
+		}
+
+		return $this->allUnslashingSanitizingFunctions;
+	}
+
+	/**
+	 * Check if a particular function is regarded as a sanitizing function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_sanitizing_function( $functionName ) {
+		return isset( $this->get_sanitizing_functions()[ $functionName ] );
+	}
+
+	/**
+	 * Check if a particular function is regarded as a sanitizing and unslashing function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_sanitizing_and_unslashing_function( $functionName ) {
+		return isset( $this->get_sanitizing_and_unslashing_functions()[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 2634cf5375..c1ba74c385 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -16,6 +16,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 
 /**
@@ -39,85 +40,7 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	/**
-	 * Functions that sanitize values.
-	 *
-	 * This list is complementary to the `$unslashingSanitizingFunctions`
-	 * list.
-	 * Sanitizing functions should be added to this list if they do *not*
-	 * implicitely unslash data and to the `$unslashingsanitizingFunctions`
-	 * list if they do.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $sanitizingFunctions = array(
-		'_wp_handle_upload'          => true,
-		'esc_url_raw'                => true,
-		'filter_input'               => true,
-		'filter_var'                 => true,
-		'hash_equals'                => true,
-		'is_email'                   => true,
-		'number_format'              => true,
-		'sanitize_bookmark_field'    => true,
-		'sanitize_bookmark'          => true,
-		'sanitize_email'             => true,
-		'sanitize_file_name'         => true,
-		'sanitize_hex_color_no_hash' => true,
-		'sanitize_hex_color'         => true,
-		'sanitize_html_class'        => true,
-		'sanitize_meta'              => true,
-		'sanitize_mime_type'         => true,
-		'sanitize_option'            => true,
-		'sanitize_sql_orderby'       => true,
-		'sanitize_term_field'        => true,
-		'sanitize_term'              => true,
-		'sanitize_text_field'        => true,
-		'sanitize_textarea_field'    => true,
-		'sanitize_title_for_query'   => true,
-		'sanitize_title_with_dashes' => true,
-		'sanitize_title'             => true,
-		'sanitize_user_field'        => true,
-		'sanitize_user'              => true,
-		'validate_file'              => true,
-		'wp_handle_sideload'         => true,
-		'wp_handle_upload'           => true,
-		'wp_kses_allowed_html'       => true,
-		'wp_kses_data'               => true,
-		'wp_kses_post'               => true,
-		'wp_kses'                    => true,
-		'wp_parse_id_list'           => true,
-		'wp_redirect'                => true,
-		'wp_safe_redirect'           => true,
-		'wp_sanitize_redirect'       => true,
-		'wp_strip_all_tags'          => true,
-	);
-
-	/**
-	 * Sanitizing functions that implicitly unslash the data passed to them.
-	 *
-	 * This list is complementary to the `$sanitizingFunctions` list.
-	 * Sanitizing functions should be added to this list if they also
-	 * implicitely unslash data and to the `$sanitizingFunctions` list
-	 * if they don't.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from public static to protected non-static.
-	 *
-	 * @var array
-	 */
-	protected $unslashingSanitizingFunctions = array(
-		'absint'       => true,
-		'boolval'      => true,
-		'count'        => true,
-		'doubleval'    => true,
-		'floatval'     => true,
-		'intval'       => true,
-		'sanitize_key' => true,
-		'sizeof'       => true,
-	);
+	use SanitizingFunctionsTrait;
 
 	/**
 	 * Functions which unslash the data passed to them.
@@ -282,8 +205,8 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 			return true;
 		}
 
-		$valid_functions  = $this->sanitizingFunctions;
-		$valid_functions += $this->unslashingSanitizingFunctions;
+		$valid_functions  = $this->get_sanitizing_functions();
+		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
 		$valid_functions += $this->unslashingFunctions;
 		$valid_functions += ArrayWalkingFunctionsHelper::get_array_walking_functions();
 
@@ -348,12 +271,12 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		}
 
 		// If slashing is required, give an error.
-		if ( ! $is_unslashed && $require_unslash && ! isset( $this->unslashingSanitizingFunctions[ $functionName ] ) ) {
+		if ( ! $is_unslashed && $require_unslash && ! $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
 			$this->add_unslash_error( $stackPtr );
 		}
 
 		// Check if this is a sanitizing function.
-		if ( isset( $this->sanitizingFunctions[ $functionName ] ) || isset( $this->unslashingSanitizingFunctions[ $functionName ] ) ) {
+		if ( $this->is_sanitizing_function( $functionName ) || $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
 			return true;
 		}
 
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index f714f46c07..dc511758a7 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -54,24 +54,6 @@ class NonceVerificationSniff extends Sniff {
 	 */
 	public $customNonceVerificationFunctions = array();
 
-	/**
-	 * Custom list of functions that sanitize the values passed to them.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customSanitizingFunctions = array();
-
-	/**
-	 * Custom sanitizing functions that implicitly unslash the values passed to them.
-	 *
-	 * @since 0.11.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customUnslashingSanitizingFunctions = array();
-
 	/**
 	 * Cache of previously added custom functions.
 	 *
@@ -84,9 +66,7 @@ class NonceVerificationSniff extends Sniff {
 	 * @var array
 	 */
 	protected $addedCustomFunctions = array(
-		'nonce'           => array(),
-		'sanitize'        => array(),
-		'unslashsanitize' => array(),
+		'nonce' => array(),
 	);
 
 	/**
@@ -305,23 +285,5 @@ protected function mergeFunctionLists() {
 
 			$this->addedCustomFunctions['nonce'] = $this->customNonceVerificationFunctions;
 		}
-
-		if ( $this->customSanitizingFunctions !== $this->addedCustomFunctions['sanitize'] ) {
-			$this->sanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customSanitizingFunctions,
-				$this->sanitizingFunctions
-			);
-
-			$this->addedCustomFunctions['sanitize'] = $this->customSanitizingFunctions;
-		}
-
-		if ( $this->customUnslashingSanitizingFunctions !== $this->addedCustomFunctions['unslashsanitize'] ) {
-			$this->unslashingSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customUnslashingSanitizingFunctions,
-				$this->unslashingSanitizingFunctions
-			);
-
-			$this->addedCustomFunctions['unslashsanitize'] = $this->customUnslashingSanitizingFunctions;
-		}
 	}
 }
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 1132f3c278..3e8f8d1831 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -12,7 +12,6 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
-use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -38,40 +37,6 @@ class ValidatedSanitizedInputSniff extends Sniff {
 	 */
 	public $check_validation_in_scope_only = false;
 
-	/**
-	 * Custom list of functions that sanitize the values passed to them.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customSanitizingFunctions = array();
-
-	/**
-	 * Custom sanitizing functions that implicitly unslash the values passed to them.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @var string|string[]
-	 */
-	public $customUnslashingSanitizingFunctions = array();
-
-	/**
-	 * Cache of previously added custom functions.
-	 *
-	 * Prevents having to do the same merges over and over again.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 - Changed from static to non-static.
-	 *               - Changed the format from simple bool to array.
-	 *
-	 * @var array
-	 */
-	protected $addedCustomFunctions = array(
-		'sanitize'        => array(),
-		'unslashsanitize' => array(),
-	);
-
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -192,8 +157,6 @@ function( $embed ) {
 			return;
 		}
 
-		$this->mergeFunctionLists();
-
 		// Now look for sanitizing functions.
 		if ( ! $this->is_sanitized( $stackPtr, true ) ) {
 			$this->phpcsFile->addError(
@@ -204,31 +167,4 @@ function( $embed ) {
 			);
 		}
 	}
-
-	/**
-	 * Merge custom functions provided via a custom ruleset with the defaults, if we haven't already.
-	 *
-	 * @since 0.11.0 Split out from the `process()` method.
-	 *
-	 * @return void
-	 */
-	protected function mergeFunctionLists() {
-		if ( $this->customSanitizingFunctions !== $this->addedCustomFunctions['sanitize'] ) {
-			$this->sanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customSanitizingFunctions,
-				$this->sanitizingFunctions
-			);
-
-			$this->addedCustomFunctions['sanitize'] = $this->customSanitizingFunctions;
-		}
-
-		if ( $this->customUnslashingSanitizingFunctions !== $this->addedCustomFunctions['unslashsanitize'] ) {
-			$this->unslashingSanitizingFunctions = RulesetPropertyHelper::merge_custom_array(
-				$this->customUnslashingSanitizingFunctions,
-				$this->unslashingSanitizingFunctions
-			);
-
-			$this->addedCustomFunctions['unslashsanitize'] = $this->customUnslashingSanitizingFunctions;
-		}
-	}
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 9c3b516009..1844d56279 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
+ * @covers \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait
  * @covers \WordPressCS\WordPress\Helpers\VariableHelper
  * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */

From 3de5fd6d3fb04a357497342b76eafd98211fe786 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 16 Jun 2023 16:42:24 +0200
Subject: [PATCH 550/822] Move unslashing-only functions related functionality
 to dedicated `UnslashingFunctionsHelper`

The unslashing function list is only used by a small set of sniffs, so are better placed in a dedicated class.

The `$unslashingFunctions` property has also been made `private static`.

Checking whether or not something is an unslashing function should now be done by calling the `UnslashingFunctionsHelper::is_unslashing_function()` method.

Includes removing a `@internal` comment from the `Sniff` class docblock as it is now redundant.

Related to 1465
---
 .../Helpers/UnslashingFunctionsHelper.php     | 59 +++++++++++++++++++
 WordPress/Sniff.php                           | 31 ++--------
 .../Security/NonceVerificationSniff.php       |  3 +-
 .../ValidatedSanitizedInputUnitTest.php       |  1 +
 4 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 WordPress/Helpers/UnslashingFunctionsHelper.php

diff --git a/WordPress/Helpers/UnslashingFunctionsHelper.php b/WordPress/Helpers/UnslashingFunctionsHelper.php
new file mode 100644
index 0000000000..0ff0a2beaa
--- /dev/null
+++ b/WordPress/Helpers/UnslashingFunctionsHelper.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+/**
+ * Helper functions and function lists for checking whether a function is an unslashing function.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The property in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class UnslashingFunctionsHelper {
+
+	/**
+	 * Functions which unslash the data passed to them.
+	 *
+	 * @since 2.1.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to private and property made static.
+	 *
+	 * @var array<string, bool>
+	 */
+	private static $unslashingFunctions = array(
+		'stripslashes_deep'              => true,
+		'stripslashes_from_strings_only' => true,
+		'wp_unslash'                     => true,
+	);
+
+	/**
+	 * Retrieve a list of the unslashing functions.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array<string, bool>
+	 */
+	public static function get_unslashing_functions() {
+		return self::$unslashingFunctions;
+	}
+
+	/**
+	 * Check if a particular function is regarded as a unslashing function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public static function is_unslashing_function( $functionName ) {
+		return isset( self::$unslashingFunctions[ $functionName ] );
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index c1ba74c385..4c5188a9ce 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -17,6 +17,7 @@
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait;
+use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 
 /**
@@ -26,35 +27,11 @@
  *
  * @package WPCS\WordPressCodingStandards
  * @since   0.4.0
- *
- * {@internal This class contains numerous properties where the array format looks
- *            like `'string' => true`, i.e. the array item is set as the array key.
- *            This allows for sniffs to verify whether something is in one of these
- *            lists using `isset()` rather than `in_array()` which is a much more
- *            efficient (faster) check to execute and therefore improves the
- *            performance of the sniffs.
- *            The `true` value in those cases is used as a placeholder and has no
- *            meaning in and of itself.
- *            In the rare few cases where the array values *do* have meaning, this
- *            is documented in the property documentation.}}
  */
 abstract class Sniff implements PHPCS_Sniff {
 
 	use SanitizingFunctionsTrait;
 
-	/**
-	 * Functions which unslash the data passed to them.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @var array
-	 */
-	protected $unslashingFunctions = array(
-		'stripslashes_deep'              => true,
-		'stripslashes_from_strings_only' => true,
-		'wp_unslash'                     => true,
-	);
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
@@ -207,7 +184,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 
 		$valid_functions  = $this->get_sanitizing_functions();
 		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
-		$valid_functions += $this->unslashingFunctions;
+		$valid_functions += UnslashingFunctionsHelper::get_unslashing_functions();
 		$valid_functions += ArrayWalkingFunctionsHelper::get_array_walking_functions();
 
 		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
@@ -224,12 +201,12 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		$functionName = $this->tokens[ $functionPtr ]['content'];
 
 		// Check if an unslashing function is being used.
-		if ( isset( $this->unslashingFunctions[ $functionName ] ) ) {
+		if ( UnslashingFunctionsHelper::is_unslashing_function( $functionName ) ) {
 
 			$is_unslashed = true;
 
 			// Remove the unslashing functions.
-			$valid_functions = array_diff_key( $valid_functions, $this->unslashingFunctions );
+			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_unslashing_functions() );
 
 			// Check is any of the remaining (sanitizing) functions is used.
 			$higherFunctionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $functionPtr, $valid_functions );
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index dc511758a7..90b7529ffd 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -13,6 +13,7 @@
 use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -184,7 +185,7 @@ private function has_nonce_check( $stackPtr ) {
 			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
-			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->unslashingFunctions ) !== false
+			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_unslashing_functions() ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
 		) {
 			$allow_nonce_after = true;
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 1844d56279..5032fa416b 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -22,6 +22,7 @@
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait
+ * @covers \WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\VariableHelper
  * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */

From 4a0b80433c5a47e2af5a7d41abd0ec9c18f37c9a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 01:15:29 +0200
Subject: [PATCH 551/822] Move validation checking functionality to dedicated
 `ValidationHelper`

The `is_validated()` utility method is only used by a small set of sniffs, so is better placed in a dedicated class.

This commit moves the `is_validated()` method to the new `WordPressCS\WordPress\Helpers\ValidationHelper` class and starts using that class in the relevant sniffs.

The method has been made stand-alone and now expects the `$phpcsFile` to be passed to it.
The method signature has changed from `protected` to `public static`.

Related to 1465

This method will be tested via the `WordPress.Security.ValidatedSanitizedInput` sniff (via pre-existing tests).
---
 WordPress/Helpers/ValidationHelper.php        | 286 ++++++++++++++++++
 WordPress/Sniff.php                           | 260 ----------------
 .../Security/ValidatedSanitizedInputSniff.php |   3 +-
 .../ValidatedSanitizedInputUnitTest.php       |   1 +
 4 files changed, 289 insertions(+), 261 deletions(-)
 create mode 100644 WordPress/Helpers/ValidationHelper.php

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
new file mode 100644
index 0000000000..1de5ed5caa
--- /dev/null
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPressCS\WordPress\Helpers;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\PassedParameters;
+use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\VariableHelper;
+
+/**
+ * Helper function for checking whether a token is validated.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @since   3.0.0 The method in this class was previously contained in the
+ *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ */
+final class ValidationHelper {
+
+	/**
+	 * Check if the existence of a variable is validated with isset(), empty(), array_key_exists()
+	 * or key_exists().
+	 *
+	 * When $in_condition_only is `false`, (which is the default), this is considered
+	 * valid:
+	 *
+	 * ```php
+	 * if ( isset( $var ) ) {
+	 *     // Do stuff, like maybe return or exit (but could be anything)
+	 * }
+	 *
+	 * foo( $var );
+	 * ```
+	 *
+	 * When it is `true`, that would be invalid; the use of the variable must be within
+	 * the scope of the validating condition, like this:
+	 *
+	 * ```php
+	 * if ( isset( $var ) ) {
+	 *     foo( $var );
+	 * }
+	 * ```
+	 *
+	 * @since 0.5.0
+	 * @since 2.1.0 Now recognizes array_key_exists() and key_exists() as validation functions.
+	 * @since 2.1.0 Stricter check on whether the correct variable and the correct
+	 *              array keys are being validated.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Visibility changed from protected to public static.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile         The file being scanned.
+	 * @param int                         $stackPtr          The index of this token in the stack.
+	 * @param array|string                $array_keys        An array key to check for ("bar" in $foo['bar'])
+	 *                                                       or an array of keys for multi-level array access.
+	 * @param bool                        $in_condition_only Whether to require that this use of the
+	 *                                                       variable occurs within the scope of the
+	 *                                                       validating condition, or just in the same
+	 *                                                       scope (default).
+	 *
+	 * @return bool Whether the var is validated.
+	 */
+	public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = array(), $in_condition_only = false ) {
+		$tokens = $phpcsFile->getTokens();
+
+		if ( $in_condition_only ) {
+			/*
+			 * This is a stricter check, requiring the variable to be used only
+			 * within the validation condition.
+			 */
+			// If there are no conditions, there's no validation.
+			if ( empty( $tokens[ $stackPtr ]['conditions'] ) ) {
+				return false;
+			}
+
+			$conditions = $tokens[ $stackPtr ]['conditions'];
+			end( $conditions ); // Get closest condition.
+			$conditionPtr = key( $conditions );
+			$condition    = $tokens[ $conditionPtr ];
+
+			if ( ! isset( $condition['parenthesis_opener'] ) ) {
+				// Live coding or parse error.
+				return false;
+			}
+
+			$scope_start = $condition['parenthesis_opener'];
+			$scope_end   = $condition['parenthesis_closer'];
+
+		} else {
+			/*
+			 * We are more loose, requiring only that the variable be validated
+			 * in the same function/file scope as it is used.
+			 */
+			$scope_start = 0;
+
+			// Check if we are in a function.
+			$function = $phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
+
+			// If so, we check only within the function, otherwise the whole file.
+			if ( false !== $function ) {
+				$scope_start = $tokens[ $function ]['scope_opener'];
+			} else {
+				// Check if we are in a closure.
+				$closure = $phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
+
+				// If so, we check only within the closure.
+				if ( false !== $closure ) {
+					$scope_start = $tokens[ $closure ]['scope_opener'];
+				}
+			}
+
+			$scope_end = $stackPtr;
+		}
+
+		if ( ! empty( $array_keys ) && ! is_array( $array_keys ) ) {
+			$array_keys = (array) $array_keys;
+		}
+
+		$bare_array_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $array_keys );
+		$targets         = array(
+			\T_ISSET          => 'construct',
+			\T_EMPTY          => 'construct',
+			\T_UNSET          => 'construct',
+			\T_STRING         => 'function_call',
+			\T_COALESCE       => 'coalesce',
+			\T_COALESCE_EQUAL => 'coalesce',
+		);
+
+		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
+		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
+
+			if ( isset( $targets[ $tokens[ $i ]['code'] ] ) === false ) {
+				continue;
+			}
+
+			switch ( $targets[ $tokens[ $i ]['code'] ] ) {
+				case 'construct':
+					$issetOpener = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
+					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $tokens[ $issetOpener ]['code'] ) {
+						// Parse error or live coding.
+						continue 2;
+					}
+
+					$issetCloser = $tokens[ $issetOpener ]['parenthesis_closer'];
+
+					// Look for this variable. We purposely stomp $i from the parent loop.
+					for ( $i = ( $issetOpener + 1 ); $i < $issetCloser; $i++ ) {
+
+						if ( \T_VARIABLE !== $tokens[ $i ]['code'] ) {
+							continue;
+						}
+
+						if ( $tokens[ $stackPtr ]['content'] !== $tokens[ $i ]['content'] ) {
+							continue;
+						}
+
+						// If we're checking for specific array keys (ex: 'hello' in
+						// $_POST['hello']), that must match too. Quote-style, however, doesn't matter.
+						if ( ! empty( $bare_array_keys ) ) {
+							$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $i );
+							$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+							$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
+							if ( ! empty( $diff ) ) {
+								continue;
+							}
+						}
+
+						return true;
+					}
+
+					break;
+
+				case 'function_call':
+					// Only check calls to array_key_exists() and key_exists().
+					if ( 'array_key_exists' !== $tokens[ $i ]['content']
+						&& 'key_exists' !== $tokens[ $i ]['content']
+					) {
+						continue 2;
+					}
+
+					$next_non_empty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
+					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $tokens[ $next_non_empty ]['code'] ) {
+						// Not a function call.
+						continue 2;
+					}
+
+					if ( ContextHelper::has_object_operator_before( $phpcsFile, $i ) === true ) {
+						// Method call.
+						continue 2;
+					}
+
+					if ( ContextHelper::is_token_namespaced( $phpcsFile, $i ) === true ) {
+						// Namespaced function call.
+						continue 2;
+					}
+
+					$params = PassedParameters::getParameters( $phpcsFile, $i );
+					if ( count( $params ) < 2 ) {
+						continue 2;
+					}
+
+					$param2_first_token = $phpcsFile->findNext( Tokens::$emptyTokens, $params[2]['start'], ( $params[2]['end'] + 1 ), true );
+					if ( false === $param2_first_token
+						|| \T_VARIABLE !== $tokens[ $param2_first_token ]['code']
+						|| $tokens[ $param2_first_token ]['content'] !== $tokens[ $stackPtr ]['content']
+					) {
+						continue 2;
+					}
+
+					if ( ! empty( $bare_array_keys ) ) {
+						// Prevent the original array from being altered.
+						$bare_keys = $bare_array_keys;
+						$last_key  = array_pop( $bare_keys );
+
+						/*
+						 * For multi-level array access, the complete set of keys could be split between
+						 * the first and the second parameter, but could also be completely in the second
+						 * parameter, so we need to check both options.
+						 */
+						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $param2_first_token );
+						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+
+						// First try matching the complete set against the second parameter.
+						$diff = array_diff_assoc( $bare_array_keys, $found_keys );
+						if ( empty( $diff ) ) {
+							return true;
+						}
+
+						// If that failed, try getting an exact match for the subset against the
+						// second parameter and the last key against the first.
+						if ( $bare_keys === $found_keys && TextStrings::stripQuotes( $params[1]['raw'] ) === $last_key ) {
+							return true;
+						}
+
+						// Didn't find the correct array keys.
+						continue 2;
+					}
+
+					return true;
+
+				case 'coalesce':
+					$prev = $i;
+					do {
+						$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
+						// Skip over array keys, like `$_GET['key']['subkey']`.
+						if ( \T_CLOSE_SQUARE_BRACKET === $tokens[ $prev ]['code'] ) {
+							$prev = $tokens[ $prev ]['bracket_opener'];
+							continue;
+						}
+
+						break;
+					} while ( $prev >= ( $scope_start + 1 ) );
+
+					// We should now have reached the variable.
+					if ( \T_VARIABLE !== $tokens[ $prev ]['code'] ) {
+						continue 2;
+					}
+
+					if ( $tokens[ $prev ]['content'] !== $tokens[ $stackPtr ]['content'] ) {
+						continue 2;
+					}
+
+					if ( ! empty( $bare_array_keys ) ) {
+						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $prev );
+						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+						$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
+						if ( ! empty( $diff ) ) {
+							continue 2;
+						}
+					}
+
+					// Right variable, correct key.
+					return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 4c5188a9ce..e9af359bdc 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -12,13 +12,11 @@
 use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
-use WordPressCS\WordPress\Helpers\VariableHelper;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -276,262 +274,4 @@ public function add_unslash_error( $stackPtr ) {
 			array( $this->tokens[ $stackPtr ]['content'] )
 		);
 	}
-
-	/**
-	 * Check if the existence of a variable is validated with isset(), empty(), array_key_exists()
-	 * or key_exists().
-	 *
-	 * When $in_condition_only is false, (which is the default), this is considered
-	 * valid:
-	 *
-	 * ```php
-	 * if ( isset( $var ) ) {
-	 *     // Do stuff, like maybe return or exit (but could be anything)
-	 * }
-	 *
-	 * foo( $var );
-	 * ```
-	 *
-	 * When it is true, that would be invalid, the use of the variable must be within
-	 * the scope of the validating condition, like this:
-	 *
-	 * ```php
-	 * if ( isset( $var ) ) {
-	 *     foo( $var );
-	 * }
-	 * ```
-	 *
-	 * @since 0.5.0
-	 * @since 2.1.0 Now recognizes array_key_exists() and key_exists() as validation functions.
-	 * @since 2.1.0 Stricter check on whether the correct variable and the correct
-	 *              array keys are being validated.
-	 *
-	 * @param int          $stackPtr          The index of this token in the stack.
-	 * @param array|string $array_keys        An array key to check for ("bar" in $foo['bar'])
-	 *                                        or an array of keys for multi-level array access.
-	 * @param bool         $in_condition_only Whether to require that this use of the
-	 *                                        variable occur within the scope of the
-	 *                                        validating condition, or just in the same
-	 *                                        scope as it (default).
-	 *
-	 * @return bool Whether the var is validated.
-	 */
-	protected function is_validated( $stackPtr, $array_keys = array(), $in_condition_only = false ) {
-
-		if ( $in_condition_only ) {
-			/*
-			 * This is a stricter check, requiring the variable to be used only
-			 * within the validation condition.
-			 */
-
-			// If there are no conditions, there's no validation.
-			if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
-				return false;
-			}
-
-			$conditions = $this->tokens[ $stackPtr ]['conditions'];
-			end( $conditions ); // Get closest condition.
-			$conditionPtr = key( $conditions );
-			$condition    = $this->tokens[ $conditionPtr ];
-
-			if ( ! isset( $condition['parenthesis_opener'] ) ) {
-				// Live coding or parse error.
-				return false;
-			}
-
-			$scope_start = $condition['parenthesis_opener'];
-			$scope_end   = $condition['parenthesis_closer'];
-
-		} else {
-			/*
-			 * We are are more loose, requiring only that the variable be validated
-			 * in the same function/file scope as it is used.
-			 */
-
-			$scope_start = 0;
-
-			// Check if we are in a function.
-			$function = $this->phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
-
-			// If so, we check only within the function, otherwise the whole file.
-			if ( false !== $function ) {
-				$scope_start = $this->tokens[ $function ]['scope_opener'];
-			} else {
-				// Check if we are in a closure.
-				$closure = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-
-				// If so, we check only within the closure.
-				if ( false !== $closure ) {
-					$scope_start = $this->tokens[ $closure ]['scope_opener'];
-				}
-			}
-
-			$scope_end = $stackPtr;
-		}
-
-		if ( ! empty( $array_keys ) && ! is_array( $array_keys ) ) {
-			$array_keys = (array) $array_keys;
-		}
-
-		$bare_array_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $array_keys );
-		$targets         = array(
-			\T_ISSET          => 'construct',
-			\T_EMPTY          => 'construct',
-			\T_UNSET          => 'construct',
-			\T_STRING         => 'function_call',
-			\T_COALESCE       => 'coalesce',
-			\T_COALESCE_EQUAL => 'coalesce',
-		);
-
-		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
-		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
-
-			if ( isset( $targets[ $this->tokens[ $i ]['code'] ] ) === false ) {
-				continue;
-			}
-
-			switch ( $targets[ $this->tokens[ $i ]['code'] ] ) {
-				case 'construct':
-					$issetOpener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $this->tokens[ $issetOpener ]['code'] ) {
-						// Parse error or live coding.
-						continue 2;
-					}
-
-					$issetCloser = $this->tokens[ $issetOpener ]['parenthesis_closer'];
-
-					// Look for this variable. We purposely stomp $i from the parent loop.
-					for ( $i = ( $issetOpener + 1 ); $i < $issetCloser; $i++ ) {
-
-						if ( \T_VARIABLE !== $this->tokens[ $i ]['code'] ) {
-							continue;
-						}
-
-						if ( $this->tokens[ $stackPtr ]['content'] !== $this->tokens[ $i ]['content'] ) {
-							continue;
-						}
-
-						// If we're checking for specific array keys (ex: 'hello' in
-						// $_POST['hello']), that must match too. Quote-style, however, doesn't matter.
-						if ( ! empty( $bare_array_keys ) ) {
-							$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $i );
-							$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
-							$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
-							if ( ! empty( $diff ) ) {
-								continue;
-							}
-						}
-
-						return true;
-					}
-
-					break;
-
-				case 'function_call':
-					// Only check calls to array_key_exists() and key_exists().
-					if ( 'array_key_exists' !== $this->tokens[ $i ]['content']
-						&& 'key_exists' !== $this->tokens[ $i ]['content']
-					) {
-						continue 2;
-					}
-
-					$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
-						// Not a function call.
-						continue 2;
-					}
-
-					if ( ContextHelper::has_object_operator_before( $this->phpcsFile, $i ) === true ) {
-						// Method call.
-						continue 2;
-					}
-
-					if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $i ) === true ) {
-						// Namespaced function call.
-						continue 2;
-					}
-
-					$params = PassedParameters::getParameters( $this->phpcsFile, $i );
-					if ( count( $params ) < 2 ) {
-						continue 2;
-					}
-
-					$param2_first_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[2]['start'], ( $params[2]['end'] + 1 ), true );
-					if ( false === $param2_first_token
-						|| \T_VARIABLE !== $this->tokens[ $param2_first_token ]['code']
-						|| $this->tokens[ $param2_first_token ]['content'] !== $this->tokens[ $stackPtr ]['content']
-					) {
-						continue 2;
-					}
-
-					if ( ! empty( $bare_array_keys ) ) {
-						// Prevent the original array from being altered.
-						$bare_keys = $bare_array_keys;
-						$last_key  = array_pop( $bare_keys );
-
-						/*
-						 * For multi-level array access, the complete set of keys could be split between
-						 * the first and the second parameter, but could also be completely in the second
-						 * parameter, so we need to check both options.
-						 */
-
-						$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $param2_first_token );
-						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
-
-						// First try matching the complete set against the second parameter.
-						$diff = array_diff_assoc( $bare_array_keys, $found_keys );
-						if ( empty( $diff ) ) {
-							return true;
-						}
-
-						// If that failed, try getting an exact match for the subset against the
-						// second parameter and the last key against the first.
-						if ( $bare_keys === $found_keys && TextStrings::stripQuotes( $params[1]['raw'] ) === $last_key ) {
-							return true;
-						}
-
-						// Didn't find the correct array keys.
-						continue 2;
-					}
-
-					return true;
-
-				case 'coalesce':
-					$prev = $i;
-					do {
-						$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
-						// Skip over array keys, like `$_GET['key']['subkey']`.
-						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ]['code'] ) {
-							$prev = $this->tokens[ $prev ]['bracket_opener'];
-							continue;
-						}
-
-						break;
-					} while ( $prev >= ( $scope_start + 1 ) );
-
-					// We should now have reached the variable.
-					if ( \T_VARIABLE !== $this->tokens[ $prev ]['code'] ) {
-						continue 2;
-					}
-
-					if ( $this->tokens[ $prev ]['content'] !== $this->tokens[ $stackPtr ]['content'] ) {
-						continue 2;
-					}
-
-					if ( ! empty( $bare_array_keys ) ) {
-						$found_keys = VariableHelper::get_array_access_keys( $this->phpcsFile, $prev );
-						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
-						$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
-						if ( ! empty( $diff ) ) {
-							continue 2;
-						}
-					}
-
-					// Right variable, correct key.
-					return true;
-			}
-		}
-
-		return false;
-	}
 }
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 3e8f8d1831..b933450ffd 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\ValidationHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
 
@@ -130,7 +131,7 @@ function( $embed ) {
 		}
 
 		if ( false === $validated ) {
-			$validated = $this->is_validated( $stackPtr, $array_keys, $this->check_validation_in_scope_only );
+			$validated = ValidationHelper::is_validated( $this->phpcsFile, $stackPtr, $array_keys, $this->check_validation_in_scope_only );
 		}
 
 		if ( false === $validated ) {
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 5032fa416b..4478d849bf 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -23,6 +23,7 @@
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait
  * @covers \WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper
+ * @covers \WordPressCS\WordPress\Helpers\ValidationHelper
  * @covers \WordPressCS\WordPress\Helpers\VariableHelper
  * @covers \WordPressCS\WordPress\Sniffs\Security\ValidatedSanitizedInputSniff
  */

From 1fd4eac658ffbecdac45e3ab247ee7234f64c25d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 02:40:42 +0200
Subject: [PATCH 552/822] Security/ValidatedSanitizedInput: rename test case
 file

... to allow for adding additional test case files testing specific (parse error) situations.
---
 ... => ValidatedSanitizedInputUnitTest.1.inc} |   0
 .../ValidatedSanitizedInputUnitTest.php       | 122 ++++++++++--------
 2 files changed, 65 insertions(+), 57 deletions(-)
 rename WordPress/Tests/Security/{ValidatedSanitizedInputUnitTest.inc => ValidatedSanitizedInputUnitTest.1.inc} (100%)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.inc
rename to WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 4478d849bf..eb01bab872 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -32,65 +32,73 @@ final class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
-		return array(
-			5   => 3,
-			7   => 1,
-			10  => 1,
-			20  => 1,
-			33  => 3,
-			65  => 1,
-			76  => 2, // Old-style WPCS ignore comments are no longer supported.
-			79  => 1,
-			80  => 1,
-			81  => 1,
-			82  => 1,
-			85  => 1,
-			90  => 1,
-			93  => 1,
-			96  => 1,
-			100 => 2,
-			101 => 1,
-			104 => 2,
-			105 => 1,
-			114 => 2,
-			121 => 1,
-			132 => 1,
-			137 => 1,
-			138 => 1,
-			150 => 2,
-			160 => 2,
-			164 => 2,
-			189 => 1,
-			202 => 1,
-			206 => 1,
-			210 => 1,
-			216 => 1,
-			217 => 1,
-			238 => 1,
-			242 => 1,
-			245 => 1,
-			251 => 1,
-			257 => 1,
-			266 => 1,
-			277 => 1,
-			290 => 2,
-			300 => 1,
-			305 => 2,
-			306 => 2,
-			307 => 2,
-			309 => 2,
-			310 => 2,
-			311 => 2,
-			315 => 2,
-			317 => 1,
-			323 => 1,
-			338 => 1,
-			342 => 3,
-			345 => 3,
-		);
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'ValidatedSanitizedInputUnitTest.1.inc':
+				return array(
+					5   => 3,
+					7   => 1,
+					10  => 1,
+					20  => 1,
+					33  => 3,
+					65  => 1,
+					76  => 2, // Old-style WPCS ignore comments are no longer supported.
+					79  => 1,
+					80  => 1,
+					81  => 1,
+					82  => 1,
+					85  => 1,
+					90  => 1,
+					93  => 1,
+					96  => 1,
+					100 => 2,
+					101 => 1,
+					104 => 2,
+					105 => 1,
+					114 => 2,
+					121 => 1,
+					132 => 1,
+					137 => 1,
+					138 => 1,
+					150 => 2,
+					160 => 2,
+					164 => 2,
+					189 => 1,
+					202 => 1,
+					206 => 1,
+					210 => 1,
+					216 => 1,
+					217 => 1,
+					238 => 1,
+					242 => 1,
+					245 => 1,
+					251 => 1,
+					257 => 1,
+					266 => 1,
+					277 => 1,
+					290 => 2,
+					300 => 1,
+					305 => 2,
+					306 => 2,
+					307 => 2,
+					309 => 2,
+					310 => 2,
+					311 => 2,
+					315 => 2,
+					317 => 1,
+					323 => 1,
+					338 => 1,
+					342 => 3,
+					345 => 3,
+				);
+
+			default:
+				return array();
+		}
 	}
 
 	/**

From 926d540526f43e04b77d200225757e07f8d701d4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 02:48:07 +0200
Subject: [PATCH 553/822] ValidationHelper::is_validated(): add some extra
 tests

... in particular testing the defensive coding which is in place in the helper method.
---
 .../Tests/Security/ValidatedSanitizedInputUnitTest.2.inc   | 7 +++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.3.inc   | 7 +++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.4.inc   | 7 +++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php     | 7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.2.inc
 create mode 100644 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.3.inc
 create mode 100644 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.4.inc

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.2.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.2.inc
new file mode 100644
index 0000000000..a4bad0ee47
--- /dev/null
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.2.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Parse error/live coding.
+// This must be the last (only) test in the file.
+isset
+
+$_POST['key']
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.3.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.3.inc
new file mode 100644
index 0000000000..75949024c6
--- /dev/null
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.3.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Parse error/live coding.
+// This must be the last (only) test in the file.
+array_key_exists
+
+$_POST['key']
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.4.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.4.inc
new file mode 100644
index 0000000000..bd342d6f2e
--- /dev/null
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.4.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Parse error/live coding.
+// This must be the last (only) test in the file.
+'key' ?? 'default';
+
+$_POST['key']
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index eb01bab872..b15e21c82e 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -96,6 +96,13 @@ public function getErrorList( $testFile = '' ) {
 					345 => 3,
 				);
 
+			case 'ValidatedSanitizedInputUnitTest.2.inc':
+			case 'ValidatedSanitizedInputUnitTest.3.inc':
+			case 'ValidatedSanitizedInputUnitTest.4.inc':
+				return array(
+					7 => 3,
+				);
+
 			default:
 				return array();
 		}

From 3d96471aa4680051e00f0ea18de8e5052d7a8966 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 01:40:02 +0200
Subject: [PATCH 554/822] ValidationHelper::is_validated(): implement
 PHPCSUtils

---
 WordPress/Helpers/ValidationHelper.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 1de5ed5caa..6c8741144b 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
@@ -75,16 +76,13 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 			 * This is a stricter check, requiring the variable to be used only
 			 * within the validation condition.
 			 */
-			// If there are no conditions, there's no validation.
-			if ( empty( $tokens[ $stackPtr ]['conditions'] ) ) {
+			$conditionPtr = Conditions::getLastCondition( $phpcsFile, $stackPtr );
+			if ( false === $conditionPtr ) {
+				// If there are no conditions, there's no validation.
 				return false;
 			}
 
-			$conditions = $tokens[ $stackPtr ]['conditions'];
-			end( $conditions ); // Get closest condition.
-			$conditionPtr = key( $conditions );
-			$condition    = $tokens[ $conditionPtr ];
-
+			$condition = $tokens[ $conditionPtr ];
 			if ( ! isset( $condition['parenthesis_opener'] ) ) {
 				// Live coding or parse error.
 				return false;
@@ -101,19 +99,11 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 			$scope_start = 0;
 
 			// Check if we are in a function.
-			$function = $phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
+			$function = Conditions::getLastCondition( $phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
 
 			// If so, we check only within the function, otherwise the whole file.
 			if ( false !== $function ) {
 				$scope_start = $tokens[ $function ]['scope_opener'];
-			} else {
-				// Check if we are in a closure.
-				$closure = $phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
-
-				// If so, we check only within the closure.
-				if ( false !== $closure ) {
-					$scope_start = $tokens[ $closure ]['scope_opener'];
-				}
 			}
 
 			$scope_end = $stackPtr;

From 5e627d3335bc64636ed93dee254f58ce6f2b8df3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 01:40:50 +0200
Subject: [PATCH 555/822] ValidationHelper::is_validated(): move inline array
 to property [1]

---
 WordPress/Helpers/ValidationHelper.php | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 6c8741144b..0d08fc3d8f 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -26,6 +26,22 @@
  */
 final class ValidationHelper {
 
+	/**
+	 * The tokens the function looks for to determine whether a token is validated.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<int|string, string>
+	 */
+	private static $targets = array(
+		\T_ISSET          => 'construct',
+		\T_EMPTY          => 'construct',
+		\T_UNSET          => 'construct',
+		\T_STRING         => 'function_call',
+		\T_COALESCE       => 'coalesce',
+		\T_COALESCE_EQUAL => 'coalesce',
+	);
+
 	/**
 	 * Check if the existence of a variable is validated with isset(), empty(), array_key_exists()
 	 * or key_exists().
@@ -114,23 +130,15 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 		}
 
 		$bare_array_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $array_keys );
-		$targets         = array(
-			\T_ISSET          => 'construct',
-			\T_EMPTY          => 'construct',
-			\T_UNSET          => 'construct',
-			\T_STRING         => 'function_call',
-			\T_COALESCE       => 'coalesce',
-			\T_COALESCE_EQUAL => 'coalesce',
-		);
 
 		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
 		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
 
-			if ( isset( $targets[ $tokens[ $i ]['code'] ] ) === false ) {
+			if ( isset( self::$targets[ $tokens[ $i ]['code'] ] ) === false ) {
 				continue;
 			}
 
-			switch ( $targets[ $tokens[ $i ]['code'] ] ) {
+			switch ( self::$targets[ $tokens[ $i ]['code'] ] ) {
 				case 'construct':
 					$issetOpener = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
 					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $tokens[ $issetOpener ]['code'] ) {

From f5ce3bf2585ceb865e0c8e3389cf6345c4828897 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 01:41:03 +0200
Subject: [PATCH 556/822] ValidationHelper::is_validated(): move inline array
 to property [2]

Includes bug fix as the function name comparison was not done in a case-insensitive manner.

Tested by adjusting one of the existing tests.
---
 WordPress/Helpers/ValidationHelper.php           | 16 +++++++++++++---
 .../ValidatedSanitizedInputUnitTest.1.inc        |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 0d08fc3d8f..2643fdf945 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -42,6 +42,18 @@ final class ValidationHelper {
 		\T_COALESCE_EQUAL => 'coalesce',
 	);
 
+	/**
+	 * List of PHP native functions to check if an array index exists.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	private static $key_exists_functions = array(
+		'array_key_exists' => true,
+		'key_exists'       => true, // Alias.
+	);
+
 	/**
 	 * Check if the existence of a variable is validated with isset(), empty(), array_key_exists()
 	 * or key_exists().
@@ -177,9 +189,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 
 				case 'function_call':
 					// Only check calls to array_key_exists() and key_exists().
-					if ( 'array_key_exists' !== $tokens[ $i ]['content']
-						&& 'key_exists' !== $tokens[ $i ]['content']
-					) {
+					if ( isset( self::$key_exists_functions[ strtolower( $tokens[ $i ]['content'] ) ] ) === false ) {
 						continue 2;
 					}
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index c7199eebf7..51f6344a9e 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -194,7 +194,7 @@ if ( array_key_exists( 'my_field1', $_POST ) ) {
 	$id = (int) $_POST['my_field1']; // OK.
 }
 
-if ( \array_key_exists( 'my_field2', $_POST ) ) {
+if ( \Array_Key_Exists( 'my_field2', $_POST ) ) {
 	$id = (int) $_POST['my_field2']; // OK.
 }
 

From e6118784aaffccaa1f37ec31d0d2cf43d950a99d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 01:47:00 +0200
Subject: [PATCH 557/822] ValidationHelper::is_validated(): extract some
 duplicate code to a separate method

---
 WordPress/Helpers/ValidationHelper.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 2643fdf945..d8f7b1bea8 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -141,7 +141,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 			$array_keys = (array) $array_keys;
 		}
 
-		$bare_array_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $array_keys );
+		$bare_array_keys = self::strip_quotes_from_array_values( $array_keys );
 
 		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
 		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
@@ -175,7 +175,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 						// $_POST['hello']), that must match too. Quote-style, however, doesn't matter.
 						if ( ! empty( $bare_array_keys ) ) {
 							$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $i );
-							$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+							$found_keys = self::strip_quotes_from_array_values( $found_keys );
 							$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 							if ( ! empty( $diff ) ) {
 								continue;
@@ -233,7 +233,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 						 * parameter, so we need to check both options.
 						 */
 						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $param2_first_token );
-						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+						$found_keys = self::strip_quotes_from_array_values( $found_keys );
 
 						// First try matching the complete set against the second parameter.
 						$diff = array_diff_assoc( $bare_array_keys, $found_keys );
@@ -277,7 +277,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 
 					if ( ! empty( $bare_array_keys ) ) {
 						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $prev );
-						$found_keys = array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $found_keys );
+						$found_keys = self::strip_quotes_from_array_values( $found_keys );
 						$diff       = array_diff_assoc( $bare_array_keys, $found_keys );
 						if ( ! empty( $diff ) ) {
 							continue 2;
@@ -291,4 +291,15 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 
 		return false;
 	}
+
+	/**
+	 * Strip quotes of all the values in an array containing only text strings.
+	 *
+	 * @param string[] $text_strings The input array.
+	 *
+	 * @var array
+	 */
+	private static function strip_quotes_from_array_values( array $text_strings ) {
+		return array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $text_strings );
+	}
 }

From a82f213f9c46c1bc229f7c365d320a73d58046f7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 03:07:02 +0200
Subject: [PATCH 558/822] ValidationHelper::is_validated(): add note about PHP
 7.4 arrow functions

---
 WordPress/Helpers/ValidationHelper.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index d8f7b1bea8..3b04c2712f 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -126,7 +126,13 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 			 */
 			$scope_start = 0;
 
-			// Check if we are in a function.
+			/*
+			 * Check if we are in a function.
+			 *
+			 * Note: PHP 7.4+ arrow functions are not taken into account as those are not
+			 * included in the "conditions" array. Additionally, arrow functions have
+			 * access to variables outside their direct scope.
+			 */
 			$function = Conditions::getLastCondition( $phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
 
 			// If so, we check only within the function, otherwise the whole file.

From 843f78c21fe7d2f65850d6b22aff376ee9ad1ca2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 02:32:49 +0200
Subject: [PATCH 559/822] ValidationHelper::is_validated(): add support for PHP
 8.0 named parameters

Includes tests in the `WordPress.Security.ValidatedSanitizedInput` test file.
---
 WordPress/Helpers/ValidationHelper.php        | 27 +++++++-----
 .../ValidatedSanitizedInputUnitTest.1.inc     | 44 ++++++++++++++++++-
 .../ValidatedSanitizedInputUnitTest.php       |  6 +++
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 3b04c2712f..fcb618fdb9 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -216,14 +216,17 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 					}
 
 					$params = PassedParameters::getParameters( $phpcsFile, $i );
-					if ( count( $params ) < 2 ) {
+
+					// As `key_exists()` is an alias of `array_key_exists()`, the param positions and names are the same.
+					$array_param = PassedParameters::getParameterFromStack( $params, 2, 'array' );
+					if ( false === $array_param ) {
 						continue 2;
 					}
 
-					$param2_first_token = $phpcsFile->findNext( Tokens::$emptyTokens, $params[2]['start'], ( $params[2]['end'] + 1 ), true );
-					if ( false === $param2_first_token
-						|| \T_VARIABLE !== $tokens[ $param2_first_token ]['code']
-						|| $tokens[ $param2_first_token ]['content'] !== $tokens[ $stackPtr ]['content']
+					$array_param_first_token = $phpcsFile->findNext( Tokens::$emptyTokens, $array_param['start'], ( $array_param['end'] + 1 ), true );
+					if ( false === $array_param_first_token
+						|| \T_VARIABLE !== $tokens[ $array_param_first_token ]['code']
+						|| $tokens[ $array_param_first_token ]['content'] !== $tokens[ $stackPtr ]['content']
 					) {
 						continue 2;
 					}
@@ -235,21 +238,25 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 
 						/*
 						 * For multi-level array access, the complete set of keys could be split between
-						 * the first and the second parameter, but could also be completely in the second
+						 * the $key and the $array parameter, but could also be completely in the $array
 						 * parameter, so we need to check both options.
 						 */
-						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $param2_first_token );
+						$found_keys = VariableHelper::get_array_access_keys( $phpcsFile, $array_param_first_token );
 						$found_keys = self::strip_quotes_from_array_values( $found_keys );
 
-						// First try matching the complete set against the second parameter.
+						// First try matching the complete set against the array parameter.
 						$diff = array_diff_assoc( $bare_array_keys, $found_keys );
 						if ( empty( $diff ) ) {
 							return true;
 						}
 
 						// If that failed, try getting an exact match for the subset against the
-						// second parameter and the last key against the first.
-						if ( $bare_keys === $found_keys && TextStrings::stripQuotes( $params[1]['raw'] ) === $last_key ) {
+						// $array parameter and the last key against the first.
+						$key_param = PassedParameters::getParameterFromStack( $params, 1, 'key' );
+						if ( false !== $key_param
+							&& $bare_keys === $found_keys
+							&& TextStrings::stripQuotes( $key_param['raw'] ) === $last_key
+						) {
 							return true;
 						}
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 51f6344a9e..bbc6f1a723 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -128,7 +128,7 @@ function test_this() {
 	if ( ! isset( $_POST['abc_field'] ) ) {
 		return;
 	}
-	
+
 	$abc = sanitize_color( wp_unslash( $_POST['abc_field'] ) ); // Bad x1 - sanitize.
 
 	// phpcs:set WordPress.Security.ValidatedSanitizedInput customSanitizingFunctions[] sanitize_color,sanitize_twitter_handle
@@ -345,3 +345,45 @@ function test_handling_embeds() {
 Do ${(_POST)} and ${_GET["${bar}"]} and ${_FILES["${bar['baz']}"]}
 EOD;
 }
+
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+function test_allow_array_key_exists_with_named_params_wrong_param_name_array() {
+	if ( array_key_exists( arrays: $_POST, key: 'my_field1',  ) ) {
+		$id = (int) $_POST['my_field1']; // Bad.
+	}
+}
+
+function test_allow_array_key_exists_with_named_params_correct_param_name() {
+	if ( array_key_exists( array: $_POST, key: 'my_field1',  ) ) {
+		$id = (int) $_POST['my_field1']; // OK.
+	}
+}
+
+function test_allow_array_key_exists_with_named_params_empty_array_param() {
+	if ( array_key_exists( array: /*comment*/, key: 'my_field1',  ) ) {
+		$id = (int) $_POST['my_field1']; // Bad.
+	}
+}
+
+function test_allow_array_key_exists_with_named_params_array_param_first_token_not_variable() {
+	if ( array_key_exists( array: [1, 2], key: 'my_field1',  ) ) {
+		$id = (int) $_POST['my_field1']; // Bad.
+	}
+}
+
+function test_allow_array_key_exists_with_named_params_multilevel_access_wrong_param_name_key() {
+	if ( array_key_exists( array: $_POST['foo'], keys: 'bar' ) ) {
+		$id = (int) $_POST['foo']['bar']; // Bad.
+	}
+}
+
+function test_allow_array_key_exists_with_named_params_multilevel_access_test() {
+	if ( array_key_exists( array: $_POST['foo'], key: 'bar' ) ) {
+		$id = (int) $_POST['bar']; // Bad x 1 - validate.
+		$id = (int) $_POST['foo']; // OK.
+		$id = (int) $_POST['foo']['bar']; // OK.
+		$id = (int) $_POST['foo']['bar']['baz']; // Bad x 1 - validate.
+	}
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index b15e21c82e..80a4ce5dc9 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -94,6 +94,12 @@ public function getErrorList( $testFile = '' ) {
 					338 => 1,
 					342 => 3,
 					345 => 3,
+					354 => 1,
+					366 => 1,
+					372 => 1,
+					378 => 1,
+					384 => 1,
+					387 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From a12116b8eaea28658929e53db90811cae28e75bd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 03:34:59 +0200
Subject: [PATCH 560/822] ValidationHelper::is_validated(): don't examine PHP
 8.0 attributes which may look like function calls

Includes test in the `WordPress.Security.ValidatedSanitizedInput` test file.
---
 WordPress/Helpers/ValidationHelper.php                   | 6 ++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc | 9 +++++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php   | 1 +
 3 files changed, 16 insertions(+)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index fcb618fdb9..7403d20851 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Conditions;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
@@ -205,6 +206,11 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 						continue 2;
 					}
 
+					if ( Context::inAttribute( $phpcsFile, $i ) === true ) {
+						// Definitely not the function call as those are not allowed in attributes.
+						continue 2;
+					}
+
 					if ( ContextHelper::has_object_operator_before( $phpcsFile, $i ) === true ) {
 						// Method call.
 						continue 2;
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index bbc6f1a723..4116734925 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -387,3 +387,12 @@ function test_allow_array_key_exists_with_named_params_multilevel_access_test()
 		$id = (int) $_POST['foo']['bar']['baz']; // Bad x 1 - validate.
 	}
 }
+
+/*
+ * Prevent the sniff trying to examine PHP 8.0 attributes.
+ */
+function test_ignore_array_key_exists_in_attribute() {
+	#[Array_Key_Exists('key', ['a', 2])]
+	$callback = function() {};
+	$id = (int) $_POST['foo']; // Bad.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 80a4ce5dc9..12e6bb9254 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -100,6 +100,7 @@ public function getErrorList( $testFile = '' ) {
 					378 => 1,
 					384 => 1,
 					387 => 1,
+					397 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 6ebe7199c0ec26852a3355c43807bf3a67a2ab32 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 03:40:54 +0200
Subject: [PATCH 561/822] ValidationHelper::is_validated(): don't examine PHP
 8.1 first call callables which look like function calls

This already is handled via the `PassedParameters` class.

Includes test in the `WordPress.Security.ValidatedSanitizedInput` test file.
---
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc  | 8 ++++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 4116734925..402a40565e 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -396,3 +396,11 @@ function test_ignore_array_key_exists_in_attribute() {
 	$callback = function() {};
 	$id = (int) $_POST['foo']; // Bad.
 }
+
+/*
+ * Ensure the sniff doesn't examine PHP 8.1 first class callables.
+ */
+function test_ignore_array_key_exists_as_first_class_callable() {
+	$callback = array_key_exists(...);
+	$id = (int) $_POST['foo']; // Bad.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 12e6bb9254..c3fae62fd4 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -101,6 +101,7 @@ public function getErrorList( $testFile = '' ) {
 					384 => 1,
 					387 => 1,
 					397 => 1,
+					405 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 946dffbb17d1ac33762504906beaf63cd47bf460 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 02:03:29 +0200
Subject: [PATCH 562/822] ValidationHelper::is_validated(): various minor
 tweaks

Includes extra test for additionally added defensive coding.
---
 WordPress/Helpers/ValidationHelper.php                | 11 +++++++----
 .../Security/ValidatedSanitizedInputUnitTest.5.inc    |  7 +++++++
 .../Security/ValidatedSanitizedInputUnitTest.php      |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.5.inc

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 7403d20851..18fee09895 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -159,8 +159,11 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 
 			switch ( self::$targets[ $tokens[ $i ]['code'] ] ) {
 				case 'construct':
-					$issetOpener = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $tokens[ $issetOpener ]['code'] ) {
+					$issetOpener = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+					if ( false === $issetOpener
+						|| \T_OPEN_PARENTHESIS !== $tokens[ $issetOpener ]['code']
+						|| isset( $tokens[ $issetOpener ]['parenthesis_closer'] ) === false
+					) {
 						// Parse error or live coding.
 						continue 2;
 					}
@@ -200,7 +203,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 						continue 2;
 					}
 
-					$next_non_empty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
+					$next_non_empty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
 					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $tokens[ $next_non_empty ]['code'] ) {
 						// Not a function call.
 						continue 2;
@@ -275,7 +278,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 				case 'coalesce':
 					$prev = $i;
 					do {
-						$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
+						$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true );
 						// Skip over array keys, like `$_GET['key']['subkey']`.
 						if ( \T_CLOSE_SQUARE_BRACKET === $tokens[ $prev ]['code'] ) {
 							$prev = $tokens[ $prev ]['bracket_opener'];
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.5.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.5.inc
new file mode 100644
index 0000000000..52861156c4
--- /dev/null
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.5.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Parse error/live coding.
+// This must be the last (only) test in the file.
+if ( isset(
+
+$_POST['foo3']
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index c3fae62fd4..90e10b5a8d 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -107,6 +107,7 @@ public function getErrorList( $testFile = '' ) {
 			case 'ValidatedSanitizedInputUnitTest.2.inc':
 			case 'ValidatedSanitizedInputUnitTest.3.inc':
 			case 'ValidatedSanitizedInputUnitTest.4.inc':
+			case 'ValidatedSanitizedInputUnitTest.5.inc':
 				return array(
 					7 => 3,
 				);

From 55315adec1ccd2184e0d50b93dd0ec85efdcb698 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 24 Jun 2023 15:26:12 +0200
Subject: [PATCH 563/822] WP/PostsPerPage: simplification

The WPCS `AbstractArrayAssignmentRestrictionsSniff` expects an array from `getGroups()` which includes a `'message'` key.
The `callback()` method subsequently allows to override that message with a higher priority message if needed in specific circumstances.

This sniff, however, doesn't need to override the message, so the `callback()` method can just use the default behaviour of returning `true` or `false` and use the `'message'` as declared in the group.
---
 WordPress/Sniffs/WP/PostsPerPageSniff.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index 30a4ec3104..def9def702 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -46,8 +46,9 @@ final class PostsPerPageSniff extends AbstractArrayAssignmentRestrictionsSniff {
 	public function getGroups() {
 		return array(
 			'posts_per_page' => array(
-				'type' => 'warning',
-				'keys' => array(
+				'type'    => 'warning',
+				'message' => 'Detected high pagination limit, `%s` is set to `%s`',
+				'keys'    => array(
 					'posts_per_page',
 					'numberposts',
 				),
@@ -62,16 +63,10 @@ public function getGroups() {
 	 * @param  mixed  $val   Assigned value.
 	 * @param  int    $line  Token line.
 	 * @param  array  $group Group definition.
-	 * @return mixed         FALSE if no match, TRUE if matches, STRING if matches
-	 *                       with custom error message passed to ->process().
+	 *
+	 * @return bool FALSE if no match, TRUE if matches.
 	 */
 	public function callback( $key, $val, $line, $group ) {
-		$this->posts_per_page = (int) $this->posts_per_page;
-
-		if ( $val > $this->posts_per_page ) {
-			return 'Detected high pagination limit, `%s` is set to `%s`';
-		}
-
-		return false;
+		return ( $val > (int) $this->posts_per_page );
 	}
 }

From 4901feefecae7f797da823a8328b3261597c81b7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 24 Jun 2023 04:19:23 +0200
Subject: [PATCH 564/822] AbstractArrayAssignmentRestrictions: add some extra
 tests

... to raise code coverage and cover some situations previously untested.

Tests have been added to the `WordPress.WP.PostsPerPage` sniff, which contains a `@covers` tag for the abstract.
---
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 40b480b5f3..6abdbee32f 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -28,3 +28,17 @@ $query_args['posts_per_page'] = 100; // OK.
 $query_args['posts_per_page'] = 200; // OK.
 $query_args['posts_per_page'] = 300; // Bad.
 // phpcs:set WordPress.WP.PostsPerPage posts_per_page 100
+
+// phpcs:set WordPress.WP.PostsPerPage exclude[] posts_per_page
+$query_args['posts_per_page'] = 300; // OK, group excluded.
+// phpcs:set WordPress.WP.PostsPerPage exclude[]
+
+// Ensure there will be no false positive for array access brackets when not used for an assignment.
+$var = $query_args['posts_per_page']; // OK.
+$firstChars = $text[0] . $text[1]; // OK.
+
+// Text strings which are not query strings should be ignored.
+_query_posts( 'numberposts' ); // OK.
+
+// Assignments to non-string keys should be ignored.
+$var[10] = 300; // OK.

From 3a5d4eb8cf117490ed2dc2e3009fd7105268aff1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 24 Jun 2023 05:39:32 +0200
Subject: [PATCH 565/822] AbstractArrayAssignmentRestrictions: improve
 documentation

Most notably: the value for `'message'` as was appears to have led to sniff devs not using the key, which was never the intention.
---
 ...stractArrayAssignmentRestrictionsSniff.php | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 223b5e1bfa..552068f72b 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -36,7 +36,7 @@ abstract class AbstractArrayAssignmentRestrictionsSniff extends Sniff {
 	 * @since 1.0.0 This property now expects to be passed an array.
 	 *              Previously a comma-delimited string was expected.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	public $exclude = array();
 
@@ -45,7 +45,7 @@ abstract class AbstractArrayAssignmentRestrictionsSniff extends Sniff {
 	 * Don't use this in extended classes, override getGroups() instead.
 	 * This is only used for Unit tests.
 	 *
-	 * @var array
+	 * @var array<string, array>
 	 */
 	public static $groups = array();
 
@@ -54,7 +54,7 @@ abstract class AbstractArrayAssignmentRestrictionsSniff extends Sniff {
 	 *
 	 * @since 0.11.0
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	protected $excluded_groups = array();
 
@@ -63,7 +63,7 @@ abstract class AbstractArrayAssignmentRestrictionsSniff extends Sniff {
 	 *
 	 * @since 0.13.0
 	 *
-	 * @var array
+	 * @var array<string, array>
 	 */
 	protected $groups_cache = array();
 
@@ -94,13 +94,13 @@ public function register() {
 	 * Example: groups => array(
 	 *  'groupname' => array(
 	 *      'type'     => 'error' | 'warning',
-	 *      'message'  => 'Dont use this one please!',
+	 *      'message'  => 'Descriptive error message. The error message will be passed the $key and $val of the current array assignment.',
 	 *      'keys'     => array( 'key1', 'another_key' ),
 	 *      'callback' => array( 'class', 'method' ), // Optional.
 	 *  )
 	 * )
 	 *
-	 * @return array
+	 * @return array<string, array>
 	 */
 	abstract public function getGroups();
 
@@ -147,11 +147,12 @@ public function process_token( $stackPtr ) {
 		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
 			$equal = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
 			if ( \T_EQUAL !== $this->tokens[ $equal ]['code'] ) {
-				return; // This is not an assignment!
+				// This is not an assignment. Bow out.
+				return;
 			}
 		}
 
-		// Instances: Multi-dimensional array, keyed by line.
+		// Instances: Multi-dimensional array.
 		$inst = array();
 
 		/*
@@ -175,7 +176,9 @@ public function process_token( $stackPtr ) {
 				$inst[ $key ][] = array( $val, $token['line'] );
 			}
 		} elseif ( \in_array( $token['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
-			// Covers assignments via query parameters: `$foo = 'bar=taz&other=thing';`.
+			/*
+			 * Covers assignments via query parameters: `$foo = 'bar=taz&other=thing';`.
+			 */
 			if ( preg_match_all( '#(?:^|&)([a-z_]+)=([^&]*)#i', TextStrings::stripQuotes( $token['content'] ), $matches ) <= 0 ) {
 				return; // No assignments here, nothing to check.
 			}
@@ -232,12 +235,13 @@ public function process_token( $stackPtr ) {
 	 *
 	 * This method must be extended to add the logic to check assignment value.
 	 *
-	 * @param  string $key   Array index / key.
-	 * @param  mixed  $val   Assigned value.
-	 * @param  int    $line  Token line.
-	 * @param  array  $group Group definition.
-	 * @return mixed         FALSE if no match, TRUE if matches, STRING if matches
-	 *                       with custom error message passed to ->process().
+	 * @param string $key   Array index / key.
+	 * @param mixed  $val   Assigned value.
+	 * @param int    $line  Token line.
+	 * @param array  $group Group definition.
+	 *
+	 * @return mixed FALSE if no match, TRUE if matches, STRING if matches
+	 *               with custom error message passed to ->process().
 	 */
 	abstract public function callback( $key, $val, $line, $group );
 }

From 8b9c3f16f3a3cfbf8a8af0cf84477cae27764c1a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 01:40:56 +0200
Subject: [PATCH 566/822] AbstractArrayAssignmentRestrictions: minor
 readability fix

---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 552068f72b..f6e1c9729c 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -182,6 +182,7 @@ public function process_token( $stackPtr ) {
 			if ( preg_match_all( '#(?:^|&)([a-z_]+)=([^&]*)#i', TextStrings::stripQuotes( $token['content'] ), $matches ) <= 0 ) {
 				return; // No assignments here, nothing to check.
 			}
+
 			foreach ( $matches[1] as $i => $_k ) {
 				$inst[ $_k ][] = array( $matches[2][ $i ], $token['line'] );
 			}

From 0021b865ff7bfc314d0e9b90cc79660896762df5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 02:39:40 +0200
Subject: [PATCH 567/822] AbstractArrayAssignmentRestrictions: implement
 PHPCSUtils

---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index f6e1c9729c..7e99a29abd 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -171,7 +172,7 @@ public function process_token( $stackPtr ) {
 				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
 				$valStart       = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $operator + 1 ), null, true );
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
-				$val            = $this->phpcsFile->getTokensAsString( $valStart, ( $valEnd - $valStart ) );
+				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
 				$val            = TextStrings::stripQuotes( $val );
 				$inst[ $key ][] = array( $val, $token['line'] );
 			}

From 98d427e6b912307bfb3edc4d9fa884cd06a9d17f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:35:52 +0100
Subject: [PATCH 568/822] AbstractArrayAssignmentRestrictions: bug fix -
 improve comment tolerance [1]

Non-code style sniffs should ignore most whitespace and comment tokens.

The `AbstractArrayAssignmentRestrictions` did not do so correctly, which could lead to false negatives.

This commit fixes the handling of comments between the "key" and the assignment operator by the sniff.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 .../AbstractArrayAssignmentRestrictionsSniff.php      |  5 +++--
 WordPress/Tests/WP/PostsPerPageUnitTest.inc           | 11 +++++++++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php           |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 7e99a29abd..6cc27d9e6e 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
@@ -146,7 +147,7 @@ public function process_token( $stackPtr ) {
 		$token = $this->tokens[ $stackPtr ];
 
 		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
-			$equal = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+			$equal = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 			if ( \T_EQUAL !== $this->tokens[ $equal ]['code'] ) {
 				// This is not an assignment. Bow out.
 				return;
@@ -167,7 +168,7 @@ public function process_token( $stackPtr ) {
 				$operator = $this->phpcsFile->findNext( \T_EQUAL, ( $stackPtr + 1 ) );
 			}
 
-			$keyIdx = $this->phpcsFile->findPrevious( array( \T_WHITESPACE, \T_CLOSE_SQUARE_BRACKET ), ( $operator - 1 ), null, true );
+			$keyIdx = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 			if ( ! is_numeric( $this->tokens[ $keyIdx ]['content'] ) ) {
 				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
 				$valStart       = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $operator + 1 ), null, true );
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 6abdbee32f..a731f9fdfa 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -42,3 +42,14 @@ _query_posts( 'numberposts' ); // OK.
 
 // Assignments to non-string keys should be ignored.
 $var[10] = 300; // OK.
+
+
+
+// Ensure the sniff disregards comments.
+$query_args['posts_per_page' /* high */ ] = 999; // Bad.
+
+$query_args['posts_per_page'] /* high */  = 999; // Bad.
+
+$args = array(
+	'posts_per_page' /* high */ => 999, // Bad.
+);
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 442ae259cd..3b4567ae63 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -51,6 +51,9 @@ public function getWarningList() {
 			23 => 1,
 			24 => 1,
 			29 => 1,
+			49 => 1,
+			51 => 1,
+			54 => 1,
 		);
 	}
 }

From 493ce2bc9c69e67b76164ac05289c9c33958e49f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:38:51 +0100
Subject: [PATCH 569/822] AbstractArrayAssignmentRestrictions: bug fix -
 improve comment tolerance [2]

Non-code style sniffs should ignore most whitespace and comment tokens.

The `AbstractArrayAssignmentRestrictions` did not do so correctly, which could lead to false negatives.

This commit fixes the handling of comments between the assignment operator and the assigned value.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 2 +-
 WordPress/Tests/WP/PostsPerPageUnitTest.inc            | 5 +++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php            | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 6cc27d9e6e..9fdc252339 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -171,7 +171,7 @@ public function process_token( $stackPtr ) {
 			$keyIdx = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 			if ( ! is_numeric( $this->tokens[ $keyIdx ]['content'] ) ) {
 				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
-				$valStart       = $this->phpcsFile->findNext( array( \T_WHITESPACE ), ( $operator + 1 ), null, true );
+				$valStart       = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
 				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
 				$val            = TextStrings::stripQuotes( $val );
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index a731f9fdfa..dff1f54d4c 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -53,3 +53,8 @@ $query_args['posts_per_page'] /* high */  = 999; // Bad.
 $args = array(
 	'posts_per_page' /* high */ => 999, // Bad.
 );
+
+$query_args['posts_per_page'] = /* high */ 999; // Bad.
+$args = array(
+	'posts_per_page' => /* high */ 999, // Bad.
+);
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 3b4567ae63..c429790988 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -54,6 +54,8 @@ public function getWarningList() {
 			49 => 1,
 			51 => 1,
 			54 => 1,
+			57 => 1,
+			59 => 1,
 		);
 	}
 }

From ee0dc37d4a5640832a9cc711846e8484fb8a68e3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:46:14 +0100
Subject: [PATCH 570/822] AbstractArrayAssignmentRestrictions: minor efficiency
 tweak [1]

Get rid of two unnecessary `in_array()` function calls.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 9fdc252339..a8bdd83f47 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -162,7 +162,7 @@ public function process_token( $stackPtr ) {
 		 * `$foo = array( 'bar' => 'taz' );`
 		 * `$foo['bar'] = $taz;`
 		 */
-		if ( \in_array( $token['code'], array( \T_CLOSE_SQUARE_BRACKET, \T_DOUBLE_ARROW ), true ) ) {
+		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] || \T_DOUBLE_ARROW === $token['code'] ) {
 			$operator = $stackPtr; // T_DOUBLE_ARROW.
 			if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
 				$operator = $this->phpcsFile->findNext( \T_EQUAL, ( $stackPtr + 1 ) );
@@ -177,7 +177,7 @@ public function process_token( $stackPtr ) {
 				$val            = TextStrings::stripQuotes( $val );
 				$inst[ $key ][] = array( $val, $token['line'] );
 			}
-		} elseif ( \in_array( $token['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
+		} elseif ( isset( Tokens::$stringTokens[ $token['code'] ] ) ) {
 			/*
 			 * Covers assignments via query parameters: `$foo = 'bar=taz&other=thing';`.
 			 */

From 0424720218d7fe30a2c7b612bfc764d70bc0f8ab Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 01:21:25 +0200
Subject: [PATCH 571/822] AbstractArrayAssignmentRestrictions: minor efficiency
 tweak [2]

The position of the `T_EQUAL` token has already been determined before, so let's use the predetermined value for efficiency.

Includes renaming the local variable to be slightly more descriptive.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index a8bdd83f47..de588ff6e3 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -147,8 +147,8 @@ public function process_token( $stackPtr ) {
 		$token = $this->tokens[ $stackPtr ];
 
 		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
-			$equal = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-			if ( \T_EQUAL !== $this->tokens[ $equal ]['code'] ) {
+			$equalPtr = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+			if ( \T_EQUAL !== $this->tokens[ $equalPtr ]['code'] ) {
 				// This is not an assignment. Bow out.
 				return;
 			}
@@ -165,7 +165,7 @@ public function process_token( $stackPtr ) {
 		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] || \T_DOUBLE_ARROW === $token['code'] ) {
 			$operator = $stackPtr; // T_DOUBLE_ARROW.
 			if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
-				$operator = $this->phpcsFile->findNext( \T_EQUAL, ( $stackPtr + 1 ) );
+				$operator = $equalPtr;
 			}
 
 			$keyIdx = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );

From 248108cea9ba7a39017c4702e51c97992bae1697 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 03:46:51 +0200
Subject: [PATCH 572/822] AbstractArrayAssignmentRestrictions: minor efficiency
 tweak [3]

No need to start looping the inner array if the `$key` is not one of the target keys in the current group.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index de588ff6e3..0957c798e5 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -203,13 +203,13 @@ public function process_token( $stackPtr ) {
 			$callback = ( isset( $group['callback'] ) && is_callable( $group['callback'] ) ) ? $group['callback'] : array( $this, 'callback' );
 
 			foreach ( $inst as $key => $assignments ) {
+				if ( ! \in_array( $key, $group['keys'], true ) ) {
+					continue;
+				}
+
 				foreach ( $assignments as $occurance ) {
 					list( $val, $line ) = $occurance;
 
-					if ( ! \in_array( $key, $group['keys'], true ) ) {
-						continue;
-					}
-
 					$output = \call_user_func( $callback, $key, $val, $line, $group );
 
 					if ( ! isset( $output ) || false === $output ) {

From c4ceb8cc36afd2c8bfa495a7acf870f5f3c2c456 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:02:25 +0100
Subject: [PATCH 573/822] AbstractArrayAssignmentRestrictions: precision (bug)
 fix

Check if the array "key" token found is a text string token as well as checking that the content is non-numeric.

This is also an efficiency fix as code like `$query_args[] = 300;` would previously be analyzed with key `[`, which is clearly nonsense.

Along the same lines, a numeric string key would previously also be analyzed, due to the quotes around the number, while PHP auto-casts numeric string keys to integers (see: https://3v4l.org/uVFsO ), which means they are not the target of this sniff and therefore should be disregarded.
This also meant that the `$key` passed to the `callback()` method could previously potentially be an integer (as the same type casts happens when we store the numeric string key to the `$inst` array), while it is documented as `string` only.

Note: this didn't lead to false positives as nobody would set the "key" to search for to `[`, but it was still wrong.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 4 +++-
 WordPress/Tests/WP/PostsPerPageUnitTest.inc            | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 0957c798e5..ea76d05c53 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -169,7 +169,9 @@ public function process_token( $stackPtr ) {
 			}
 
 			$keyIdx = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-			if ( ! is_numeric( $this->tokens[ $keyIdx ]['content'] ) ) {
+			if ( isset( Tokens::$stringTokens[ $this->tokens[ $keyIdx ]['code'] ] )
+				&& ! is_numeric( $this->tokens[ $keyIdx ]['content'] )
+			) {
 				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
 				$valStart       = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index dff1f54d4c..f756b638ba 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -40,10 +40,10 @@ $firstChars = $text[0] . $text[1]; // OK.
 // Text strings which are not query strings should be ignored.
 _query_posts( 'numberposts' ); // OK.
 
-// Assignments to non-string keys should be ignored.
+// Assignments to non-string keys should be ignored. Note: PHP will auto-cast numeric strings to ints, so those should also be disregarded.
 $var[10] = 300; // OK.
-
-
+$var[] = 400; // OK.
+$var['239'] = 500; // OK.
 
 // Ensure the sniff disregards comments.
 $query_args['posts_per_page' /* high */ ] = 999; // Bad.

From d0bd47c535d23f0a6ba50618e41a56655b09108e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 04:14:23 +0200
Subject: [PATCH 574/822] AbstractArrayAssignmentRestrictions: bug fix -
 simplify the `$inst`(ances) array

As things were, the sniff would store the encountered "instances" in a multi-dimensional array looking like this:
```
array(
    (string) 'key' => array(
        [0] => array(
            [0] => (string) 'value',
            [1] => (int) line number,
        ),
        ...
    )
)
```

Now, the sniffs listens to four different tokens:
* `T_DOUBLE_ARROW`
* `T_CLOSE_SQUARE_BRACKET`
* `T_CONSTANT_ENCAPSED_STRING`
* `T_DOUBLE_QUOTED_STRING`

For the first two, there could only ever be one entry in the lowest level of the array as it looks at each array item individually due to the use of the `T_DOUBLE_ARROW` token for array declarations and the `T_CLOSE_SQUARE_BRACKET` token being used for assignments to an existing array.

For the last two, the found string is analyzed to see if it is a query string and parsed if it is. In that case, there could be multiple entries in the array.

However.... when PHP parses a query string, there will never be multiple entries for the same key: https://3v4l.org/n3Iv9

So, I cannot fanthom why having multiple entries for the same key would be useful for this sniff. Only the last found entry should be taken into account.
There were also no tests (anywhere) covering a query string containing a duplicate key.

So, taking the above into account, this commit simplifies the entries are stored in the `$inst` array to this:
```
array(
    (string) 'key' => array(
        [0] => (string) 'value',
        [1] => (int) line number,
    )
)
```

This array format change will now prevent incorrect messages about a "high" value which is subsequently overwritten by a "low" value anyway.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 ...stractArrayAssignmentRestrictionsSniff.php | 48 +++++++++----------
 WordPress/Tests/WP/PostsPerPageUnitTest.inc   |  3 ++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index ea76d05c53..c547d5828c 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -176,8 +176,8 @@ public function process_token( $stackPtr ) {
 				$valStart       = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
 				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
-				$val            = TextStrings::stripQuotes( $val );
-				$inst[ $key ][] = array( $val, $token['line'] );
+				$val          = TextStrings::stripQuotes( $val );
+				$inst[ $key ] = array( $val, $token['line'] );
 			}
 		} elseif ( isset( Tokens::$stringTokens[ $token['code'] ] ) ) {
 			/*
@@ -188,7 +188,7 @@ public function process_token( $stackPtr ) {
 			}
 
 			foreach ( $matches[1] as $i => $_k ) {
-				$inst[ $_k ][] = array( $matches[2][ $i ], $token['line'] );
+				$inst[ $_k ] = array( $matches[2][ $i ], $token['line'] );
 			}
 		}
 
@@ -204,33 +204,31 @@ public function process_token( $stackPtr ) {
 
 			$callback = ( isset( $group['callback'] ) && is_callable( $group['callback'] ) ) ? $group['callback'] : array( $this, 'callback' );
 
-			foreach ( $inst as $key => $assignments ) {
+			foreach ( $inst as $key => $assignment ) {
 				if ( ! \in_array( $key, $group['keys'], true ) ) {
 					continue;
 				}
 
-				foreach ( $assignments as $occurance ) {
-					list( $val, $line ) = $occurance;
-
-					$output = \call_user_func( $callback, $key, $val, $line, $group );
-
-					if ( ! isset( $output ) || false === $output ) {
-						continue;
-					} elseif ( true === $output ) {
-						$message = $group['message'];
-					} else {
-						$message = $output;
-					}
-
-					MessageHelper::addMessage(
-						$this->phpcsFile,
-						$message,
-						$stackPtr,
-						( 'error' === $group['type'] ),
-						MessageHelper::stringToErrorcode( $groupName . '_' . $key ),
-						array( $key, $val )
-					);
+				list( $val, $line ) = $assignment;
+
+				$output = \call_user_func( $callback, $key, $val, $line, $group );
+
+				if ( ! isset( $output ) || false === $output ) {
+					continue;
+				} elseif ( true === $output ) {
+					$message = $group['message'];
+				} else {
+					$message = $output;
 				}
+
+				MessageHelper::addMessage(
+					$this->phpcsFile,
+					$message,
+					$stackPtr,
+					( 'error' === $group['type'] ),
+					MessageHelper::stringToErrorcode( $groupName . '_' . $key ),
+					array( $key, $val )
+				);
 			}
 		}
 	}
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index f756b638ba..ed51653cff 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -58,3 +58,6 @@ $query_args['posts_per_page'] = /* high */ 999; // Bad.
 $args = array(
 	'posts_per_page' => /* high */ 999, // Bad.
 );
+
+// Safeguard that when a query string contains duplicate key, the value of the last one is used.
+_query_posts( 'posts_per_page=999&nopaging=true&posts_per_page=50' ); // OK.

From 0666aca48ff52a6ff65411fa83beace09f4374d9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 04:36:25 +0200
Subject: [PATCH 575/822] AbstractArrayAssignmentRestrictions: make the
 contents of `$inst` more comprehensible

Even though the array is only used locally, let's use keys for the entries to make the code more readable/comprehensible.
---
 ...bstractArrayAssignmentRestrictionsSniff.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index c547d5828c..e185bcc605 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -177,7 +177,10 @@ public function process_token( $stackPtr ) {
 				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
 				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
 				$val          = TextStrings::stripQuotes( $val );
-				$inst[ $key ] = array( $val, $token['line'] );
+				$inst[ $key ] = array(
+					'value' => $val,
+					'line'  => $token['line'],
+				);
 			}
 		} elseif ( isset( Tokens::$stringTokens[ $token['code'] ] ) ) {
 			/*
@@ -187,8 +190,11 @@ public function process_token( $stackPtr ) {
 				return; // No assignments here, nothing to check.
 			}
 
-			foreach ( $matches[1] as $i => $_k ) {
-				$inst[ $_k ] = array( $matches[2][ $i ], $token['line'] );
+			foreach ( $matches[1] as $match_nr => $key ) {
+				$inst[ $key ] = array(
+					'value' => $matches[2][ $match_nr ],
+					'line'  => $token['line'],
+				);
 			}
 		}
 
@@ -209,9 +215,7 @@ public function process_token( $stackPtr ) {
 					continue;
 				}
 
-				list( $val, $line ) = $assignment;
-
-				$output = \call_user_func( $callback, $key, $val, $line, $group );
+				$output = \call_user_func( $callback, $key, $assignment['value'], $assignment['line'], $group );
 
 				if ( ! isset( $output ) || false === $output ) {
 					continue;
@@ -227,7 +231,7 @@ public function process_token( $stackPtr ) {
 					$stackPtr,
 					( 'error' === $group['type'] ),
 					MessageHelper::stringToErrorcode( $groupName . '_' . $key ),
-					array( $key, $val )
+					array( $key, $assignment['value'] )
 				);
 			}
 		}

From 02621eb9a1a1f785ae7988b62fca8a3bf344e147 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 04:48:52 +0200
Subject: [PATCH 576/822] AbstractArrayAssignmentRestrictions: report the error
 for array assignments on the key pointer

For array assignments, the error would previously be reported on a `]` or `=>` token, while those tokens in and of themselves are not where the problem lies.

As the sniff reports based on the key (with an optional value check in the `callback()` method), I think it is more appropriate and more correct for the sniff to report on the stack pointer to the token identified as the key.

To achieve this, a new array entry is added to the `$inst` array so the loop throwing the error has access to that information.

For query strings, the error will continue to be thrown on the text string token containing the query string.

The difference this commit makes can be seen when using the `code` report offered by PHPCS, like so `--report=code`.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 .../AbstractArrayAssignmentRestrictionsSniff.php     | 12 +++++++-----
 WordPress/Tests/WP/PostsPerPageUnitTest.inc          |  5 +++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php          |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index e185bcc605..f7ced975a4 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -178,8 +178,9 @@ public function process_token( $stackPtr ) {
 				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
 				$val          = TextStrings::stripQuotes( $val );
 				$inst[ $key ] = array(
-					'value' => $val,
-					'line'  => $token['line'],
+					'value'  => $val,
+					'line'   => $token['line'],
+					'keyptr' => $keyIdx,
 				);
 			}
 		} elseif ( isset( Tokens::$stringTokens[ $token['code'] ] ) ) {
@@ -192,8 +193,9 @@ public function process_token( $stackPtr ) {
 
 			foreach ( $matches[1] as $match_nr => $key ) {
 				$inst[ $key ] = array(
-					'value' => $matches[2][ $match_nr ],
-					'line'  => $token['line'],
+					'value'  => $matches[2][ $match_nr ],
+					'line'   => $token['line'],
+					'keyptr' => $stackPtr,
 				);
 			}
 		}
@@ -228,7 +230,7 @@ public function process_token( $stackPtr ) {
 				MessageHelper::addMessage(
 					$this->phpcsFile,
 					$message,
-					$stackPtr,
+					$assignment['keyptr'],
 					( 'error' === $group['type'] ),
 					MessageHelper::stringToErrorcode( $groupName . '_' . $key ),
 					array( $key, $assignment['value'] )
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index ed51653cff..c78a50529a 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -61,3 +61,8 @@ $args = array(
 
 // Safeguard that when a query string contains duplicate key, the value of the last one is used.
 _query_posts( 'posts_per_page=999&nopaging=true&posts_per_page=50' ); // OK.
+
+// Ensure the error gets reported on the key pointer.
+$query_args[
+	'posts_per_page'
+] = 300; // Bad, error should be reported on the above line.
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index c429790988..032690d409 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -56,6 +56,7 @@ public function getWarningList() {
 			54 => 1,
 			57 => 1,
 			59 => 1,
+			67 => 1,
 		);
 	}
 }

From 521089823fb2863320031c3773902808f8fd6987 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 15:15:03 +0200
Subject: [PATCH 577/822] AbstractArrayAssignmentRestrictions: allow for PHP
 7.4+ null coalesce equals

While other assignment operators all lead to calculations, which means we cannot reliably determine the actual value, the null coalesce assignment operator provides a default value, which means we can analyze the value as if it were the value set.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 4 +++-
 WordPress/Tests/WP/PostsPerPageUnitTest.inc            | 4 ++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php            | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index f7ced975a4..ee8a16e6e2 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -148,7 +148,9 @@ public function process_token( $stackPtr ) {
 
 		if ( \T_CLOSE_SQUARE_BRACKET === $token['code'] ) {
 			$equalPtr = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-			if ( \T_EQUAL !== $this->tokens[ $equalPtr ]['code'] ) {
+			if ( \T_EQUAL !== $this->tokens[ $equalPtr ]['code']
+				&& \T_COALESCE_EQUAL !== $this->tokens[ $equalPtr ]['code']
+			) {
 				// This is not an assignment. Bow out.
 				return;
 			}
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index c78a50529a..e002ed7429 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -66,3 +66,7 @@ _query_posts( 'posts_per_page=999&nopaging=true&posts_per_page=50' ); // OK.
 $query_args[
 	'posts_per_page'
 ] = 300; // Bad, error should be reported on the above line.
+
+// Ensure that PHP 7.4 null coalesce equals get picked up on.
+$query_args['posts_per_page'] ??= 50; // OK.
+$query_args['posts_per_page'] ??= 200; // Bad.
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 032690d409..25da82de33 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -57,6 +57,7 @@ public function getWarningList() {
 			57 => 1,
 			59 => 1,
 			67 => 1,
+			72 => 1,
 		);
 	}
 }

From a78f445affb38890a09dd674870564a9396af9c9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 15:11:59 +0200
Subject: [PATCH 578/822] AbstractArrayAssignmentRestrictions: add test with
 PHP 8.0 match

Includes tests via the `WordPress.WP.PostsPerPage` sniff.
---
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index e002ed7429..fa184ff038 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -70,3 +70,8 @@ $query_args[
 // Ensure that PHP 7.4 null coalesce equals get picked up on.
 $query_args['posts_per_page'] ??= 50; // OK.
 $query_args['posts_per_page'] ??= 200; // Bad.
+
+// Ensure that the sniff does not report on PHP 8.0 match arms.
+$val = match($val) {
+	'posts_per_page' => 999, // OK, not an array assignment.
+};

From 02b4581d9ad5461066413582f77d49f4a143a72a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:04:00 +0100
Subject: [PATCH 579/822] AbstractArrayAssignmentRestrictions: bug fix -
 improve value capturing

This commit improves the way the `AbstractArrayAssignmentRestrictionsSniff` captures the value of an array key assignment before it gets passed on to the callback for further examination.

As things were previously, the sniff would go wrong in two cases:
1. Without a trailing comma after an array item, the long/short array close bracket would be included in the value, while it shouldn't be.
    This was reported in issue 2211.
2. The sniff would not always capture a complete value when the value contained a function call, sub-array, closure etc; basically anything which can contain a comma or semi-colon, but where that comma/semi-colon is in an "inner" construct and not the "outer" construct which is being captured.
    This was reported in issue 2027

The fix included in this commit fixes the first issue completely and a partial fix for the second issue.

Includes tests via the `WordPress.WP.PostsPerPage` sniff.

Fixes 2211
---
 .../AbstractArrayAssignmentRestrictionsSniff.php | 16 ++++++++++++----
 WordPress/Tests/WP/PostsPerPageUnitTest.inc      |  6 ++++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php      |  2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index ee8a16e6e2..b2c0d48660 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -174,10 +174,18 @@ public function process_token( $stackPtr ) {
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $keyIdx ]['code'] ] )
 				&& ! is_numeric( $this->tokens[ $keyIdx ]['content'] )
 			) {
-				$key            = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
-				$valStart       = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
-				$valEnd         = $this->phpcsFile->findNext( array( \T_COMMA, \T_SEMICOLON ), ( $valStart + 1 ), null, false, null, true );
-				$val            = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, ( $valEnd - 1 ), true ) );
+				$key      = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
+				$valStart = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
+				$valEnd   = $this->phpcsFile->findEndOfStatement( $valStart, \T_COLON );
+				if ( \T_COMMA === $this->tokens[ $valEnd ]['code']
+					|| \T_SEMICOLON === $this->tokens[ $valEnd ]['code']
+				) {
+					// FindEndOfStatement includes the comma/semi-colon if that's the end of the statement.
+					// That's not what we want (and inconsistent), so remove it.
+					--$valEnd;
+				}
+
+				$val          = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, $valEnd, true ) );
 				$val          = TextStrings::stripQuotes( $val );
 				$inst[ $key ] = array(
 					'value'  => $val,
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index fa184ff038..cddd979781 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -75,3 +75,9 @@ $query_args['posts_per_page'] ??= 200; // Bad.
 $val = match($val) {
 	'posts_per_page' => 999, // OK, not an array assignment.
 };
+
+// Verify handling of arrays without trailing comma after the last array item.
+$args = array( 'posts_per_page' => 999 ); // Bad.
+$args = [
+	'posts_per_page' => 999
+]; // Bad.
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 25da82de33..7dbd98b3ac 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -58,6 +58,8 @@ public function getWarningList() {
 			59 => 1,
 			67 => 1,
 			72 => 1,
+			80 => 1,
+			82 => 1,
 		);
 	}
 }

From 62bffac72088f544190ab8c8bc7b08295fb40aac Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:25:38 +0200
Subject: [PATCH 580/822] AbstractArrayAssignmentRestrictionsSniff: don't strip
 quotes off value

As the value capturing is now more likely to (correctly) contain multiple tokens, stripping the quotes of a value is plain incorrect as wit would lead to a value like this:
```php
$var['key'] = 'my' . 10 . 'something';
```
... to be passed on as `my' . 10 . 'something` - i.e. without the surrounding quotes, but with the non-matching quotes inside the value.

I'm proposing to remove the call to `TextStrings::stripQuotes()` to allow the `callback()` to receive a more accurate and actionable value.

This will be a potentially breaking change for _some_ extenders, so will need a clear entry in the dev upgrade guide. (It doesn't impact the WPCS native sniffs extending the abstract at this time)
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index b2c0d48660..13615429fc 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -186,7 +186,6 @@ public function process_token( $stackPtr ) {
 				}
 
 				$val          = trim( GetTokensAsString::compact( $this->phpcsFile, $valStart, $valEnd, true ) );
-				$val          = TextStrings::stripQuotes( $val );
 				$inst[ $key ] = array(
 					'value'  => $val,
 					'line'   => $token['line'],

From 2b368bf7df359013e969a9bcecb85da588c509fb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 27 Jun 2023 23:45:14 +0200
Subject: [PATCH 581/822] Helpers\IsUnitTestTrait: bug fix - allow for custom
 test classes passed as FQN

While looking at an old PR (1960), I realized that custom test classes passed as FQN were not handled correctly by the trait.
This code was not adjusted in that PR, just moved, so this bug has existed for a while.

The problem was in this code snippet:
```php
		$known_test_classes = RulesetPropertyHelper::merge_custom_array(
			$this->custom_test_classes,
			$this->known_test_classes
		);

		/*
		 * Show some tolerance for user input.
		 * The custom test class names should be passed as FQN without a prefixing `\`.
		 */
		foreach ( $known_test_classes as $k => $v ) {
			$known_test_classes[ $k ] = ltrim( $v, '\\' );
		}
```

After the merge of the custom classes, the `$known_test_classes` array is in `string` => `bool` format, so the `foreach()` loop is absolutely not having the intended effect. The only thing it does, is change the boolean value to strings...

I also noticed that the array merge was being done every single time the `is_test_class()` method was being called. We can make that a bit more efficient as it will be rare that the list of custom tests classes changes during a run.

So, I have made the following changes:
* Introduce a new `get_all_test_classes()` method which will handle the cleaning of the custom names and the merge.
    This new class uses two new properties `$added_custom_test_classes` and `$all_test_classes` to prevent having to do the same merge over and over again.
* The `$known_test_classes` property has now been made `private`.
* The logic to trim namespace separators of custom test class names has been moved to before the merge as we don't need to trim the names from the `$known_test_classes`.
* The logic to trim namespace separators will now work correctly as the value of the `$custom_test_classes` will be `string[]` and hasn't been "flipped" yet (keys/values reversed).

Includes additional unit tests.
---
 WordPress/Helpers/IsUnitTestTrait.php         | 74 +++++++++++++++----
 WordPress/Tests/Files/FileNameUnitTest.php    |  6 +-
 ...unit.inc => test-sample-custom-unit.1.inc} |  0
 .../TestFiles/test-sample-custom-unit.2.inc   |  6 ++
 .../TestFiles/test-sample-custom-unit.3.inc   |  8 ++
 .../TestFiles/test-sample-custom-unit.4.inc   |  6 ++
 .../TestFiles/test-sample-custom-unit.5.inc   |  8 ++
 7 files changed, 92 insertions(+), 16 deletions(-)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.inc => test-sample-custom-unit.1.inc} (100%)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index e4a0869b92..85439c40ee 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -73,12 +73,13 @@ trait IsUnitTestTrait {
 	 *           directory of WP Core.}
 	 *
 	 * @since 0.11.0
-	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
-	 *               Renamed from `$test_class_whitelist` to `$known_test_classes`.
+	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
+	 *               - Renamed from `$test_class_whitelist` to `$known_test_classes`.
+	 *               - Visibility changed from protected to private.
 	 *
 	 * @var string[]
 	 */
-	protected $known_test_classes = array(
+	private $known_test_classes = array(
 		// Base test cases.
 		'WP_UnitTestCase'                            => true,
 		'WP_UnitTestCase_Base'                       => true,
@@ -100,6 +101,60 @@ trait IsUnitTestTrait {
 		'TestCase'                                   => true,
 	);
 
+	/**
+	 * Cache of previously added custom test classes.
+	 *
+	 * Prevents having to do the same merges over and over again.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[]
+	 */
+	private $added_custom_test_classes = array();
+
+	/**
+	 * Combined list of WP/PHPUnit native and custom test classes.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	private $all_test_classes = array();
+
+	/**
+	 * Retrieve a list of all registered test classes, both WP/PHPUnit native as well as custom.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, bool>
+	 */
+	protected function get_all_test_classes() {
+		if ( array() === $this->all_test_classes
+			|| $this->custom_test_classes !== $this->added_custom_test_classes
+		) {
+			/*
+			 * Show some tolerance for user input.
+			 * The custom test class names should be passed as FQN without a prefixing `\`.
+			 */
+			$custom_test_classes = array();
+			if ( ! empty( $this->custom_test_classes ) ) {
+				foreach ( $this->custom_test_classes as $v ) {
+					$custom_test_classes[] = ltrim( $v, '\\' );
+				}
+			}
+
+			$this->all_test_classes = RulesetPropertyHelper::merge_custom_array(
+				$custom_test_classes,
+				$this->known_test_classes
+			);
+
+			// Store the original value so the comparison can succeed.
+			$this->added_custom_test_classes = $this->custom_test_classes;
+		}
+
+		return $this->all_test_classes;
+	}
+
 	/**
 	 * Check if a class token is part of a unit test suite.
 	 *
@@ -127,18 +182,7 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 		}
 
 		// Add any potentially extra custom test classes to the known test classes list.
-		$known_test_classes = RulesetPropertyHelper::merge_custom_array(
-			$this->custom_test_classes,
-			$this->known_test_classes
-		);
-
-		/*
-		 * Show some tolerance for user input.
-		 * The custom test class names should be passed as FQN without a prefixing `\`.
-		 */
-		foreach ( $known_test_classes as $k => $v ) {
-			$known_test_classes[ $k ] = ltrim( $v, '\\' );
-		}
+		$known_test_classes = $this->get_all_test_classes();
 
 		// Is the class/trait one of the known test classes ?
 		$namespace = Namespaces::determineNamespace( $phpcsFile, $stackPtr );
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 13909316cf..0e8c48579f 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -75,7 +75,11 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		'test-sample-phpunit.inc'                    => 0,
 		'test-sample-phpunit6.inc'                   => 0,
 		'test-sample-wpunit.inc'                     => 0,
-		'test-sample-custom-unit.inc'                => 0,
+		'test-sample-custom-unit.1.inc'              => 0,
+		'test-sample-custom-unit.2.inc'              => 0,
+		'test-sample-custom-unit.3.inc'              => 0,
+		'test-sample-custom-unit.4.inc'              => 0,
+		'test-sample-custom-unit.5.inc'              => 1, // Namespaced vs non-namespaced.
 		'test-sample-namespaced-declaration.1.inc'   => 0,
 		'test-sample-namespaced-declaration.2.inc'   => 1, // Namespaced vs non-namespaced.
 		'test-sample-namespaced-declaration.3.inc'   => 1, // Wrong namespace.
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.1.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.1.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc
new file mode 100644
index 0000000000..41170aa93d
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc
@@ -0,0 +1,6 @@
+<!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
+phpcs:set WordPress.Files.FileName custom_test_classes[] \My_TestClass
+<?php
+
+class TestSample extends My_TestClass {}
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc
new file mode 100644
index 0000000000..ff77ee2774
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc
@@ -0,0 +1,8 @@
+<!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
+phpcs:set WordPress.Files.FileName custom_test_classes[] \Plugin\Tests\My_TestClass
+<?php
+
+namespace Plugin\Tests;
+
+class TestSample extends My_TestClass {}
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc
new file mode 100644
index 0000000000..3df9b2c54a
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc
@@ -0,0 +1,6 @@
+<!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
+phpcs:set WordPress.Files.FileName custom_test_classes[] \My_TestClass
+<?php
+
+class TestSample extends \My_TestClass {}
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc
new file mode 100644
index 0000000000..392a1546db
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc
@@ -0,0 +1,8 @@
+<!-- Annotation has to be on the second line as errors are thrown on line 1 and errors on annotation lines are ignored. -->
+phpcs:set WordPress.Files.FileName custom_test_classes[] \My_TestClass
+<?php
+
+namespace Plugin\Tests;
+
+class TestSample extends My_TestClass {}
+/* phpcs:set WordPress.Files.FileName custom_test_classes[] */

From e6a41f200b9ea11fa34310d6c211cb8cd80b4e50 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:27:58 +0200
Subject: [PATCH 582/822] ArrayWalkingFunctionsHelper: improve consistency in
 method names across Helpers

For the stand-alone Helper classes which only contain one "functions list" array property, name the retrieval method `get_functions()`.

After all, these are not traits, which run a risk of a class `use`-ing the trait overloading the method and as the method is `static`, the class name used in the function call already clearly indicates _which_ function list is being retrieved.
---
 WordPress/Helpers/ArrayWalkingFunctionsHelper.php | 3 ++-
 WordPress/Sniff.php                               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
index 97f1c24d46..0232736e12 100644
--- a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
+++ b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
@@ -34,6 +34,7 @@ final class ArrayWalkingFunctionsHelper {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility changed from protected to private and property made static.
+	 *                Use the `get_functions()` method for access.
 	 *              - The value has changed from an integer to an array containing the integer
 	 *                parameter position + its name.
 	 *
@@ -57,7 +58,7 @@ final class ArrayWalkingFunctionsHelper {
 	 *
 	 * @return array<string, bool>
 	 */
-	public static function get_array_walking_functions() {
+	public static function get_functions() {
 		return \array_fill_keys( \array_keys( self::$arrayWalkingFunctions ), true );
 	}
 
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e9af359bdc..e5b8578c44 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -183,7 +183,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		$valid_functions  = $this->get_sanitizing_functions();
 		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
 		$valid_functions += UnslashingFunctionsHelper::get_unslashing_functions();
-		$valid_functions += ArrayWalkingFunctionsHelper::get_array_walking_functions();
+		$valid_functions += ArrayWalkingFunctionsHelper::get_functions();
 
 		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
 

From 928052004cd3dea3982b7c85bb1b94010ccd7dee Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:29:49 +0200
Subject: [PATCH 583/822] UnslashingFunctionsHelper: improve consistency in
 method names across Helpers

For the stand-alone Helper classes which only contain one "functions list" array property, name the retrieval method `get_functions()`.

After all, these are not traits, which run a risk of a class `use`-ing the trait overloading the method and as the method is `static`, the class name used in the function call already clearly indicates _which_ function list is being retrieved.
---
 WordPress/Helpers/UnslashingFunctionsHelper.php      | 3 ++-
 WordPress/Sniff.php                                  | 4 ++--
 WordPress/Sniffs/Security/NonceVerificationSniff.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/UnslashingFunctionsHelper.php b/WordPress/Helpers/UnslashingFunctionsHelper.php
index 0ff0a2beaa..446fa50bdf 100644
--- a/WordPress/Helpers/UnslashingFunctionsHelper.php
+++ b/WordPress/Helpers/UnslashingFunctionsHelper.php
@@ -24,6 +24,7 @@ final class UnslashingFunctionsHelper {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility changed from protected to private and property made static.
+	 *                Use the `get_functions()` method for access.
 	 *
 	 * @var array<string, bool>
 	 */
@@ -40,7 +41,7 @@ final class UnslashingFunctionsHelper {
 	 *
 	 * @return array<string, bool>
 	 */
-	public static function get_unslashing_functions() {
+	public static function get_functions() {
 		return self::$unslashingFunctions;
 	}
 
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e5b8578c44..fa5f343654 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -182,7 +182,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 
 		$valid_functions  = $this->get_sanitizing_functions();
 		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
-		$valid_functions += UnslashingFunctionsHelper::get_unslashing_functions();
+		$valid_functions += UnslashingFunctionsHelper::get_functions();
 		$valid_functions += ArrayWalkingFunctionsHelper::get_functions();
 
 		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
@@ -204,7 +204,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 			$is_unslashed = true;
 
 			// Remove the unslashing functions.
-			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_unslashing_functions() );
+			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_functions() );
 
 			// Check is any of the remaining (sanitizing) functions is used.
 			$higherFunctionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $functionPtr, $valid_functions );
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 90b7529ffd..6bf1f869e7 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -185,7 +185,7 @@ private function has_nonce_check( $stackPtr ) {
 			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
-			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_unslashing_functions() ) !== false
+			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_functions() ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
 		) {
 			$allow_nonce_after = true;

From 2e0c47a89313caa3be7457109d71c8718bb9a8b3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:35:07 +0200
Subject: [PATCH 584/822] Helpers: add some more defensive coding

The `Helper` classes containing stand-alone `static` methods can be used by both WPCS itself as well as external standards extending WPCS.

As these methods have been made stand-alone, they should probably contain a little more defensive coding in select places.

Note: this code will not be "covered" by tests at this moment as the WPCS code as-is will never hit these conditions.

At a later point in time, we may want to add dedicated tests for the Helper methods which aren't moving to PHPCSUtils. When we do, we can make sure this defensive code gets covered too.
---
 WordPress/Helpers/ContextHelper.php     | 16 ++++++++++++++--
 WordPress/Helpers/DeprecationHelper.php |  6 +++++-
 WordPress/Helpers/ListHelper.php        |  2 +-
 WordPress/Helpers/ValidationHelper.php  |  3 +++
 WordPress/Helpers/VariableHelper.php    | 13 +++++++++++--
 WordPress/Helpers/WPDBTrait.php         |  4 +++-
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 757479e46d..7369c1e719 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -129,6 +129,10 @@ final class ContextHelper {
 	 */
 	public static function has_object_operator_before( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
 		$before = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
 		return isset( Collections::objectOperators()[ $tokens[ $before ]['code'] ] );
@@ -151,7 +155,11 @@ public static function has_object_operator_before( File $phpcsFile, $stackPtr )
 	 */
 	public static function is_token_namespaced( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
-		$prev   = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
+		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
 		if ( \T_NS_SEPARATOR !== $tokens[ $prev ]['code'] ) {
 			return false;
@@ -320,7 +328,11 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 	 */
 	public static function is_safe_casted( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
-		$prev   = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
+		$prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
 		return isset( self::$safe_casts[ $tokens[ $prev ]['code'] ] );
 	}
diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
index fa55b143a1..33085e525e 100644
--- a/WordPress/Helpers/DeprecationHelper.php
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -43,7 +43,11 @@ final class DeprecationHelper {
 	 * @return bool
 	 */
 	public static function is_function_deprecated( File $phpcsFile, $stackPtr ) {
-		$tokens                  = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
 		$ignore                  = Tokens::$methodPrefixes;
 		$ignore[ \T_WHITESPACE ] = \T_WHITESPACE;
 
diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index 4078aa2423..4117b30032 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -53,7 +53,7 @@ public static function get_list_variables( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
 		// Is this one of the tokens this function handles ?
-		if ( isset( Collections::listOpenTokensBC()[ $tokens[ $stackPtr ]['code'] ] ) === false ) {
+		if ( isset( $tokens[ $stackPtr ], Collections::listOpenTokensBC()[ $tokens[ $stackPtr ]['code'] ] ) === false ) {
 			return array();
 		}
 
diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 18fee09895..950364cc36 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -99,6 +99,9 @@ final class ValidationHelper {
 	 */
 	public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = array(), $in_condition_only = false ) {
 		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
 
 		if ( $in_condition_only ) {
 			/*
diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index e4aa4f1392..428de8ab1a 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -53,7 +53,9 @@ public static function get_array_access_keys( File $phpcsFile, $stackPtr, $all =
 		$tokens = $phpcsFile->getTokens();
 		$keys   = array();
 
-		if ( \T_VARIABLE !== $tokens[ $stackPtr ]['code'] ) {
+		if ( isset( $tokens[ $stackPtr ] ) === false
+			|| \T_VARIABLE !== $tokens[ $stackPtr ]['code']
+		) {
 			return $keys;
 		}
 
@@ -140,7 +142,11 @@ public static function get_array_access_key( File $phpcsFile, $stackPtr ) {
 	 * @return bool Whether this is a comparison.
 	 */
 	public static function is_comparison( File $phpcsFile, $stackPtr, $include_coalesce = true ) {
-		$tokens           = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
 		$comparisonTokens = Tokens::$comparisonTokens;
 		if ( false === $include_coalesce ) {
 			unset( $comparisonTokens[ \T_COALESCE ] );
@@ -203,6 +209,9 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 	 */
 	public static function is_assignment( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
 
 		static $valid = array(
 			\T_VARIABLE             => true,
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index a09257ebc7..8d93ba1480 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -50,8 +50,10 @@ trait WPDBTrait {
 	 * @return bool Whether this is a $wpdb method call.
 	 */
 	protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
-
 		$tokens = $phpcsFile->getTokens();
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
 
 		// Check for wpdb.
 		if ( ( \T_VARIABLE === $tokens[ $stackPtr ]['code'] && '$wpdb' !== $tokens[ $stackPtr ]['content'] )

From 3900d240670e7d2ec9c2235c85064230fd6849f5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:23:29 +0200
Subject: [PATCH 585/822] ContextHelper::$safe_casts: make `private`

Follow up on 2232.

This property was previously not made `private` as it is used by the `EscapeOutput` sniff. For consistency with other classes and to better protect the value of the property, I'm proposing to make it `private` now anyway and add a `get_safe_cast_tokens()` method to retrieve the list.

This prevents potential problems if external standards would attempt to adjust the list (which they could while the property was `public static`, even though the class is `final`).
---
 WordPress/Helpers/ContextHelper.php               | 15 +++++++++++++--
 WordPress/Sniffs/Security/EscapeOutputSniff.php   |  2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.php |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 757479e46d..280989d48f 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -34,11 +34,11 @@ final class ContextHelper {
 	 *
 	 * @since 1.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
-	 *              - The property visibility was changed from `protected` to `public static`.
+	 *              - The property visibility was changed from `protected` to `private static`.
 	 *
 	 * @var array
 	 */
-	public static $safe_casts = array(
+	private static $safe_casts = array(
 		\T_INT_CAST    => true,
 		\T_DOUBLE_CAST => true,
 		\T_BOOL_CAST   => true,
@@ -306,6 +306,17 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 		return false;
 	}
 
+	/**
+	 * Retrieve a list of the tokens which are regarded as "safe casts".
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array<string, bool>
+	 */
+	public static function get_safe_cast_tokens() {
+		return self::$safe_casts;
+	}
+
 	/**
 	 * Check if something is being casted to a safe value.
 	 *
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 4eed80f46d..0f00efcf0c 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -340,7 +340,7 @@ public function process_token( $stackPtr ) {
 			$watch = false;
 
 			// Allow int/double/bool casted variables.
-			if ( isset( ContextHelper::$safe_casts[ $this->tokens[ $i ]['code'] ] ) ) {
+			if ( isset( ContextHelper::get_safe_cast_tokens()[ $this->tokens[ $i ]['code'] ] ) ) {
 				$in_cast = true;
 				continue;
 			}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5468176b4e..4664245d45 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -21,6 +21,7 @@
  * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
+ * @covers \WordPressCS\WordPress\Helpers\ContextHelper::get_safe_cast_tokens
  * @covers \WordPressCS\WordPress\Helpers\ConstantsHelper::is_use_of_global_constant
  * @covers \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait
  * @covers \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait

From 9d7305924207be9558ba995a3af87f3fad18a5c8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:04:02 +0200
Subject: [PATCH 586/822] ArrayWalkingFunctionsHelper: make sure function names
 are checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniffs didn't actually lowercase the name before passing it to the Helper class methods, so the sniffs would throw false positives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `EscapeOutput` sniff and the `ValidatedSanitizedInput` sniff.
---
 WordPress/Helpers/ArrayWalkingFunctionsHelper.php             | 4 ++--
 WordPress/Tests/Security/EscapeOutputUnitTest.inc             | 2 +-
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
index 97f1c24d46..ed7a1d0a03 100644
--- a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
+++ b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
@@ -71,7 +71,7 @@ public static function get_array_walking_functions() {
 	 * @return bool
 	 */
 	public static function is_array_walking_function( $functionName ) {
-		return isset( self::$arrayWalkingFunctions[ $functionName ] );
+		return isset( self::$arrayWalkingFunctions[ strtolower( $functionName ) ] );
 	}
 
 	/**
@@ -93,7 +93,7 @@ public static function get_callback_parameter( File $phpcsFile, $stackPtr ) {
 			return false;
 		}
 
-		$functionName = $tokens[ $stackPtr ]['content'];
+		$functionName = strtolower( $tokens[ $stackPtr ]['content'] );
 		if ( isset( self::$arrayWalkingFunctions[ $functionName ] ) === false ) {
 			return false;
 		}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index 5b618fb78e..c0e1be18c7 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -171,7 +171,7 @@ echo implode( '<br>', urlencode_deep( $items ) ); // Ok.
 echo implode( '<br>', array_map( 'esc_html', $items ) ); // Ok.
 echo implode( '<br>', array_map( 'foo', $items ) ); // Bad.
 echo join( '<br>', $items ); // Bad.
-echo join( '<br>', array_map( 'esc_html', $items ) ); // Ok.
+echo join( '<br>', Array_Map( 'esc_html', $items ) ); // Ok.
 
 echo '<option name="' . esc_attr( $name ) . '"' .
      ( $name === $selected ? ' selected' : '' ) .
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 402a40565e..b2b6c49fb2 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -103,7 +103,7 @@ $current_tax_slug = isset( $_GET['a'] ) ? sanitize_text_field( wp_unslash( $_GET
 
 echo sanitize_text_field( $_POST['foo545'] ); // Error for no validation, unslashing.
 echo array_map( 'sanitize_text_field', $_GET['test'] ); // Bad, no unslashing.
-echo array_map( 'sanitize_key', $_GET['test'] ); // Ok.
+echo Array_Map( 'sanitize_key', $_GET['test'] ); // Ok.
 
 foo( absint( $_GET['foo'] ) ); // Ok.
 $ids = array_map( 'absint', $_GET['test'] ); // Ok.

From 745b1623ac67750dde37086afd180e92823cc604 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:07:58 +0200
Subject: [PATCH 587/822] FormattingFunctionsHelper: make sure function names
 are checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniffs didn't actually lowercase the name before passing it to the Helper class methods, so the sniffs would throw false positives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `PreparedSQL` sniff and the `EscapeOutput` sniff.
---
 WordPress/Helpers/FormattingFunctionsHelper.php   | 2 +-
 WordPress/Tests/DB/PreparedSQLUnitTest.1.inc      | 2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/FormattingFunctionsHelper.php b/WordPress/Helpers/FormattingFunctionsHelper.php
index babfada020..88430098df 100644
--- a/WordPress/Helpers/FormattingFunctionsHelper.php
+++ b/WordPress/Helpers/FormattingFunctionsHelper.php
@@ -56,6 +56,6 @@ final class FormattingFunctionsHelper {
 	 * @return bool
 	 */
 	public static function is_formatting_function( $functionName ) {
-		return isset( self::$formattingFunctions[ $functionName ] );
+		return isset( self::$formattingFunctions[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
index 0eb8f28a81..e9124c4a97 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.1.inc
@@ -79,7 +79,7 @@ $all_post_meta = $wpdb->get_results( $wpdb->prepare( sprintf( <<<'ND'
 		AND `post_id` IN (%s)
 ND
 	, $wpdb->postmeta,
-	implode( ',', array_fill( 0, count( $post_ids ), '%d' ) )
+	IMPLODE( ',', array_fill( 0, count( $post_ids ), '%d' ) )
 ), $post_ids ) ); // OK.
 
 wpdb::prepare( "SELECT * FROM $wpdb?->posts WHERE post_title LIKE '" . foo() . "';" ); // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index c0e1be18c7..a08c5675fd 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -303,7 +303,7 @@ _deprecated_file(); // Ignore.
 
 // Issue #1246.
 echo antispambot( 'john.doe@mysite.com' ); // OK.
-echo antispambot( esc_html( $email ) ); // OK.
+echo antiSpambot( esc_html( $email ) ); // OK.
 echo antispambot( $email ); // Bad.
 
 /*

From 31fa7641c31886b4c5eeaeb6df2352dc712442bf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:44:58 +0200
Subject: [PATCH 588/822] UnslashingFunctionsHelper: make sure function names
 are checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniff didn't actually lowercase the name before passing it to the Helper class methods, so the sniff would throw false positives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `ValidatedSanitizedInput` sniff.
---
 WordPress/Helpers/UnslashingFunctionsHelper.php                | 2 +-
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/UnslashingFunctionsHelper.php b/WordPress/Helpers/UnslashingFunctionsHelper.php
index 0ff0a2beaa..dd2bc17550 100644
--- a/WordPress/Helpers/UnslashingFunctionsHelper.php
+++ b/WordPress/Helpers/UnslashingFunctionsHelper.php
@@ -54,6 +54,6 @@ public static function get_unslashing_functions() {
 	 * @return bool
 	 */
 	public static function is_unslashing_function( $functionName ) {
-		return isset( self::$unslashingFunctions[ $functionName ] );
+		return isset( self::$unslashingFunctions[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index b2b6c49fb2..1fa22be333 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -113,7 +113,7 @@ if ( is_array( $_GET['test'] ) ) {} // Ok.
 output( "some string \$_POST[some_var]" ); // Ok.
 output( "some string \\$_POST[some_var] $_GET[evil]" ); // Bad x2.
 
-echo esc_html( wp_strip_all_tags( wp_unslash( $_GET['a'] ) ) ); // Ok.
+echo esc_html( wp_strip_all_tags( WP_Unslash( $_GET['a'] ) ) ); // Ok.
 
 // Test validation check vs anonymous functions.
 isset( $_POST['abc'] ); // Validation in global scope, not function scope.

From baf95127b9f9122f1beb077be2d1e83512ed78f3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 19:55:03 +0200
Subject: [PATCH 589/822] EscapingFunctionsTrait: make sure function names are
 checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniff didn't actually lowercase the name before passing it to the trait methods, so the sniff would throw false positives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `EscapeOutput` sniff.
---
 WordPress/Helpers/EscapingFunctionsTrait.php      | 4 ++--
 WordPress/Tests/Security/EscapeOutputUnitTest.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index d66ba2992f..d4664775aa 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -223,7 +223,7 @@ public function is_escaping_function( $functionName ) {
 			$this->addedCustomEscapingFunctions['escape'] = $this->customEscapingFunctions;
 		}
 
-		return isset( $this->allEscapingFunctions[ $functionName ] );
+		return isset( $this->allEscapingFunctions[ strtolower( $functionName ) ] );
 	}
 
 	/**
@@ -247,6 +247,6 @@ public function is_auto_escaped_function( $functionName ) {
 			$this->addedCustomEscapingFunctions['autoescape'] = $this->customAutoEscapedFunctions;
 		}
 
-		return isset( $this->allAutoEscapedFunctions[ $functionName ] );
+		return isset( $this->allAutoEscapedFunctions[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index a08c5675fd..c4e429ac37 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -15,7 +15,7 @@ while ( have_posts() ) {
 ?>
 
 <h2><?php echo $title; // Bad. ?></h2>
-<h2><?php echo esc_html( $title ); // OK. ?></h2>
+<h2><?php echo esc_HTML( $title ); // OK. ?></h2>
 <h2><?php echo apply_filters( 'the_title', $title ); // Bad, no escaping function. ?></h2>
 
 <?php
@@ -138,7 +138,7 @@ _doing_it_wrong( __METHOD__, "Invalid value for the 'bob' argument " . esc_html(
 trigger_error( "There was an error: {$message}", E_USER_NOTICE ); // Bad.
 trigger_error( "There was an error: " . esc_html( $message ), E_USER_NOTICE ); // Ok.
 
-echo '<p>' . sprintf( esc_html__( 'Some text -> %sLink text%s', 'textdomain' ), '<a href="' . esc_url( add_query_arg( array( 'page' => 'my_page' ), admin_url( 'admin.php' ) ) ) . '">', '</a>' ). '</p>'; // Ok.
+echo '<p>' . sprintf( esc_html__( 'Some text -> %sLink text%s', 'textdomain' ), '<a href="' . Esc_Url( add_query_arg( array( 'page' => 'my_page' ), admin_url( 'admin.php' ) ) ) . '">', '</a>' ). '</p>'; // Ok.
 
 echo '<br/><strong>' . sprintf( esc_html__( 'Found %d results', 'textdomain' ), (int) $result_count ) . '</strong><br/><br/>'; // Ok.
 

From 53309ac1f26d945268534c8f7f8ccb6080147a13 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:12:18 +0200
Subject: [PATCH 590/822] PrintingFunctionsTrait: make sure function names are
 checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniff didn't actually lowercase the name before passing it to the trait method, so the sniff would throw false negatives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `EscapeOutput` sniff.
---
 WordPress/Helpers/PrintingFunctionsTrait.php      | 2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
index a3a525878b..ff1df2b190 100644
--- a/WordPress/Helpers/PrintingFunctionsTrait.php
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -107,6 +107,6 @@ public function is_printing_function( $functionName ) {
 			$this->addedCustomPrintingFunctions = $this->customPrintingFunctions;
 		}
 
-		return isset( $this->allPrintingFunctions[ $functionName ] );
+		return isset( $this->allPrintingFunctions[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
index c4e429ac37..b7a606bfc8 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.inc
@@ -128,7 +128,7 @@ echo $html_fragment; // WPCS: XSS whitelist.
 ?><?php echo $html_fragment; // XSS pass. ?><?php
 
 _deprecated_function( __FUNCTION__, '1.3.0', 'another_func' ); // Ok.
-_deprecated_function( __FUNCTION__, '1.3.0', $another_func ); // Bad.
+_Deprecated_Function( __FUNCTION__, '1.3.0', $another_func ); // Bad.
 _deprecated_function( __FUNCTION__, '1.3.0', esc_html( $another_func ) ); // Ok.
 _deprecated_file( __FILE__, '1.3.0' ); // Ok.
 _deprecated_argument( __METHOD__, '1.3.0', 'The $arg is deprecated.' ); // Ok.
@@ -261,7 +261,7 @@ echo esc_html_x( $some_nasty_var, 'context' ); // Ok.
 echo PHP_VERSION_ID, PHP_VERSION, PHP_EOL, PHP_EXTRA_VERSION; // OK.
 
 trigger_error( 'DEBUG INFO - ' . __METHOD__ . '::internal_domains: domain = ' . $domain ); // Bad.
-trigger_error( $domain ); // Bad.
+Trigger_ERROR( $domain ); // Bad.
 
 vprintf( 'Hello %s', [ $foo ] ); // Bad.
 vprintf( 'Hello %s', [ esc_html( $foo ) ] ); // Ok.

From 7455b6fca81ee7bc43a3f23ac3db0fbaa49782e4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:43:07 +0200
Subject: [PATCH 591/822] SanitizingFunctionsTrait: make sure function names
 are checked case-insensitively

These functions should be self-contained, so should not presume that the sniff has already lowercased the function name before passing it.

This fixes a bug as, in this case, the sniffs didn't actually lowercase the name before passing it to the Helper class methods, so the sniffs would throw false positives for non-lowercase function calls.

Tested by adjusting some pre-existing tests for the `ValidatedSanitizedInput` sniff.
---
 WordPress/Helpers/SanitizingFunctionsTrait.php                | 4 ++--
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizingFunctionsTrait.php
index f51d3f4e09..1ab8a41dbf 100644
--- a/WordPress/Helpers/SanitizingFunctionsTrait.php
+++ b/WordPress/Helpers/SanitizingFunctionsTrait.php
@@ -220,7 +220,7 @@ public function get_sanitizing_and_unslashing_functions() {
 	 * @return bool
 	 */
 	public function is_sanitizing_function( $functionName ) {
-		return isset( $this->get_sanitizing_functions()[ $functionName ] );
+		return isset( $this->get_sanitizing_functions()[ strtolower( $functionName ) ] );
 	}
 
 	/**
@@ -233,6 +233,6 @@ public function is_sanitizing_function( $functionName ) {
 	 * @return bool
 	 */
 	public function is_sanitizing_and_unslashing_function( $functionName ) {
-		return isset( $this->get_sanitizing_and_unslashing_functions()[ $functionName ] );
+		return isset( $this->get_sanitizing_and_unslashing_functions()[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 1fa22be333..90dfd3322b 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -94,7 +94,7 @@ switch ( do_something( wp_unslash( $_POST['foo'] ) ) ) {} // Bad.
 
 // Sanitization is required even when the value is being escaped.
 echo esc_html( wp_unslash( $_POST['foo'] ) ); // Bad.
-echo esc_html( sanitize_text_field( wp_unslash( $_POST['foo'] ) ) ); // Ok.
+echo esc_html( Sanitize_Text_Field( wp_unslash( $_POST['foo'] ) ) ); // Ok.
 
 $current_tax_slug = isset( $_GET['a'] ) ? sanitize_key( $_GET['a'] ) : false; // Ok.
 $current_tax_slug = isset( $_GET['a'] ) ? $_GET['a'] : false; // Bad x 2
@@ -105,7 +105,7 @@ echo sanitize_text_field( $_POST['foo545'] ); // Error for no validation, unslas
 echo array_map( 'sanitize_text_field', $_GET['test'] ); // Bad, no unslashing.
 echo Array_Map( 'sanitize_key', $_GET['test'] ); // Ok.
 
-foo( absint( $_GET['foo'] ) ); // Ok.
+foo( AbsINT( $_GET['foo'] ) ); // Ok.
 $ids = array_map( 'absint', $_GET['test'] ); // Ok.
 
 if ( is_array( $_GET['test'] ) ) {} // Ok.

From afa064572e885823d77565a8a96e1f0f0b2b9f31 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 21:36:15 +0200
Subject: [PATCH 592/822] Security/PluginMenuSlug: order functions list
 alphabetically

The list of functions has been verified against WP Core. No changes were needed.
---
 .../Sniffs/Security/PluginMenuSlugSniff.php   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index 7f9fdacfe9..ae565d2ac0 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -51,50 +51,50 @@ final class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 	 *                                         keys and parameter names as the values
 	 */
 	protected $target_functions = array(
-		'add_menu_page'       => array(
+		'add_comments_page'   => array(
 			4 => 'menu_slug',
 		),
-		'add_object_page'     => array(
+		'add_dashboard_page'  => array(
 			4 => 'menu_slug',
 		),
-		'add_utility_page'    => array(
+		'add_links_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_submenu_page'    => array(
-			1 => 'parent_slug',
-			5 => 'menu_slug',
+		'add_management_page' => array(
+			4 => 'menu_slug',
 		),
-		'add_dashboard_page'  => array(
+		'add_media_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_posts_page'      => array(
+		'add_menu_page'       => array(
 			4 => 'menu_slug',
 		),
-		'add_media_page'      => array(
+		'add_object_page'     => array(
 			4 => 'menu_slug',
 		),
-		'add_links_page'      => array(
+		'add_options_page'    => array(
 			4 => 'menu_slug',
 		),
 		'add_pages_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_comments_page'   => array(
+		'add_plugins_page'    => array(
 			4 => 'menu_slug',
 		),
-		'add_theme_page'      => array(
+		'add_posts_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_plugins_page'    => array(
-			4 => 'menu_slug',
+		'add_submenu_page'    => array(
+			1 => 'parent_slug',
+			5 => 'menu_slug',
 		),
-		'add_users_page'      => array(
+		'add_theme_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_management_page' => array(
+		'add_users_page'      => array(
 			4 => 'menu_slug',
 		),
-		'add_options_page'    => array(
+		'add_utility_page'    => array(
 			4 => 'menu_slug',
 		),
 	);

From 574b7bb192f0686c9d8d32bc4c68f61517ac6f9a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 01:47:18 +0200
Subject: [PATCH 593/822] NamingConventions/PrefixAllGlobals: make the "is PHP
 native polyfill ?" check case-insensitive

The `PrefixAllGlobals` sniff has a tolerance for non-prefixed polyfills for PHP native functions. This check, however, did a case-sensitive comparison, while PHP natively treats function names case-insensitively.

Fixed now.

Includes tests.
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php     | 4 +++-
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 03e72181af..e02a2ee650 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -218,6 +218,7 @@ public function register() {
 		// Get a list of all PHP native functions.
 		$all_functions            = get_defined_functions();
 		$this->built_in_functions = array_flip( $all_functions['internal'] );
+		$this->built_in_functions = array_change_key_case( $this->built_in_functions, \CASE_LOWER );
 
 		// Set the sniff targets.
 		$targets  = array(
@@ -413,7 +414,8 @@ public function process_token( $stackPtr ) {
 					}
 
 					$item_name = FunctionDeclarations::getName( $this->phpcsFile, $stackPtr );
-					if ( isset( $this->built_in_functions[ $item_name ] ) ) {
+					$item_lc   = strtolower( $item_name );
+					if ( isset( $this->built_in_functions[ $item_lc ] ) ) {
 						// Backfill for PHP native function.
 						return;
 					}
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index 96677caecc..fedc9cce9c 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -644,4 +644,11 @@ function acronym_only_check_global_statement_in_current_scope() {
 	$something = 'value'; // OK, global statement is in different scope.
 }
 
+/*
+ * Safeguard that function name comparisons for PHP native function polyfills are done case-insensitively.
+ */
+if ( function_exists( 'stripos' ) ) {
+	function striPos() {}
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From 56c38cdac4fe4d7463eecc5a43daa5bf658bae0e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 04:03:08 +0200
Subject: [PATCH 594/822] PHP/StrictInArray: rename a local variable

... to a more logical name (as the parameter in PHP was renamed, but our local variable name which included that name was not updated).
---
 WordPress/Sniffs/PHP/StrictInArraySniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 9cf92719d6..0d0f57463e 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -94,8 +94,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 * this code will need to be adjusted to handle those.
 		 */
 		if ( false === $param_info['always_needed'] ) {
-			$has_search = PassedParameters::getParameterFromStack( $parameters, 2, 'filter_value' );
-			if ( false === $has_search ) {
+			$has_filter_value = PassedParameters::getParameterFromStack( $parameters, 2, 'filter_value' );
+			if ( false === $has_filter_value ) {
 				return;
 			}
 		}

From 26fbf495923b2f2d96f99886e31afac3a88d5a93 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 06:45:42 +0200
Subject: [PATCH 595/822] NamingConventions/ValidVariableName: re-order member
 names + remove one

... as it is no longer used in WP Core.
---
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php      | 5 ++---
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php    | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index a61c420f1e..c62f0aef66 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -66,12 +66,11 @@ final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * @var array
 	 */
 	protected $allowed_mixed_case_member_var_names = array(
-		'ID'                => true,
 		'comment_ID'        => true,
+		'comment_author_IP' => true,
 		'comment_post_ID'   => true,
+		'ID'                => true,
 		'post_ID'           => true,
-		'comment_author_IP' => true,
-		'cat_ID'            => true,
 	);
 
 	/**
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 467924b686..65c15b4a1e 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -71,7 +71,8 @@ public function getErrorList() {
 			103 => 1,
 			104 => 1,
 			105 => 1,
-			121 => 1,
+			120 => 1,
+			121 => 2,
 			126 => 1,
 			138 => 1,
 			145 => 1,

From 5cd7c45d3c28b2dd6cd0e810978d400f9f2c63d8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:13:51 +0200
Subject: [PATCH 596/822] WP/DiscouragedConstants: use the `ConstantsHelper`
 class

Cricky... not sure why none of us ever noticed this, but we had a huge chunk of duplicate code here, which can be removed by letting the sniff use the utility method.

Includes one minor tweak to the utility method.

Includes additional test which would previously have failed.
---
 WordPress/Helpers/ConstantsHelper.php         |  1 -
 .../Sniffs/WP/DiscouragedConstantsSniff.php   | 82 +------------------
 .../Tests/WP/DiscouragedConstantsUnitTest.inc |  2 +
 3 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index 5236329f98..2c82401bb8 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -77,7 +77,6 @@ public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
 			\T_INSTANCEOF      => true,
 			\T_INSTEADOF       => true,
 			\T_GOTO            => true,
-			\T_AS              => true,
 		);
 		$tokens_to_ignore += Tokens::$ooScopeTokens;
 		$tokens_to_ignore += Collections::objectOperators();
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 40a0ad14bb..d6eb617d9d 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -10,13 +10,11 @@
 namespace WordPressCS\WordPress\Sniffs\WP;
 
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\PassedParameters;
-use PHPCSUtils\Utils\Scopes;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
-use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\ConstantsHelper;
 
 /**
  * Warns against usage of discouraged WP CONSTANTS and recommends alternatives.
@@ -65,32 +63,6 @@ final class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 		),
 	);
 
-	/**
-	 * Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a constant.
-	 *
-	 * Additional tokens are added from within the contructor.
-	 *
-	 * @var array
-	 */
-	private $preceding_tokens_to_ignore = array(
-		\T_NAMESPACE       => true,
-		\T_USE             => true,
-		\T_EXTENDS         => true,
-		\T_IMPLEMENTS      => true,
-		\T_NEW             => true,
-		\T_FUNCTION        => true,
-		\T_INSTANCEOF      => true,
-		\T_GOTO            => true,
-	);
-
-	/**
-	 * Constructor to enrich a property.
-	 */
-	public function __construct() {
-		$this->preceding_tokens_to_ignore += Tokens::$ooScopeTokens;
-		$this->preceding_tokens_to_ignore += Collections::objectOperators();
-	}
-
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
@@ -129,60 +101,10 @@ public function process_arbitrary_tstring( $stackPtr ) {
 			return;
 		}
 
-		$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-		if ( false !== $next && \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code'] ) {
-			// Function call or declaration.
-			return;
-		}
-
-		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
-		if ( false !== $prev && isset( $this->preceding_tokens_to_ignore[ $this->tokens[ $prev ]['code'] ] ) ) {
-			// Not the use of a constant.
-			return;
-		}
-
-		if ( ContextHelper::is_token_namespaced( $this->phpcsFile, $stackPtr ) === true ) {
-			// Namespaced constant of the same name.
-			return;
-		}
-
-		if ( false !== $prev
-			&& \T_CONST === $this->tokens[ $prev ]['code']
-			&& true === Scopes::isOOConstant( $this->phpcsFile, $prev )
-		) {
-			// Class constant of the same name.
+		if ( ConstantsHelper::is_use_of_global_constant( $this->phpcsFile, $stackPtr ) === false ) {
 			return;
 		}
 
-		/*
-		 * Deal with a number of variations of use statements.
-		 */
-		for ( $i = $stackPtr; $i > 0; $i-- ) {
-			if ( $this->tokens[ $i ]['line'] !== $this->tokens[ $stackPtr ]['line'] ) {
-				break;
-			}
-		}
-
-		$first_on_line = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
-		if ( false !== $first_on_line && \T_USE === $this->tokens[ $first_on_line ]['code'] ) {
-			$next_on_line = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $first_on_line + 1 ), null, true );
-			if ( false !== $next_on_line ) {
-				if ( \T_STRING === $this->tokens[ $next_on_line ]['code']
-					&& 'const' === $this->tokens[ $next_on_line ]['content']
-				) {
-					$has_ns_sep = $this->phpcsFile->findNext( \T_NS_SEPARATOR, ( $next_on_line + 1 ), $stackPtr );
-					if ( false !== $has_ns_sep ) {
-						// Namespaced const (group) use statement.
-						return;
-					}
-				} else {
-					// Not a const use statement.
-					return;
-				}
-			}
-		}
-
-		// Ok, this is really one of the discouraged constants.
 		$this->phpcsFile->addWarning(
 			'Found usage of constant "%s". Use %s instead.',
 			$stackPtr,
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
index 5dc64d8ba5..ea8ae72524 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.inc
@@ -100,3 +100,5 @@ enum ContainsConst {
 	const STYLESHEETPATH = 'something';
 	private function STYLESHEETPATH() {}
 }
+
+echo HEADER_TEXTCOLOR::$var; // OK.

From 2f7c31f42430f2133bd9d081bea74c48921a229f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 02:58:33 +0200
Subject: [PATCH 597/822] Docs: clarify the `$matched_content` parameter

When the `$matched_content` param is passed from the `AbstractFunctionRestrictionsSniff` or, by extension, from the `AbstractFunctionParameterSniff``, it will always already be in lowercase.

When the `$matched_content` param is passed from the `AbstractClassRestrictionsSniff` sniff it will be in its original case.

This commit updates the docs of all involved methods to include information about the case of the content of `$matched_content` to clarify this.

Includes removing two unnecessary calls to `strtolower()` in child classes.

Includes overloading the `process_matched_token()` method in the `AbstractClassRestrictionsSniff`, not because the code does anything different, but only to ensure the docblock annotates correctly that in child classes of that abstract the `$matched_content` will be in its original case.
---
 WordPress/AbstractClassRestrictionsSniff.php  | 20 +++++++++++++
 WordPress/AbstractFunctionParameterSniff.php  |  9 ++++--
 .../AbstractFunctionRestrictionsSniff.php     |  3 +-
 .../EscapedNotTranslatedSniff.php             |  3 +-
 .../DateTime/CurrentTimeTimestampSniff.php    |  3 +-
 .../PrefixAllGlobalsSniff.php                 |  3 +-
 .../NamingConventions/ValidHookNameSniff.php  |  3 +-
 .../ValidPostTypeSlugSniff.php                |  3 +-
 WordPress/Sniffs/PHP/IniSetSniff.php          |  3 +-
 .../Sniffs/PHP/PregQuoteDelimiterSniff.php    |  3 +-
 WordPress/Sniffs/PHP/StrictInArraySniff.php   |  3 +-
 .../Sniffs/Security/PluginMenuSlugSniff.php   |  3 +-
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php |  6 ++--
 .../Sniffs/WP/AlternativeFunctionsSniff.php   |  3 +-
 WordPress/Sniffs/WP/CapabilitiesSniff.php     |  6 ++--
 WordPress/Sniffs/WP/ClassNameCaseSniff.php    |  1 +
 .../Sniffs/WP/DeprecatedClassesSniff.php      |  3 +-
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    | 15 +++++-----
 .../WP/DeprecatedParameterValuesSniff.php     |  6 ++--
 .../Sniffs/WP/DeprecatedParametersSniff.php   |  3 +-
 .../Sniffs/WP/DiscouragedConstantsSniff.php   |  6 ++--
 .../WP/EnqueuedResourceParametersSniff.php    |  3 +-
 WordPress/Sniffs/WP/I18nSniff.php             | 30 ++++++++++++-------
 23 files changed, 96 insertions(+), 45 deletions(-)

diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index bd3b7aa949..65af629555 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -191,6 +191,26 @@ public function check_for_matches( $stackPtr ) {
 		return min( $skip_to );
 	}
 
+	/**
+	 * Process a matched token.
+	 *
+	 * @since 0.11.0 Split out from the `process()` method.
+	 *
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $group_name      The name of the group which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in it original case.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 *
+	 * @phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
+	 */
+	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
+		parent::process_matched_token( $stackPtr, $group_name, $matched_content );
+	}
+	// phpcs:enable
+
 	/**
 	 * Prepare the class name for use in a regular expression.
 	 *
diff --git a/WordPress/AbstractFunctionParameterSniff.php b/WordPress/AbstractFunctionParameterSniff.php
index 974edf116a..de3a94fb07 100644
--- a/WordPress/AbstractFunctionParameterSniff.php
+++ b/WordPress/AbstractFunctionParameterSniff.php
@@ -62,7 +62,8 @@ public function getGroups() {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
@@ -85,7 +86,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
@@ -101,7 +103,8 @@ abstract public function process_parameters( $stackPtr, $group_name, $matched_co
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index d9f1c1774e..186f01e881 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -320,7 +320,8 @@ public function check_for_matches( $stackPtr ) {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index cca0a8c50d..76d1d53bc2 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -57,7 +57,8 @@ final class EscapedNotTranslatedSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 6cac190e09..5d20f5866c 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -59,7 +59,8 @@ final class CurrentTimeTimestampSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 03e72181af..b5073b0f3f 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -806,7 +806,8 @@ protected function process_list_assignment( $stackPtr ) {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index c04461dff4..77decc4803 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -87,7 +87,8 @@ public function getGroups() {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 8b880f5648..7c5de5e79b 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -117,7 +117,8 @@ public function register() {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param array  $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index e6d825739f..0ce252b685 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -137,7 +137,8 @@ final class IniSetSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index 2041468b88..91c1820ae9 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -50,7 +50,8 @@ final class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 9cf92719d6..fde2afaeab 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -77,7 +77,8 @@ final class StrictInArraySniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index 7f9fdacfe9..4b3f369e89 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -106,7 +106,8 @@ final class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index e2a90d52af..88116e0b6d 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -467,7 +467,8 @@ public function process_token( $stackPtr ) {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
@@ -594,7 +595,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return void
 	 */
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 3269bf2caa..3c50c34efd 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -214,7 +214,8 @@ public function getGroups() {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 583a9e5160..cc185ad795 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -352,14 +352,14 @@ final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param array  $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$function_name_lc = strtolower( $matched_content );
-		$function_details = $this->target_functions[ $function_name_lc ];
+		$function_details = $this->target_functions[ $matched_content ];
 
 		$parameter = PassedParameters::getParameterFromStack(
 			$parameters,
diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index d974210e6f..11a622b073 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -630,6 +630,7 @@ public function getGroups() {
 	 * @param string $group_name      The name of the group which was matched. Will
 	 *                                always be 'wp_classes'.
 	 * @param string $matched_content The token content (class name) which was matched.
+	 *                                in its original case.
 	 *
 	 * @return void
 	 */
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index b79ac75e1d..3dabfaca77 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -91,7 +91,8 @@ public function getGroups() {
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched. Will
 	 *                                always be 'deprecated_classes'.
-	 * @param string $matched_content The token content (class name) which was matched.
+	 * @param string $matched_content The token content (class name) which was matched
+	 *                                in its original case.
 	 *
 	 * @return void
 	 */
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index c58390b665..c83aadafe5 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -1520,7 +1520,8 @@ public function getGroups() {
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched. Will
 	 *                                always be 'deprecated_functions'.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return void
 	 */
@@ -1528,24 +1529,22 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		$this->set_minimum_wp_version();
 
-		$function_name = strtolower( $matched_content );
-
 		$message = '%s() has been deprecated since WordPress version %s.';
 		$data    = array(
-			$matched_content,
-			$this->deprecated_functions[ $function_name ]['version'],
+			$this->tokens[ $stackPtr ]['content'],
+			$this->deprecated_functions[ $matched_content ]['version'],
 		);
 
-		if ( ! empty( $this->deprecated_functions[ $function_name ]['alt'] ) ) {
+		if ( ! empty( $this->deprecated_functions[ $matched_content ]['alt'] ) ) {
 			$message .= ' Use %s instead.';
-			$data[]   = $this->deprecated_functions[ $function_name ]['alt'];
+			$data[]   = $this->deprecated_functions[ $matched_content ]['alt'];
 		}
 
 		MessageHelper::addMessage(
 			$this->phpcsFile,
 			$message,
 			$stackPtr,
-			( $this->wp_version_compare( $this->deprecated_functions[ $function_name ]['version'], $this->minimum_wp_version, '<' ) ),
+			( $this->wp_version_compare( $this->deprecated_functions[ $matched_content ]['version'], $this->minimum_wp_version, '<' ) ),
 			MessageHelper::stringToErrorcode( $matched_content . 'Found' ),
 			$data
 		);
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index fbe0d8a376..89915bc1d5 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -218,7 +218,8 @@ final class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSnif
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
@@ -243,7 +244,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 	 *
 	 * @since 1.0.0
 	 *
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameter       Array with start and end token positon of the parameter.
 	 * @param array  $parameter_args  Array with alternative and WordPress deprecation version of the parameter.
 	 *
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index a3a4ace94e..ca1c2f1bf3 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -316,7 +316,8 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 40a0ad14bb..c9c2e6df9b 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -201,14 +201,14 @@ public function process_arbitrary_tstring( $stackPtr ) {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
 	 */
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
-		$function_name = strtolower( $matched_content );
-		$target_param  = $this->target_functions[ $function_name ];
+		$target_param = $this->target_functions[ $matched_content ];
 
 		// Was the target parameter passed ?
 		$found_param = PassedParameters::getParameterFromStack( $parameters, $target_param['position'], $target_param['name'] );
diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index d2370f1b5b..47b82247b5 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -114,7 +114,8 @@ public function register() {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 4c97f934b9..f835bc34cf 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -262,7 +262,8 @@ public function process_token( $stackPtr ) {
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return void
 	 */
@@ -293,7 +294,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return void
 	 */
@@ -318,7 +320,8 @@ public function process_no_parameters( $stackPtr, $group_name, $matched_content
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
 	 * @param string $group_name      The name of the group which was matched.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void
@@ -408,7 +411,8 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 	 * @since 3.0.0 Check moved from the `process_matched_token()` method to this method.
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      The parameters array.
 	 * @param int    $expected_count  The expected number of passed arguments.
 	 *
@@ -434,7 +438,8 @@ private function check_argument_count( $stackPtr, $matched_content, $parameters,
 	 * @since 3.0.0 Most of the logic in this method used to be contained in the, now removed, `check_argument_tokens()` method.
 	 *
 	 * @param int         $stackPtr        The position of the current token in the stack.
-	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $matched_content The token content (function name) which was matched
+	 *                                     in lowercase.
 	 * @param string      $param_name      The name of the parameter being examined.
 	 * @param array|false $param_info      Parameter info array for an individual parameter,
 	 *                                     as received from the PassedParemeters class.
@@ -534,7 +539,8 @@ private function check_argument_is_string_literal( $stackPtr, $matched_content,
 	 *
 	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_argument_tokens()` method.
 	 *
-	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $matched_content The token content (function name) which was matched
+	 *                                     in lowercase.
 	 * @param string      $param_name      The name of the parameter being examined.
 	 * @param array|false $param_info      Parameter info array for an individual parameter,
 	 *                                     as received from the PassedParemeters class.
@@ -625,7 +631,8 @@ private function check_textdomain_matches( $matched_content, $param_name, $param
 	 *
 	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
 	 *
-	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $matched_content The token content (function name) which was matched
+	 *                                     in lowercase.
 	 * @param string      $param_name      The name of the parameter being examined.
 	 * @param array|false $param_info      Parameter info array for an individual parameter,
 	 *                                     as received from the PassedParemeters class.
@@ -706,7 +713,8 @@ private function check_placeholders_in_string( $matched_content, $param_name, $p
 	 *
 	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
 	 *
-	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $matched_content The token content (function name) which was matched
+	 *                                     in lowercase.
 	 * @param string      $param_name      The name of the parameter being examined.
 	 * @param array|false $param_info      Parameter info array for an individual parameter,
 	 *                                     as received from the PassedParemeters class.
@@ -740,7 +748,8 @@ private function check_string_has_translatable_content( $matched_content, $param
 	 *
 	 * @since 3.0.0 The logic in this method used to be contained in the, now removed, `check_text()` method.
 	 *
-	 * @param string      $matched_content The token content (function name) which was matched.
+	 * @param string      $matched_content The token content (function name) which was matched
+	 *                                     in lowercase.
 	 * @param string      $param_name      The name of the parameter being examined.
 	 * @param array|false $param_info      Parameter info array for an individual parameter,
 	 *                                     as received from the PassedParemeters class.
@@ -839,7 +848,8 @@ private function compare_single_and_plural_arguments( $stackPtr, $param_info_sin
 	 *              - The method visibility has been changed from `protected` to `private`.
 	 *
 	 * @param int    $stackPtr        The position of the gettext call token in the stack.
-	 * @param string $matched_content The token content (function name) which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
 	 *
 	 * @return void

From 5a708ae87bb0f8dba3fd042fff63c39c02b501b1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:09:43 +0200
Subject: [PATCH 598/822] Docs: use correct format for `@internal` tags

... which have two meanings:
* `@internal` stand-alone without braces means that a construct is intended for internal use only.
* `{@internal ....}` with a comment means this is a comment for other devs.
---
 WordPress/Helpers/ContextHelper.php                       | 8 ++++----
 WordPress/Helpers/ListHelper.php                          | 4 ++--
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php    | 4 ++--
 WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 757479e46d..adf59355d3 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -115,8 +115,8 @@ final class ContextHelper {
 	/**
 	 * Check if a particular token acts - statically or non-statically - on an object.
 	 *
-	 * @internal Note: this may still mistake a namespaced function imported via a `use` statement for
-	 * a global function!
+	 * {@internal Note: this may still mistake a namespaced function imported via a `use` statement for
+	 * a global function!}
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
@@ -137,8 +137,8 @@ public static function has_object_operator_before( File $phpcsFile, $stackPtr )
 	/**
 	 * Check if a particular token is prefixed with a namespace.
 	 *
-	 * @internal This will give a false positive if the file is not namespaced and the token is prefixed
-	 * with `namespace\`.
+	 * {@internal This will give a false positive if the file is not namespaced and the token is prefixed
+	 * with `namespace\`.}
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index 4078aa2423..84713a9b3b 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -34,8 +34,8 @@ final class ListHelper {
 	/**
 	 * Get a list of the token pointers to the variables being assigned to in a list statement.
 	 *
-	 * @internal No need to take special measures for nested lists. Nested or not,
-	 * each list part can only contain one variable being written to.
+	 * {@internal No need to take special measures for nested lists. Nested or not,
+	 * each list part can only contain one variable being written to.}
 	 *
 	 * @since 2.2.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 03e72181af..9ca8203d8a 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -773,8 +773,8 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 	/**
 	 * Check that global variables declared via a list construct are prefixed.
 	 *
-	 * @internal No need to take special measures for nested lists. Nested or not,
-	 * each list part can only contain one variable being written to.
+	 * {@internal No need to take special measures for nested lists. Nested or not,
+	 * each list part can only contain one variable being written to.}
 	 *
 	 * @since 2.2.0
 	 *
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index c0a13b6f44..70fa404f9d 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -163,8 +163,8 @@ public function process_token( $stackPtr ) {
 	/**
 	 * Check that global variables declared via a list construct are prefixed.
 	 *
-	 * @internal No need to take special measures for nested lists. Nested or not,
-	 * each list part can only contain one variable being written to.
+	 * {@internal No need to take special measures for nested lists. Nested or not,
+	 * each list part can only contain one variable being written to.}
 	 *
 	 * @since 2.2.0
 	 *

From cc74d1431e490bee761d3789364596d55c0989e3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:25:23 +0200
Subject: [PATCH 599/822] Docs: remove redundant comment

Follow up on 2187 which removed the need to reset the `minimum_wp_version` property in test case files to a specific WP version, in favour of allowing a reset to "unset".

This means the version number in the `WP/AlternativeFunctionsUnitTest.inc` test case file doesn't need to be updated anymore when the default value of the `minimum_wp_version` changes, so this comment is now just confusing.
---
 WordPress/Helpers/MinimumWPVersionTrait.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index df39567a83..c7279cd523 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -63,9 +63,6 @@ trait MinimumWPVersionTrait {
 	 *               - The property has been renamed from `$minimum_supported_version` to `$minimum_wp_version`.
 	 *               - The CLI option has been renamed from `minimum_supported_wp_version` to `minimum_wp_version`.
 	 *
-	 * @internal When the value of this property is changed, it will also need
-	 *           to be changed in the `WP/AlternativeFunctionsUnitTest.inc` file.
-	 *
 	 * @var string WordPress version.
 	 */
 	public $minimum_wp_version;

From 83eba3a4f61c07e7b93428d81779a1cd1d8a91ca Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:42:41 +0200
Subject: [PATCH 600/822] WP/AlternativeFunctionsSniff::is_local_data_stream():
 update param name and docs

PR 2169 switched the sniff from using the `'raw'` parameter value to using the `'clean'` (without comments) parameter value, however, the `is_local_data_stream()` method still referred to the `'raw'` value, even though it is now using the `'clean'` value.

Fixed now to prevent future confusion.
---
 WordPress/Sniffs/WP/AlternativeFunctionsSniff.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 3269bf2caa..b70bd1724f 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -345,24 +345,24 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	}
 
 	/**
-	 * Determine based on the "raw" parameter value, whether a file parameter points to
+	 * Determine based on the "clean" parameter value, whether a file parameter points to
 	 * a local data stream.
 	 *
-	 * @param string $raw_param_value Raw parameter value.
+	 * @param string $clean_param_value Parameter value without comments.
 	 *
 	 * @return bool True if this is a local data stream. False otherwise.
 	 */
-	protected function is_local_data_stream( $raw_param_value ) {
+	protected function is_local_data_stream( $clean_param_value ) {
 
-		$raw_stripped = TextStrings::stripQuotes( $raw_param_value );
-		if ( isset( $this->allowed_local_streams[ $raw_stripped ] )
-			|| isset( $this->allowed_local_stream_constants[ $raw_param_value ] )
+		$stripped = TextStrings::stripQuotes( $clean_param_value );
+		if ( isset( $this->allowed_local_streams[ $stripped ] )
+			|| isset( $this->allowed_local_stream_constants[ $clean_param_value ] )
 		) {
 			return true;
 		}
 
 		foreach ( $this->allowed_local_stream_partials as $partial ) {
-			if ( strpos( $raw_stripped, $partial ) === 0 ) {
+			if ( strpos( $stripped, $partial ) === 0 ) {
 				return true;
 			}
 		}

From 0a23302e8d41d7b9fb4f7176ce42369d726b1cb1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 21:15:33 +0200
Subject: [PATCH 601/822] IsUnitTestTrait: make sure namespace and class names
 are checked case-insensitively

As PHP treats namespace names and class names case-insensitively, this helper should do so too.

This is a bug fix as the sniff would previously throw false positives for test classes where the case of the class name/extended class name did not match.

Tested by adding an extra test to the `WordPress.Files.FilesName` sniff.
---
 WordPress/Helpers/IsUnitTestTrait.php         | 26 ++++++++++++++-----
 WordPress/Tests/Files/FileNameUnitTest.php    |  1 +
 .../test-sample-phpunit6-case-insensitive.inc |  3 +++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-phpunit6-case-insensitive.inc

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 85439c40ee..241d61d28c 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -96,7 +96,7 @@ trait IsUnitTestTrait {
 
 		// PHPUnit native test cases.
 		'PHPUnit_Framework_TestCase'                 => true,
-		'PHPUnit\Framework\TestCase'                 => true,
+		'PHPUnit\\Framework\\TestCase'               => true,
 		// PHPUnit native TestCase class when imported via use statement.
 		'TestCase'                                   => true,
 	);
@@ -143,9 +143,15 @@ protected function get_all_test_classes() {
 				}
 			}
 
+			/*
+			 * Lowercase all names, both custom as well as "known", as PHP treats namespaced names case-insensitively.
+			 */
+			$custom_test_classes = array_map( 'strtolower', $custom_test_classes );
+			$known_test_classes  = array_change_key_case( $this->known_test_classes, \CASE_LOWER );
+
 			$this->all_test_classes = RulesetPropertyHelper::merge_custom_array(
 				$custom_test_classes,
-				$this->known_test_classes
+				$known_test_classes
 			);
 
 			// Store the original value so the comparison can succeed.
@@ -184,15 +190,19 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 		// Add any potentially extra custom test classes to the known test classes list.
 		$known_test_classes = $this->get_all_test_classes();
 
+		$namespace = strtolower( Namespaces::determineNamespace( $phpcsFile, $stackPtr ) );
+
 		// Is the class/trait one of the known test classes ?
-		$namespace = Namespaces::determineNamespace( $phpcsFile, $stackPtr );
 		$className = ObjectDeclarations::getName( $phpcsFile, $stackPtr );
-		if ( '' !== $namespace ) {
-			if ( isset( $known_test_classes[ $namespace . '\\' . $className ] ) ) {
+		if ( empty( $className ) === false ) {
+			$className = strtolower( $className );
+			if ( '' !== $namespace ) {
+				if ( isset( $known_test_classes[ $namespace . '\\' . $className ] ) ) {
+					return true;
+				}
+			} elseif ( isset( $known_test_classes[ $className ] ) ) {
 				return true;
 			}
-		} elseif ( isset( $known_test_classes[ $className ] ) ) {
-			return true;
 		}
 
 		// Does the class/trait extend one of the known test classes ?
@@ -201,6 +211,8 @@ protected function is_test_class( File $phpcsFile, $stackPtr ) {
 			return false;
 		}
 
+		$extendedClassName = strtolower( $extendedClassName );
+
 		if ( '\\' === $extendedClassName[0] ) {
 			if ( isset( $known_test_classes[ substr( $extendedClassName, 1 ) ] ) ) {
 				return true;
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 0e8c48579f..aa80029cc6 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -74,6 +74,7 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		 */
 		'test-sample-phpunit.inc'                    => 0,
 		'test-sample-phpunit6.inc'                   => 0,
+		'test-sample-phpunit6-case-insensitive.inc'  => 0,
 		'test-sample-wpunit.inc'                     => 0,
 		'test-sample-custom-unit.1.inc'              => 0,
 		'test-sample-custom-unit.2.inc'              => 0,
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-phpunit6-case-insensitive.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-phpunit6-case-insensitive.inc
new file mode 100644
index 0000000000..e551348fd6
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-phpunit6-case-insensitive.inc
@@ -0,0 +1,3 @@
+<?php
+// Take note of the `PHPunit` vs `PHPUnit` in the namespace and the `Testcase` vs `TestCase` for the extended class name.
+class TestSample extends PHPunit\Framework\Testcase {}

From 9c878769a86e84ff23b5792e0e80ecde418f39fb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 30 Jun 2023 01:36:02 +0200
Subject: [PATCH 602/822] Files/FileName: improve handling of files using
 non-underscore, non-dash word separators

Addresses Gary's question in 2154:

> I can see there are some test files with extra `.` in (and not just underscores), but I was wondering if an incorrect file name like `class.my-class.php` might be detected, as the checking for hyphenation only replaces underscores.

I have tested this and while the file would already be flagged by the "class name vs file name check", the "is hyphenated" check would not flag the file.

Fixed now. Includes extra tests.

Note: this fix requires that the numbered test files we were using have to be renamed as the `.#.inc` would cause the sniff to throw errors when there shouldn't be any.

Related to issue 2164, but doesn't fix it completely.
---
 WordPress/Sniffs/Files/FileNameSniff.php      |  9 +++--
 WordPress/Tests/Files/FileNameUnitTest.php    | 34 ++++++++++---------
 ...it.1.inc => test-sample-custom-unit-1.inc} |  0
 ...it.2.inc => test-sample-custom-unit-2.inc} |  0
 ...it.3.inc => test-sample-custom-unit-3.inc} |  0
 ...it.4.inc => test-sample-custom-unit-4.inc} |  0
 ...it.5.inc => test-sample-custom-unit-5.inc} |  0
 ...est-sample-global-namespace-extends-1.inc} |  0
 ...est-sample-global-namespace-extends-2.inc} |  0
 ... test-sample-namespaced-declaration-1.inc} |  0
 ... test-sample-namespaced-declaration-2.inc} |  0
 ... test-sample-namespaced-declaration-3.inc} |  0
 ... test-sample-namespaced-declaration-4.inc} |  0
 ...c => test-sample-namespaced-extends-1.inc} |  0
 ...c => test-sample-namespaced-extends-2.inc} |  0
 ...c => test-sample-namespaced-extends-3.inc} |  0
 ...c => test-sample-namespaced-extends-4.inc} |  0
 ...c => test-sample-namespaced-extends-5.inc} |  0
 .../class.with.dot.not.underscore.inc         |  3 ++
 .../class@with#other+punctuation.inc          |  3 ++
 20 files changed, 31 insertions(+), 18 deletions(-)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.1.inc => test-sample-custom-unit-1.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.2.inc => test-sample-custom-unit-2.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.3.inc => test-sample-custom-unit-3.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.4.inc => test-sample-custom-unit-4.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-custom-unit.5.inc => test-sample-custom-unit-5.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-global-namespace-extends.1.inc => test-sample-global-namespace-extends-1.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-global-namespace-extends.2.inc => test-sample-global-namespace-extends-2.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-declaration.1.inc => test-sample-namespaced-declaration-1.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-declaration.2.inc => test-sample-namespaced-declaration-2.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-declaration.3.inc => test-sample-namespaced-declaration-3.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-declaration.4.inc => test-sample-namespaced-declaration-4.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-extends.1.inc => test-sample-namespaced-extends-1.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-extends.2.inc => test-sample-namespaced-extends-2.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-extends.3.inc => test-sample-namespaced-extends-3.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-extends.4.inc => test-sample-namespaced-extends-4.inc} (100%)
 rename WordPress/Tests/Files/FileNameUnitTests/TestFiles/{test-sample-namespaced-extends.5.inc => test-sample-namespaced-extends-5.inc} (100%)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/class.with.dot.not.underscore.inc
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/class@with#other+punctuation.inc

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index e69472572c..d8b1bc5370 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -207,8 +207,13 @@ public function process_token( $stackPtr ) {
 	 * @return void
 	 */
 	protected function check_filename_is_hyphenated( $file_name ) {
-		$expected = strtolower( str_replace( '_', '-', $file_name ) );
-		if ( $file_name === $expected ) {
+		$extension = strrchr( $file_name, '.' );
+		$name      = substr( $file_name, 0, ( strlen( $file_name ) - strlen( $extension ) ) );
+
+		$expected = strtolower( preg_replace( '`[[:punct:]]`', '-', $name ) ) . $extension;
+		if ( $file_name === $expected
+			|| isset( $this->class_exceptions[ $file_name ] )
+		) {
 			return;
 		}
 
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 0e8c48579f..5abba579cc 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -40,6 +40,8 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		'SomeFile.inc'                               => 1,
 		'some-File.inc'                              => 1,
 		'SomeView.inc'                               => 1,
+		'class.with.dot.not.underscore.inc'          => 2,
+		'class@with#other+punctuation.inc'           => 2,
 
 		// Class file names.
 		'my-class.inc'                               => 1,
@@ -75,23 +77,23 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		'test-sample-phpunit.inc'                    => 0,
 		'test-sample-phpunit6.inc'                   => 0,
 		'test-sample-wpunit.inc'                     => 0,
-		'test-sample-custom-unit.1.inc'              => 0,
-		'test-sample-custom-unit.2.inc'              => 0,
-		'test-sample-custom-unit.3.inc'              => 0,
-		'test-sample-custom-unit.4.inc'              => 0,
-		'test-sample-custom-unit.5.inc'              => 1, // Namespaced vs non-namespaced.
-		'test-sample-namespaced-declaration.1.inc'   => 0,
-		'test-sample-namespaced-declaration.2.inc'   => 1, // Namespaced vs non-namespaced.
-		'test-sample-namespaced-declaration.3.inc'   => 1, // Wrong namespace.
-		'test-sample-namespaced-declaration.4.inc'   => 1, // Non-namespaced vs namespaced.
-		'test-sample-global-namespace-extends.1.inc' => 0, // Prefixed user input.
-		'test-sample-global-namespace-extends.2.inc' => 1, // Non-namespaced vs namespaced.
+		'test-sample-custom-unit-1.inc'              => 0,
+		'test-sample-custom-unit-2.inc'              => 0,
+		'test-sample-custom-unit-3.inc'              => 0,
+		'test-sample-custom-unit-4.inc'              => 0,
+		'test-sample-custom-unit-5.inc'              => 1, // Namespaced vs non-namespaced.
+		'test-sample-namespaced-declaration-1.inc'   => 0,
+		'test-sample-namespaced-declaration-2.inc'   => 1, // Namespaced vs non-namespaced.
+		'test-sample-namespaced-declaration-3.inc'   => 1, // Wrong namespace.
+		'test-sample-namespaced-declaration-4.inc'   => 1, // Non-namespaced vs namespaced.
+		'test-sample-global-namespace-extends-1.inc' => 0, // Prefixed user input.
+		'test-sample-global-namespace-extends-2.inc' => 1, // Non-namespaced vs namespaced.
 		'test-sample-extends-with-use.inc'           => 0,
-		'test-sample-namespaced-extends.1.inc'       => 0,
-		'test-sample-namespaced-extends.2.inc'       => 1, // Wrong namespace.
-		'test-sample-namespaced-extends.3.inc'       => 1, // Namespaced vs non-namespaced.
-		'test-sample-namespaced-extends.4.inc'       => 1, // Non-namespaced vs namespaced.
-		'test-sample-namespaced-extends.5.inc'       => 0,
+		'test-sample-namespaced-extends-1.inc'       => 0,
+		'test-sample-namespaced-extends-2.inc'       => 1, // Wrong namespace.
+		'test-sample-namespaced-extends-3.inc'       => 1, // Namespaced vs non-namespaced.
+		'test-sample-namespaced-extends-4.inc'       => 1, // Non-namespaced vs namespaced.
+		'test-sample-namespaced-extends-5.inc'       => 0,
 		'Test_Sample.inc'                            => 0,
 
 		/*
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-1.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.1.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-1.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-2.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.2.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-2.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-3.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.3.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-3.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-4.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.4.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-4.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-5.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit.5.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-custom-unit-5.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends-1.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.1.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends-1.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends-2.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends.2.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-global-namespace-extends-2.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-1.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.1.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-1.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-2.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.2.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-2.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-3.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.3.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-3.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-4.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration.4.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-declaration-4.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-1.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.1.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-1.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-2.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.2.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-2.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-3.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.3.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-3.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-4.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.4.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-4.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc b/WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-5.inc
similarity index 100%
rename from WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends.5.inc
rename to WordPress/Tests/Files/FileNameUnitTests/TestFiles/test-sample-namespaced-extends-5.inc
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class.with.dot.not.underscore.inc b/WordPress/Tests/Files/FileNameUnitTests/class.with.dot.not.underscore.inc
new file mode 100644
index 0000000000..9bbdfa79fe
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/class.with.dot.not.underscore.inc
@@ -0,0 +1,3 @@
+<?php
+
+class With_Dot_Not_Underscore {}
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class@with#other+punctuation.inc b/WordPress/Tests/Files/FileNameUnitTests/class@with#other+punctuation.inc
new file mode 100644
index 0000000000..b9cdd35ff6
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/class@with#other+punctuation.inc
@@ -0,0 +1,3 @@
+<?php
+
+class With_Other_Punctuation {}

From 04516e50088c78db7ff374a57bd015d204a49cdd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 30 Jun 2023 02:28:18 +0200
Subject: [PATCH 603/822] Files/FileName: improve handling of files using
 different file extensions

Addresses Gary's second question in 2154:

> I also see `substr( $file_name, 0, -4 )`, which is assuming that a PHP-rendered file will always have a three letter file extension, but I wonder if someone could break that assumption with `--extensions=php3,myphp` or similar.

While I still think we should add a rule about requiring the `.php` extension to the handbook (after a Make post), as that rule currently doesn't exist, the sniff should not assume that all files will have a three character file extension.

Fixed now. Includes extra tests.

Related to issue 2164, but doesn't fix it completely. (the "check for a `.php` file extension" is not addressed yet as this is not a handbook rule at this time)
---
 WordPress/Sniffs/Files/FileNameSniff.php                   | 7 ++++---
 WordPress/Tests/Files/FileNameUnitTest.php                 | 6 ++++++
 .../class-file-with-different-extension.php3               | 3 +++
 .../class-wrong-with-different-extension.php3              | 3 +++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/class-file-with-different-extension.php3
 create mode 100644 WordPress/Tests/Files/FileNameUnitTests/class-wrong-with-different-extension.php3

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index d8b1bc5370..5fed8e77ec 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -242,10 +242,11 @@ protected function check_filename_is_hyphenated( $file_name ) {
 	 * @return void
 	 */
 	protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
+		$extension  = strrchr( $file_name, '.' );
 		$class_name = ObjectDeclarations::getName( $this->phpcsFile, $class_ptr );
-		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) );
+		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) ) . $extension;
 
-		if ( substr( $file_name, 0, -4 ) === $expected
+		if ( $file_name === $expected
 			|| isset( $this->class_exceptions[ $file_name ] )
 		) {
 			return;
@@ -256,7 +257,7 @@ protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
 			0,
 			'InvalidClassFileName',
 			array(
-				$expected . '.php',
+				$expected,
 				$file_name,
 			)
 		);
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 5abba579cc..e1cf277cb2 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -42,6 +42,7 @@ final class FileNameUnitTest extends AbstractSniffUnitTest {
 		'SomeView.inc'                               => 1,
 		'class.with.dot.not.underscore.inc'          => 2,
 		'class@with#other+punctuation.inc'           => 2,
+		'class-wrong-with-different-extension.php3'  => 1,
 
 		// Class file names.
 		'my-class.inc'                               => 1,
@@ -132,6 +133,11 @@ protected function getTestFiles( $testFileBase ) {
 		$sep        = \DIRECTORY_SEPARATOR;
 		$test_files = glob( dirname( $testFileBase ) . $sep . 'FileNameUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.inc', \GLOB_BRACE );
 
+		$php3_test_files = glob( dirname( $testFileBase ) . $sep . 'FileNameUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.php3', \GLOB_BRACE );
+		foreach ( $php3_test_files as $file ) {
+			$test_files[] = $file;
+		}
+
 		if ( ! empty( $test_files ) ) {
 			return $test_files;
 		}
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class-file-with-different-extension.php3 b/WordPress/Tests/Files/FileNameUnitTests/class-file-with-different-extension.php3
new file mode 100644
index 0000000000..ad920b4cab
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/class-file-with-different-extension.php3
@@ -0,0 +1,3 @@
+<?php
+
+class File_With_Different_Extension {}
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class-wrong-with-different-extension.php3 b/WordPress/Tests/Files/FileNameUnitTests/class-wrong-with-different-extension.php3
new file mode 100644
index 0000000000..ad920b4cab
--- /dev/null
+++ b/WordPress/Tests/Files/FileNameUnitTests/class-wrong-with-different-extension.php3
@@ -0,0 +1,3 @@
+<?php
+
+class File_With_Different_Extension {}

From 39183db45087c1d0414c88943ffb9b22d87a842c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:12:17 +0200
Subject: [PATCH 604/822] Files/FileName: update for changes in WP Core

In WP 6.1.0, the classes contained in the files listed in `$class_exceptions` were moved to files which comply with the file name requirements.
The original files still remain, but no longer contain a class, so we no longer need to make an exception for these in the `check_filename_has_class_prefix()` check.

However, with the stricter check for hyphenation-only word separators as introduced in the earlier commit, we do need to continue making an exception for these files for the `check_filename_is_hyphenated()` check.

For that reason, the properties remain.

Having said that, in this commit:
* I remove the check against these properties from the `check_filename_has_class_prefix()` check.
* The properties are renamed to `$*hyphenation_exceptions` to better reflect what they are used for.
* Two additional non-compliant files from WP Core are added to the list.
---
 WordPress/Sniffs/Files/FileNameSniff.php      | 24 +++++++++++++------
 .../class.wp-dependencies.inc                 |  2 +-
 .../FileNameUnitTests/class.wp-scripts.inc    |  2 +-
 .../FileNameUnitTests/class.wp-styles.inc     |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 5fed8e77ec..4178599dcd 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -96,27 +96,39 @@ final class FileNameSniff extends Sniff {
 	/**
 	 * Historical exceptions in WP core to the class name rule.
 	 *
+	 * Note: these files were renamed to comply with the naming conventions in
+	 * WP 6.1.0.
+	 * This means we no longer need to make an exception for them in the
+	 * `check_filename_has_class_prefix()` check, however, we do still need to
+	 * make an exception in the `check_filename_is_hyphenated()` check.
+	 *
 	 * @since 0.11.0
+	 * @since 3.0.0  Property has been renamed from `$class_exceptions` to `$hyphenation_exceptions`,
 	 *
 	 * @var array
 	 */
-	private $class_exceptions = array(
+	private $hyphenation_exceptions = array(
 		'class.wp-dependencies.php' => true,
 		'class.wp-scripts.php'      => true,
 		'class.wp-styles.php'       => true,
+		'functions.wp-scripts.php'  => true,
+		'functions.wp-styles.php'   => true,
 	);
 
 	/**
 	 * Unit test version of the historical exceptions in WP core.
 	 *
 	 * @since 0.11.0
+	 * @since 3.0.0  Property has been renamed from `$unittest_class_exceptions` to `$unittest_hyphenation_exceptions`,
 	 *
 	 * @var array
 	 */
-	private $unittest_class_exceptions = array(
+	private $unittest_hyphenation_exceptions = array(
 		'class.wp-dependencies.inc' => true,
 		'class.wp-scripts.inc'      => true,
 		'class.wp-styles.inc'       => true,
+		'functions.wp-scripts.inc'  => true,
+		'functions.wp-styles.inc'   => true,
 	);
 
 	/**
@@ -126,7 +138,7 @@ final class FileNameSniff extends Sniff {
 	 */
 	public function register() {
 		if ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) ) {
-			$this->class_exceptions += $this->unittest_class_exceptions;
+			$this->hyphenation_exceptions += $this->unittest_hyphenation_exceptions;
 		}
 
 		return Collections::phpOpenTags();
@@ -212,7 +224,7 @@ protected function check_filename_is_hyphenated( $file_name ) {
 
 		$expected = strtolower( preg_replace( '`[[:punct:]]`', '-', $name ) ) . $extension;
 		if ( $file_name === $expected
-			|| isset( $this->class_exceptions[ $file_name ] )
+			|| isset( $this->hyphenation_exceptions[ $file_name ] )
 		) {
 			return;
 		}
@@ -246,9 +258,7 @@ protected function check_filename_has_class_prefix( $class_ptr, $file_name ) {
 		$class_name = ObjectDeclarations::getName( $this->phpcsFile, $class_ptr );
 		$expected   = 'class-' . strtolower( str_replace( '_', '-', $class_name ) ) . $extension;
 
-		if ( $file_name === $expected
-			|| isset( $this->class_exceptions[ $file_name ] )
-		) {
+		if ( $file_name === $expected ) {
 			return;
 		}
 
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class.wp-dependencies.inc b/WordPress/Tests/Files/FileNameUnitTests/class.wp-dependencies.inc
index 021a2ea049..e2d041f055 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/class.wp-dependencies.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/class.wp-dependencies.inc
@@ -1,3 +1,3 @@
 <?php
 
-class WP_Dependencies {}
+// WP Core file no longer contains a class.
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class.wp-scripts.inc b/WordPress/Tests/Files/FileNameUnitTests/class.wp-scripts.inc
index 2373e838af..e2d041f055 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/class.wp-scripts.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/class.wp-scripts.inc
@@ -1,3 +1,3 @@
 <?php
 
-class WP_Scripts {}
+// WP Core file no longer contains a class.
diff --git a/WordPress/Tests/Files/FileNameUnitTests/class.wp-styles.inc b/WordPress/Tests/Files/FileNameUnitTests/class.wp-styles.inc
index dae5eaeaf9..e2d041f055 100644
--- a/WordPress/Tests/Files/FileNameUnitTests/class.wp-styles.inc
+++ b/WordPress/Tests/Files/FileNameUnitTests/class.wp-styles.inc
@@ -1,3 +1,3 @@
 <?php
 
-class WP_Styles {}
+// WP Core file no longer contains a class.

From 1da9c43e1ef6f51dcb3f8f1530c66570bea59fd0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 01:59:48 +0200
Subject: [PATCH 605/822] NamingConventions/PrefixAllGlobals: allow
 non-prefixed declarations for pluggable functions and classes

While the `PrefixAllGlobals` sniff already allowed for WP native constants which can be user declared, it did not allow for explicitly pluggable functions and classes being declared in plugins/themes.

I'm quite surprised actually that this was not reported as a bug so far.

Either way, fixed now.

In both cases, a case-insensitive name comparison is done as PHP natively treats function names and class names case-insensitively.

The lists added are based on some prelim sniffs created for issue 1803 and WP Core 6.3-beta2.

Notes:
* When generating these lists, I've explicitly excluded the `wp-includes/compat.php` file (which contains the polyfills for PHP native functionality).
* I've intentionally included the Twenty* theme related functions and classes as WPCS should also allow for being used by child themes of those themes.
* I've _excluded_ polyfills for new WP functionality from the Twenty* themes (which allow the themes to use those functions when running on older WP versions), as those functions aren't intentionally pluggable by WP itself.
* I've marked a number of functions/classes with a `// Deprecated` comment based on manual verification (and the declaration being in the `wp-includes/pluggable-deprecated.php` file).
    While it would, of course, be better if those would not be "plugged", it is not for this sniff to have an opinion on that and declaring these without a prefix should be allowed.
* In the `$pluggable_functions` list, I've intentionally commented two functions out as those are declared nested within another function and do not look _intentionally_ pluggable. This may need further verification, but at least this way it is documented why these are not included in the list.

Includes tests.
---
 .../PrefixAllGlobalsSniff.php                 | 209 ++++++++++++++++++
 .../PrefixAllGlobalsUnitTest.1.inc            |  22 ++
 2 files changed, 231 insertions(+)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index e02a2ee650..93bea5c923 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -195,6 +195,201 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 		'WP_DEFAULT_THEME'     => true,
 	);
 
+	/**
+	 * A list of functions declared in WP core as "Pluggable", i.e. overloadable from a plugin.
+	 *
+	 * Note: deprecated functions should still be included in this list as plugins may support older WP versions.
+	 *
+	 * @since 3.0.0.
+	 *
+	 * @var array<string, bool>
+	 */
+	protected $pluggable_functions = array(
+		'auth_redirect'                                  => true,
+		'cache_users'                                    => true,
+		'check_admin_referer'                            => true,
+		'check_ajax_referer'                             => true,
+		'get_avatar'                                     => true,
+		'get_currentuserinfo'                            => true, // Deprecated.
+		'get_user_by'                                    => true,
+		'get_user_by_email'                              => true, // Deprecated.
+		'get_userdata'                                   => true,
+		'get_userdatabylogin'                            => true, // Deprecated.
+		'graceful_fail'                                  => true,
+		'install_global_terms'                           => true,
+		'install_network'                                => true,
+		'is_user_logged_in'                              => true,
+		// 'lowercase_octets'                            => true, => unclear if this function is meant to be publicly pluggable.
+		'maybe_add_column'                               => true,
+		'maybe_create_table'                             => true,
+		'set_current_user'                               => true, // Deprecated.
+		'twenty_twenty_one_entry_meta_footer'            => true,
+		'twenty_twenty_one_post_thumbnail'               => true,
+		'twenty_twenty_one_post_title'                   => true,
+		'twenty_twenty_one_posted_by'                    => true,
+		'twenty_twenty_one_posted_on'                    => true,
+		'twenty_twenty_one_setup'                        => true,
+		'twenty_twenty_one_the_posts_navigation'         => true,
+		'twentyeleven_admin_header_image'                => true,
+		'twentyeleven_admin_header_style'                => true,
+		'twentyeleven_comment'                           => true,
+		'twentyeleven_content_nav'                       => true,
+		'twentyeleven_continue_reading_link'             => true,
+		'twentyeleven_header_style'                      => true,
+		'twentyeleven_posted_on'                         => true,
+		'twentyeleven_setup'                             => true,
+		'twentyfifteen_comment_nav'                      => true,
+		'twentyfifteen_entry_meta'                       => true,
+		'twentyfifteen_excerpt_more'                     => true,
+		'twentyfifteen_fonts_url'                        => true,
+		'twentyfifteen_get_color_scheme'                 => true,
+		'twentyfifteen_get_color_scheme_choices'         => true,
+		'twentyfifteen_get_link_url'                     => true,
+		'twentyfifteen_header_style'                     => true,
+		'twentyfifteen_post_thumbnail'                   => true,
+		'twentyfifteen_sanitize_color_scheme'            => true,
+		'twentyfifteen_setup'                            => true,
+		'twentyfifteen_the_custom_logo'                  => true,
+		'twentyfourteen_admin_header_image'              => true,
+		'twentyfourteen_admin_header_style'              => true,
+		'twentyfourteen_excerpt_more'                    => true,
+		'twentyfourteen_font_url'                        => true,
+		'twentyfourteen_header_style'                    => true,
+		'twentyfourteen_list_authors'                    => true,
+		'twentyfourteen_paging_nav'                      => true,
+		'twentyfourteen_post_nav'                        => true,
+		'twentyfourteen_post_thumbnail'                  => true,
+		'twentyfourteen_posted_on'                       => true,
+		'twentyfourteen_setup'                           => true,
+		'twentyfourteen_the_attached_image'              => true,
+		'twentynineteen_comment_count'                   => true,
+		'twentynineteen_comment_form'                    => true,
+		'twentynineteen_discussion_avatars_list'         => true,
+		'twentynineteen_entry_footer'                    => true,
+		'twentynineteen_get_user_avatar_markup'          => true,
+		'twentynineteen_post_thumbnail'                  => true,
+		'twentynineteen_posted_by'                       => true,
+		'twentynineteen_posted_on'                       => true,
+		'twentynineteen_setup'                           => true,
+		'twentynineteen_the_posts_navigation'            => true,
+		'twentyseventeen_edit_link'                      => true,
+		'twentyseventeen_entry_footer'                   => true,
+		'twentyseventeen_fonts_url'                      => true,
+		'twentyseventeen_header_style'                   => true,
+		'twentyseventeen_posted_on'                      => true,
+		'twentyseventeen_time_link'                      => true,
+		'twentysixteen_categorized_blog'                 => true,
+		'twentysixteen_entry_date'                       => true,
+		'twentysixteen_entry_meta'                       => true,
+		'twentysixteen_entry_taxonomies'                 => true,
+		'twentysixteen_excerpt'                          => true,
+		'twentysixteen_excerpt_more'                     => true,
+		'twentysixteen_fonts_url'                        => true,
+		'twentysixteen_get_color_scheme'                 => true,
+		'twentysixteen_get_color_scheme_choices'         => true,
+		'twentysixteen_header_style'                     => true,
+		'twentysixteen_post_thumbnail'                   => true,
+		'twentysixteen_sanitize_color_scheme'            => true,
+		'twentysixteen_setup'                            => true,
+		'twentysixteen_the_custom_logo'                  => true,
+		'twentyten_admin_header_style'                   => true,
+		'twentyten_comment'                              => true,
+		'twentyten_continue_reading_link'                => true,
+		'twentyten_posted_in'                            => true,
+		'twentyten_posted_on'                            => true,
+		'twentyten_setup'                                => true,
+		'twentythirteen_entry_date'                      => true,
+		'twentythirteen_entry_meta'                      => true,
+		'twentythirteen_excerpt_more'                    => true,
+		'twentythirteen_fonts_url'                       => true,
+		'twentythirteen_paging_nav'                      => true,
+		'twentythirteen_post_nav'                        => true,
+		'twentythirteen_the_attached_image'              => true,
+		'twentytwelve_comment'                           => true,
+		'twentytwelve_content_nav'                       => true,
+		'twentytwelve_entry_meta'                        => true,
+		'twentytwelve_get_font_url'                      => true,
+		'twentytwenty_customize_partial_blogdescription' => true,
+		'twentytwenty_customize_partial_blogname'        => true,
+		'twentytwenty_customize_partial_site_logo'       => true,
+		'twentytwenty_generate_css'                      => true,
+		'twentytwenty_get_customizer_css'                => true,
+		'twentytwenty_get_theme_svg'                     => true,
+		'twentytwenty_the_theme_svg'                     => true,
+		'twentytwentytwo_styles'                         => true,
+		'twentytwentytwo_support'                        => true,
+		'wp_authenticate'                                => true,
+		'wp_cache_add_multiple'                          => true,
+		'wp_cache_delete_multiple'                       => true,
+		'wp_cache_flush_group'                           => true,
+		'wp_cache_flush_runtime'                         => true,
+		'wp_cache_get_multiple'                          => true,
+		'wp_cache_set_multiple'                          => true,
+		'wp_cache_supports'                              => true,
+		'wp_check_password'                              => true,
+		'wp_clear_auth_cookie'                           => true,
+		'wp_clearcookie'                                 => true, // Deprecated.
+		'wp_create_nonce'                                => true,
+		'wp_generate_auth_cookie'                        => true,
+		'wp_generate_password'                           => true,
+		'wp_get_cookie_login'                            => true, // Deprecated.
+		'wp_get_current_user'                            => true,
+		// 'wp_handle_upload_error'                      => true, => unclear if this function is meant to be publicly pluggable.
+		'wp_hash'                                        => true,
+		'wp_hash_password'                               => true,
+		'wp_install'                                     => true,
+		'wp_install_defaults'                            => true,
+		'wp_login'                                       => true, // Deprecated.
+		'wp_logout'                                      => true,
+		'wp_mail'                                        => true,
+		'wp_new_blog_notification'                       => true,
+		'wp_new_user_notification'                       => true,
+		'wp_nonce_tick'                                  => true,
+		'wp_notify_moderator'                            => true,
+		'wp_notify_postauthor'                           => true,
+		'wp_parse_auth_cookie'                           => true,
+		'wp_password_change_notification'                => true,
+		'wp_rand'                                        => true,
+		'wp_redirect'                                    => true,
+		'wp_safe_redirect'                               => true,
+		'wp_salt'                                        => true,
+		'wp_sanitize_redirect'                           => true,
+		'wp_set_auth_cookie'                             => true,
+		'wp_set_current_user'                            => true,
+		'wp_set_password'                                => true,
+		'wp_setcookie'                                   => true, // Deprecated.
+		'wp_text_diff'                                   => true,
+		'wp_upgrade'                                     => true,
+		'wp_validate_auth_cookie'                        => true,
+		'wp_validate_redirect'                           => true,
+		'wp_verify_nonce'                                => true,
+	);
+
+	/**
+	 * A list of classes declared in WP core as "Pluggable", i.e. overloadable from a plugin.
+	 *
+	 * Source: {@link https://core.trac.wordpress.org/browser/trunk/src/wp-includes/pluggable.php}
+	 * and {@link https://core.trac.wordpress.org/browser/trunk/src/wp-includes/pluggable-deprecated.php}
+	 *
+	 * Note: deprecated classes should still be included in this list as plugins may support older WP versions.
+	 *
+	 * @since 3.0.0.
+	 *
+	 * @var array<string, bool>
+	 */
+	protected $pluggable_classes = array(
+		'TwentyTwenty_Customize'           => true,
+		'TwentyTwenty_Non_Latin_Languages' => true,
+		'TwentyTwenty_SVG_Icons'           => true,
+		'TwentyTwenty_Script_Loader'       => true,
+		'TwentyTwenty_Separator_Control'   => true,
+		'TwentyTwenty_Walker_Comment'      => true,
+		'TwentyTwenty_Walker_Page'         => true,
+		'Twenty_Twenty_One_Customize'      => true,
+		'WP_User_Search'                   => true,
+		'wp_atom_server'                   => true, // Deprecated.
+	);
+
 	/**
 	 * List of all PHP native functions.
 	 *
@@ -220,6 +415,10 @@ public function register() {
 		$this->built_in_functions = array_flip( $all_functions['internal'] );
 		$this->built_in_functions = array_change_key_case( $this->built_in_functions, \CASE_LOWER );
 
+		// Make sure the pluggable functions and classes list can be easily compared.
+		$this->pluggable_functions = array_change_key_case( $this->pluggable_functions, \CASE_LOWER );
+		$this->pluggable_classes   = array_change_key_case( $this->pluggable_classes, \CASE_LOWER );
+
 		// Set the sniff targets.
 		$targets  = array(
 			\T_NAMESPACE => \T_NAMESPACE,
@@ -420,6 +619,11 @@ public function process_token( $stackPtr ) {
 						return;
 					}
 
+					if ( isset( $this->pluggable_functions[ $item_lc ] ) ) {
+						// Pluggable function should not be prefixed.
+						return;
+					}
+
 					$error_text = 'Functions declared in the global namespace';
 					$error_code = 'NonPrefixedFunctionFound';
 					break;
@@ -434,6 +638,11 @@ public function process_token( $stackPtr ) {
 
 					switch ( $this->tokens[ $stackPtr ]['code'] ) {
 						case \T_CLASS:
+							if ( isset( $this->pluggable_classes[ strtolower( $item_name ) ] ) ) {
+								// Pluggable class should not be prefixed.
+								return;
+							}
+
 							if ( class_exists( '\\' . $item_name, false ) ) {
 								// Backfill for PHP native class.
 								return;
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
index fedc9cce9c..6da047a248 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc
@@ -651,4 +651,26 @@ if ( function_exists( 'stripos' ) ) {
 	function striPos() {}
 }
 
+/*
+ * Safeguard that pluggable functions and classes can be declared without a prefix.
+ */
+function wp_hash_password( $password ) {
+	// Do something.
+	return $hash;
+}
+
+function WP_Mail() {}
+
+class WP_User_Search {}
+
+class WP_Atom_Server {
+	public function __call( $name, $arguments ) {
+		// Do something.
+	}
+
+	public static function __callStatic( $name, $arguments ) {
+		// Do something.
+	}
+}
+
 // phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

From 4046b3d8a18d7f26211836508911cc4ddfe8d26b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 04:41:05 +0200
Subject: [PATCH 606/822] GH Actions/manage-labels: remove label which doesn't
 exist anymore

As discussed in Slack, I've:
* Removed the `Status: PR Exists` label.
* Reviewed all other labels for consistency in the capitalization of the phrases and made fixes where needed.

This updates the GH Actions workflow which references those labels to match.
---
 .github/workflows/manage-labels.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/manage-labels.yml b/.github/workflows/manage-labels.yml
index 6e4a1f4f12..6d27b145c1 100644
--- a/.github/workflows/manage-labels.yml
+++ b/.github/workflows/manage-labels.yml
@@ -21,8 +21,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            Status: Awaiting Feedback
-            Status: Review Ready
+            Status: Awaiting feedback
+            Status: Review ready
 
   on-pr-close:
     runs-on: ubuntu-latest
@@ -35,9 +35,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            Status: Awaiting Feedback
-            Status: close candidate
-            Status: Review Ready
+            Status: Awaiting feedback
+            Status: Close candidate
+            Status: Review ready
 
   on-issue-close:
     runs-on: ubuntu-latest
@@ -50,8 +50,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            Status: Awaiting Feedback
-            Status: close candidate
-            Status: help wanted
-            Status: good first issue
-            Status: PR Exists
+            Status: Awaiting feedback
+            Status: Close candidate
+            Status: Good first issue
+            Status: Help wanted

From b66f146419e359d4dae1fd15522787e2ad55d0b9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 11:16:25 +0200
Subject: [PATCH 607/822] DB/DirectDatabaseQuery: SQL keywords are
 case-insensitive

This was already handled correctly for `ALTER` etc, but not for the new check for `TRUNCATE`.

Includes test.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   |  2 +-
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index eb92cd565f..6da2528c4d 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -202,7 +202,7 @@ public function process_token( $stackPtr ) {
 				break;
 			}
 
-			if ( strpos( TextStrings::stripQuotes( $this->tokens[ $_pos ]['content'] ), 'TRUNCATE ' ) === 0 ) {
+			if ( strpos( strtoupper( TextStrings::stripQuotes( $this->tokens[ $_pos ]['content'] ) ), 'TRUNCATE ' ) === 0 ) {
 				// Ignore queries to truncate the database as caching those is irrelevant and they need a direct db query.
 				return;
 			}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 2e75d64ece..d94841d2fd 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -317,3 +317,13 @@ function stay_silent_for_truncate_query() {
 		)
 	);
 }
+
+function stay_silent_for_truncate_query_lowercase_sql_keywords() {
+	global $wpdb;
+	$wpdb->query(
+		$wpdb->prepare(
+			'truncate table `%1$s`',
+			plugin_get_table_name( 'Name' )
+		)
+	);
+}

From 361b69d81fd4135ae554f9933e6d78839f11632c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 11:17:32 +0200
Subject: [PATCH 608/822] DB/DirectDatabaseQuery: method names are
 case-insensitive

... so the sniff needs to do the name comparisons in a case-insensitive manner.

Includes test.
---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   | 2 +-
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 5 +++++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 6da2528c4d..ead689179c 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -185,7 +185,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		$methodPtr = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $is_object_call + 1 ), null, true );
-		$method    = $this->tokens[ $methodPtr ]['content'];
+		$method    = strtolower( $this->tokens[ $methodPtr ]['content'] );
 
 		$this->mergeFunctionLists();
 
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index d94841d2fd..00b969321b 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -327,3 +327,8 @@ function stay_silent_for_truncate_query_lowercase_sql_keywords() {
 		)
 	);
 }
+
+function method_names_are_caseinsensitive() {
+	global $wpdb;
+	$autoload = $wpdb->Get_Var( $wpdb->Prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option_name ) ); // Warning x 2.
+}
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 349e20991c..5488d4db33 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -92,6 +92,7 @@ public function getWarningList() {
 			288 => 1,
 			300 => 1,
 			306 => 2,
+			333 => 2,
 		);
 	}
 }

From 0d37c0ce37ef63580b1c7b9f0918988727da5efb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:04:00 +0100
Subject: [PATCH 609/822] WP/PostsPerPage: bug fix - non-numeric values for
 "posts_per_page" should be disregarded

This expands the tests for the "value capturing" fix in the previous commit.

Additionally, it adds a safeguard to the `WordPress.WP.PostsPerPage` sniff `callback()` method to prevent reporting an error when the value captured is not purely numeric.

This safeguard is needed as the way [text to number comparisons](https://wiki.php.net/rfc/string_to_number_comparison) are executed has changed in PHP 8.0 and that change affects this sniff.
See: https://3v4l.org/nOlYL#veol

Fixes 2027
---
 WordPress/Sniffs/WP/PostsPerPageSniff.php   |  9 +++++-
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 21 ++++++++++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php | 36 +++++++++++----------
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index def9def702..f94c899bf3 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff;
 
 /**
@@ -67,6 +68,12 @@ public function getGroups() {
 	 * @return bool FALSE if no match, TRUE if matches.
 	 */
 	public function callback( $key, $val, $line, $group ) {
-		return ( $val > (int) $this->posts_per_page );
+		$val = TextStrings::stripQuotes( $val );
+		if ( preg_match( '`^[-]?[0-9]+$`', $val ) !== 1 ) {
+			// Not a purely numeric value, so any comparison would be a false comparison.
+			return false;
+		}
+
+		return ( (int) $val > (int) $this->posts_per_page );
 	}
 }
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index cddd979781..1cf35213e2 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -81,3 +81,24 @@ $args = array( 'posts_per_page' => 999 ); // Bad.
 $args = [
 	'posts_per_page' => 999
 ]; // Bad.
+
+// Verify that the complete value is being captured correctly and that non-numeric values are disregarded.
+$args = array(
+	'posts_per_page' => min( max( $first, $last ), $default_min ), // Should be ignored as undetermined.
+	'posts_per_page' => 10 + $extra, // Should be ignored as undetermined.
+	'posts_per_page' => $value[0][1], // Should be ignored as undetermined.
+	'posts_per_page' => $value ? 10 * $value : 300, // Should be ignored as undetermined.
+	'posts_per_page' => get_value( name: 'post_per_page', type: 'query' ), // Should be ignored as undetermined.
+	'posts_per_page' => function($a): int {
+		return do_something( $a );
+	}, // Should be ignored as undetermined.
+	'posts_per_page' => [ 100, 200, 300 ], // Should be ignored as undetermined.
+	'posts_per_page' => array(100, 200, 300), // Should be ignored as undetermined.
+);
+$query_args['posts_per_page'] = my\get_posts_per_page(); // Should be ignored as undetermined.
+$query_args['posts_per_page'] = '1e3'; // Should be ignored as undetermined. Would evaluate to 1000 with an int cast, but WP doesn't cast the value.
+
+// Purely numeric strings should probably be accepted still as this won't make a difference for the database query.
+$query_args['posts_per_page'] = '50'; // OK.
+$query_args['posts_per_page'] = '200'; // Bad.
+$query_args['posts_per_page'] = "200"; // Bad.
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 7dbd98b3ac..b4555e1bb7 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -43,23 +43,25 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			4  => 1,
-			10 => 1,
-			11 => 1,
-			13 => 1,
-			22 => 1,
-			23 => 1,
-			24 => 1,
-			29 => 1,
-			49 => 1,
-			51 => 1,
-			54 => 1,
-			57 => 1,
-			59 => 1,
-			67 => 1,
-			72 => 1,
-			80 => 1,
-			82 => 1,
+			4   => 1,
+			10  => 1,
+			11  => 1,
+			13  => 1,
+			22  => 1,
+			23  => 1,
+			24  => 1,
+			29  => 1,
+			49  => 1,
+			51  => 1,
+			54  => 1,
+			57  => 1,
+			59  => 1,
+			67  => 1,
+			72  => 1,
+			80  => 1,
+			82  => 1,
+			103 => 1,
+			104 => 1,
 		);
 	}
 }

From 0ececb6d8699905e6700fcdd353e88b8cdb58b7f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:04:00 +0100
Subject: [PATCH 610/822] WP/PostsPerPage: bug fix - allow for explicitly
 positive numbers

This prevents false negatives when the number given is explicitly positive.

Includes tests.
---
 WordPress/Sniffs/WP/PostsPerPageSniff.php   | 2 +-
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 6 ++++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index f94c899bf3..5ba7215cb3 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -69,7 +69,7 @@ public function getGroups() {
 	 */
 	public function callback( $key, $val, $line, $group ) {
 		$val = TextStrings::stripQuotes( $val );
-		if ( preg_match( '`^[-]?[0-9]+$`', $val ) !== 1 ) {
+		if ( preg_match( '`^[+-]?[0-9]+$`', $val ) !== 1 ) {
 			// Not a purely numeric value, so any comparison would be a false comparison.
 			return false;
 		}
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 1cf35213e2..8f4f59af81 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -102,3 +102,9 @@ $query_args['posts_per_page'] = '1e3'; // Should be ignored as undetermined. Wou
 $query_args['posts_per_page'] = '50'; // OK.
 $query_args['posts_per_page'] = '200'; // Bad.
 $query_args['posts_per_page'] = "200"; // Bad.
+
+// Verify handling of explicitly positive numbers.
+$args = array(
+	'posts_per_page' => +50, // OK.
+	'posts_per_page' => +200, // Bad.
+);
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index b4555e1bb7..4175ed8d66 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -62,6 +62,7 @@ public function getWarningList() {
 			82  => 1,
 			103 => 1,
 			104 => 1,
+			109 => 1,
 		);
 	}
 }

From 5cf4fe1634a0ea8908f3bef775ebc5cde2dd1a01 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 15:08:46 +0200
Subject: [PATCH 611/822] WP/PostsPerPage: allow for non-decimal nrs, PHP 7.4
 numeric literals, PHP 8.1 octal literals

While it will probably be exceedingly rare for the `posts_per_page` value to be passed as anything but a decimal number (except to bypass the sniff), the sniff should still treat numbers passed using a different base correctly.

Along the same lines, decimal numbers passed using PHP 7.4 numeric literal notation should also be handled correctly.

Fixed now. Includes safeguard to only handle text string values when they are purely numeric.

Includes tests.
---
 WordPress/Sniffs/WP/PostsPerPageSniff.php   | 29 ++++++++++++++++++---
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 16 ++++++++++++
 WordPress/Tests/WP/PostsPerPageUnitTest.php |  6 +++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index 5ba7215cb3..b98e30db89 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\WP;
 
+use PHPCSUtils\Utils\Numbers;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff;
 
@@ -68,12 +69,34 @@ public function getGroups() {
 	 * @return bool FALSE if no match, TRUE if matches.
 	 */
 	public function callback( $key, $val, $line, $group ) {
-		$val = TextStrings::stripQuotes( $val );
-		if ( preg_match( '`^[+-]?[0-9]+$`', $val ) !== 1 ) {
-			// Not a purely numeric value, so any comparison would be a false comparison.
+		$stripped_val = TextStrings::stripQuotes( $val );
+
+		if ( $val !== $stripped_val ) {
+			// The value was a text string. For text strings, we only accept purely numeric values.
+			if ( preg_match( '`^[0-9]+$`', $stripped_val ) !== 1 ) {
+				// Not a purely numeric value, so any comparison would be a false comparison.
+				return false;
+			}
+
+			// Purely numeric string, treat it as an integer from here on out.
+			$val = $stripped_val;
+		}
+
+		$first_char = $val[0];
+		if ( '-' === $first_char || '+' === $first_char ) {
+			$val = ltrim( $val, '-+' );
+		} else {
+			$first_char = '';
+		}
+
+		$real_value = Numbers::getDecimalValue( $val );
+		if ( false === $real_value ) {
+			// This wasn't a purely numeric value, so any comparison would be a false comparison.
 			return false;
 		}
 
+		$val = $first_char . $real_value;
+
 		return ( (int) $val > (int) $this->posts_per_page );
 	}
 }
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 8f4f59af81..7474ba6c3c 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -108,3 +108,19 @@ $args = array(
 	'posts_per_page' => +50, // OK.
 	'posts_per_page' => +200, // Bad.
 );
+
+// Verify handling of PHP 7.4+ numeric literals, PHP 8.1 octal literals, non-decimal numbers and floats.
+$args = array(
+	'posts_per_page' => 0b1001011, // OK (75).
+	'posts_per_page' => 0b10010110, // Bad (150).
+	'posts_per_page' => 0x4B, // OK (75).
+	'posts_per_page' => 0x96, // Bad (150).
+	'posts_per_page' => 0113, // OK (75).
+	'posts_per_page' => 0226, // Bad (150).
+	'posts_per_page' => 0O113, // OK (75).
+	'posts_per_page' => 0o226, // Bad (150).
+	'posts_per_page' => 7_5, // OK (75).
+	'posts_per_page' => 1_50, // Bad (150).
+	'posts_per_page' => 75.0, // OK (75).
+	'posts_per_page' => 150.000, // Bad (150).
+);
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 4175ed8d66..3cc98c410a 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -63,6 +63,12 @@ public function getWarningList() {
 			103 => 1,
 			104 => 1,
 			109 => 1,
+			115 => 1,
+			117 => 1,
+			119 => 1,
+			121 => 1,
+			123 => 1,
+			125 => 1,
 		);
 	}
 }

From 3c423a5098c19ef6c6396b1e3d38bc75ff8ec258 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 29 Jun 2023 02:23:59 +0200
Subject: [PATCH 612/822] Always use BCFile for find[Start|End]OfStatement()

All methods in the `BCFile` class have PHPCSUtils native alternatives, which we already use, with the exception of the `findEndOfStatement()` method and the `findStartOfStatement()` method.

To be on the safe side, in case a polyfill is needed in those methods for a future PHP version or for support for PHPCS 4.x, let's consistently use the `BCFile` versions of these methods.
---
 WordPress/AbstractArrayAssignmentRestrictionsSniff.php       | 3 ++-
 .../CodeAnalysis/AssignmentInTernaryConditionSniff.php       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 13615429fc..4aa65f07bf 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\TextStrings;
@@ -176,7 +177,7 @@ public function process_token( $stackPtr ) {
 			) {
 				$key      = TextStrings::stripQuotes( $this->tokens[ $keyIdx ]['content'] );
 				$valStart = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $operator + 1 ), null, true );
-				$valEnd   = $this->phpcsFile->findEndOfStatement( $valStart, \T_COLON );
+				$valEnd   = BCFile::findEndOfStatement( $this->phpcsFile, $valStart, \T_COLON );
 				if ( \T_COMMA === $this->tokens[ $valEnd ]['code']
 					|| \T_SEMICOLON === $this->tokens[ $valEnd ]['code']
 				) {
diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index b5a3379f97..c12cb88742 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\CodeAnalysis;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Utils\Parentheses;
 use WordPressCS\WordPress\Sniff;
 
@@ -100,13 +101,13 @@ public function process_token( $stackPtr ) {
 			$opener = Parentheses::getLastOpener( $this->phpcsFile, $stackPtr );
 			$closer = Parentheses::getLastCloser( $this->phpcsFile, $stackPtr );
 
-			$next_statement_closer = $this->phpcsFile->findEndOfStatement( $stackPtr, array( \T_COLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_SQUARE_BRACKET ) );
+			$next_statement_closer = BCFile::findEndOfStatement( $this->phpcsFile, $stackPtr, array( \T_COLON, \T_CLOSE_PARENTHESIS, \T_CLOSE_SQUARE_BRACKET ) );
 			if ( false !== $next_statement_closer && $next_statement_closer < $closer ) {
 				// Parentheses are unrelated to the ternary.
 				return;
 			}
 
-			$prev_statement_closer = $this->phpcsFile->findStartOfStatement( $stackPtr, array( \T_COLON, \T_OPEN_PARENTHESIS, \T_OPEN_SQUARE_BRACKET ) );
+			$prev_statement_closer = BCFile::findStartOfStatement( $this->phpcsFile, $stackPtr, array( \T_COLON, \T_OPEN_PARENTHESIS, \T_OPEN_SQUARE_BRACKET ) );
 			if ( false !== $prev_statement_closer && $opener < $prev_statement_closer ) {
 				// Parentheses are unrelated to the ternary.
 				return;

From 2ae05bd0890fa5dc06a0e9a295b2faa4bf572c45 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 24 Jun 2023 05:51:21 +0200
Subject: [PATCH 613/822] AbstractArrayAssignmentRestrictions: remove support
 for 'callback'

[OPTIONAL]

The `getGroups()` method allows to pass a custom callback for any particular group, however, in practice that array key is never used as the `callback()` method (the default) is declared as `abstract` and therefore **must** be defined in a child class.

I propose to remove support for the `callback` array key from the abstract sniff.

Sniffs which extend this abstract can still use different logic for different groups by applying a switch to the `$group` parameter received in the `callback()`, along the lines of:
```php
public function callback( $key, $val, $line, $group ) {
    switch( $group ) {
        case 'groupA':
            return $this->callback_for_group_A($key, val, $line);
        case 'groupB':
            return $this->callback_for_group_B($key, val, $line);
    }
}
```

I have verified that [none of the sniffs published in public repos and which extend this abstract sniff](https://sourcegraph.com/search?q=context:global+use+WordPressCS%5CWordPress%5CAbstractArrayAssignmentRestrictionsSniff&patternType=standard&case=yes&sm=0&groupBy=group) currently use the `'callback'` key.

Removing the support for the key is a breaking change, but one with low impact based on current usage of the abstract.
---
 .../AbstractArrayAssignmentRestrictionsSniff.php      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index 13615429fc..f980a2754a 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -95,10 +95,9 @@ public function register() {
 	 *
 	 * Example: groups => array(
 	 *  'groupname' => array(
-	 *      'type'     => 'error' | 'warning',
-	 *      'message'  => 'Descriptive error message. The error message will be passed the $key and $val of the current array assignment.',
-	 *      'keys'     => array( 'key1', 'another_key' ),
-	 *      'callback' => array( 'class', 'method' ), // Optional.
+	 *      'type'    => 'error' | 'warning',
+	 *      'message' => 'Descriptive error message. The error message will be passed the $key and $val of the current array assignment.',
+	 *      'keys'    => array( 'key1', 'another_key' ),
 	 *  )
 	 * )
 	 *
@@ -219,14 +218,12 @@ public function process_token( $stackPtr ) {
 				continue;
 			}
 
-			$callback = ( isset( $group['callback'] ) && is_callable( $group['callback'] ) ) ? $group['callback'] : array( $this, 'callback' );
-
 			foreach ( $inst as $key => $assignment ) {
 				if ( ! \in_array( $key, $group['keys'], true ) ) {
 					continue;
 				}
 
-				$output = \call_user_func( $callback, $key, $assignment['value'], $assignment['line'], $group );
+				$output = \call_user_func( array( $this, 'callback' ), $key, $assignment['value'], $assignment['line'], $group );
 
 				if ( ! isset( $output ) || false === $output ) {
 					continue;

From 53e1edc452af0867bea3d99798421a29c8257c7e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 6 Jul 2023 08:51:26 +0200
Subject: [PATCH 614/822] Docs: add `@internal` tag to classes marked as
 internal API

This adds _"the other"_ `@internal` tag to these classes, also marking the classes as "internal API" via the tag (on top of the notice in the docblock description).
---
 WordPress/Helpers/ConstantsHelper.php       | 2 ++
 WordPress/Helpers/ContextHelper.php         | 2 ++
 WordPress/Helpers/DeprecationHelper.php     | 2 ++
 WordPress/Helpers/ListHelper.php            | 2 ++
 WordPress/Helpers/RulesetPropertyHelper.php | 2 ++
 WordPress/Helpers/SnakeCaseHelper.php       | 2 ++
 WordPress/Helpers/VariableHelper.php        | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index 2c82401bb8..506254b2a1 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -26,6 +26,8 @@
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The method in this class was previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and has been moved here.
diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index a7ccc979c8..aeaf4b1e34 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -23,6 +23,8 @@
  * This also means that it has no promise of backward compatibility. Use at your own risk.
  * ---------------------------------------------------------------------------------------------
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The methods in this class were previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and have been moved here.
diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
index 33085e525e..2a7a665473 100644
--- a/WordPress/Helpers/DeprecationHelper.php
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -23,6 +23,8 @@
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The method in this class was previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and has been moved here.
diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index 8649a8462b..a58610c124 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -25,6 +25,8 @@
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The method in this class was previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and has been moved here.
diff --git a/WordPress/Helpers/RulesetPropertyHelper.php b/WordPress/Helpers/RulesetPropertyHelper.php
index 0411e95930..3722266ac9 100644
--- a/WordPress/Helpers/RulesetPropertyHelper.php
+++ b/WordPress/Helpers/RulesetPropertyHelper.php
@@ -17,6 +17,8 @@
  * This also means that it has no promise of backward compatibility. Use at your own risk.
  * ---------------------------------------------------------------------------------------------
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The method in this class was previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and has been moved here.
diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index a6bf69dd74..5dd559cf9e 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -22,6 +22,8 @@
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The method in this class was previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and has been moved here.
diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 428de8ab1a..68ca0d6bd7 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -25,6 +25,8 @@
  * {@internal The functionality in this class will likely be replaced at some point in
  * the future by functions from PHPCSUtils.}
  *
+ * @internal
+ *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The methods in this class were previously contained in the
  *                `WordPressCS\WordPress\Sniff` class and have been moved here.

From fdd7e487c5b34e406c54b3b684b3ba83ffd9733f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 6 Jul 2023 08:43:53 +0200
Subject: [PATCH 615/822] Docs: add missing `@uses` tags

Follow up on 2259, which moved these `public` properties to the `SanitizingFunctionsTrait`.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php       | 3 +++
 WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 6bf1f869e7..9cd489ffce 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -27,6 +27,9 @@
  * @since   0.5.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
+ *
+ * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
+ * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
  */
 class NonceVerificationSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index b933450ffd..4551973d96 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -28,6 +28,9 @@
  * @since   0.5.0  Method getArrayIndexKey() has been moved to the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ *
+ * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
+ * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
  */
 class ValidatedSanitizedInputSniff extends Sniff {
 

From 846d09fff8b011402eb0c8caaffa7ea47fae465e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 6 Jul 2023 09:22:59 +0200
Subject: [PATCH 616/822] Docs: make sure all moved methods have correct
 changelog entries

---
 WordPress/Helpers/ConstantsHelper.php                | 1 +
 WordPress/Helpers/ContextHelper.php                  | 9 +++++++++
 WordPress/Helpers/IsUnitTestTrait.php                | 3 ++-
 WordPress/Helpers/ListHelper.php                     | 1 +
 WordPress/Helpers/SnakeCaseHelper.php                | 3 ++-
 WordPress/Helpers/ValidationHelper.php               | 3 ++-
 WordPress/Helpers/VariableHelper.php                 | 8 ++++----
 WordPress/Helpers/WPDBTrait.php                      | 2 +-
 WordPress/Helpers/WPHookHelper.php                   | 2 +-
 WordPress/Sniffs/Security/NonceVerificationSniff.php | 6 ++++--
 10 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index 2c82401bb8..d74c690c99 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -38,6 +38,7 @@ final class ConstantsHelper {
 	 * @since 1.0.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method was changed to be `static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The position of the function call token.
diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index a7ccc979c8..5037c2b3e8 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -120,7 +120,9 @@ final class ContextHelper {
 	 *
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method was renamed from `is_class_object_call() to `has_object_operator_before()`.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
@@ -147,6 +149,7 @@ public static function has_object_operator_before( File $phpcsFile, $stackPtr )
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
@@ -189,6 +192,8 @@ public static function is_token_namespaced( File $phpcsFile, $stackPtr ) {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
+	 *              - The `$global` parameter was renamed to `$global_function`.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile       The file being scanned.
 	 * @param int                         $stackPtr        The index of the token in the stack.
@@ -263,6 +268,7 @@ public static function is_in_function_call( File $phpcsFile, $stackPtr, array $v
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
@@ -286,6 +292,7 @@ public static function is_in_type_test( File $phpcsFile, $stackPtr ) {
 	 *              in function calls to array_key_exists() and key_exists() as well.
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
@@ -331,6 +338,7 @@ public static function get_safe_cast_tokens() {
 	 * @since 0.5.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
@@ -354,6 +362,7 @@ public static function is_safe_casted( File $phpcsFile, $stackPtr ) {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 241d61d28c..7714da6176 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -171,7 +171,8 @@ protected function get_all_test_classes() {
 	 *
 	 * @since 0.12.0 Split off from the `is_token_in_test_method()` method.
 	 * @since 1.0.0  Improved recognition of namespaced class names.
-	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
+	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
+	 *               - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The position of the token to be examined.
diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index 8649a8462b..f7eca3ca0b 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -40,6 +40,7 @@ final class ListHelper {
 	 * @since 2.2.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *              - The `$list_open_close` parameter was dropped.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index a6bf69dd74..d7ab04af24 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -34,7 +34,8 @@ final class SnakeCaseHelper {
 	 * @since 2.0.0 Moved from the `WordPress.NamingConventions.ValidFunctionName` sniff
 	 *              to this class, renamed from `get_name_suggestion` and made static
 	 *              so it can also be used by classes which don't extend this class.
-	 * @since 3.0.0 Moved from the Sniff class to this class.
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - Renamed from `get_snake_case_name_suggestion()` to `get_suggestion()`.
 	 *
 	 * @param string $name The construct name.
 	 *
diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 950364cc36..4860d186e5 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -84,7 +84,8 @@ final class ValidationHelper {
 	 * @since 2.1.0 Stricter check on whether the correct variable and the correct
 	 *              array keys are being validated.
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
-	 *              - Visibility changed from protected to public static.
+	 *              - The method visibility was changed from `protected` to `public static`.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile         The file being scanned.
 	 * @param int                         $stackPtr          The index of this token in the stack.
diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 428de8ab1a..42c6eeb83c 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -39,7 +39,7 @@ final class VariableHelper {
 	 * @since 2.1.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility is now `public` (was `protected`) and the method `static`.
-	 *              - The $phpcsFile parameter was added.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the variable token in the stack.
@@ -101,7 +101,7 @@ public static function get_array_access_keys( File $phpcsFile, $stackPtr, $all =
 	 * @since 2.1.0 Now uses get_array_access_keys() under the hood.
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility is now `public` (was `protected`) and the method `static`.
-	 *              - The $phpcsFile parameter was added.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the variable token in the stack.
@@ -128,7 +128,7 @@ public static function get_array_access_key( File $phpcsFile, $stackPtr ) {
 	 * @since 2.1.0 Added the $include_coalesce parameter.
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility is now `public` (was `protected`) and the method `static`.
-	 *              - The $phpcsFile parameter was added.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile        The file being scanned.
 	 * @param int                         $stackPtr         The index of this token in the stack.
@@ -198,7 +198,7 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 	 * @since 0.5.0
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility is now `public` (was `protected`) and the method `static`.
-	 *              - The $phpcsFile parameter was added.
+	 *              - The `$phpcsFile` parameter was added.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
 	 * @param int                         $stackPtr  The index of the token in the stack.
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 8d93ba1480..eeb613b8dc 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -37,7 +37,7 @@ trait WPDBTrait {
 	 *               vars are automatically updated.
 	 * @since 0.14.0 Moved this method from the `PreparedSQL` sniff to the base WP sniff.
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
-	 *               - The $phpcsFile parameter was added.
+	 *               - The `$phpcsFile` parameter was added.
 	 *
 	 * {@internal This method should be refactored to not exhibit "magic" behaviour
 	 *            for properties in the sniff class(es) using it.}}
diff --git a/WordPress/Helpers/WPHookHelper.php b/WordPress/Helpers/WPHookHelper.php
index 625712d4c1..70580b60a4 100644
--- a/WordPress/Helpers/WPHookHelper.php
+++ b/WordPress/Helpers/WPHookHelper.php
@@ -27,7 +27,7 @@ final class WPHookHelper {
 	 * @since 0.11.0 Changed from public static to protected non-static.
 	 * @since 3.0.0  - Moved from the Sniff class to this class.
 	 *               - The property visibility has changed from `protected` to `private static`.
-	 *                 Use the `get_function_names()` method for access.
+	 *                 Use the `get_functions()` method for access.
 	 *               - The format of the value has changed from a non-relevant boolean to
 	 *                 an array with the parameter position and name(s) for the hook name parameter.
 	 *
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 6bf1f869e7..33d4d2e6a1 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -75,7 +75,8 @@ class NonceVerificationSniff extends Sniff {
 	 *
 	 * @since 0.5.0
 	 * @since 0.11.0 Changed from public static to protected non-static.
-	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 * @since 3.0.0  - Moved from the generic `Sniff` class to this class.
+	 *               - Visibility changed from `protected` to `private.
 	 *
 	 * @var array
 	 */
@@ -141,7 +142,8 @@ public function process_token( $stackPtr ) {
 	 * Check if this token has an associated nonce check.
 	 *
 	 * @since 0.5.0
-	 * @since 3.0.0  Moved from the generic `Sniff` class to this class.
+	 * @since 3.0.0 - Moved from the generic `Sniff` class to this class.
+	 *              - Visibility changed from `protected` to `private.
 	 *
 	 * @param int $stackPtr The position of the current token in the stack of tokens.
 	 *

From 10e48911cbbd27326883ef6d807cf6c4f3550c36 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:47:51 +0200
Subject: [PATCH 617/822] VariableHelper::is_comparison(): minor defensive
 coding tweak

Prevent a potential "Undefined array key "bracket_closer"" PHP notice in the case of parse errors.
---
 WordPress/Helpers/VariableHelper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index dc3c7a8728..a0fe91761c 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -171,8 +171,10 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 		$next_token = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
 		// This might be an opening square bracket in the case of arrays ($var['a']).
-		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $tokens[ $next_token ]['code'] ) {
-
+		while ( false !== $next_token
+			&& \T_OPEN_SQUARE_BRACKET === $tokens[ $next_token ]['code']
+			&& isset( $tokens[ $next_token ]['bracket_closer'] )
+		) {
 			$next_token = $phpcsFile->findNext(
 				Tokens::$emptyTokens,
 				( $tokens[ $next_token ]['bracket_closer'] + 1 ),

From 4ed7675f9f10b569afef5198f4e490c386cafca1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:42:59 +0200
Subject: [PATCH 618/822] Security/NonceVerification: rename test case file

... to allow for splitting the test case file up for properly pure tests and for adding additional test case files.
---
 ...st.inc => NonceVerificationUnitTest.1.inc} |  0
 .../Security/NonceVerificationUnitTest.php    | 91 +++++++++++--------
 2 files changed, 53 insertions(+), 38 deletions(-)
 rename WordPress/Tests/Security/{NonceVerificationUnitTest.inc => NonceVerificationUnitTest.1.inc} (100%)

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/Security/NonceVerificationUnitTest.inc
rename to WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index edcc509cb0..0cdb7a1559 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -31,53 +31,68 @@ final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'NonceVerificationUnitTest.1.inc':
+				return array(
+					5   => 1,
+					9   => 1,
+					31  => 1,
+					44  => 1,
+					48  => 1,
+					69  => 1,
+					88  => 1, // Old-style WPCS ignore comments are no longer supported.
+					89  => 1,
+					113 => 1,
+					114 => 1,
+					122 => 1,
+					126 => 1,
+					148 => 1,
+					150 => 1,
+					159 => 1,
+					160 => 1,
+					161 => 1,
+					177 => 1,
+					185 => 1,
+					190 => 1,
+					198 => 1,
+					202 => 1,
+					252 => 1,
+					269 => 1,
+					306 => 1,
+					312 => 1,
+					335 => 1,
+					339 => 1,
+					347 => 1,
+					351 => 1,
+				);
 
-		return array(
-			5   => 1,
-			9   => 1,
-			31  => 1,
-			44  => 1,
-			48  => 1,
-			69  => 1,
-			88  => 1, // Old-style WPCS ignore comments are no longer supported.
-			89  => 1,
-			113 => 1,
-			114 => 1,
-			122 => 1,
-			126 => 1,
-			148 => 1,
-			150 => 1,
-			159 => 1,
-			160 => 1,
-			161 => 1,
-			177 => 1,
-			185 => 1,
-			190 => 1,
-			198 => 1,
-			202 => 1,
-			252 => 1,
-			269 => 1,
-			306 => 1,
-			312 => 1,
-			335 => 1,
-			339 => 1,
-			347 => 1,
-			351 => 1,
-		);
+			default:
+				return array();
+		}
 	}
 
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of warnings>
 	 */
-	public function getWarningList() {
-		return array(
-			375 => 1,
-			389 => 1,
-		);
+	public function getWarningList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'NonceVerificationUnitTest.1.inc':
+				return array(
+					375 => 1,
+					389 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 }

From bbfbb9eb64ce9c04b573a1ef87b43bc7196c536a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:54:20 +0200
Subject: [PATCH 619/822] Security/NonceVerification: move test involving
 global scope to separate test case file

This prevents tests which involve the global scope from influencing each other (which was happening for an upcoming bug fix).
---
 .../Security/NonceVerificationUnitTest.1.inc  | 10 ----
 .../Security/NonceVerificationUnitTest.2.inc  | 15 ++++++
 .../Security/NonceVerificationUnitTest.php    | 46 ++++++++++---------
 3 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.2.inc

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index d1a865ce63..cf74b760c6 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -116,16 +116,6 @@ function foo_5() {
 	check_ajax_referer( 'something' );
 }
 
-// Test anonymous function - Bad, needs nonce check.
-check_ajax_referer( 'something' ); // Nonce check is not in function scope.
-$b = function () {
-	if ( ! isset( $_POST['abc'] ) ) { // Bad.
-		return;
-	}
-
-	do_something( $_POST['abc'] ); // Bad.
-};
-
 /*
  * Test using custom properties, setting & unsetting (resetting).
  */
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.2.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.2.inc
new file mode 100644
index 0000000000..1171e2f6df
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.2.inc
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * Verify that a nonce check in the global scope will not be accepted as valid for superglobal use in function local scope.
+ */
+
+// Test anonymous function - Bad, needs nonce check.
+check_ajax_referer( 'something' ); // Nonce check is not in function scope.
+$b = function () {
+	if ( ! isset( $_POST['abc'] ) ) { // Bad.
+		return;
+	}
+
+	do_something( $_POST['abc'] ); // Bad.
+};
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 0cdb7a1559..556b8c073e 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -49,26 +49,30 @@ public function getErrorList( $testFile = '' ) {
 					89  => 1,
 					113 => 1,
 					114 => 1,
-					122 => 1,
-					126 => 1,
-					148 => 1,
+					138 => 1,
+					140 => 1,
+					149 => 1,
 					150 => 1,
-					159 => 1,
-					160 => 1,
-					161 => 1,
-					177 => 1,
-					185 => 1,
-					190 => 1,
-					198 => 1,
-					202 => 1,
-					252 => 1,
-					269 => 1,
-					306 => 1,
-					312 => 1,
-					335 => 1,
-					339 => 1,
-					347 => 1,
-					351 => 1,
+					151 => 1,
+					167 => 1,
+					175 => 1,
+					180 => 1,
+					188 => 1,
+					192 => 1,
+					242 => 1,
+					259 => 1,
+					296 => 1,
+					302 => 1,
+					325 => 1,
+					329 => 1,
+					337 => 1,
+					341 => 1,
+				);
+
+			case 'NonceVerificationUnitTest.2.inc':
+				return array(
+					10 => 1,
+					14 => 1,
 				);
 
 			default:
@@ -87,8 +91,8 @@ public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
 			case 'NonceVerificationUnitTest.1.inc':
 				return array(
-					375 => 1,
-					389 => 1,
+					365 => 1,
+					379 => 1,
 				);
 
 			default:

From 071122bef5b848c3c485c5f7727fa249ccb145a7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:37:40 +0200
Subject: [PATCH 620/822] Security/NonceVerification: add some extra tests
 involving global scope

... to raise code coverage.
---
 .../Security/NonceVerificationUnitTest.3.inc  | 27 +++++++++++++++++++
 .../Security/NonceVerificationUnitTest.4.inc  | 25 +++++++++++++++++
 .../Security/NonceVerificationUnitTest.5.inc  | 18 +++++++++++++
 .../Security/NonceVerificationUnitTest.6.inc  | 11 ++++++++
 .../Security/NonceVerificationUnitTest.php    | 10 +++++++
 5 files changed, 91 insertions(+)
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.3.inc
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.4.inc
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.5.inc
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.6.inc

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.3.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.3.inc
new file mode 100644
index 0000000000..8a74d0078d
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.3.inc
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Verify a correct nonce check (way) _before_ in the global scope.
+ */
+wp_verify_nonce( $_POST['prefix_nonce'] );
+
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+
+echo $_POST['prefix_myfield']; // OK.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.4.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.4.inc
new file mode 100644
index 0000000000..38cdca2c28
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.4.inc
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * Verify a missing nonce check _before_ in the global scope.
+ */
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+
+echo $_GET['prefix_myfield']; // Bad.
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.5.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.5.inc
new file mode 100644
index 0000000000..77f502bdb0
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.5.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * Verify an allowed nonce check _after_ in the global scope.
+ */
+
+if ( isset ( $_POST['prefix_myfield'] ) { // OK.
+	
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+
+	wp_verify_nonce( $_POST['prefix_nonce'] );
+	echo $_POST['prefix_myfield']; // OK.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.6.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.6.inc
new file mode 100644
index 0000000000..a866aea863
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.6.inc
@@ -0,0 +1,11 @@
+<?php
+
+/*
+ * Verify an incorrect nonce check _after_ in the global scope.
+ */
+
+if ( isset ( $_REQUEST['prefix_myfield'] ) {
+	echo $_REQUEST['prefix_myfield']; // Bad, nonce is too late.
+}
+
+wp_verify_nonce( $_REQUEST['prefix_nonce'] );
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 556b8c073e..2f91cb3895 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -95,6 +95,16 @@ public function getWarningList( $testFile = '' ) {
 					379 => 1,
 				);
 
+			case 'NonceVerificationUnitTest.4.inc':
+				return array(
+					25 => 1,
+				);
+
+			case 'NonceVerificationUnitTest.6.inc':
+				return array(
+					8 => 1,
+				);
+
 			default:
 				return array();
 		}

From 851b75d3665cc86cbce4c47159369cf612d8574f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 09:32:22 +0200
Subject: [PATCH 621/822] Security/NonceVerification: test with empty()

There were plenty of tests which checked the nonce verification in combination with a superglobal being used in `isset()` and `array_key_exists()`, but none in combination with `empty()`, while the sniff does handle that as well and treats it the same as `isset()`/`array_key_exists()`.

This adjusts a few pre-existing tests to make sure that the handling of `empty()` is covered by tests too.

Note: it is important that these have separate tests as `empty()` has its own token.
---
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index cf74b760c6..9b987b6fca 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -30,7 +30,7 @@ function foo() {
 function process() {
 	do_something( $_POST['foo'] ); // Bad.
 
-	if ( ! isset( $_POST['test'] ) || ! wp_verify_nonce( 'some_action' ) ) {
+	if ( empty( $_POST['test'] ) || ! wp_verify_nonce( 'some_action' ) ) {
 		exit;
 	}
 
@@ -41,7 +41,7 @@ class Some_Class {
 
 	// Bad, needs nonce check.
 	function bar() {
-		if ( ! isset( $_POST['test'] ) ) { // Bad.
+		if ( empty( $_POST['test'] ) ) { // Bad.
 			return;
 		}
 

From 46eeac7d3f0ee14226e49b93159ff2732a91890c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 21:04:54 +0200
Subject: [PATCH 622/822] Security/NonceVerification: remove redundant function
 call

The `NonceVerification` sniff extends the WPCS base `Sniff` class, so has access to `$this->tokens`. No need for the call to `$phpcsFile->getTokens()`.
---
 .../Security/NonceVerificationSniff.php       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 13c773323c..8b7a74ab8a 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -170,16 +170,14 @@ private function has_nonce_check( $stackPtr ) {
 		$start = 0;
 		$end   = $stackPtr;
 
-		$tokens = $this->phpcsFile->getTokens();
-
 		// If we're in a function, only look inside of it.
 		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
-		if ( isset( $tokens[ $stackPtr ]['conditions'] ) === true ) {
-			$conditions = $tokens[ $stackPtr ]['conditions'];
+		if ( isset( $this->tokens[ $stackPtr ]['conditions'] ) === true ) {
+			$conditions = $this->tokens[ $stackPtr ]['conditions'];
 			$conditions = array_reverse( $conditions, true );
 			foreach ( $conditions as $tokenPtr => $condition ) {
 				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
-					$start = $tokens[ $tokenPtr ]['scope_opener'];
+					$start = $this->tokens[ $tokenPtr ]['scope_opener'];
 					break;
 				}
 			}
@@ -200,7 +198,7 @@ private function has_nonce_check( $stackPtr ) {
 		// If this superglobal is inside such a check, look for the nonce after it as well,
 		// all the way to the end of the scope.
 		if ( true === $allow_nonce_after ) {
-			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
+			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $this->tokens[ $start ]['scope_closer'];
 		}
 
 		// Check if we've looked here before.
@@ -236,23 +234,23 @@ private function has_nonce_check( $stackPtr ) {
 		// Loop through the tokens looking for nonce verification functions.
 		for ( $i = $start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
-			if ( \T_FUNCTION === $tokens[ $i ]['code']
-				|| \T_CLOSURE === $tokens[ $i ]['code']
-				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ]['code'] ] )
+			if ( \T_FUNCTION === $this->tokens[ $i ]['code']
+				|| \T_CLOSURE === $this->tokens[ $i ]['code']
+				|| isset( Tokens::$ooScopeTokens[ $this->tokens[ $i ]['code'] ] )
 			) {
-				if ( isset( $tokens[ $i ]['scope_closer'] ) ) {
-					$i = $tokens[ $i ]['scope_closer'];
+				if ( isset( $this->tokens[ $i ]['scope_closer'] ) ) {
+					$i = $this->tokens[ $i ]['scope_closer'];
 				}
 				continue;
 			}
 
 			// If this isn't a function name, skip it.
-			if ( \T_STRING !== $tokens[ $i ]['code'] ) {
+			if ( \T_STRING !== $this->tokens[ $i ]['code'] ) {
 				continue;
 			}
 
 			// If this is one of the nonce verification functions, we can bail out.
-			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ]['content'] ] ) ) {
+			if ( isset( $this->nonceVerificationFunctions[ $this->tokens[ $i ]['content'] ] ) ) {
 				/*
 				 * Now, make sure it is a call to a global function.
 				 */

From d842ffcffe13f72aaaac88f1c2d369525e470e7e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 21:06:13 +0200
Subject: [PATCH 623/822] Security/NonceVerification: remove redundant local
 variable

No need to store the sub-array if it's only accessed a couple of times.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 8b7a74ab8a..73346b901c 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -109,10 +109,7 @@ public function register() {
 	 * @return void
 	 */
 	public function process_token( $stackPtr ) {
-
-		$instance = $this->tokens[ $stackPtr ];
-
-		if ( ! isset( $this->superglobals[ $instance['content'] ] ) ) {
+		if ( ! isset( $this->superglobals[ $this->tokens[ $stackPtr ]['content'] ] ) ) {
 			return;
 		}
 
@@ -127,7 +124,7 @@ public function process_token( $stackPtr ) {
 		}
 
 		$error_code = 'Missing';
-		if ( false === $this->superglobals[ $instance['content'] ] ) {
+		if ( false === $this->superglobals[ $this->tokens[ $stackPtr ]['content'] ] ) {
 			$error_code = 'Recommended';
 		}
 
@@ -136,7 +133,7 @@ public function process_token( $stackPtr ) {
 			$this->phpcsFile,
 			'Processing form data without nonce verification.',
 			$stackPtr,
-			$this->superglobals[ $instance['content'] ],
+			$this->superglobals[ $this->tokens[ $stackPtr ]['content'] ],
 			$error_code
 		);
 	}

From 436a9a17e2b44c29990aec5034293aca8932011f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:15:17 +0200
Subject: [PATCH 624/822] Security/NonceVerification: changes to
 `$addedCustomFunctions` property

* As the sniff itself now only handles the nonce functions, we don't need a multi-dimensional array (the `'nonce'` subkey).
* To prevent potential conflicts with properties in traits, make the property name more specific.
* And even though the class has not been made `final`, I do think it makes sense to make this property `private`.
    The property is only intended for use by the (`protected`) `mergeFunctionLists()` method. If a child class overloads that method, they are responsible for whatever properties their overloaded method needs.
---
 .../Security/NonceVerificationSniff.php       | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 73346b901c..9047f9b593 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -58,21 +58,6 @@ class NonceVerificationSniff extends Sniff {
 	 */
 	public $customNonceVerificationFunctions = array();
 
-	/**
-	 * Cache of previously added custom functions.
-	 *
-	 * Prevents having to do the same merges over and over again.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 - Changed from public static to protected non-static.
-	 *               - Changed the format from simple bool to array.
-	 *
-	 * @var array
-	 */
-	protected $addedCustomFunctions = array(
-		'nonce' => array(),
-	);
-
 	/**
 	 * List of the functions which verify nonces.
 	 *
@@ -89,6 +74,22 @@ class NonceVerificationSniff extends Sniff {
 		'check_ajax_referer'  => true,
 	);
 
+	/**
+	 * Cache of previously added custom functions.
+	 *
+	 * Prevents having to do the same merges over and over again.
+	 *
+	 * @since 0.5.0
+	 * @since 0.11.0 - Changed from public static to protected non-static.
+	 *               - Changed the format from simple bool to array.
+	 * @since 3.0.0  - Property rename from `$addedCustomFunctions` to `$addedCustomNonceFunctions`.
+	 *               - Visibility changed from `protected` to `private.
+	 *               - Format changed from a multi-dimensional array to a single-dimensional array.
+	 *
+	 * @var array
+	 */
+	private $addedCustomNonceFunctions = array();
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -278,13 +279,13 @@ private function has_nonce_check( $stackPtr ) {
 	 * @return void
 	 */
 	protected function mergeFunctionLists() {
-		if ( $this->customNonceVerificationFunctions !== $this->addedCustomFunctions['nonce'] ) {
+		if ( $this->customNonceVerificationFunctions !== $this->addedCustomNonceFunctions ) {
 			$this->nonceVerificationFunctions = RulesetPropertyHelper::merge_custom_array(
 				$this->customNonceVerificationFunctions,
 				$this->nonceVerificationFunctions
 			);
 
-			$this->addedCustomFunctions['nonce'] = $this->customNonceVerificationFunctions;
+			$this->addedCustomNonceFunctions = $this->customNonceVerificationFunctions;
 		}
 	}
 }

From 3b00b2cea46aac1be5ff9ef6cb83def98d3a3998 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 05:28:00 +0200
Subject: [PATCH 625/822] Security/NonceVerification: bug fix - `$_FILES` not
 `$_FILE`

PHP does not have a `$_FILE` superglobal...
Ref: https://www.php.net/manual/en/language.variables.superglobals.php

Looks like this typo has been in this sniff from the start:
* WordPress/WordPress-Coding-Standards 325
* https://github.com/WordPress/WordPress-Coding-Standards/pull/325/commits/14803501da4334e53768b3de8a7396519c66b303

A similar typo elsewhere was fixed long time ago: WordPress/WordPress-Coding-Standards 368

Adjusted some existing tests now to safeguard this.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php     | 2 +-
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 9047f9b593..915011f845 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -44,7 +44,7 @@ class NonceVerificationSniff extends Sniff {
 	 */
 	protected $superglobals = array(
 		'$_POST'    => true,
-		'$_FILE'    => true,
+		'$_FILES'   => true,
 		'$_GET'     => false,
 		'$_REQUEST' => false,
 	);
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 9b987b6fca..79a04de3a5 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -91,7 +91,7 @@ function foo_3() {
 
 // We need to account for when there are multiple vars in a single isset().
 function foo_4() {
-	if ( ! isset( $_POST['foo'], $_POST['bar'], $_POST['_wpnonce'] ) ) { // OK.
+	if ( ! isset( $_POST['foo'], $_FILES['bar'], $_POST['_wpnonce'] ) ) { // OK.
 		return;
 	}
 
@@ -111,7 +111,7 @@ function sanitization_allowed() {
 function foo_5() {
 
 	do_something( (int) $_POST['foo'] ); // Bad.
-	do_something( sanitize_key( $_POST['bar'] ) ); // Bad.
+	do_something( sanitize_key( $_FILES['bar'] ) ); // Bad.
 
 	check_ajax_referer( 'something' );
 }

From 93dbac435791b2a10a804c9576b641d3d4ac808a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:54:56 +0200
Subject: [PATCH 626/822] Security/NonceVerification: move results cache to
 property

No idea why this was made a function local `static` variable, but it makes more sense (and results in cleaner code) if we cache this in a property.

As the cache wasn't previously accessible from child classes anyway, I'm making this a `private` property.
---
 .../Security/NonceVerificationSniff.php       | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 915011f845..a745a20c7b 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -90,6 +90,21 @@ class NonceVerificationSniff extends Sniff {
 	 */
 	private $addedCustomNonceFunctions = array();
 
+	/**
+	 * Information on the last scope that we checked to find a nonce verification.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array {
+	 *      @type string   $file        The name of the file.
+	 *      @type int      $start       The index of the token where the scope started.
+	 *      @type int      $end         The index of the token where the scope ended.
+	 *      @type bool|int $nonce_check The index of the token where an nonce check
+	 *                                  was found, or false if none was found.
+	 * }
+	 */
+	private $cached_results;
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -151,20 +166,6 @@ public function process_token( $stackPtr ) {
 	 * @return bool
 	 */
 	private function has_nonce_check( $stackPtr ) {
-
-		/**
-		 * A cache of the scope that we last checked for nonce verification in.
-		 *
-		 * @var array {
-		 *      @var string   $file        The name of the file.
-		 *      @var int      $start       The index of the token where the scope started.
-		 *      @var int      $end         The index of the token where the scope ended.
-		 *      @var bool|int $nonce_check The index of the token where an nonce check
-		 *                                 was found, or false if none was found.
-		 * }
-		 */
-		static $last;
-
 		$start = 0;
 		$end   = $stackPtr;
 
@@ -202,17 +203,17 @@ private function has_nonce_check( $stackPtr ) {
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
-		if ( is_array( $last )
-			&& $filename === $last['file']
-			&& $start === $last['start']
+		if ( is_array( $this->cached_results )
+			&& $filename === $this->cached_results['file']
+			&& $start === $this->cached_results['start']
 		) {
 
-			if ( false !== $last['nonce_check'] ) {
+			if ( false !== $this->cached_results['nonce_check'] ) {
 				// If we have already found an nonce check in this scope, we just
 				// need to check whether it comes before this token. It is OK if the
 				// check is after the token though, if this was only a isset() check.
-				return ( true === $allow_nonce_after || $last['nonce_check'] < $stackPtr );
-			} elseif ( $end <= $last['end'] ) {
+				return ( true === $allow_nonce_after || $this->cached_results['nonce_check'] < $stackPtr );
+			} elseif ( $end <= $this->cached_results['end'] ) {
 				// If not, we can still go ahead and return false if we've already
 				// checked to the end of the search area.
 				return false;
@@ -220,9 +221,9 @@ private function has_nonce_check( $stackPtr ) {
 
 			// We haven't checked this far yet, but we can still save work by
 			// skipping over the part we've already checked.
-			$start = $last['end'];
+			$start = $this->cached_results['end'];
 		} else {
-			$last = array(
+			$this->cached_results = array(
 				'file'  => $filename,
 				'start' => $start,
 				'end'   => $end,
@@ -260,13 +261,13 @@ private function has_nonce_check( $stackPtr ) {
 					continue;
 				}
 
-				$last['nonce_check'] = $i;
+				$this->cached_results['nonce_check'] = $i;
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$last['nonce_check'] = false;
+		$this->cached_results['nonce_check'] = false;
 
 		return false;
 	}

From ea8cbb23dc860ea850e8871c8b57f1dd2d6b7500 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:24:32 +0200
Subject: [PATCH 627/822] Security/NonceVerification: improve caching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As things were, the "cache" would only ever contain information about one search.

Now, while this is fine for files which have all code in the global scope òr all code within function scopes, for mixed files, this makes the cache useless as the cache would be reset based on global or function scope and results would not be re-used as intended.

In this commit, I'm changing the cache to a multi-dimensional array, which can hold information about all searches done within a file, which should improve performance for (large) mixed files.

When I then add some debug code, you can see the difference based on the new test file:
**Before**
```
Start: 0
End: 321
----
Cache re-used
----
Cache re-used
----
Start: 113
End: 150
----
Cache re-used
----
Start: 0
End: 188
----
Cache re-used
----
Start: 212
End: 249
----
Cache re-used
----
Start: 0
End: 321
----
Cache re-used
```

**After**
```
Start: 0
End: 321
----
Cache re-used
----
Cache re-used
----
Start: 113
End: 150
----
Cache re-used
----
Cache re-used
----
Cache re-used
----
Start: 212
End: 249
----
Cache re-used
----
Cache re-used
----
Cache re-used
```
---
 .../Security/NonceVerificationSniff.php       | 73 ++++++++++++-------
 .../Security/NonceVerificationUnitTest.7.inc  | 62 ++++++++++++++++
 .../Security/NonceVerificationUnitTest.php    |  6 ++
 3 files changed, 114 insertions(+), 27 deletions(-)
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.7.inc

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index a745a20c7b..02a1d901cd 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -91,17 +91,25 @@ class NonceVerificationSniff extends Sniff {
 	private $addedCustomNonceFunctions = array();
 
 	/**
-	 * Information on the last scope that we checked to find a nonce verification.
+	 * Information on the all scopes that were checked to find a nonce verification in a particular file.
+	 *
+	 * The array will be in the following format:
+	 * ```
+	 * array(
+	 *   'file'  => (string) The name of the file.
+	 *   'cache' => (array) array(
+	 *     # => array(             The key is the token pointer to the "start" position.
+	 *       'end'   => (int)      The token pointer to the "end" position.
+	 *       'nonce' => (int|bool) The token pointer where n nonce check
+	 *                             was found, or false if none was found.
+	 *     )
+	 *   )
+	 * )
+	 * ```
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array {
-	 *      @type string   $file        The name of the file.
-	 *      @type int      $start       The index of the token where the scope started.
-	 *      @type int      $end         The index of the token where the scope ended.
-	 *      @type bool|int $nonce_check The index of the token where an nonce check
-	 *                                  was found, or false if none was found.
-	 * }
+	 * @var array<string, mixed>
 	 */
 	private $cached_results;
 
@@ -200,38 +208,49 @@ private function has_nonce_check( $stackPtr ) {
 			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $this->tokens[ $start ]['scope_closer'];
 		}
 
+		$search_start = $start;
+
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
 		if ( is_array( $this->cached_results )
 			&& $filename === $this->cached_results['file']
-			&& $start === $this->cached_results['start']
 		) {
+			if ( isset( $this->cached_results['cache'][ $start ] ) ) {
+				if ( false !== $this->cached_results['cache'][ $start ]['nonce'] ) {
+					// If we have already found an nonce check in this scope, we just
+					// need to check whether it comes before this token. It is OK if the
+					// check is after the token though, if this was only a isset() check.
+					return ( true === $allow_nonce_after || $this->cached_results['cache'][ $start ]['nonce'] < $stackPtr );
+				} elseif ( $end <= $this->cached_results['cache'][ $start ]['end'] ) {
+					// If not, we can still go ahead and return false if we've already
+					// checked to the end of the search area.
+					return false;
+				}
 
-			if ( false !== $this->cached_results['nonce_check'] ) {
-				// If we have already found an nonce check in this scope, we just
-				// need to check whether it comes before this token. It is OK if the
-				// check is after the token though, if this was only a isset() check.
-				return ( true === $allow_nonce_after || $this->cached_results['nonce_check'] < $stackPtr );
-			} elseif ( $end <= $this->cached_results['end'] ) {
-				// If not, we can still go ahead and return false if we've already
-				// checked to the end of the search area.
-				return false;
+				// We haven't checked this far yet, but we can still save work by
+				// skipping over the part we've already checked.
+				$search_start = $this->cached_results['cache'][ $start ]['end'];
+			} else {
+				$this->cached_results['cache'][ $start ] = array(
+					'end'   => $end,
+					'nonce' => false,
+				);
 			}
-
-			// We haven't checked this far yet, but we can still save work by
-			// skipping over the part we've already checked.
-			$start = $this->cached_results['end'];
 		} else {
 			$this->cached_results = array(
 				'file'  => $filename,
-				'start' => $start,
-				'end'   => $end,
+				'cache' => array(
+					$start => array(
+						'end'   => $end,
+						'nonce' => false,
+					),
+				),
 			);
 		}
 
 		// Loop through the tokens looking for nonce verification functions.
-		for ( $i = $start; $i < $end; $i++ ) {
+		for ( $i = $search_start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
 			if ( \T_FUNCTION === $this->tokens[ $i ]['code']
 				|| \T_CLOSURE === $this->tokens[ $i ]['code']
@@ -261,13 +280,13 @@ private function has_nonce_check( $stackPtr ) {
 					continue;
 				}
 
-				$this->cached_results['nonce_check'] = $i;
+				$this->cached_results['cache'][ $start ]['nonce'] = $i;
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$this->cached_results['nonce_check'] = false;
+		$this->cached_results['cache'][ $start ]['nonce'] = false;
 
 		return false;
 	}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.7.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.7.inc
new file mode 100644
index 0000000000..7fa3d64123
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.7.inc
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This test is not actually testing anything in the sniff.
+ * More than anything, it demonstrates why the cache format change is relevant.
+ */
+
+if ( isset ( $_POST['prefix_myfield'] ) { // OK.
+
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+
+	echo $_POST['prefix_myfield']; // Bad.
+
+	do_something();
+	do_something();
+	do_something();
+
+	echo $_POST['prefix_myfield']; // Bad.
+}
+
+function this_would_previously_reset_the_cache() {
+	if (
+		'newsletter_sign_up' === $_POST['action'] && // OK.
+		wp_verify_nonce( $_POST['newsletter_nonce'] )
+	) {}
+}
+
+// With the change made to the caching, the in-file search will now continue on line 17 instead of start from 0 again.
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+do_something();
+
+wp_verify_nonce( $_POST['prefix_nonce'] );
+echo $_POST['prefix_myfield']; // OK.
+
+function this_would_previously_reset_the_cache_again() {
+	if (
+		'newsletter_sign_up' === $_POST['action'] && // OK.
+		wp_verify_nonce( $_POST['newsletter_nonce'] )
+	) {}
+}
+
+// With the change made to the caching, no in-search file search is needed here as we already found a nonce-check on line 35.
+if ( isset ( $_POST['prefix_myfield'] ) { // OK.
+
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+	do_something();
+
+	echo $_POST['prefix_myfield']; // OK.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 2f91cb3895..12011fec18 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -75,6 +75,12 @@ public function getErrorList( $testFile = '' ) {
 					14 => 1,
 				);
 
+			case 'NonceVerificationUnitTest.7.inc':
+				return array(
+					17 => 1,
+					23 => 1,
+				);
+
 			default:
 				return array();
 		}

From 916c28b45d5d649b48bf83e20b2a81cea1e8593a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 20:37:19 +0200
Subject: [PATCH 628/822] Security/NonceVerification: add cache getter and
 setter methods

Move the logic for getting and setting the cache to separate methods.

Includes removing the cache "priming", which isn't actually necessary as the cache will be set, no matter what, before the function returns.

Even though the class isn't `final`, as the cache was previously not accessible from child classes anyway, I'm making these methods `private`.
---
 .../Security/NonceVerificationSniff.php       | 124 ++++++++++++------
 1 file changed, 87 insertions(+), 37 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 02a1d901cd..83ff8a101e 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -208,45 +208,26 @@ private function has_nonce_check( $stackPtr ) {
 			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $this->tokens[ $start ]['scope_closer'];
 		}
 
-		$search_start = $start;
-
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
-		if ( is_array( $this->cached_results )
-			&& $filename === $this->cached_results['file']
-		) {
-			if ( isset( $this->cached_results['cache'][ $start ] ) ) {
-				if ( false !== $this->cached_results['cache'][ $start ]['nonce'] ) {
-					// If we have already found an nonce check in this scope, we just
-					// need to check whether it comes before this token. It is OK if the
-					// check is after the token though, if this was only a isset() check.
-					return ( true === $allow_nonce_after || $this->cached_results['cache'][ $start ]['nonce'] < $stackPtr );
-				} elseif ( $end <= $this->cached_results['cache'][ $start ]['end'] ) {
-					// If not, we can still go ahead and return false if we've already
-					// checked to the end of the search area.
-					return false;
-				}
+		$current_cache = $this->get_cache( $filename, $start );
+		if ( false !== $current_cache['nonce'] ) {
+			// If we have already found an nonce check in this scope, we just
+			// need to check whether it comes before this token. It is OK if the
+			// check is after the token though, if this was only a isset() check.
+			return ( true === $allow_nonce_after || $current_cache['nonce'] < $stackPtr );
+		} elseif ( $end <= $current_cache['end'] ) {
+			// If not, we can still go ahead and return false if we've already
+			// checked to the end of the search area.
+			return false;
+		}
 
-				// We haven't checked this far yet, but we can still save work by
-				// skipping over the part we've already checked.
-				$search_start = $this->cached_results['cache'][ $start ]['end'];
-			} else {
-				$this->cached_results['cache'][ $start ] = array(
-					'end'   => $end,
-					'nonce' => false,
-				);
-			}
-		} else {
-			$this->cached_results = array(
-				'file'  => $filename,
-				'cache' => array(
-					$start => array(
-						'end'   => $end,
-						'nonce' => false,
-					),
-				),
-			);
+		$search_start = $start;
+		if ( $current_cache['end'] > $start ) {
+			// We haven't checked this far yet, but we can still save work by
+			// skipping over the part we've already checked.
+			$search_start = $this->cached_results['cache'][ $start ]['end'];
 		}
 
 		// Loop through the tokens looking for nonce verification functions.
@@ -280,17 +261,86 @@ private function has_nonce_check( $stackPtr ) {
 					continue;
 				}
 
-				$this->cached_results['cache'][ $start ]['nonce'] = $i;
+				$this->set_cache( $filename, $start, $end, $i );
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$this->cached_results['cache'][ $start ]['nonce'] = false;
+		$this->set_cache( $filename, $start, $end, false );
 
 		return false;
 	}
 
+	/**
+	 * Helper function to retrieve results from the cache.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $filename The name of the current file.
+	 * @param int    $start    The stack pointer searches started from.
+	 *
+	 * @return array<string, mixed>
+	 */
+	private function get_cache( $filename, $start ) {
+		if ( is_array( $this->cached_results )
+			&& $filename === $this->cached_results['file']
+			&& isset( $this->cached_results['cache'][ $start ] )
+		) {
+			return $this->cached_results['cache'][ $start ];
+		}
+
+		return array(
+			'end'   => 0,
+			'nonce' => false,
+		);
+	}
+
+	/**
+	 * Helper function to store results to the cache.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string   $filename The name of the current file.
+	 * @param int      $start    The stack pointer searches started from.
+	 * @param int      $end      The stack pointer searched stopped at.
+	 * @param int|bool $nonce    Stack pointer to the nonce verification function call or false if none was found.
+	 *
+	 * @return void
+	 */
+	private function set_cache( $filename, $start, $end, $nonce ) {
+		if ( is_array( $this->cached_results ) === false
+			|| $filename !== $this->cached_results['file']
+		) {
+			$this->cached_results = array(
+				'file'  => $filename,
+				'cache' => array(
+					$start => array(
+						'end'   => $end,
+						'nonce' => $nonce,
+					),
+				),
+			);
+			return;
+		}
+
+		// Okay, so we know the current cache is for the current file. Check if we've seen this start pointer before.
+		if ( isset( $this->cached_results['cache'][ $start ] ) === false ) {
+			$this->cached_results['cache'][ $start ] = array(
+				'end'   => $end,
+				'nonce' => $nonce,
+			);
+			return;
+		}
+
+		// Update existing entry.
+		if ( $end > $this->cached_results['cache'][ $start ]['end'] ) {
+			$this->cached_results['cache'][ $start ]['end'] = $end;
+		}
+
+		$this->cached_results['cache'][ $start ]['nonce'] = $nonce;
+	}
+
 	/**
 	 * Merge custom functions provided via a custom ruleset with the defaults, if we haven't already.
 	 *

From 3a8edc2879a347e2b4f3552e05d25bca0639b91d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 17 Dec 2022 14:40:11 +0100
Subject: [PATCH 629/822] Security/NonceVerification: implement PHPCSUtils

---
 .../Security/NonceVerificationSniff.php       | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 83ff8a101e..4ca8e07544 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -9,7 +9,8 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
-use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\MessageHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
@@ -178,16 +179,9 @@ private function has_nonce_check( $stackPtr ) {
 		$end   = $stackPtr;
 
 		// If we're in a function, only look inside of it.
-		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
-		if ( isset( $this->tokens[ $stackPtr ]['conditions'] ) === true ) {
-			$conditions = $this->tokens[ $stackPtr ]['conditions'];
-			$conditions = array_reverse( $conditions, true );
-			foreach ( $conditions as $tokenPtr => $condition ) {
-				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
-					$start = $this->tokens[ $tokenPtr ]['scope_opener'];
-					break;
-				}
-			}
+		$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+		if ( false !== $functionPtr ) {
+			$start = $this->tokens[ $functionPtr ]['scope_opener'];
 		}
 
 		$allow_nonce_after = false;
@@ -233,10 +227,7 @@ private function has_nonce_check( $stackPtr ) {
 		// Loop through the tokens looking for nonce verification functions.
 		for ( $i = $search_start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
-			if ( \T_FUNCTION === $this->tokens[ $i ]['code']
-				|| \T_CLOSURE === $this->tokens[ $i ]['code']
-				|| isset( Tokens::$ooScopeTokens[ $this->tokens[ $i ]['code'] ] )
-			) {
+			if ( isset( Collections::closedScopes()[ $this->tokens[ $i ]['code'] ] ) ) {
 				if ( isset( $this->tokens[ $i ]['scope_closer'] ) ) {
 					$i = $this->tokens[ $i ]['scope_closer'];
 				}

From 0866afc45e2cd8cc118496534aaea5939496482d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:44:53 +0200
Subject: [PATCH 630/822] Security/NonceVerification: bug fix - ignore OO
 properties

Properties with the same name as a superglobal should be ignored as these are not the actual superglobal.

Note: I'm not adding a similar check for function parameters as a function parameter with the same name as a superglobal with cause a fatal error since PHP 5.4, so IMO checking for that is not relevant.

Includes tests.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php     | 6 ++++++
 WordPress/Tests/Security/NonceVerificationUnitTest.8.inc | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 WordPress/Tests/Security/NonceVerificationUnitTest.8.inc

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 4ca8e07544..481cbbfd2e 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -12,6 +12,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
 use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
@@ -138,6 +139,11 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		if ( Scopes::isOOProperty( $this->phpcsFile, $stackPtr ) ) {
+			// Property with the same name as a superglobal. Not our target.
+			return;
+		}
+
 		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			return;
 		}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.8.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.8.inc
new file mode 100644
index 0000000000..c2c134ddb7
--- /dev/null
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.8.inc
@@ -0,0 +1,6 @@
+<?php
+
+class IgnoreProperties {
+	public $_GET = array( 'key' => 'something' ); // OK.
+	public $_POST; // OK.
+}

From 10e3180954729ed8397e17564354a2d51ef08b9d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:37:03 +0200
Subject: [PATCH 631/822] Security/NonceVerification: bug fix - disregard
 assignments via list()

Sometimes I hate my brain....

Okay, so, while hopefully not common, assignments to superglobals can also happen via list constructs. As this sniff (correctly) disregards all assignments as safe, we should also disregard list assignments.

This commit makes it so.

Includes tests safeguarding the fix, which would previously lead to false positives.
---
 .../Security/NonceVerificationSniff.php       | 21 +++++++++++++----
 .../Security/NonceVerificationUnitTest.1.inc  | 23 +++++++++++++++++++
 .../Security/NonceVerificationUnitTest.php    |  2 ++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 481cbbfd2e..3686db7c4e 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Conditions;
+use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\ContextHelper;
@@ -121,10 +122,10 @@ class NonceVerificationSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
+		$targets  = array( \T_VARIABLE => \T_VARIABLE );
+		$targets += Collections::listOpenTokensBC(); // We need to skip over lists.
 
-		return array(
-			\T_VARIABLE,
-		);
+		return $targets;
 	}
 
 	/**
@@ -132,9 +133,21 @@ public function register() {
 	 *
 	 * @param int $stackPtr The position of the current token in the stack.
 	 *
-	 * @return void
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
+		// Skip over lists as whatever is in those will always be assignments.
+		if ( isset( Collections::listOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+			$open_close = Lists::getOpenClose( $this->phpcsFile, $stackPtr );
+			$skip_to    = $stackPtr;
+			if ( false !== $open_close ) {
+				$skip_to = $open_close['closer'];
+			}
+
+			return $skip_to;
+		}
+
 		if ( ! isset( $this->superglobals[ $this->tokens[ $stackPtr ]['content'] ] ) ) {
 			return;
 		}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 79a04de3a5..f4bd9c7684 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -381,3 +381,26 @@ function disallow_for_non_array_comparison_in_condition_with_named_params() {
 		foo();
 	}
 }
+
+function test_long_list_assignment() {
+	list( $_POST['key1'], list( $_POST['key2'] ) ) = $something; // OK.
+}
+function test_short_list_assignment() {
+	[ $_POST['key1'], [ $_POST['key2'] ] ] = $something; // OK.
+}
+
+function test_assignment_to_long_list_with_noncecheck() {
+	wp_verify_nonce( $_POST['nonce'] );
+	list( $key, list( $key2 ) ) = $_POST; // OK.
+}
+function test_assignment_to_short_list_with_noncecheck() {
+	wp_verify_nonce( $_POST['nonce'] );
+	[ $key, [ $key2 ] ] = $_POST; // OK.
+}
+
+function test_assignment_to_long_list_without_noncecheck() {
+	list( $key, list( $key2 ) ) = $_POST; // Bad.
+}
+function test_assignment_to_short_list_without_noncecheck() {
+	[ $key, [ $key2 ] ] = $_POST; // Bad.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 12011fec18..212ed2c20f 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -67,6 +67,8 @@ public function getErrorList( $testFile = '' ) {
 					329 => 1,
 					337 => 1,
 					341 => 1,
+					402 => 1,
+					405 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From f8cd5059f1b4efa41b1bd6372e89c90326e40bde Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Jul 2023 08:26:06 +0200
Subject: [PATCH 632/822] Security/NonceVerification: new `needs_nonce_check()`
 method

The "does this superglobal use need a nonce ?" check was previously contained in the `process_token()` method and the "must the nonce check be done before or is it allowed after ?" check was done in the `has_nonce_check()` method.

With an eye on expanding the number of checks in this field, I'm moving the logic for these two checks to a new `needs_nonce_check()` method which will either return (string) `'before|after'` or `false` when no nonce check is needed.

As the class isn't `final`, I'm making this a `protected` method (instead of `private`) to allow some flexibility for child classes.

Note: I'm deliberately _not_ moving the (new) "is OO property" check to the `needs_nonce_check()` method as in that case it isn't a superglobal in the first place, so not a variable this sniff should look at.
---
 .../Security/NonceVerificationSniff.php       | 55 +++++++++++++------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 3686db7c4e..01181da15c 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -157,22 +157,23 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
+		$needs_nonce = $this->needs_nonce_check( $stackPtr );
+		if ( false === $needs_nonce ) {
 			return;
 		}
 
 		$this->mergeFunctionLists();
 
-		if ( $this->has_nonce_check( $stackPtr ) ) {
+		if ( $this->has_nonce_check( $stackPtr, ( 'after' === $needs_nonce ) ) ) {
 			return;
 		}
 
+		// If we're still here, no nonce-verification function was found.
 		$error_code = 'Missing';
 		if ( false === $this->superglobals[ $this->tokens[ $stackPtr ]['content'] ] ) {
 			$error_code = 'Recommended';
 		}
 
-		// If we're still here, no nonce-verification function was found.
 		MessageHelper::addMessage(
 			$this->phpcsFile,
 			'Processing form data without nonce verification.',
@@ -182,18 +183,51 @@ public function process_token( $stackPtr ) {
 		);
 	}
 
+	/**
+	 * Determine whether or not a nonce check is needed for the current superglobal.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int $stackPtr The position of the current token in the stack of tokens.
+	 *
+	 * @return string|false String "before" or "after" if a nonce check is needed.
+	 *                      FALSE when no nonce check is needed.
+	 */
+	protected function needs_nonce_check( $stackPtr ) {
+		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
+			// Overwritting the value of a superglobal.
+			return false;
+		}
+
+		$needs_nonce = 'before';
+		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr )
+			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
+			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
+			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
+			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_functions() ) !== false
+			|| $this->is_only_sanitized( $stackPtr )
+		) {
+			$needs_nonce = 'after';
+		}
+
+		return $needs_nonce;
+	}
+
 	/**
 	 * Check if this token has an associated nonce check.
 	 *
 	 * @since 0.5.0
 	 * @since 3.0.0 - Moved from the generic `Sniff` class to this class.
 	 *              - Visibility changed from `protected` to `private.
+	 *              - New `$allow_nonce_after` parameter.
 	 *
-	 * @param int $stackPtr The position of the current token in the stack of tokens.
+	 * @param int  $stackPtr          The position of the current token in the stack of tokens.
+	 * @param bool $allow_nonce_after Whether the nonce check _must_ be before the $stackPtr or
+	 *                                is allowed _after_ the $stackPtr.
 	 *
 	 * @return bool
 	 */
-	private function has_nonce_check( $stackPtr ) {
+	private function has_nonce_check( $stackPtr, $allow_nonce_after = false ) {
 		$start = 0;
 		$end   = $stackPtr;
 
@@ -203,17 +237,6 @@ private function has_nonce_check( $stackPtr ) {
 			$start = $this->tokens[ $functionPtr ]['scope_opener'];
 		}
 
-		$allow_nonce_after = false;
-		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr )
-			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
-			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
-			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
-			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_functions() ) !== false
-			|| $this->is_only_sanitized( $stackPtr )
-		) {
-			$allow_nonce_after = true;
-		}
-
 		// We allow for certain actions, such as an isset() check to come before the nonce check.
 		// If this superglobal is inside such a check, look for the nonce after it as well,
 		// all the way to the end of the scope.

From 154855a049423d0efa8a1170dc05942c7fa5206a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Jul 2023 08:40:55 +0200
Subject: [PATCH 633/822] Security/NonceVerification: efficiency fix - check
 for being in a nonce verification method early

As things were, if the superglobal being examined was _in_ a call to one of the nonce verification functions, the sniff would still loop from the start of the scope (start of the function/file) to the current token before coming to that conclusion.
This is, of course, highly inefficient for long functions/large files.

I've been in two minds about whether to add this check to the `needs_nonce_check()` method or the `has_nonce_check()` method.
For optimal efficiency, the best place is at the start of the `needs_nonce_check()` method as it will prevent having to do all the other "is in type check, is in sanitization function" checks, which are redundant if the call is a nonce check itself.
And after all, if the current superglobal is _in_ a nonce check, it doesn't _need_ a nonce check as it already has one.

To allow for caching the found nonce check, the gathering of the basic information needed for the caching has to be moved to the `process_token()` method though, so both the `needs_nonce_check()` method, as well as the `has_nonce_check()` method now get an extra `$cache_keys` parameter.

It also means that the lists of custom and known nonce verification functions have to be merged earlier, so the call to `$this->mergeFunctionLists()` has been moved up.
---
 .../Security/NonceVerificationSniff.php       | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 01181da15c..5ae546043e 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -157,14 +157,27 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$needs_nonce = $this->needs_nonce_check( $stackPtr );
-		if ( false === $needs_nonce ) {
-			return;
+		// Determine the cache keys for this item.
+		$cache_keys = array(
+			'file'  => $this->phpcsFile->getFilename(),
+			'start' => 0,
+			'end'   => $stackPtr,
+		);
+
+		// If we're in a function, only look inside of it.
+		$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
+		if ( false !== $functionPtr ) {
+			$cache_keys['start'] = $this->tokens[ $functionPtr ]['scope_opener'];
 		}
 
 		$this->mergeFunctionLists();
 
-		if ( $this->has_nonce_check( $stackPtr, ( 'after' === $needs_nonce ) ) ) {
+		$needs_nonce = $this->needs_nonce_check( $stackPtr, $cache_keys );
+		if ( false === $needs_nonce ) {
+			return;
+		}
+
+		if ( $this->has_nonce_check( $stackPtr, $cache_keys, ( 'after' === $needs_nonce ) ) ) {
 			return;
 		}
 
@@ -188,12 +201,21 @@ public function process_token( $stackPtr ) {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param int $stackPtr The position of the current token in the stack of tokens.
+	 * @param int   $stackPtr   The position of the current token in the stack of tokens.
+	 * @param array $cache_keys The keys for the applicable cache (to potentially set).
 	 *
 	 * @return string|false String "before" or "after" if a nonce check is needed.
 	 *                      FALSE when no nonce check is needed.
 	 */
-	protected function needs_nonce_check( $stackPtr ) {
+	protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
+		$in_nonce_check = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $this->nonceVerificationFunctions );
+		if ( false !== $in_nonce_check ) {
+			// This *is* the nonce check, so bow out, but do store to cache.
+			// @todo Change to use arg unpacking once PHP < 5.6 has been dropped.
+			$this->set_cache( $cache_keys['file'], $cache_keys['start'], $cache_keys['end'], $in_nonce_check );
+			return false;
+		}
+
 		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			// Overwritting the value of a superglobal.
 			return false;
@@ -219,23 +241,19 @@ protected function needs_nonce_check( $stackPtr ) {
 	 * @since 0.5.0
 	 * @since 3.0.0 - Moved from the generic `Sniff` class to this class.
 	 *              - Visibility changed from `protected` to `private.
+	 *              - New `$cache_keys` parameter.
 	 *              - New `$allow_nonce_after` parameter.
 	 *
-	 * @param int  $stackPtr          The position of the current token in the stack of tokens.
-	 * @param bool $allow_nonce_after Whether the nonce check _must_ be before the $stackPtr or
-	 *                                is allowed _after_ the $stackPtr.
+	 * @param int   $stackPtr          The position of the current token in the stack of tokens.
+	 * @param array $cache_keys        The keys for the applicable cache.
+	 * @param bool  $allow_nonce_after Whether the nonce check _must_ be before the $stackPtr or
+	 *                                 is allowed _after_ the $stackPtr.
 	 *
 	 * @return bool
 	 */
-	private function has_nonce_check( $stackPtr, $allow_nonce_after = false ) {
-		$start = 0;
-		$end   = $stackPtr;
-
-		// If we're in a function, only look inside of it.
-		$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
-		if ( false !== $functionPtr ) {
-			$start = $this->tokens[ $functionPtr ]['scope_opener'];
-		}
+	private function has_nonce_check( $stackPtr, array $cache_keys, $allow_nonce_after = false ) {
+		$start = $cache_keys['start'];
+		$end   = $cache_keys['end'];
 
 		// We allow for certain actions, such as an isset() check to come before the nonce check.
 		// If this superglobal is inside such a check, look for the nonce after it as well,
@@ -244,10 +262,8 @@ private function has_nonce_check( $stackPtr, $allow_nonce_after = false ) {
 			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $this->tokens[ $start ]['scope_closer'];
 		}
 
-		// Check if we've looked here before.
-		$filename = $this->phpcsFile->getFilename();
-
-		$current_cache = $this->get_cache( $filename, $start );
+		// Check against the cache.
+		$current_cache = $this->get_cache( $cache_keys['file'], $start );
 		if ( false !== $current_cache['nonce'] ) {
 			// If we have already found an nonce check in this scope, we just
 			// need to check whether it comes before this token. It is OK if the
@@ -294,13 +310,13 @@ private function has_nonce_check( $stackPtr, $allow_nonce_after = false ) {
 					continue;
 				}
 
-				$this->set_cache( $filename, $start, $end, $i );
+				$this->set_cache( $cache_keys['file'], $start, $end, $i );
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$this->set_cache( $filename, $start, $end, false );
+		$this->set_cache( $cache_keys['file'], $start, $end, false );
 
 		return false;
 	}

From 8f2dd9c09ab864cdae5fc303b59b70d4a61ea673 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 7 Jul 2023 04:27:41 +0200
Subject: [PATCH 634/822] Security/NonceVerification: bug fix - allow unsetting
 of superglobal key without nonce verification

If all that's being done is to unset a value, there is no risk, so let the sniff stay silent.

Includes tests.

Note: I've checked in with the security team to confirm this is the correct behaviour.

Fixes 1981
---
 .../Sniffs/Security/NonceVerificationSniff.php    |  6 ++++++
 .../Security/NonceVerificationUnitTest.1.inc      | 15 +++++++++++++++
 .../Tests/Security/NonceVerificationUnitTest.php  |  1 +
 3 files changed, 22 insertions(+)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 5ae546043e..f6abaab88f 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -11,6 +11,7 @@
 
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Conditions;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\Scopes;
@@ -216,6 +217,11 @@ protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
 			return false;
 		}
 
+		if ( Context::inUnset( $this->phpcsFile, $stackPtr ) ) {
+			// Variable is only being unset, no nonce check needed.
+			return false;
+		}
+
 		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			// Overwritting the value of a superglobal.
 			return false;
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index f4bd9c7684..15d63db5f3 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -404,3 +404,18 @@ function test_assignment_to_long_list_without_noncecheck() {
 function test_assignment_to_short_list_without_noncecheck() {
 	[ $key, [ $key2 ] ] = $_POST; // Bad.
 }
+
+function dont_throw_error_when_only_used_in_unset() {
+	unset( $_POST['foo'] ); // OK.
+}
+
+function dont_throw_error_when_only_used_in_unset_but_error_for_other_use() {
+	unset( $_POST['foo'] ); // OK.
+	echo $_POST['bar']; // Bad.
+}
+
+function dont_throw_error_when_only_used_in_unset_when_there_is_nonce_check_before_other_use() {
+	unset( $_POST['foo'] ); // OK.
+	wp_verify_nonce( $_POST['prefix_nonce'] );
+	echo $_POST['bar']; // OK.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 212ed2c20f..8baee5aad6 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -69,6 +69,7 @@ public function getErrorList( $testFile = '' ) {
 					341 => 1,
 					402 => 1,
 					405 => 1,
+					414 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From 68ccbc94149e84205a83f6d4f107f796bb72d868 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 09:43:57 +0200
Subject: [PATCH 635/822] Security/NonceVerification: add test with PHP 7.0+
 null coalesce operator

This is already being handled correctly as the WPCS `VariableHelper::is_comparison()` method (optionally) treats null coalesce the same as other comparison operators.

This behaviour is now safeguarded with a test.
---
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 9 +++++++++
 WordPress/Tests/Security/NonceVerificationUnitTest.php   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 15d63db5f3..71162c4633 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -419,3 +419,12 @@ function dont_throw_error_when_only_used_in_unset_when_there_is_nonce_check_befo
 	wp_verify_nonce( $_POST['prefix_nonce'] );
 	echo $_POST['bar']; // OK.
 }
+
+function test_null_coalesce() {
+	$var = $_POST['foo'] ?? 10; // OK.
+	wp_verify_nonce( $_POST['nonce'] );
+}
+function test_null_coalesce_without_noncecheck() {
+	$var = $_POST['foo'] ?? 10; // Bad.
+	// Do something.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 8baee5aad6..9654c777b0 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -70,6 +70,7 @@ public function getErrorList( $testFile = '' ) {
 					402 => 1,
 					405 => 1,
 					414 => 1,
+					428 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From c0f47eb52b56a0b7caab60651db630a05bd28c0f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:09:20 +0200
Subject: [PATCH 636/822] Security/NonceVerification: support PHP 7.4+ null
 coalesce equals

Assignments to a superglobal using the PHP 7.4 null coalesce equals operator should be treated the same as if the variable was used in an `isset()` or with a `??` (PHP 7.0 null coalesce) operator. I.e. as long as there is a nonce check _before_ or _after_, it's fine.

As things were, null coalesce equals was treated the same as an assignment (which does not need nonce verification), even though the value of the superglobal key may not be overwritten due to the use of null coalescence.

To fix this, I'm adding a new `$include_coalesce` parameter to the `VariableHelper::is_assignment()` method to allow the method to include/exclude the null coalesce equal operator based on the value passed to that parameter.
The default value of the parameter is `true` which maintains the pre-existing behaviour of the function.

This mirrors the similar method signature and behaviour in the `VariableHelper::is_comparison()` method.

The `NonceVerificationSniff::needs_nonce_check()` method will now call that method twice, once to exclude variable assignments (with the exception of null coalesce assignments) and once to allow null coalesce equals assignments to set the expectation for the nonce verification to "after".

This may seem inefficient (and is in a way), but the footprint of the `VariableHelper::is_assignment()` method is small and the duplicate code we'd need to handle this differently not worth the effort.

Includes tests safeguarding the change.
---
 WordPress/Helpers/VariableHelper.php          | 26 ++++++++++++++-----
 .../Security/NonceVerificationSniff.php       |  3 ++-
 .../Security/NonceVerificationUnitTest.1.inc  | 10 +++++++
 .../Security/NonceVerificationUnitTest.php    |  1 +
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index dc3c7a8728..0fb6720acc 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -201,15 +201,22 @@ public static function is_comparison( File $phpcsFile, $stackPtr, $include_coale
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - Visibility is now `public` (was `protected`) and the method `static`.
 	 *              - The `$phpcsFile` parameter was added.
+	 *              - The `$include_coalesce` parameter was added.
 	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-	 * @param int                         $stackPtr  The index of the token in the stack.
-	 *                                               This must point to either a T_VARIABLE or
-	 *                                               T_CLOSE_SQUARE_BRACKET token.
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile        The file being scanned.
+	 * @param int                         $stackPtr         The index of the token in the stack.
+	 *                                                      This must point to either a T_VARIABLE or
+	 *                                                      T_CLOSE_SQUARE_BRACKET token.
+	 * @param bool                        $include_coalesce Optional. Whether or not to regard the null
+	 *                                                      coalesce operator - ?? - as a comparison operator.
+	 *                                                      Defaults to true.
+	 *                                                      Null coalesce is a special comparison operator in this
+	 *                                                      sense as it doesn't compare a variable to whatever is
+	 *                                                      on the other side of the comparison operator.
 	 *
 	 * @return bool Whether the token is a variable being assigned a value.
 	 */
-	public static function is_assignment( File $phpcsFile, $stackPtr ) {
+	public static function is_assignment( File $phpcsFile, $stackPtr, $include_coalesce = true ) {
 		$tokens = $phpcsFile->getTokens();
 		if ( isset( $tokens[ $stackPtr ] ) === false ) {
 			return false;
@@ -232,8 +239,13 @@ public static function is_assignment( File $phpcsFile, $stackPtr ) {
 			return false;
 		}
 
+		$assignmentTokens = Tokens::$assignmentTokens;
+		if ( false === $include_coalesce ) {
+			unset( $assignmentTokens[ \T_COALESCE_EQUAL ] );
+		}
+
 		// If the next token is an assignment, that's all we need to know.
-		if ( isset( Tokens::$assignmentTokens[ $tokens[ $next_non_empty ]['code'] ] ) ) {
+		if ( isset( $assignmentTokens[ $tokens[ $next_non_empty ]['code'] ] ) ) {
 			return true;
 		}
 
@@ -241,7 +253,7 @@ public static function is_assignment( File $phpcsFile, $stackPtr ) {
 		if ( \T_OPEN_SQUARE_BRACKET === $tokens[ $next_non_empty ]['code']
 			&& isset( $tokens[ $next_non_empty ]['bracket_closer'] )
 		) {
-			return self::is_assignment( $phpcsFile, $tokens[ $next_non_empty ]['bracket_closer'] );
+			return self::is_assignment( $phpcsFile, $tokens[ $next_non_empty ]['bracket_closer'], $include_coalesce );
 		}
 
 		return false;
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index f6abaab88f..935add67e6 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -222,7 +222,7 @@ protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
 			return false;
 		}
 
-		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
+		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr, false ) ) {
 			// Overwritting the value of a superglobal.
 			return false;
 		}
@@ -231,6 +231,7 @@ protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
 		if ( ContextHelper::is_in_isset_or_empty( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_type_test( $this->phpcsFile, $stackPtr )
 			|| VariableHelper::is_comparison( $this->phpcsFile, $stackPtr )
+			|| VariableHelper::is_assignment( $this->phpcsFile, $stackPtr, true )
 			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_functions() ) !== false
 			|| $this->is_only_sanitized( $stackPtr )
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 71162c4633..3d1369ee55 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -428,3 +428,13 @@ function test_null_coalesce_without_noncecheck() {
 	$var = $_POST['foo'] ?? 10; // Bad.
 	// Do something.
 }
+
+function test_null_coalesce_equals() {
+	$_POST['foo'][0] ??= 10; // OK.
+	wp_verify_nonce( $_POST['nonce'] );
+}
+
+function test_null_coalesce_equals_without_noncecheck() {
+	$_POST['foo'][0] ??= 10; // Bad.
+	// Do something.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 9654c777b0..a97350a65c 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -71,6 +71,7 @@ public function getErrorList( $testFile = '' ) {
 					405 => 1,
 					414 => 1,
 					428 => 1,
+					438 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From 5a9d988b1187c28c83663506e40f9505ed727e44 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:21:54 +0200
Subject: [PATCH 637/822] Security/NonceVerification: disregard PHP 7.4 arrow
 function when determining search scope

As arrow functions are "open", we should not limit a search for a nonce verification to the scope of the arrow function.

Includes tests documenting the behaviour.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php     | 1 +
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 9 +++++++++
 WordPress/Tests/Security/NonceVerificationUnitTest.php   | 1 +
 3 files changed, 11 insertions(+)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 935add67e6..402530047d 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -166,6 +166,7 @@ public function process_token( $stackPtr ) {
 		);
 
 		// If we're in a function, only look inside of it.
+		// This doesn't take arrow functions into account as those are "open".
 		$functionPtr = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) );
 		if ( false !== $functionPtr ) {
 			$cache_keys['start'] = $this->tokens[ $functionPtr ]['scope_opener'];
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 3d1369ee55..4abfed88ed 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -438,3 +438,12 @@ function test_null_coalesce_equals_without_noncecheck() {
 	$_POST['foo'][0] ??= 10; // Bad.
 	// Do something.
 }
+
+function test_open_arrow_fn_with_noncecheck() {
+	wp_verify_nonce( $_POST['nonce'] );
+	$callback = fn() => $_POST['key']++; // OK.
+}
+
+function test_open_arrow_fn_without_noncecheck() {
+	$callback = fn() => $_POST['key']++; // Bad.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index a97350a65c..fea72dbb60 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -72,6 +72,7 @@ public function getErrorList( $testFile = '' ) {
 					414 => 1,
 					428 => 1,
 					438 => 1,
+					448 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From ae646c6306407501d5e0d9bc53019f8d31645004 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:28:41 +0200
Subject: [PATCH 638/822] Security/NonceVerification: disregard nonce check in
 PHP 7.4 arrow function when searching

As an arrow function is a callback and we don't trace whether a callback is called, any nonce check found within an arrow function should be disregarded.
This mirrors the sniff behaviour with regards to closures, meaning nonce checks in nested arrow functions and in nested closures will now be treated the same.

Includes test.
---
 WordPress/Sniffs/Security/NonceVerificationSniff.php     | 4 +++-
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 5 +++++
 WordPress/Tests/Security/NonceVerificationUnitTest.php   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 402530047d..9e8003d503 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -293,7 +293,9 @@ private function has_nonce_check( $stackPtr, array $cache_keys, $allow_nonce_aft
 		// Loop through the tokens looking for nonce verification functions.
 		for ( $i = $search_start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
-			if ( isset( Collections::closedScopes()[ $this->tokens[ $i ]['code'] ] ) ) {
+			if ( isset( Collections::closedScopes()[ $this->tokens[ $i ]['code'] ] )
+				|| \T_FN === $this->tokens[ $i ]['code']
+			) {
 				if ( isset( $this->tokens[ $i ]['scope_closer'] ) ) {
 					$i = $this->tokens[ $i ]['scope_closer'];
 				}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 4abfed88ed..c002a338b7 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -447,3 +447,8 @@ function test_open_arrow_fn_with_noncecheck() {
 function test_open_arrow_fn_without_noncecheck() {
 	$callback = fn() => $_POST['key']++; // Bad.
 }
+
+function test_disregard_noncecheck_in_nested_arrow_function() {
+	$callback = fn() => check_admin_referer( 'foo' );
+	echo $_POST['foo']; // Bad, we don't know if the callback has been called or not.
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index fea72dbb60..6c7f4f9f47 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -73,6 +73,7 @@ public function getErrorList( $testFile = '' ) {
 					428 => 1,
 					438 => 1,
 					448 => 1,
+					453 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From a915928455ccd1708cdb8d6d31cd78378e79f9fd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:59:49 +0200
Subject: [PATCH 639/822] Security/NonceVerification: add test with PHP 8.0+
 match construct

This just adds a test documenting the behaviour in combination with `match` constructs.

The use of `$_POST` in the `default` branch should realistically be flagged as the nonce check will not have been executed (as it is executed conditionally, only for `'value'`.

However, this is a structural flaw in the sniff as a whole, as it doesn't check at all whether a nonce check is done conditionally or not.

Example:
```php
function test() {
	if ( $foo ) {
		wp_verify_nonce( $_POST['nonce'] );
	} else {
		echo $_POST['key']; // Should be flagged as nonce check will definitely not have run, but isn't.
	}

	echo $_POST['key']; // Should potentially be flagged, depending on value of $foo, but isn't.
}
```

If would be very hard to fix this as a lot of conditions involve variables and we don't have access to runtime values, so it would, in most cases, be very hard to determine whether a conditionally run nonce check will have run.

With that in mind, I think allowing the sniff to treat `match` the same as other conditional constructs are currently treated is the correct behaviour for now.

If/when at some point in the future someone would attempt to make the conditionally run nonce check more precise, `match` should be handled the same as all other control structures.
---
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index c002a338b7..611fe93a86 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -452,3 +452,10 @@ function test_disregard_noncecheck_in_nested_arrow_function() {
 	$callback = fn() => check_admin_referer( 'foo' );
 	echo $_POST['foo']; // Bad, we don't know if the callback has been called or not.
 }
+
+function test_match() {
+	$var = match($_POST['key']) { // OK. comparison with nonce check after.
+		'value' => wp_verify_nonce( $_POST['nonce'] ), // OK.
+		default => $_POST['key'], // OK, due to check above. Realistically, this is wrong, but that goes for all conditional checks.
+	};
+}

From c73c642ba05b93ab3491685b12cf2535d3a8e2b1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 9 Jul 2023 12:08:19 +0200
Subject: [PATCH 640/822] Security/NonceVerification: add test with PHP 8.1+
 nested enum

Just like other nested constructs, the search for a nonce check should limit itself to the current scope and skip over nested closed scopes/not look outside the current scope.

This is already handled correctly for enums due to the sniff using the PHPCSUtils `Collections::closedScopes()` method.

This just adds tests to safeguard this.
---
 .../Security/NonceVerificationUnitTest.1.inc  | 27 +++++++++++++++++++
 .../Security/NonceVerificationUnitTest.php    |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 611fe93a86..1f94dfc4bd 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -459,3 +459,30 @@ function test_match() {
 		default => $_POST['key'], // OK, due to check above. Realistically, this is wrong, but that goes for all conditional checks.
 	};
 }
+
+function function_containing_nested_enum_with_nonce_check() {
+	enum MyEnum {
+		public function nested_method() {
+			wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['my_nonce'] ) ), 'the_nonce' );
+		}
+	}
+	
+	echo $_POST['foo']; // Bad.
+}
+
+function function_containing_nested_enum_with_nonce_check_outside() {
+	wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['my_nonce'] ) ), 'the_nonce' );
+
+	enum MyEnum {
+		public function nested_method() {
+			echo $_POST['foo']; // Bad.
+		}
+	}
+}
+
+enum MyEnum {
+	public function nested_method() {
+		wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['my_nonce'] ) ), 'the_nonce' );
+		echo $_POST['foo']; // OK.
+	}
+}
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 6c7f4f9f47..5a5bebd94a 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -74,6 +74,8 @@ public function getErrorList( $testFile = '' ) {
 					438 => 1,
 					448 => 1,
 					453 => 1,
+					470 => 1,
+					478 => 1,
 				);
 
 			case 'NonceVerificationUnitTest.2.inc':

From 59856f777d4a114f239952c8f404f95177784b4d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Jul 2023 08:19:45 +0200
Subject: [PATCH 641/822] Security/NonceVerification: various documentation
 tweaks

---
 WordPress/Sniffs/Security/NonceVerificationSniff.php     | 7 ++++---
 WordPress/Tests/Security/NonceVerificationUnitTest.1.inc | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 9e8003d503..2d460606da 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -31,6 +31,7 @@
  * @since   0.5.0
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
+ * @since   3.0.0  This sniff has received significant updates to its logic and structure.
  *
  * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
  * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
@@ -224,7 +225,7 @@ protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
 		}
 
 		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr, false ) ) {
-			// Overwritting the value of a superglobal.
+			// Overwriting the value of a superglobal.
 			return false;
 		}
 
@@ -273,9 +274,9 @@ private function has_nonce_check( $stackPtr, array $cache_keys, $allow_nonce_aft
 		// Check against the cache.
 		$current_cache = $this->get_cache( $cache_keys['file'], $start );
 		if ( false !== $current_cache['nonce'] ) {
-			// If we have already found an nonce check in this scope, we just
+			// If we have already found a nonce check in this scope, we just
 			// need to check whether it comes before this token. It is OK if the
-			// check is after the token though, if this was only a isset() check.
+			// check is after the token though, if this was only an isset() check.
 			return ( true === $allow_nonce_after || $current_cache['nonce'] < $stackPtr );
 		} elseif ( $end <= $current_cache['end'] ) {
 			// If not, we can still go ahead and return false if we've already
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
index 1f94dfc4bd..cb8348b4ad 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.1.inc
@@ -454,7 +454,7 @@ function test_disregard_noncecheck_in_nested_arrow_function() {
 }
 
 function test_match() {
-	$var = match($_POST['key']) { // OK. comparison with nonce check after.
+	$var = match($_POST['key']) { // OK, it's a comparison, with the nonce check after.
 		'value' => wp_verify_nonce( $_POST['nonce'] ), // OK.
 		default => $_POST['key'], // OK, due to check above. Realistically, this is wrong, but that goes for all conditional checks.
 	};

From 0fc6aa019485caf8708b1c94276266cca8bd8a0d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 21:12:42 +0200
Subject: [PATCH 642/822] NamingConventions/ValidVariableName: bring back
 `$catID`

Looks like between my last WP Core scan and now, `$catID` is back... _sigh_
---
 WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php  | 1 +
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php      | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index c62f0aef66..550a67a38f 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -66,6 +66,7 @@ final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * @var array
 	 */
 	protected $allowed_mixed_case_member_var_names = array(
+		'cat_ID'            => true,
 		'comment_ID'        => true,
 		'comment_author_IP' => true,
 		'comment_post_ID'   => true,
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 65c15b4a1e..467924b686 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -71,8 +71,7 @@ public function getErrorList() {
 			103 => 1,
 			104 => 1,
 			105 => 1,
-			120 => 1,
-			121 => 2,
+			121 => 1,
 			126 => 1,
 			138 => 1,
 			145 => 1,

From e6523fa35437a7c62c99eff00174fd031dc5cb3e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:59:20 +0200
Subject: [PATCH 643/822] Arrays/ArrayDeclarationSpacing: implement PHPCSUtils
 [1]

---
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f6d2fb873b..f76adb1d24 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 
@@ -52,21 +53,6 @@ final class ArrayDeclarationSpacingSniff extends Sniff {
 	 */
 	public $allow_single_item_single_line_associative_arrays = true;
 
-	/**
-	 * Token this sniff targets.
-	 *
-	 * Also used for distinguishing between the array and an array value
-	 * which is also an array.
-	 *
-	 * @since 0.12.0
-	 *
-	 * @var array
-	 */
-	private $targets = array(
-		\T_ARRAY            => \T_ARRAY,
-		\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
-	);
-
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -75,7 +61,7 @@ final class ArrayDeclarationSpacingSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
-		return $this->targets;
+		return Collections::arrayOpenTokensBC();
 	}
 
 	/**
@@ -90,7 +76,7 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code']
+		if ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] )
 			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
 		) {
 			// Short list, not short array.

From 590259f3d5e5a1fa53835f8a959cf03ae6d69eee Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 09:45:21 +0200
Subject: [PATCH 644/822] Arrays/ArrayDeclarationSpacing: implement PHPCSUtils 
 [2] / PHP 7.2+ keyed lists

Since PHP 7.2, lists can also contain keys and the double arrow in those will tokenize as `T_DOUBLE_ARROW`, same as for arrays.
An array value can contain a list assignment, so we need to take this into account.

The PHPCSUtils `Arrays::getDoubleArrowPtr()` method does so correctly since PHPCSUtils 1.0.7, so upping the minimum supported PHPCSUtils version in combination with switching to the PHPCSUtils method for retrieving the double arrow will fix this.

Includes removing the "initial check" for a double arrow as that only serves to cause the array to be walked twice when an arrow is found, so it's more efficient to not do this initial check.

Includes tests safeguarding the issue with lists.

:point_right: Reviewing with _ignore whitespace changes_ recommended.
---
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 125 ++++++++----------
 .../ArrayDeclarationSpacingUnitTest.1.inc     |   3 +
 ...rrayDeclarationSpacingUnitTest.1.inc.fixed |   3 +
 .../ArrayDeclarationSpacingUnitTest.2.inc     |   3 +
 ...rrayDeclarationSpacingUnitTest.2.inc.fixed |   3 +
 composer.json                                 |   2 +-
 6 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f76adb1d24..e8c9a4f24e 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -178,90 +178,73 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 		/*
 		 * Check that associative arrays are always multi-line.
 		 */
-		$array_has_keys = $this->phpcsFile->findNext( \T_DOUBLE_ARROW, $opener, $closer );
-		if ( false !== $array_has_keys ) {
+		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
-			$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
-
-			if ( ( false === $this->allow_single_item_single_line_associative_arrays
-					&& ! empty( $array_items ) )
-				|| ( true === $this->allow_single_item_single_line_associative_arrays
-					&& \count( $array_items ) > 1 )
-			) {
-				/*
-				 * Make sure the double arrow is for *this* array, not for a nested one.
-				 */
-				$array_has_keys = false; // Reset before doing more detailed check.
-				foreach ( $array_items as $item ) {
-					for ( $ptr = $item['start']; $ptr <= $item['end']; $ptr++ ) {
-						if ( \T_DOUBLE_ARROW === $this->tokens[ $ptr ]['code'] ) {
-							$array_has_keys = true;
-							break 2;
-						}
+		if ( ( false === $this->allow_single_item_single_line_associative_arrays
+				&& ! empty( $array_items ) )
+			|| ( true === $this->allow_single_item_single_line_associative_arrays
+				&& \count( $array_items ) > 1 )
+		) {
+			/*
+			 * Make sure the double arrow is for *this* array, not for a nested one.
+			 */
+			$array_has_keys = false; // Reset before doing more detailed check.
+			foreach ( $array_items as $item ) {
+				if ( Arrays::getDoubleArrowPtr( $this->phpcsFile, $item['start'], $item['end'] ) !== false ) {
+					$array_has_keys = true;
+					break;
+				}
+			}
 
-						// Skip passed any nested arrays.
-						if ( isset( $this->targets[ $this->tokens[ $ptr ]['code'] ] ) ) {
-							$nested_array_open_close = Arrays::getOpenClose( $this->phpcsFile, $ptr );
-							if ( false === $nested_array_open_close ) {
-								// Nested array open/close could not be determined.
-								continue;
-							}
+			if ( true === $array_has_keys ) {
 
-							$ptr = $nested_array_open_close['closer'];
-						}
-					}
+				$phrase = 'an';
+				if ( true === $this->allow_single_item_single_line_associative_arrays ) {
+					$phrase = 'a multi-item';
 				}
+				$fix = $this->phpcsFile->addFixableError(
+					'When %s array uses associative keys, each value should start on a new line.',
+					$closer,
+					'AssociativeArrayFound',
+					array( $phrase )
+				);
 
-				if ( true === $array_has_keys ) {
-
-					$phrase = 'an';
-					if ( true === $this->allow_single_item_single_line_associative_arrays ) {
-						$phrase = 'a multi-item';
-					}
-					$fix = $this->phpcsFile->addFixableError(
-						'When %s array uses associative keys, each value should start on a new line.',
-						$closer,
-						'AssociativeArrayFound',
-						array( $phrase )
-					);
+				if ( true === $fix ) {
 
-					if ( true === $fix ) {
+					$this->phpcsFile->fixer->beginChangeset();
 
-						$this->phpcsFile->fixer->beginChangeset();
+					foreach ( $array_items as $item ) {
+						/*
+						 * Add a line break before the first non-empty token in the array item.
+						 * Prevents extraneous whitespace at the start of the line which could be
+						 * interpreted as alignment whitespace.
+						 */
+						$first_non_empty = $this->phpcsFile->findNext(
+							Tokens::$emptyTokens,
+							$item['start'],
+							( $item['end'] + 1 ),
+							true
+						);
+						if ( false === $first_non_empty ) {
+							continue;
+						}
 
-						foreach ( $array_items as $item ) {
-							/*
-							 * Add a line break before the first non-empty token in the array item.
-							 * Prevents extraneous whitespace at the start of the line which could be
-							 * interpreted as alignment whitespace.
-							 */
-							$first_non_empty = $this->phpcsFile->findNext(
-								Tokens::$emptyTokens,
-								$item['start'],
-								( $item['end'] + 1 ),
-								true
-							);
-							if ( false === $first_non_empty ) {
-								continue;
-							}
-
-							if ( $item['start'] <= ( $first_non_empty - 1 )
-								&& \T_WHITESPACE === $this->tokens[ ( $first_non_empty - 1 ) ]['code']
-							) {
-								// Remove whitespace which would otherwise becoming trailing
-								// (as it gives problems with the fixed file).
-								$this->phpcsFile->fixer->replaceToken( ( $first_non_empty - 1 ), '' );
-							}
-
-							$this->phpcsFile->fixer->addNewlineBefore( $first_non_empty );
+						if ( $item['start'] <= ( $first_non_empty - 1 )
+							&& \T_WHITESPACE === $this->tokens[ ( $first_non_empty - 1 ) ]['code']
+						) {
+							// Remove whitespace which would otherwise becoming trailing
+							// (as it gives problems with the fixed file).
+							$this->phpcsFile->fixer->replaceToken( ( $first_non_empty - 1 ), '' );
 						}
 
-						$this->phpcsFile->fixer->endChangeset();
+						$this->phpcsFile->fixer->addNewlineBefore( $first_non_empty );
 					}
 
-					// No need to check for spacing around opener/closer as this array should be multi-line.
-					return;
+					$this->phpcsFile->fixer->endChangeset();
 				}
+
+				// No need to check for spacing around opener/closer as this array should be multi-line.
+				return;
 			}
 		}
 
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
index 0a241823d1..9feaab3c71 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
@@ -124,3 +124,6 @@ $bad = array(
 	end */
 	'key4' => 'value4'
 );
+
+// Don't confuse list arrows with array arrows.
+$okay = array( $item1, list( 'key1' => $a, 'key2' => $b ) = $array, $item3 );
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
index 244b5787e4..08733f93a8 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
@@ -180,3 +180,6 @@ $bad = array(
 	end */
 	'key4' => 'value4'
 );
+
+// Don't confuse list arrows with array arrows.
+$okay = array( $item1, list( 'key1' => $a, 'key2' => $b ) = $array, $item3 );
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
index 2faa45c0e6..76f9487c5b 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
@@ -133,3 +133,6 @@ $bad = [
 [
 	'prop1' => $prop1, 'prop2' => $prop2, // OK.
 ] = $some_var;
+
+// Don't confuse list arrows with array arrows.
+$okay = [ $item1, [ 'key1' => $a, 'key2' => $b ] = $array, $item3 ];
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
index f882e730cb..ff7b5f81dc 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
@@ -193,3 +193,6 @@ $bad = [
 [
 	'prop1' => $prop1, 'prop2' => $prop2, // OK.
 ] = $some_var;
+
+// Don't confuse list arrows with array arrows.
+$okay = [ $item1, [ 'key1' => $a, 'key2' => $b ] = $array, $item3 ];
diff --git a/composer.json b/composer.json
index 7b5534930e..6e451a81c9 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"php": ">=5.4",
 		"ext-filter": "*",
 		"squizlabs/php_codesniffer": "^3.7.2",
-		"phpcsstandards/phpcsutils": "^1.0.5",
+		"phpcsstandards/phpcsutils": "^1.0.7",
 		"phpcsstandards/phpcsextra": "^1.0"
 	},
 	"require-dev": {

From a0b40fdf6ebbfb8b525192422f93ef4389fe7514 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:06:11 +0200
Subject: [PATCH 645/822] Arrays/ArrayDeclarationSpacing: implement PHPCSUtils
 [3]

Simplify the "associative array should be multi-line" fixer.

The `process_single_line_array()` method would previously loop through the array items and place each array item on a new line.

However, the `process_multi_line_array()` method contains logic to do the same (and better).

This simplifies the `process_single_line_array()` method to only change the single-line array to a multi-line array. This will then trigger the `process_multi_line_array()` method in the next fixer loop, which will do the rest.

Note: there is one small difference in how the file is fixed: comments will no longer be treated as _trailing_ comments for the _previous_ item, but will be treated as belonging with the current item.

In my opinion, this change is acceptable as in all honesty, there is no way for the sniff to know whether the comment belongs with the previous item or the current item, so keeping it with the current item should be fine.

Includes implementing use of the PHPCSUtils `SpacesFixer` to make the actual fix.
---
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 54 +++++--------------
 ...rrayDeclarationSpacingUnitTest.1.inc.fixed |  4 +-
 ...rrayDeclarationSpacingUnitTest.2.inc.fixed |  4 +-
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index e8c9a4f24e..48331ed0f9 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -11,6 +11,7 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Fixers\SpacesFixer;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
@@ -197,52 +198,25 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 			}
 
 			if ( true === $array_has_keys ) {
-
-				$phrase = 'an';
+				$error = 'When an array uses associative keys, each value should start on %s.';
 				if ( true === $this->allow_single_item_single_line_associative_arrays ) {
-					$phrase = 'a multi-item';
+					$error = 'When a multi-item array uses associative keys, each value should start on %s.';
 				}
-				$fix = $this->phpcsFile->addFixableError(
-					'When %s array uses associative keys, each value should start on a new line.',
+
+				/*
+				 * Just add a new line before the array closer.
+				 * The multi-line array fixer will then fix the individual array items in the next fixer loop.
+				 */
+				SpacesFixer::checkAndFix(
+					$this->phpcsFile,
 					$closer,
+					$this->phpcsFile->findPrevious( \T_WHITESPACE, ( $closer - 1 ), null, true ),
+					'newline',
+					$error,
 					'AssociativeArrayFound',
-					array( $phrase )
+					'error'
 				);
 
-				if ( true === $fix ) {
-
-					$this->phpcsFile->fixer->beginChangeset();
-
-					foreach ( $array_items as $item ) {
-						/*
-						 * Add a line break before the first non-empty token in the array item.
-						 * Prevents extraneous whitespace at the start of the line which could be
-						 * interpreted as alignment whitespace.
-						 */
-						$first_non_empty = $this->phpcsFile->findNext(
-							Tokens::$emptyTokens,
-							$item['start'],
-							( $item['end'] + 1 ),
-							true
-						);
-						if ( false === $first_non_empty ) {
-							continue;
-						}
-
-						if ( $item['start'] <= ( $first_non_empty - 1 )
-							&& \T_WHITESPACE === $this->tokens[ ( $first_non_empty - 1 ) ]['code']
-						) {
-							// Remove whitespace which would otherwise becoming trailing
-							// (as it gives problems with the fixed file).
-							$this->phpcsFile->fixer->replaceToken( ( $first_non_empty - 1 ), '' );
-						}
-
-						$this->phpcsFile->fixer->addNewlineBefore( $first_non_empty );
-					}
-
-					$this->phpcsFile->fixer->endChangeset();
-				}
-
 				// No need to check for spacing around opener/closer as this array should be multi-line.
 				return;
 			}
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
index 08733f93a8..60da3be7db 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
@@ -55,8 +55,8 @@ $key3 => 'value3',
 
 // Test for fixing associative arrays with comments between values.
 $bad = array(
-'key1' => 'value1', /* comment */
-'key2' => 'value2'
+'key1' => 'value1',
+/* comment */ 'key2' => 'value2'
 ); // Bad.
 
 // Test for fixing non-associative array with a nested associative array which *will* be fixed.
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
index ff7b5f81dc..ff7b41e78a 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
@@ -55,8 +55,8 @@ $key3 => 'value3',
 
 // Test for fixing associative arrays with comments between values.
 $bad = [
-'key1' => 'value1', /* comment */
-'key2' => 'value2'
+'key1' => 'value1',
+/* comment */ 'key2' => 'value2'
 ]; // Bad.
 
 // Test for fixing non-associative array with a nested associative array which *will* be fixed.

From 8765b74e9c0ab43d323c6ab91c19bf5d900c95d1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:19:51 +0200
Subject: [PATCH 646/822] Arrays/ArrayDeclarationSpacing: implement PHPCSUtils
 [4]

---
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 48331ed0f9..33f677642f 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -382,28 +382,15 @@ protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
 			}
 
 			if ( $this->tokens[ $end_of_last_item ]['line'] === $this->tokens[ $first_content ]['line'] ) {
-
-				$fix = $this->phpcsFile->addFixableError(
-					'Each item in a multi-line array must be on a new line',
+				SpacesFixer::checkAndFix(
+					$this->phpcsFile,
 					$first_content,
-					'ArrayItemNoNewLine'
+					$end_of_last_item,
+					'newline',
+					'Each item in a multi-line array must be on %s. Found: %s',
+					'ArrayItemNoNewLine',
+					'error'
 				);
-
-				if ( true === $fix ) {
-
-					$this->phpcsFile->fixer->beginChangeset();
-
-					if ( ( $end_of_last_item + 1 ) <= ( $first_content - 1 )
-						&& \T_WHITESPACE === $this->tokens[ ( $first_content - 1 ) ]['code']
-					) {
-						// Remove whitespace which would otherwise becoming trailing
-						// (as it gives problems with the fixed file).
-						$this->phpcsFile->fixer->replaceToken( ( $first_content - 1 ), '' );
-					}
-
-					$this->phpcsFile->fixer->addNewlineBefore( $first_content );
-					$this->phpcsFile->fixer->endChangeset();
-				}
 			}
 
 			$end_of_last_item = $end_of_this_item;

From ebb9d61e78148b78e96f153273d172046ff510b3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 20:17:36 +0200
Subject: [PATCH 647/822] Arrays/ArrayDeclarationSpacing: replace whitespace
 checks with PHPCSExtra sniff

This commit removes the brace related spacing checks from the `WordPress.Arrays.ArrayDeclarationSpacing` sniff in favour of using the PHPCSExtra `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff.

Includes removing tests which were only testing the brace spacing related issue.
Includes minor updates to the `fixed` file for the remaining tests to account for a fix which will no longer be made by this sniff.

Note: in effect, the combined sniffs will do the same as before, though a few more notices will be thrown.
This is due to the original set-up not throwing errors for "space after opener" and "space before closer", when a "single line array with associative keys must be multi-line" error would be thrown, as the fix would be the same.
These "space after opener" and "space before closer" errors will now show together with the "single line must be multi-line" error and the fixers of the combined sniffs will sort it out between them.

Refs:
* PHPCSStandards/PHPCSExtra 12
* https://github.com/PHPCSStandards/PHPCSExtra/pulls?q=is%3Apr+arraybracespacing+is%3Aclosed
---
 WordPress-Core/ruleset.xml                    |  12 +-
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 153 +-----------------
 .../ArrayDeclarationSpacingUnitTest.1.inc     |  48 +-----
 ...rrayDeclarationSpacingUnitTest.1.inc.fixed |  59 +------
 .../ArrayDeclarationSpacingUnitTest.2.inc     |  31 +---
 ...rrayDeclarationSpacingUnitTest.2.inc.fixed |  43 +----
 .../ArrayDeclarationSpacingUnitTest.php       |  90 ++++-------
 7 files changed, 60 insertions(+), 376 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 52ec1c2d32..254a477cd6 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -256,10 +256,18 @@
 
 	<!-- Generic array layout check. -->
 	<!-- Covers rule: For associative arrays, each item should start on a new line
-		 when the array contains more than one item.
-		 Also covers various single-line array whitespace issues. -->
+		 when the array contains more than one item. -->
 	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing"/>
 
+	<!-- Covers various array whitespace issues. -->
+	<rule ref="NormalizedArrays.Arrays.ArrayBraceSpacing">
+		<properties>
+			<property name="spacesWhenEmpty" value="0"/>
+			<property name="spacesSingleLine" value="1"/>
+			<property name="spacesMultiLine" value="newline"/>
+		</properties>
+	</rule>
+
 	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
 	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
 
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 33f677642f..f7b8738d8d 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -19,12 +19,8 @@
 /**
  * Enforces WordPress array spacing format.
  *
- * - Check for no space between array keyword and array opener.
- * - Check for no space between the parentheses of an empty array.
- * - Checks for one space after the array opener / before the array closer in single-line arrays.
  * - Checks that associative arrays are multi-line.
  * - Checks that each array item in a multi-line array starts on a new line.
- * - Checks that the array closer in a multi-line array is on a new line.
  *
  * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
@@ -42,6 +38,8 @@
  * @since   0.14.0 Single item associative arrays are now by default exempt from the
  *                 "must be multi-line" rule. This behaviour can be changed using the
  *                 `allow_single_item_single_line_associative_arrays` property.
+ * @since   3.0.0  Removed various whitespace related checks and fixers in favour of the PHPCSExtra
+ *                 `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff.
  */
 final class ArrayDeclarationSpacingSniff extends Sniff {
 
@@ -97,64 +95,6 @@ public function process_token( $stackPtr ) {
 		$closer = $array_open_close['closer'];
 		unset( $array_open_close );
 
-		/*
-		 * Long arrays only: Check for space between the array keyword and the open parenthesis.
-		 */
-		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] ) {
-
-			if ( ( $stackPtr + 1 ) !== $opener ) {
-				$error      = 'There must be no space between the "array" keyword and the opening parenthesis';
-				$error_code = 'SpaceAfterKeyword';
-
-				$nextNonWhitespace = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), ( $opener + 1 ), true );
-				if ( $nextNonWhitespace !== $opener ) {
-					// Don't auto-fix: Something other than whitespace found between keyword and open parenthesis.
-					$this->phpcsFile->addError( $error, $stackPtr, $error_code );
-				} else {
-
-					$fix = $this->phpcsFile->addFixableError( $error, $stackPtr, $error_code );
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->beginChangeset();
-						for ( $i = ( $stackPtr + 1 ); $i < $opener; $i++ ) {
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-						}
-						$this->phpcsFile->fixer->endChangeset();
-						unset( $i );
-					}
-				}
-				unset( $error, $error_code, $nextNonWhitespace, $fix );
-			}
-		}
-
-		/*
-		 * Check for empty arrays.
-		 */
-		$nextNonWhitespace = $this->phpcsFile->findNext( \T_WHITESPACE, ( $opener + 1 ), ( $closer + 1 ), true );
-		if ( $nextNonWhitespace === $closer ) {
-
-			if ( ( $opener + 1 ) !== $closer ) {
-				$fix = $this->phpcsFile->addFixableError(
-					'Empty array declaration must have no space between the parentheses',
-					$stackPtr,
-					'SpaceInEmptyArray'
-				);
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->beginChangeset();
-					for ( $i = ( $opener + 1 ); $i < $closer; $i++ ) {
-						$this->phpcsFile->fixer->replaceToken( $i, '' );
-					}
-					$this->phpcsFile->fixer->endChangeset();
-					unset( $i );
-				}
-			}
-
-			// This array is empty, so the below checks aren't necessary.
-			return;
-		}
-		unset( $nextNonWhitespace );
-
 		// Pass off to either the single line or multi-line array analysis.
 		if ( $this->tokens[ $opener ]['line'] === $this->tokens[ $closer ]['line'] ) {
 			$this->process_single_line_array( $stackPtr, $opener, $closer );
@@ -164,7 +104,7 @@ public function process_token( $stackPtr ) {
 	}
 
 	/**
-	 * Process a single-line array.
+	 * Check that associative arrays are always multi-line.
 	 *
 	 * @since 0.13.0 The actual checks contained in this method used to
 	 *               be in the `process()` method.
@@ -176,9 +116,6 @@ public function process_token( $stackPtr ) {
 	 * @return void
 	 */
 	protected function process_single_line_array( $stackPtr, $opener, $closer ) {
-		/*
-		 * Check that associative arrays are always multi-line.
-		 */
 		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
 		if ( ( false === $this->allow_single_item_single_line_associative_arrays
@@ -216,62 +153,6 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 					'AssociativeArrayFound',
 					'error'
 				);
-
-				// No need to check for spacing around opener/closer as this array should be multi-line.
-				return;
-			}
-		}
-
-		/*
-		 * Check that there is a single space after the array opener and before the array closer.
-		 */
-		if ( \T_WHITESPACE !== $this->tokens[ ( $opener + 1 ) ]['code'] ) {
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Missing space after array opener.',
-				$opener,
-				'NoSpaceAfterArrayOpener'
-			);
-
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->addContent( $opener, ' ' );
-			}
-		} elseif ( ' ' !== $this->tokens[ ( $opener + 1 ) ]['content'] ) {
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Expected 1 space after array opener, found %s.',
-				$opener,
-				'SpaceAfterArrayOpener',
-				array( \strlen( $this->tokens[ ( $opener + 1 ) ]['content'] ) )
-			);
-
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->replaceToken( ( $opener + 1 ), ' ' );
-			}
-		}
-
-		if ( \T_WHITESPACE !== $this->tokens[ ( $closer - 1 ) ]['code'] ) {
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Missing space before array closer.',
-				$closer,
-				'NoSpaceBeforeArrayCloser'
-			);
-
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->addContentBefore( $closer, ' ' );
-			}
-		} elseif ( ' ' !== $this->tokens[ ( $closer - 1 ) ]['content'] ) {
-
-			$fix = $this->phpcsFile->addFixableError(
-				'Expected 1 space before array closer, found %s.',
-				$closer,
-				'SpaceBeforeArrayCloser',
-				array( \strlen( $this->tokens[ ( $closer - 1 ) ]['content'] ) )
-			);
-
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->replaceToken( ( $closer - 1 ), ' ' );
 			}
 		}
 	}
@@ -289,34 +170,6 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 	 * @return void
 	 */
 	protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
-		/*
-		 * Check that the closing bracket is on a new line.
-		 */
-		$last_content = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $closer - 1 ), $opener, true );
-		if ( false !== $last_content
-			&& $this->tokens[ $last_content ]['line'] === $this->tokens[ $closer ]['line']
-		) {
-			$fix = $this->phpcsFile->addFixableError(
-				'Closing parenthesis of array declaration must be on a new line',
-				$closer,
-				'CloseBraceNewLine'
-			);
-			if ( true === $fix ) {
-				$this->phpcsFile->fixer->beginChangeset();
-
-				if ( $last_content < ( $closer - 1 )
-					&& \T_WHITESPACE === $this->tokens[ ( $closer - 1 ) ]['code']
-				) {
-					// Remove whitespace which would otherwise becoming trailing
-					// (as it gives problems with the fixed file).
-					$this->phpcsFile->fixer->replaceToken( ( $closer - 1 ), '' );
-				}
-
-				$this->phpcsFile->fixer->addNewlineBefore( $closer );
-				$this->phpcsFile->fixer->endChangeset();
-			}
-		}
-
 		/*
 		 * Check that each array item starts on a new line.
 		 */
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
index 9feaab3c71..a40f8fcd78 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
@@ -3,13 +3,6 @@
  * Test sniff with long arrays.
  */
 
-$good = array( 'value1', 'value2' ); // Ok.
-
-$query_vars = array('food'); // Bad, no spaces after opening and before closing parenthesis.
-
-// Test for fixing of extra whitespace.
-$test = array(   1, 2     );
-
 $bad = array( 'key' => 'value' ); // OK, one item single-line associative arrays are ok.
 
 // Test for fixing nested associative arrays.
@@ -32,40 +25,7 @@ $bad = array( 'key1' => 'value1', /* comment */ 'key2' => 'value2' ); // Bad.
 $bad = array( 'value1', 'value2', array( 'sub1' => 1, 'sub2' => 2 ), 'value4' ); // Bad.
 
 /*
- * Test spacing between array keyword and open parenthesis.
- */
-$a = array(); // OK.
-$b = array  (); // Bad.
-$train = array
-(
-	true,
-	'aaa'
-); // Bad - space between keyword and opener.
-
-$a = array
-// Bad.
-( 'a', 'b' );
-
-$a = array /* Bad. */ ( 'a', 'b' );
-
-/*
- * Tests for empty array with space between parentheses.
- */
-// OK.
-$a = array();
-$value = array( /* comment */ );
-$x = array(
-		// comment
-	 );
-
-// Bad.
-$value = array ( );
-$value = array(   );
-$x = array(
-	 );
-
-/*
- * Tests for multi-line arrays - closing brace on new line + array items each on new line.
+ * Tests for multi-line arrays - array items each on new line.
  */
 // OK.
 $value = array(
@@ -97,12 +57,6 @@ $x = array('name' => 'test',
 $foo = array(1
 , 2);
 
-$fields = array(
-	'value' => 'type');
-
-$bad = array('key' => 'value'); // Bad, spacing around parenthesis.
-$bad = array(     'key' => 'value'     ); // Bad, spacing around parenthesis.
-
 // phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays false
 
 $bad = array( 'key' => 'value' ); // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
index 60da3be7db..072fee9908 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
@@ -3,13 +3,6 @@
  * Test sniff with long arrays.
  */
 
-$good = array( 'value1', 'value2' ); // Ok.
-
-$query_vars = array( 'food' ); // Bad, no spaces after opening and before closing parenthesis.
-
-// Test for fixing of extra whitespace.
-$test = array( 1, 2 );
-
 $bad = array( 'key' => 'value' ); // OK, one item single-line associative arrays are ok.
 
 // Test for fixing nested associative arrays.
@@ -67,42 +60,10 @@ array(
 'sub1' => 1,
 'sub2' => 2
 ),
-'value4'
-); // Bad.
-
-/*
- * Test spacing between array keyword and open parenthesis.
- */
-$a = array(); // OK.
-$b = array(); // Bad.
-$train = array(
-	true,
-	'aaa'
-); // Bad - space between keyword and opener.
-
-$a = array
-// Bad.
-( 'a', 'b' );
-
-$a = array /* Bad. */ ( 'a', 'b' );
+'value4' ); // Bad.
 
 /*
- * Tests for empty array with space between parentheses.
- */
-// OK.
-$a = array();
-$value = array( /* comment */ );
-$x = array(
-		// comment
-	 );
-
-// Bad.
-$value = array();
-$value = array();
-$x = array();
-
-/*
- * Tests for multi-line arrays - closing brace on new line + array items each on new line.
+ * Tests for multi-line arrays - array items each on new line.
  */
 // OK.
 $value = array(
@@ -127,14 +88,12 @@ $value = array(
 $value = array(
 1 => $one,
 	2 => $two ,
-/* Comment. */ 3 => $three ,
-);
+/* Comment. */ 3 => $three , );
 
 $value = array(
 	 '1'=> TRUE,
 FALSE,
-'3' => 'aaa',
-);
+'3' => 'aaa',);
 
 $x = array(
 'name' => 'test',
@@ -143,15 +102,7 @@ $x = array(
 $foo = array(
 1
 ,
-2
-);
-
-$fields = array(
-	'value' => 'type'
-);
-
-$bad = array( 'key' => 'value' ); // Bad, spacing around parenthesis.
-$bad = array( 'key' => 'value' ); // Bad, spacing around parenthesis.
+2);
 
 // phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays false
 
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
index 76f9487c5b..34ea62060f 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc
@@ -3,13 +3,6 @@
  * Test sniff with short arrays.
  */
 
-$good = [ 'value1', 'value2' ]; // Ok.
-
-$query_vars = ['food']; // Bad, no spaces after opening and before closing parenthesis.
-
-// Test for fixing of extra whitespace.
-$test = [   1, 2     ];
-
 $bad = [ 'key' => 'value' ]; // OK, one item single-line associative arrays are ok.
 
 // Test for fixing nested associative arrays.
@@ -32,23 +25,7 @@ $bad = [ 'key1' => 'value1', /* comment */ 'key2' => 'value2' ]; // Bad.
 $bad = [ 'value1', 'value2', [ 'sub1' => 1, 'sub2' => 2 ], 'value4' ]; // Bad.
 
 /*
- * Tests for empty array with space between parentheses.
- */
-// OK.
-$a = [];
-$value = [ /* comment */ ];
-$x = [
-		// comment
-	 ];
-
-// Bad.
-$value = [ ];
-$value = [   ];
-$x = [
-	 ];
-
-/*
- * Tests for multi-line arrays - closing brace on new line + array items each on new line.
+ * Tests for multi-line arrays - array items each on new line.
  */
 // OK.
 $value = [
@@ -80,12 +57,6 @@ $x = ['name' => 'test',
 $foo = [1
 , 2];
 
-$fields = [
-	'value' => 'type'];
-
-$bad = ['key' => 'value']; // Bad, spacing around parenthesis.
-$bad = [     'key' => 'value'     ]; // Bad, spacing around parenthesis.
-
 // phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays false
 
 $bad = [ 'key' => 'value' ]; // Bad.
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
index ff7b41e78a..c4b03f73cc 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.2.inc.fixed
@@ -3,13 +3,6 @@
  * Test sniff with short arrays.
  */
 
-$good = [ 'value1', 'value2' ]; // Ok.
-
-$query_vars = [ 'food' ]; // Bad, no spaces after opening and before closing parenthesis.
-
-// Test for fixing of extra whitespace.
-$test = [ 1, 2 ];
-
 $bad = [ 'key' => 'value' ]; // OK, one item single-line associative arrays are ok.
 
 // Test for fixing nested associative arrays.
@@ -67,26 +60,10 @@ $bad = [
 'sub1' => 1,
 'sub2' => 2
 ],
-'value4'
-]; // Bad.
-
-/*
- * Tests for empty array with space between parentheses.
- */
-// OK.
-$a = [];
-$value = [ /* comment */ ];
-$x = [
-		// comment
-	 ];
-
-// Bad.
-$value = [];
-$value = [];
-$x = [];
+'value4' ]; // Bad.
 
 /*
- * Tests for multi-line arrays - closing brace on new line + array items each on new line.
+ * Tests for multi-line arrays - array items each on new line.
  */
 // OK.
 $value = [
@@ -111,14 +88,12 @@ $value = [
 $value = [
 1 => $one,
 	2 => $two ,
-/* Comment. */ 3 => $three ,
-];
+/* Comment. */ 3 => $three , ];
 
 $value = [
 	 '1'=> TRUE,
 FALSE,
-'3' => 'aaa',
-];
+'3' => 'aaa',];
 
 $x = [
 'name' => 'test',
@@ -127,15 +102,7 @@ $x = [
 $foo = [
 1
 ,
-2
-];
-
-$fields = [
-	'value' => 'type'
-];
-
-$bad = [ 'key' => 'value' ]; // Bad, spacing around parenthesis.
-$bad = [ 'key' => 'value' ]; // Bad, spacing around parenthesis.
+2];
 
 // phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays false
 
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index f613e70fae..c833d84da9 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -36,66 +36,46 @@ public function getErrorList( $testFile = '' ) {
 			// Long arrays.
 			case 'ArrayDeclarationSpacingUnitTest.1.inc':
 				return array(
-					8   => 2,
-					11  => 2,
-					16  => 4,
-					20  => 2,
-					22  => 1,
-					26  => 1,
-					29  => 1,
-					32  => 1,
-					38  => 1,
-					39  => 1,
-					45  => 1,
-					49  => 1,
-					62  => 2,
-					63  => 1,
-					64  => 1,
-					84  => 1,
-					85  => 1,
-					88  => 1,
-					89  => 2,
-					92  => 3,
-					94  => 1,
-					97  => 1,
-					98  => 2,
-					101 => 1,
-					103 => 2,
-					104 => 2,
-					108 => 1,
-					109 => 1,
-					121 => 1,
+					9  => 4,
+					13 => 2,
+					15 => 1,
+					19 => 1,
+					22 => 1,
+					25 => 1,
+					44 => 1,
+					45 => 1,
+					48 => 1,
+					49 => 1,
+					52 => 2,
+					54 => 1,
+					57 => 1,
+					58 => 1,
+					62 => 1,
+					63 => 1,
+					75 => 1,
 				);
 
 			// Short arrays.
 			case 'ArrayDeclarationSpacingUnitTest.2.inc':
 				return array(
-					8   => 2,
-					11  => 2,
-					16  => 4,
-					20  => 2,
-					22  => 1,
-					26  => 1,
-					29  => 1,
-					32  => 1,
-					45  => 1,
-					46  => 1,
-					47  => 1,
-					67  => 1,
-					68  => 1,
-					71  => 1,
-					72  => 2,
-					75  => 3,
-					77  => 1,
-					80  => 1,
-					81  => 2,
-					84  => 1,
-					86  => 2,
-					87  => 2,
-					91  => 1,
-					92  => 1,
-					104 => 1,
-					126 => 1,
+					9  => 4,
+					13 => 2,
+					15 => 1,
+					19 => 1,
+					22 => 1,
+					25 => 1,
+					44 => 1,
+					45 => 1,
+					48 => 1,
+					49 => 1,
+					52 => 2,
+					54 => 1,
+					57 => 1,
+					58 => 1,
+					62 => 1,
+					63 => 1,
+					75 => 1,
+					97 => 1,
 				);
 
 			default:

From e38b2507641ceb24797cc18f336ca101d7ecc032 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:42:54 +0200
Subject: [PATCH 648/822] 
 Arrays/ArrayDeclarationSpacing::process_multi_line_array(): remove redundant
 parameter

The previous change made passing the array `$closer` token to the `process_multi_line_array()` method redundant, so let's remove the parameter.
---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f7b8738d8d..f07f721d77 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -99,7 +99,7 @@ public function process_token( $stackPtr ) {
 		if ( $this->tokens[ $opener ]['line'] === $this->tokens[ $closer ]['line'] ) {
 			$this->process_single_line_array( $stackPtr, $opener, $closer );
 		} else {
-			$this->process_multi_line_array( $stackPtr, $opener, $closer );
+			$this->process_multi_line_array( $stackPtr, $opener );
 		}
 	}
 
@@ -162,14 +162,14 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 	 *
 	 * @since 0.13.0 The actual checks contained in this method used to
 	 *               be in the `ArrayDeclaration` sniff.
+	 * @since 3.0.0  Removed the `$closer` parameter.
 	 *
 	 * @param int $stackPtr The position of the current token in the stack.
 	 * @param int $opener   The position of the array opener.
-	 * @param int $closer   The position of the array closer.
 	 *
 	 * @return void
 	 */
-	protected function process_multi_line_array( $stackPtr, $opener, $closer ) {
+	protected function process_multi_line_array( $stackPtr, $opener ) {
 		/*
 		 * Check that each array item starts on a new line.
 		 */

From 7c87f4f407993f7101f1392c16af7f5e65851d45 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:09:05 +0200
Subject: [PATCH 649/822] 
 Arrays/ArrayDeclarationSpacing::process_single_line_array(): lower nesting
 level

As the checks for whitespace around the array opener/closer have now been removed, the code in the `process_single_line_array()` method no longer needs to be nested in condition upon condition.

This commit applies the typical "bow out early" pattern to the code in the method.

:point_right: This change will be easier to review while ignoring whitespace changes.
---
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f07f721d77..737a0839fb 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -117,44 +117,46 @@ public function process_token( $stackPtr ) {
 	 */
 	protected function process_single_line_array( $stackPtr, $opener, $closer ) {
 		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
-
 		if ( ( false === $this->allow_single_item_single_line_associative_arrays
-				&& ! empty( $array_items ) )
+				&& empty( $array_items ) )
 			|| ( true === $this->allow_single_item_single_line_associative_arrays
-				&& \count( $array_items ) > 1 )
+				&& \count( $array_items ) === 1 )
 		) {
-			/*
-			 * Make sure the double arrow is for *this* array, not for a nested one.
-			 */
-			$array_has_keys = false; // Reset before doing more detailed check.
-			foreach ( $array_items as $item ) {
-				if ( Arrays::getDoubleArrowPtr( $this->phpcsFile, $item['start'], $item['end'] ) !== false ) {
-					$array_has_keys = true;
-					break;
-				}
-			}
-
-			if ( true === $array_has_keys ) {
-				$error = 'When an array uses associative keys, each value should start on %s.';
-				if ( true === $this->allow_single_item_single_line_associative_arrays ) {
-					$error = 'When a multi-item array uses associative keys, each value should start on %s.';
-				}
+			return;
+		}
 
-				/*
-				 * Just add a new line before the array closer.
-				 * The multi-line array fixer will then fix the individual array items in the next fixer loop.
-				 */
-				SpacesFixer::checkAndFix(
-					$this->phpcsFile,
-					$closer,
-					$this->phpcsFile->findPrevious( \T_WHITESPACE, ( $closer - 1 ), null, true ),
-					'newline',
-					$error,
-					'AssociativeArrayFound',
-					'error'
-				);
+		/*
+		 * Make sure the double arrow is for *this* array, not for a nested one.
+		 */
+		$array_has_keys = false;
+		foreach ( $array_items as $item ) {
+			if ( Arrays::getDoubleArrowPtr( $this->phpcsFile, $item['start'], $item['end'] ) !== false ) {
+				$array_has_keys = true;
+				break;
 			}
 		}
+
+		if ( false === $array_has_keys ) {
+			return;
+		}
+		$error = 'When an array uses associative keys, each value should start on %s.';
+		if ( true === $this->allow_single_item_single_line_associative_arrays ) {
+			$error = 'When a multi-item array uses associative keys, each value should start on %s.';
+		}
+
+		/*
+		 * Just add a new line before the array closer.
+		 * The multi-line array fixer will then fix the individual array items in the next fixer loop.
+		 */
+		SpacesFixer::checkAndFix(
+			$this->phpcsFile,
+			$closer,
+			$this->phpcsFile->findPrevious( \T_WHITESPACE, ( $closer - 1 ), null, true ),
+			'newline',
+			$error,
+			'AssociativeArrayFound',
+			'error'
+		);
 	}
 
 	/**

From c7eae91c7f504bfdfbb766870d257e9b1bf5ec38 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 10 Jul 2023 20:26:54 +0200
Subject: [PATCH 650/822] Arrays/ArrayDeclarationSpacing: minor test tweaks

---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php  | 8 ++++----
 .../Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc    | 4 ++++
 .../Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed    | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 737a0839fb..f6900b09f8 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -221,8 +221,8 @@ protected function process_multi_line_array( $stackPtr, $opener ) {
 
 				if ( false === $next ) {
 					// Shouldn't happen, but just in case.
-					$end_of_last_item = $end_of_this_item;
-					continue;
+					$end_of_last_item = $end_of_this_item; // @codeCoverageIgnore
+					continue; // @codeCoverageIgnore
 				}
 
 				if ( $this->tokens[ $next ]['line'] !== $this->tokens[ $first_content ]['line'] ) {
@@ -232,8 +232,8 @@ protected function process_multi_line_array( $stackPtr, $opener ) {
 
 			if ( false === $first_content ) {
 				// Shouldn't happen, but just in case.
-				$end_of_last_item = $end_of_this_item;
-				continue;
+				$end_of_last_item = $end_of_this_item; // @codeCoverageIgnore
+				continue; // @codeCoverageIgnore
 			}
 
 			if ( $this->tokens[ $end_of_last_item ]['line'] === $this->tokens[ $first_content ]['line'] ) {
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
index a40f8fcd78..fd47c0a3a9 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc
@@ -81,3 +81,7 @@ $bad = array(
 
 // Don't confuse list arrows with array arrows.
 $okay = array( $item1, list( 'key1' => $a, 'key2' => $b ) = $array, $item3 );
+
+// Live coding/parse error.
+// This must be the last test in the file!
+$ignore = array( $item1, 'key' => 'value',
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
index 072fee9908..c0bddcc551 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed
@@ -134,3 +134,7 @@ $bad = array(
 
 // Don't confuse list arrows with array arrows.
 $okay = array( $item1, list( 'key1' => $a, 'key2' => $b ) = $array, $item3 );
+
+// Live coding/parse error.
+// This must be the last test in the file!
+$ignore = array( $item1, 'key' => 'value',

From 5c04d9d7911ff0600b4baaaec71423ddc62ae0f8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:34:44 +0200
Subject: [PATCH 651/822] Core: add section about trait use statement rules
 with select new sniffs

> ### Trait Use Statements
>
> Trait use statements should be at the top of a class and should have exactly one blank line before the first use statement, and at least one blank line after the last statement. The only exception is when the class only contains trait use statements, in which case the blank line after may be omitted.
>
> The following code examples show the formatting requirements for trait use statements regarding things like spacing, grouping and indentation.

Refs:
* https://make.wordpress.org/core/2020/03/20/updating-the-coding-standards-for-modern-php/ - Trait use statement section
* https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#trait-use-statements
* WordPress/wpcs-docs 101
* WordPress/wpcs-docs 130
* https://www.php-fig.org/psr/psr-12/#42-using-traits

The WP rules for traits are very akin to the PSR12 rules with only a few exceptions:
* WP allows a blank line between the class/trait declaration statement and the first trait `use` statement.
* In the Make post, the proposed rules allowed for single-line `use` statements with conflict resolution. PSR12 always demands multi-line in that case.

The upstream PSR12 trait use sniff therefore seems like a good fit.

I propose to exclude the "blank line before first `use`" error code to address the first point mentioned above.

As for the second point, the code sample which showed the single-line `use` statement in the docs has been updated to multi-line in PR WordPress/wpcs-docs 130. With that change and taking into consideration that these rules are new to WPCS anyway, it makes sense to actually apply the PSR version of the rule demanding that conflict resolution must always be multi-line.

Other than that, this PR contains one more exclusion to prevent duplicate error messages about a spacing issue already covered via another sniff.
Note: this exclusion won't work (yet) as there is a typo in the upstream sniff. PR squizlabs/PHP_CodeSniffer 3856 is open to fix this.
---
 WordPress-Core/ruleset.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 254a477cd6..03c23449df 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -483,6 +483,35 @@
 	<rule ref="Generic.Files.OneObjectStructurePerFile"/>
 
 
+	<!--
+	#############################################################################
+	Handbook: Object-Oriented Programming - Trait Use Statements.
+	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#trait-use-statements
+	#############################################################################
+	-->
+	<!-- Covers rule: Trait use statements should be at the top of a class ... -->
+	<!-- Covered by the PSR12.Traits.UseDeclaration sniff. -->
+
+	<!-- Rule: ... and should have exactly one blank line before the first use statement,
+		 and at least one blank line after the last statement.
+		 The only exception is when the class only contains trait use statements,
+		 in which case the blank line after may be omitted. -->
+	<!-- Blank line after covered by the PSR12.Traits.UseDeclaration sniff. -->
+
+	<!-- Covers rule: (example based rules: spacing, grouping and indentation). -->
+	<rule ref="PSR12.Traits.UseDeclaration"/>
+
+	<!-- Allow for a blank line between the OO statement and the first trait use statement. -->
+	<rule ref="PSR12.Traits.UseDeclaration.UseAfterBrace">
+		<severity>0</severity>
+	</rule>
+
+	<!-- Prevent duplicate messages - spacing after use is already covered by `Generic.WhiteSpace.LanguageConstructSpacing`. -->
+	<rule ref="PSR12.Traits.UseDeclaration.SpaceAfterUse">
+		<severity>0</severity>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	Handbook: Object-Oriented Programming - Visibility should always be declared.

From 0ed93aff4ddbee0335e66142339ad7266565efb6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 19 Jul 2023 22:01:29 +0200
Subject: [PATCH 652/822] Composer: update PHPCSUtils + PHPCSExtra

PHPCSUtils released version 1.0.8 with a small bug fix.

PHPCSExtra has just released version 1.1.0. with 7 new sniffs, most of which we'll want to add to WPCS (will be done in follow-up PRs).

Refs:
* https://github.com/PHPCSStandards/PHPCSUtils/releases/tag/1.0.8
* https://github.com/PHPCSStandards/PHPCSExtra/releases/tag/1.1.0
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6e451a81c9..28efe020fc 100644
--- a/composer.json
+++ b/composer.json
@@ -19,8 +19,8 @@
 		"php": ">=5.4",
 		"ext-filter": "*",
 		"squizlabs/php_codesniffer": "^3.7.2",
-		"phpcsstandards/phpcsutils": "^1.0.7",
-		"phpcsstandards/phpcsextra": "^1.0"
+		"phpcsstandards/phpcsutils": "^1.0.8",
+		"phpcsstandards/phpcsextra": "^1.1.0"
 	},
 	"require-dev": {
 		"phpcompatibility/php-compatibility": "^9.0",

From 33f0361c84ac060ea36f88523867a718a7000309 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Jun 2023 14:18:24 +0200
Subject: [PATCH 653/822] Core: add some more sniffs for import `use`
 statements

Includes preventing a duplicate notification about "spacing after the `use` keyword".

Refs:
* `Universal.UseStatements.DisallowMixedGroupUse` - upstream PHPCSStandards/PHPCSExtra 241
* `Universal.UseStatements.NoUselessAliases` - upstream PHPCSStandards/PHPCSExtra 244
* `Universal.UseStatements.KeywordSpacing` - upstream PHPCSStandards/PHPCSExtra 247
---
 WordPress-Core/ruleset.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 03c23449df..2533154c0e 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -460,10 +460,19 @@
 	<!-- Not yet covered: use statements which are not part of the file header. -->
 	<rule ref="PSR12.Files.FileHeader.IncorrectGrouping"/>
 
-	<!-- Rule: When using aliases, make sure the aliases follow the WordPress naming convention and are unique. -->
+	<!-- Rule: When using aliases, make sure the aliases follow the WordPress naming convention ... -->
+
+	<!-- Covers rule: ... and are unique. -->
+	<rule ref="Universal.UseStatements.NoUselessAliases"/>
 
 	<!-- Rule: (example based rules, group use formatting, spacing around keywords) -->
+
+	<!-- Implied through the examples: There should be exactly one space before/after keywords. -->
 	<!-- Spacing after "use" keyword: covered by the Generic.WhiteSpace.LanguageConstructSpacing sniff. -->
+	<rule ref="Universal.UseStatements.KeywordSpacing"/>
+	<rule ref="Universal.UseStatements.KeywordSpacing.SpaceAfterUse">
+		<severity>0</severity>
+	</rule>
 
 	<!-- Implied through the examples: Names in an import use statement should not start with a leading backslash. -->
 	<rule ref="Universal.UseStatements.NoLeadingBackslash"/>
@@ -472,6 +481,11 @@
 		 For the "use" and "as" keywords, this is covered via the Generic.PHP.LowerCaseKeyword sniff. -->
 	<rule ref="Universal.UseStatements.LowercaseFunctionConst"/>
 
+	<!-- Implied through the examples: When using group use statements, there should be one statement
+		 for each type - OO constructs (classes/interfaces/traits), functions, constants.
+		 The various types should not be combined in one group use statement. -->
+	<rule ref="Universal.UseStatements.DisallowMixedGroupUse"/>
+
 
 	<!--
 	#############################################################################

From 098012a8c68fce784abfbaf2cdb89ae5aa909f51 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 18 Jun 2023 14:22:53 +0200
Subject: [PATCH 654/822] Extra: add sniff to detect inefficient "echo
 sprintf(...)"

... which ought to be replaced by `prinft(...)`.

Ref: PHPCSStandards/PHPCSExtra 242
---
 WordPress-Extra/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index 4232c26092..b3685b7c37 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -171,6 +171,9 @@
 		or declare object-oriented structures, but not both. -->
 	<rule ref="Universal.Files.SeparateFunctionsFromOO"/>
 
+	<!-- Detect useless "echo sprintf(...)". -->
+	<rule ref="Universal.CodeAnalysis.NoEchoSprintf"/>
+
 	<!--
 	#############################################################################
 	Code style sniffs for more recent PHP features and syntaxes.

From 20029ed817f91cd9dc22bac1296f714d0dc00b16 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:11:19 +0200
Subject: [PATCH 655/822] Replace the WordPress.Array.CommaAfterArrayItem sniff

... with two sniffs from PHPCSExtra.

The original WPCS native sniff did two things:
1. Check for a comma after the last item in an array (forbid it for single-line arrays, enforce it for multi-line arrays).
2. Check the spacing around commas in arrays (no space before the comma, one space or new line after the comma with an allowance for aligned trailing comments).

The sniff will now be replaced by the following upstream sniffs:
* `NormalizedArrays.Arrays.CommaAfterLast` for the comma after the last item in an array.
* `Universal.WhiteSpace.CommaSpacing` for the spacing around commas (and not just in arrays).

The behaviour of the sniffs is 100% in line with the original sniff (verified by running both the old and the new sniffs over the test case file for the WPCS sniff being removed).

Additionally, the `Universal.WhiteSpace.CommaSpacing` sniff will now check the spacing around commas in more places, where WPCS previously did not check the comma spacing and will make sure the comma is before a trailing comment, not after.

The `Universal.WhiteSpace.CommaSpacing` sniff by default checks the spacing for _all_ commas with the following exceptions:
* A comma preceded or followed by a parenthesis, curly or square bracket will not be flagged to prevent conflicts with sniffs handling spacing around braces.
* A comma preceded or followed by another comma, like for skipping items in a list assignment, will not be flagged.
* A comma preceded by a non-indented heredoc/nowdoc closer.
    These will be flagged, but in that case, unless the `php_version` config directive is set to a version higher than PHP 7.3.0, a new line before will be enforced to prevent parse errors on PHP < 7.3.

This also means that the sniff will flag issues with the spacing around commas in function declarations, function calls and closure use statements, while WPCS already has other sniffs in place to handle this.

Luckily, the upstream sniff offers very modular error codes, so we can selectively silence those errors in the most common situations to prevent duplicate notices about the same issue.
For those places were the `Universal` sniff doesn't offer modular codes, we can, in most cases, selectively silence the errors coming from other sniffs. This commit includes some of those exclusions, but we may need to add more if we discover additional message duplications.

There may, however, still be some places which could get duplicate messages. It is, however, not expected that those will ever lead to fixer conflicts.

Both upstream sniffs contain fixers for all issues.

Ref:
* PHPCSStandards/PHPCSExtra 11
* PHPCSStandards/PHPCSExtra 254
---
 WordPress-Core/ruleset.xml                    |  49 ++-
 .../Arrays/CommaAfterArrayItemSniff.php       | 312 ------------------
 .../Arrays/CommaAfterArrayItemUnitTest.inc    | 212 ------------
 .../CommaAfterArrayItemUnitTest.inc.fixed     | 201 -----------
 .../Arrays/CommaAfterArrayItemUnitTest.php    |  91 -----
 5 files changed, 47 insertions(+), 818 deletions(-)
 delete mode 100644 WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
 delete mode 100644 WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc
 delete mode 100644 WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc.fixed
 delete mode 100644 WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index 03c23449df..b205565392 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -144,7 +144,45 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
 	#############################################################################
 	-->
-	<!-- Covers rule: Always put spaces after commas, and on both sides of logical,
+	<!-- Covers rule: Always put spaces after commas... -->
+	<!-- No space before a comma and one space or a new line after. -->
+	<rule ref="Universal.WhiteSpace.CommaSpacing"/>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.TooMuchSpaceAfterCommaBeforeTrailingComment">
+		<!-- Alignment of trailing comments is allowed. -->
+		<severity>0</severity>
+	</rule>
+	<!-- Comma spacing in function declarations, including closure use statements, is handled by the
+		 Squiz.Functions.FunctionDeclarationArgumentSpacing sniff. -->
+	<rule ref="Universal.WhiteSpace.CommaSpacing.SpaceBeforeInFunctionDeclaration">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.TooMuchSpaceAfterInFunctionDeclaration">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.NoSpaceAfterInFunctionDeclaration">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.SpaceBeforeInClosureUse">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.TooMuchSpaceAfterInClosureUse">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.NoSpaceAfterInClosureUse">
+		<severity>0</severity>
+	</rule>
+	<!-- Comma spacing in function calls is handled by the Generic.Functions.FunctionCallArgumentSpacing sniff. -->
+	<rule ref="Universal.WhiteSpace.CommaSpacing.SpaceBeforeInFunctionCall">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.TooMuchSpaceAfterInFunctionCall">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Universal.WhiteSpace.CommaSpacing.NoSpaceAfterInFunctionCall">
+		<severity>0</severity>
+	</rule>
+
+	<!-- Covers rule: Always put spaces ... on both sides of logical,
 		 arithmetic, comparison, string and assignment operators. -->
 	<rule ref="WordPress.WhiteSpace.OperatorSpacing"/>
 	<rule ref="Squiz.Strings.ConcatenationSpacing">
@@ -269,7 +307,7 @@
 	</rule>
 
 	<!-- Covers rule: Note the comma after the last array item: this is recommended. -->
-	<rule ref="WordPress.Arrays.CommaAfterArrayItem"/>
+	<rule ref="NormalizedArrays.Arrays.CommaAfterLast"/>
 
 	<!-- Covers rule: For switch control structures, case statements should be indented one tab
 		 from the switch statement and the contents of the case should be indented one tab
@@ -510,6 +548,13 @@
 	<rule ref="PSR12.Traits.UseDeclaration.SpaceAfterUse">
 		<severity>0</severity>
 	</rule>
+	<!-- Prevent duplicate messages - spacing around a comma is already covered by `Universal.WhiteSpace.CommaSpacing`. -->
+	<rule ref="PSR12.Traits.UseDeclaration.SpaceBeforeComma">
+		<severity>0</severity>
+	</rule>
+	<rule ref="PSR12.Traits.UseDeclaration.SpaceAfterComma">
+		<severity>0</severity>
+	</rule>
 
 
 	<!--
diff --git a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php b/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
deleted file mode 100644
index c1376b3df0..0000000000
--- a/WordPress/Sniffs/Arrays/CommaAfterArrayItemSniff.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Sniffs\Arrays;
-
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\Arrays;
-use PHPCSUtils\Utils\PassedParameters;
-use WordPressCS\WordPress\Sniff;
-
-/**
- * Enforces a comma after each array item and the spacing around it.
- *
- * Rules:
- * - For multi-line arrays, a comma is needed after each array item.
- * - Same for single-line arrays, but no comma is allowed after the last array item.
- * - There should be no space between the comma and the end of the array item.
- * - There should be exactly one space between the comma and the start of the
- *   next array item for single-line items.
- *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- */
-final class CommaAfterArrayItemSniff extends Sniff {
-
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register() {
-		return Collections::arrayOpenTokensBC();
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param int $stackPtr The position of the current token in the stack.
-	 *
-	 * @return void
-	 */
-	public function process_token( $stackPtr ) {
-
-		if ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $stackPtr ]['code'] ] )
-			&& Arrays::isShortArray( $this->phpcsFile, $stackPtr ) === false
-		) {
-			// Short list or real square brackets, not short array.
-			return;
-		}
-
-		/*
-		 * Determine the array opener & closer.
-		 */
-		$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $stackPtr );
-		if ( false === $array_open_close ) {
-			// Array open/close could not be determined.
-			return;
-		}
-
-		$opener = $array_open_close['opener'];
-		$closer = $array_open_close['closer'];
-		unset( $array_open_close );
-
-		// This array is empty, so the below checks aren't necessary.
-		if ( ( $opener + 1 ) === $closer ) {
-			return;
-		}
-
-		$single_line = true;
-		if ( $this->tokens[ $opener ]['line'] !== $this->tokens[ $closer ]['line'] ) {
-			$single_line = false;
-		}
-
-		$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
-		if ( empty( $array_items ) ) {
-			// Strange, no array items found.
-			return;
-		}
-
-		$array_item_count = \count( $array_items );
-
-		// Note: $item_index is 1-based and the array items are split on the commas!
-		foreach ( $array_items as $item_index => $item ) {
-			$maybe_comma = ( $item['end'] + 1 );
-			$is_comma    = false;
-			if ( isset( $this->tokens[ $maybe_comma ] ) && \T_COMMA === $this->tokens[ $maybe_comma ]['code'] ) {
-				$is_comma = true;
-			}
-
-			/*
-			 * Check if this is a comma at the end of the last item in a single line array.
-			 */
-			if ( true === $single_line && $item_index === $array_item_count ) {
-
-				$this->phpcsFile->recordMetric(
-					$stackPtr,
-					'Single line array - comma after last item',
-					( true === $is_comma ? 'yes' : 'no' )
-				);
-
-				if ( true === $is_comma ) {
-					$fix = $this->phpcsFile->addFixableError(
-						'Comma not allowed after last value in single-line array declaration',
-						$maybe_comma,
-						'CommaAfterLast'
-					);
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->replaceToken( $maybe_comma, '' );
-					}
-				}
-
-				/*
-				 * No need to do the spacing checks for the last item in a single line array.
-				 * This is handled by another sniff checking the spacing before the array closer.
-				 */
-				continue;
-			}
-
-			$last_content = $this->phpcsFile->findPrevious(
-				Tokens::$emptyTokens,
-				$item['end'],
-				$item['start'],
-				true
-			);
-
-			if ( false === $last_content ) {
-				// Shouldn't be able to happen, but just in case, ignore this array item.
-				continue;
-			}
-
-			/**
-			 * Make sure every item in a multi-line array has a comma at the end.
-			 *
-			 * Should in reality only be triggered by the last item in a multi-line array
-			 * as otherwise we'd have a parse error already.
-			 */
-			if ( false === $is_comma && false === $single_line ) {
-
-				$fix = $this->phpcsFile->addFixableError(
-					'Each array item in a multi-line array declaration must end in a comma',
-					$last_content,
-					'NoComma'
-				);
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->addContent( $last_content, ',' );
-				}
-			}
-
-			if ( false === $single_line && $item_index === $array_item_count ) {
-				$this->phpcsFile->recordMetric(
-					$stackPtr,
-					'Multi-line array - comma after last item',
-					( true === $is_comma ? 'yes' : 'no' )
-				);
-			}
-
-			if ( false === $is_comma ) {
-				// Can't check spacing around the comma if there is no comma.
-				continue;
-			}
-
-			/*
-			 * Check for whitespace at the end of the array item.
-			 */
-			if ( $last_content !== $item['end']
-				// Ignore whitespace at the end of a multi-line item if it is the end of a heredoc/nowdoc.
-				&& ( true === $single_line
-					|| ! isset( Tokens::$heredocTokens[ $this->tokens[ $last_content ]['code'] ] ) )
-			) {
-				$newlines = 0;
-				$spaces   = 0;
-				for ( $i = $item['end']; $i > $last_content; $i-- ) {
-
-					if ( \T_WHITESPACE === $this->tokens[ $i ]['code'] ) {
-						if ( $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar ) {
-							++$newlines;
-						} else {
-							$spaces += $this->tokens[ $i ]['length'];
-						}
-					} elseif ( \T_COMMENT === $this->tokens[ $i ]['code']
-						|| isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $i ]['code'] ] )
-					) {
-						break;
-					}
-				}
-
-				$space_phrases = array();
-				if ( $spaces > 0 ) {
-					$space_phrases[] = $spaces . ' spaces';
-				}
-				if ( $newlines > 0 ) {
-					$space_phrases[] = $newlines . ' newlines';
-				}
-				unset( $newlines, $spaces );
-
-				$fix = $this->phpcsFile->addFixableError(
-					'Expected 0 spaces between "%s" and comma; %s found',
-					$maybe_comma,
-					'SpaceBeforeComma',
-					array(
-						$this->tokens[ $last_content ]['content'],
-						implode( ' and ', $space_phrases ),
-					)
-				);
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->beginChangeset();
-					for ( $i = $item['end']; $i > $last_content; $i-- ) {
-
-						if ( \T_WHITESPACE === $this->tokens[ $i ]['code'] ) {
-							$this->phpcsFile->fixer->replaceToken( $i, '' );
-
-						} elseif ( \T_COMMENT === $this->tokens[ $i ]['code']
-							|| isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $i ]['code'] ] )
-						) {
-							// We need to move the comma to before the comment.
-							$this->phpcsFile->fixer->addContent( $last_content, ',' );
-							$this->phpcsFile->fixer->replaceToken( $maybe_comma, '' );
-
-							/*
-							 * No need to worry about removing too much whitespace in
-							 * combination with a `//` comment as in that case, the newline
-							 * is part of the comment, so we're good.
-							 */
-
-							break;
-						}
-					}
-					$this->phpcsFile->fixer->endChangeset();
-				}
-			}
-
-			if ( ! isset( $this->tokens[ ( $maybe_comma + 1 ) ] ) ) {
-				// Shouldn't be able to happen, but just in case.
-				continue;
-			}
-
-			/*
-			 * Check whitespace after the comma.
-			 */
-			$next_token = $this->tokens[ ( $maybe_comma + 1 ) ];
-
-			if ( \T_WHITESPACE === $next_token['code'] ) {
-
-				if ( false === $single_line && $this->phpcsFile->eolChar === $next_token['content'] ) {
-					continue;
-				}
-
-				$next_non_whitespace = $this->phpcsFile->findNext(
-					\T_WHITESPACE,
-					( $maybe_comma + 1 ),
-					$closer,
-					true
-				);
-
-				if ( false === $next_non_whitespace
-					|| ( false === $single_line
-						&& $this->tokens[ $next_non_whitespace ]['line'] === $this->tokens[ $maybe_comma ]['line']
-						&& ( \T_COMMENT === $this->tokens[ $next_non_whitespace ]['code']
-							|| isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $next_non_whitespace ]['code'] ] ) ) )
-				) {
-					continue;
-				}
-
-				$space_length = $next_token['length'];
-				if ( 1 === $space_length ) {
-					continue;
-				}
-
-				$fix = $this->phpcsFile->addFixableError(
-					'Expected 1 space between comma and "%s"; %s found',
-					$maybe_comma,
-					'SpaceAfterComma',
-					array(
-						$this->tokens[ $next_non_whitespace ]['content'],
-						$space_length,
-					)
-				);
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->replaceToken( ( $maybe_comma + 1 ), ' ' );
-				}
-			} else {
-				// This is either a comment or a mixed single/multi-line array.
-				// Just add a space and let other sniffs sort out the array layout.
-				$fix = $this->phpcsFile->addFixableError(
-					'Expected 1 space between comma and "%s"; 0 found',
-					$maybe_comma,
-					'NoSpaceAfterComma',
-					array( $next_token['content'] )
-				);
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->addContent( $maybe_comma, ' ' );
-				}
-			}
-		}
-	}
-}
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc
deleted file mode 100644
index b9e35bce38..0000000000
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/*
- * Good.
- */
-$good = array();
-
-$good = array( 1, 2, 3 );
-$good = [ 'a', 'b', 'c' ];
-
-$good = array(
-	1,
-	2,
-	3,
-);
-$good = [
-	'a',
-	'b',
-	'c',
-];
-
-$good = array(
-	1 => 'value',
-	2 => array( 1 ),
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$good = [
-	'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 ),
-	'c' => apply_filters( 'filter', $input, $var ),
-];
-
-// OK: that this should be a multi-line array is not the concern of this sniff.
-$good = array( 1 => 'a', 2 => 'b', 3 => 'c' );
-$good = [ 'a' => 1, 'b' => 2, 'c' => 3 ];
-
-$good = array( 1, 2, // OK: that each item should be on its own line or single line array is not the concern of this sniff.
-	3, ); // OK: that the brace should be on another line is not the concern of this sniff.
-
-/*
- * Bad.
- */
-// Spacing before comma.
-$bad = array( 1 , 2         , 3 ); // Bad x2.
-$bad = [ 'a' , 'b'    , 'c' ]; // Bad x2.
-
-// Spacing after comma.
-$bad = array( 1,2,    3 ); // Bad x2.
-$bad = [ 'a','b',    'c' ]; // Bad x2.
-
-// Comma after last.
-$bad = array( 1, 2, 3, );
-$bad = [ 'a', 'b', 'c', ];
-
-// Spacing before comma.
-$bad = array(
-	1 => 'value'  ,
-	2 => array( 1 ) ,
-	3 => apply_filters( 'filter', $input, $var )       , /* Comment. */
-);
-$bad = [
-	'a' => 'value'  ,          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 )
-
-
-	 ,
-	'c' => apply_filters( 'filter', $input, $var )     ,
-];
-
-// NO spacing after comma.
-$bad = array(
-	3 => apply_filters( 'filter', $input, $var ),/* Comment. */
-);
-$bad = [
-	'a' => 'value',// Comment.
-];
-
-// NO comma after last.
-$bad = array(
-	1 => 'value',
-	2 => array( 1 ),
-	3 => apply_filters( 'filter', $input, $var )/* Comment. */
-);
-$bad = [
-	'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 ),
-	'c' => apply_filters( 'filter', $input, $var )
-];
-
-$bad = array( 1 => 'a' ,    2 => 'b',3 => 'c', );
-$bad = [ 'a' => 1   ,   'b' => 2,'c' => 3, ];
-
-$bad = array( 1  ,    2,
-	3 );
-
-// Combining a lot of errors in a nested array.
-$bad = array(
-	1 => 'value' ,
-	2 => [
-		'a' => 'value'     ,// Comment - the extra spacing is fine, might be for alignment with other comments.
-		'b' => array(
-			1
-		),
-		'c' => apply_filters( 'filter', $input, $var )
-	],
-	3 => apply_filters( 'filter', $input, $var )/* Comment. */
-);
-
-// Alternative array style.
-$bad = array(
-          1 => 'value'
-        , 2 => array( 1 )
-        , 3 => apply_filters( 'filter', $input, $var )/* Comment. */
-);
-$bad = [
-	  'a' => 'value'          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	, 'b' => array( 1 )
-	, 'c' => apply_filters( 'filter', $input, $var )
-];
-$bad = [
-	 'a' => 'value'          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	,'b' => array( 1 )
-	,'c' => apply_filters( 'filter', $input, $var ),
-];
-
-$bad = array(
-         'first',
-         'second'
-         //'third',
-        );
-
-$bad = array(
- 'key3' => function($bar) {
-    return $bar;
- }
-);
-
-// Issue #998.
-$a = array(
-	'foo' => bar( 1, 29 ));
-
-// Issue #986.
-get_current_screen()->add_help_tab( array(
-		'id'		=> <<<EOD
-Here comes some text.
-EOD
-,
-) );
-
-get_current_screen()->add_help_tab( array(
-'id'		=> <<<EOD
-Here comes some text.
-EOD
-. '</hr>',
-) );
-
-// Test various situations using PHPCS annotations.
-// Combining a lot of errors in a nested array.
-$bad = array(
-	1 => 'value' ,
-	2 => [
-		'a' => 'value'     ,// phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
-		'b' => array(
-			1
-		),
-		'c' => apply_filters( 'filter', $input, $var )
-	],
-	3 => apply_filters( 'filter', $input, $var )/* phpcs:ignore Standard.Category.Sniff */
-);
-
-// Alternative array style.
-$bad = array(
-          1 => 'value'
-        , 2 => array( 1 )
-        , 3 => apply_filters( 'filter', $input, $var )/* phpcs:ignore Standard.Category.Sniff. */
-);
-$bad = [
-	  'a' => 'value'          // phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
-	, 'b' => array( 1 )
-	, 'c' => apply_filters( 'filter', $input, $var )
-];
-$bad = [
-	 'a' => 'value'          // phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
-	,'b' => array( 1 )
-	,'c' => apply_filters( 'filter', $input, $var ),
-];
-
-$bad = array(
-         'first', // phpcs:disable Standard.Category.Sniff
-         'second'
-         // phpcs:enable Standard.Category.Sniff
-        );
-
-/*
- * Issue #1692: Test distinguishing between short array and short list.
- */
-// Empty list, not allowed since PHP 7.0, but not our concern.
-[,,] = $array; // OK.
-
-[$var1, $var2,] = $array; // OK.
-
-// Keyed list.
-['enabled' => $enabled, 'compression' => $compression,] = [ 'enabled' => true, 'compression' => 'gzip', ]; // Bad x 1 - only for the short array, not the short list.
-
-// Nested short lists.
-[$var1, , [$var2, $var3,], $var4,] = $array; // OK.
-
-// Destructuring - multiline.
-[
-	'prop1' => $prop1,
-	'prop2' => $prop2
-] = $some_var;
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc.fixed b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc.fixed
deleted file mode 100644
index 6100bc1cd2..0000000000
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.inc.fixed
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-/*
- * Good.
- */
-$good = array();
-
-$good = array( 1, 2, 3 );
-$good = [ 'a', 'b', 'c' ];
-
-$good = array(
-	1,
-	2,
-	3,
-);
-$good = [
-	'a',
-	'b',
-	'c',
-];
-
-$good = array(
-	1 => 'value',
-	2 => array( 1 ),
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$good = [
-	'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 ),
-	'c' => apply_filters( 'filter', $input, $var ),
-];
-
-// OK: that this should be a multi-line array is not the concern of this sniff.
-$good = array( 1 => 'a', 2 => 'b', 3 => 'c' );
-$good = [ 'a' => 1, 'b' => 2, 'c' => 3 ];
-
-$good = array( 1, 2, // OK: that each item should be on its own line or single line array is not the concern of this sniff.
-	3, ); // OK: that the brace should be on another line is not the concern of this sniff.
-
-/*
- * Bad.
- */
-// Spacing before comma.
-$bad = array( 1, 2, 3 ); // Bad x2.
-$bad = [ 'a', 'b', 'c' ]; // Bad x2.
-
-// Spacing after comma.
-$bad = array( 1, 2, 3 ); // Bad x2.
-$bad = [ 'a', 'b', 'c' ]; // Bad x2.
-
-// Comma after last.
-$bad = array( 1, 2, 3 );
-$bad = [ 'a', 'b', 'c' ];
-
-// Spacing before comma.
-$bad = array(
-	1 => 'value',
-	2 => array( 1 ),
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$bad = [
-	'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 ),
-	'c' => apply_filters( 'filter', $input, $var ),
-];
-
-// NO spacing after comma.
-$bad = array(
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$bad = [
-	'a' => 'value', // Comment.
-];
-
-// NO comma after last.
-$bad = array(
-	1 => 'value',
-	2 => array( 1 ),
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$bad = [
-	'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-	'b' => array( 1 ),
-	'c' => apply_filters( 'filter', $input, $var ),
-];
-
-$bad = array( 1 => 'a', 2 => 'b', 3 => 'c' );
-$bad = [ 'a' => 1, 'b' => 2, 'c' => 3 ];
-
-$bad = array( 1, 2,
-	3, );
-
-// Combining a lot of errors in a nested array.
-$bad = array(
-	1 => 'value',
-	2 => [
-		'a' => 'value', // Comment - the extra spacing is fine, might be for alignment with other comments.
-		'b' => array(
-			1,
-		),
-		'c' => apply_filters( 'filter', $input, $var ),
-	],
-	3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-
-// Alternative array style.
-$bad = array(
-          1 => 'value', 2 => array( 1 ), 3 => apply_filters( 'filter', $input, $var ), /* Comment. */
-);
-$bad = [
-	  'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
- 'b' => array( 1 ), 'c' => apply_filters( 'filter', $input, $var ),
-];
-$bad = [
-	 'a' => 'value',          // Comment - the extra spacing is fine, might be for alignment with other comments.
-'b' => array( 1 ), 'c' => apply_filters( 'filter', $input, $var ),
-];
-
-$bad = array(
-         'first',
-         'second',
-         //'third',
-        );
-
-$bad = array(
- 'key3' => function($bar) {
-    return $bar;
- },
-);
-
-// Issue #998.
-$a = array(
-	'foo' => bar( 1, 29 ), );
-
-// Issue #986.
-get_current_screen()->add_help_tab( array(
-		'id'		=> <<<EOD
-Here comes some text.
-EOD
-,
-) );
-
-get_current_screen()->add_help_tab( array(
-'id'		=> <<<EOD
-Here comes some text.
-EOD
-. '</hr>',
-) );
-
-// Test various situations using PHPCS annotations.
-// Combining a lot of errors in a nested array.
-$bad = array(
-	1 => 'value',
-	2 => [
-		'a' => 'value', // phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
-		'b' => array(
-			1,
-		),
-		'c' => apply_filters( 'filter', $input, $var ),
-	],
-	3 => apply_filters( 'filter', $input, $var ), /* phpcs:ignore Standard.Category.Sniff */
-);
-
-// Alternative array style.
-$bad = array(
-          1 => 'value', 2 => array( 1 ), 3 => apply_filters( 'filter', $input, $var ), /* phpcs:ignore Standard.Category.Sniff. */
-);
-$bad = [
-	  'a' => 'value',          // phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
- 'b' => array( 1 ), 'c' => apply_filters( 'filter', $input, $var ),
-];
-$bad = [
-	 'a' => 'value',          // phpcs:disable Standard.Category.Sniff - the extra spacing is fine, might be for alignment with other comments.
-'b' => array( 1 ), 'c' => apply_filters( 'filter', $input, $var ),
-];
-
-$bad = array(
-         'first', // phpcs:disable Standard.Category.Sniff
-         'second',
-         // phpcs:enable Standard.Category.Sniff
-        );
-
-/*
- * Issue #1692: Test distinguishing between short array and short list.
- */
-// Empty list, not allowed since PHP 7.0, but not our concern.
-[,,] = $array; // OK.
-
-[$var1, $var2,] = $array; // OK.
-
-// Keyed list.
-['enabled' => $enabled, 'compression' => $compression,] = [ 'enabled' => true, 'compression' => 'gzip' ]; // Bad x 1 - only for the short array, not the short list.
-
-// Nested short lists.
-[$var1, , [$var2, $var3,], $var4,] = $array; // OK.
-
-// Destructuring - multiline.
-[
-	'prop1' => $prop1,
-	'prop2' => $prop2
-] = $some_var;
diff --git a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php b/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
deleted file mode 100644
index 33d99a69a6..0000000000
--- a/WordPress/Tests/Arrays/CommaAfterArrayItemUnitTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Unit test class for WordPress Coding Standard.
- *
- * @package WPCS\WordPressCodingStandards
- * @link    https://github.com/WordPress/WordPress-Coding-Standards
- * @license https://opensource.org/licenses/MIT MIT
- */
-
-namespace WordPressCS\WordPress\Tests\Arrays;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the Arrays.CommaAfterArrayItem sniff.
- *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- *
- * @covers \WordPressCS\WordPress\Sniffs\Arrays\CommaAfterArrayItemSniff
- */
-final class CommaAfterArrayItemUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return array(
-			44  => 2,
-			45  => 2,
-			48  => 2,
-			49  => 2,
-			52  => 1,
-			53  => 1,
-			57  => 1,
-			58  => 1,
-			59  => 1,
-			62  => 1,
-			66  => 1,
-			67  => 1,
-			72  => 1,
-			75  => 1,
-			82  => 1,
-			87  => 1,
-			90  => 4,
-			91  => 4,
-			93  => 2,
-			94  => 1,
-			98  => 1,
-			100 => 2,
-			102 => 1,
-			104 => 1,
-			106 => 1,
-			112 => 1,
-			113 => 2,
-			117 => 1,
-			118 => 2,
-			122 => 2,
-			123 => 2,
-			128 => 1,
-			135 => 1,
-			140 => 1,
-			160 => 1,
-			162 => 2,
-			164 => 1,
-			166 => 1,
-			168 => 1,
-			174 => 1,
-			175 => 2,
-			179 => 1,
-			180 => 2,
-			184 => 2,
-			185 => 2,
-			190 => 1,
-			203 => 1,
-		);
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return array();
-	}
-}

From 6e3f97e49d8229c6eca9091743a2b57ab101faa3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 12 Jun 2023 13:20:07 +0200
Subject: [PATCH 656/822] Rulesets: various minor tweaks

Double-checked the ruleset against the handbook. Everything currently in the handbook is now in the Core ruleset. :white_checkmark:

* Removed duplicate rule (the `Universal.UseStatements.LowercaseFunctionConst` was previously added here, but subsequently added to the "Use import statement" section as well).
* Removed links to closed issues when the issue has been addressed in the mean time.
* Made sure that rules which haven't got a sniff associated with them, while they are potentially sniffable, have an issue attached to them.
* Made sure that rules which are "covered" by one or more sniffs have the `Covers` prefix.
---
 WordPress-Core/ruleset.xml  | 25 ++++++++++++++-----------
 WordPress-Extra/ruleset.xml |  4 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index f612c81e9d..f84fcca4d2 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -113,13 +113,14 @@
 	<!-- Covers rule: Files should be named descriptively using lowercase letters.
 		 Hyphens should separate words. -->
 	<!-- Covers rule: Class file names should be based on the class name with "class-"
-		 prepended and the underscores in the class name replaced with hyphens.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
+		 prepended and the underscores in the class name replaced with hyphens. -->
 	<!-- Covers rule: Files containing template tags in wp-includes should have "-template"
-		 appended to the end of the name.
-		 https://github.com/WordPress/WordPress-Coding-Standards/issues/642 -->
+		 appended to the end of the name. -->
 	<rule ref="WordPress.Files.FileName"/>
 
+	<!-- Rule: For files containing test classes, the file name should reflect the class name exactly, as per PSR4.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/1995 -->
+
 
 	<!--
 	#############################################################################
@@ -387,8 +388,8 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#multiline-function-calls
 	#############################################################################
 	-->
-	<!-- Rule: When splitting a function call over multiple lines, each parameter must be on a separate line.
-		 Covered via PEAR.Functions.FunctionCallSignature in Space Usage section. -->
+	<!-- Covers rule: When splitting a function call over multiple lines, each parameter must be on a separate line. -->
+	<!-- Covered via PEAR.Functions.FunctionCallSignature in Space Usage section. -->
 
 	<!-- Rule: Single line inline comments can take up their own line. -->
 	<!-- Rule: Each parameter must take up no more than a single line. Multi-line parameter
@@ -464,9 +465,11 @@
 	Ref: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#namespace-declarations
 	#############################################################################
 	-->
-	<!-- Rule: Each part of a namespace name should consist of capitalized words separated by underscores. -->
+	<!-- Rule: Each part of a namespace name should consist of capitalized words separated by underscores.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/2304 -->
 
-	<!-- Rule: Namespace declarations should have exactly one blank line before the declaration and at least one blank line after. -->
+	<!-- Rule: Namespace declarations should have exactly one blank line before the declaration and at least one blank line after.
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/2305 -->
 
 	<!-- Covers rule: There should be only one namespace declaration per file... -->
 	<rule ref="Universal.Namespaces.OneDeclarationPerFile"/>
@@ -498,12 +501,13 @@
 	<!-- Not yet covered: use statements which are not part of the file header. -->
 	<rule ref="PSR12.Files.FileHeader.IncorrectGrouping"/>
 
-	<!-- Rule: When using aliases, make sure the aliases follow the WordPress naming convention ... -->
+	<!-- Rule: When using aliases, make sure the aliases follow the WordPress naming convention ...
+		 https://github.com/WordPress/WordPress-Coding-Standards/issues/2306 -->
 
 	<!-- Covers rule: ... and are unique. -->
 	<rule ref="Universal.UseStatements.NoUselessAliases"/>
 
-	<!-- Rule: (example based rules, group use formatting, spacing around keywords) -->
+	<!-- Covers rules: (example based rules, group use formatting, spacing around keywords) -->
 
 	<!-- Implied through the examples: There should be exactly one space before/after keywords. -->
 	<!-- Spacing after "use" keyword: covered by the Generic.WhiteSpace.LanguageConstructSpacing sniff. -->
@@ -869,7 +873,6 @@
 
 	<!-- Lowercase PHP keywords, like class, function and case. -->
 	<rule ref="Generic.PHP.LowerCaseKeyword"/>
-	<rule ref="Universal.UseStatements.LowercaseFunctionConst"/>
 
 	<!-- Class opening braces should be on the same line as the statement. -->
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index b3685b7c37..bf753e6b95 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -155,7 +155,7 @@
 	<rule ref="Universal.Arrays.DuplicateArrayKey"/>
 
 	<!-- Disallows return type declarations on constructor/destructor methods,
-		and constructor/destructor methods returning a value. -->
+		 and constructor/destructor methods returning a value. -->
 	<rule ref="Universal.CodeAnalysis.ConstructorDestructorReturn"/>
 
 	<!-- Detects foreach control structures using the same variable for both key and value. -->
@@ -168,7 +168,7 @@
 	<rule ref="Universal.ControlStructures.DisallowLonelyIf"/>
 
 	<!-- Enforce for a file to either declare (global/namespaced) functions
-		or declare object-oriented structures, but not both. -->
+		 or declare object-oriented structures, but not both. -->
 	<rule ref="Universal.Files.SeparateFunctionsFromOO"/>
 
 	<!-- Detect useless "echo sprintf(...)". -->

From 7fd57b7ff3603c98ba0d6f1fed5227984dbc0736 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 21 Jul 2023 12:37:04 +0200
Subject: [PATCH 657/822] DB/PreparedSQLPlaceholders: final fixes for %i
 support

* Add sniff to the list of sniffs using the `MinimumWPVersionTrait`
* Fix incorrect implementation of the minimum WP version check.
    This check was never supposed to hide the `QuotedIdentifierPlaceholder` check when the minimum supported WP version is below 6.2.
    Instead, the check is needed to flag the `%i` modifier as an "unsupported placeholder" when used with a minimum supported WP version below 6.2.

Includes tests safeguarding the new `UnsupportedIdentifierPlaceholder` error.
Note: I've left the `phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version 6.2` before the original set of test in place to prevent having to up the error/warning nrs for all those tests, while this particular error is safeguarded via separate tests anyway.

Includes a few minor doc tweaks.
Includes a minor efficiency fix (condition order in an `if`).
---
 WordPress/Helpers/MinimumWPVersionTrait.php   |  8 +--
 .../DB/PreparedSQLPlaceholdersSniff.php       | 51 ++++++++++++-------
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    |  6 +++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  3 ++
 4 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index df39567a83..8f89ead835 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -31,10 +31,10 @@ trait MinimumWPVersionTrait {
 	/**
 	 * Minimum supported WordPress version.
 	 *
-	 * Currently used by the `WordPress.WP.AlternativeFunctions`,
-	 * `WordPress.WP.Capabilities`, `WordPress.WP.DeprecatedClasses`,
-	 * `WordPress.WP.DeprecatedFunctions`, `WordPress.WP.DeprecatedParameter`
-	 * and the `WordPress.WP.DeprecatedParameterValues` sniff.
+	 * Currently used by the `WordPress.Security.PreparedSQLPlaceholders`,
+	 * `WordPress.WP.AlternativeFunctions`, `WordPress.WP.Capabilities`,
+	 * `WordPress.WP.DeprecatedClasses`, `WordPress.WP.DeprecatedFunctions`,
+	 * `WordPress.WP.DeprecatedParameter` and the `WordPress.WP.DeprecatedParameterValues` sniff.
 	 *
 	 * These sniffs will adapt their behaviour based on the minimum supported WP version
 	 * indicated.
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 59944007c6..23544f4668 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -22,10 +22,12 @@
  * Check the following issues:
  * - The only placeholders supported are: %d, %f (%F), %s, %i, and their variations.
  * - Literal % signs need to be properly escaped as `%%`.
- * - Simple placeholders (%d, %f, %F, %s) should be left unquoted in the query string.
+ * - Simple placeholders (%d, %f, %F, %s, %i) should be left unquoted in the query string.
  * - Complex placeholders - numbered and formatted variants - will not be quoted
  *   automagically by $wpdb->prepare(), so if used for values, should be quoted in
  *   the query string.
+ *   The only exception to this is complex placeholders for %i. In that case, the
+ *   replacement *will* still be backtick-quoted.
  * - Either an array of replacements should be passed matching the number of
  *   placeholders found or individual parameters for each placeholder should
  *   be passed.
@@ -50,7 +52,6 @@
 final class PreparedSQLPlaceholdersSniff extends Sniff {
 
 	use MinimumWPVersionTrait;
-
 	use WPDBTrait;
 
 	/**
@@ -407,6 +408,24 @@ function ( $symbol ) {
 				unset( $match, $matches );
 			}
 
+			if ( $this->wp_version_compare( $this->minimum_wp_version, '6.2', '<' ) ) {
+				if ( preg_match_all( '`' . self::PREPARE_PLACEHOLDER_REGEX . '`x', $content, $matches ) > 0 ) {
+					if ( ! empty( $matches[0] ) ) {
+						foreach ( $matches[0] as $match ) {
+							if ( 'i' === substr( $match, -1 ) ) {
+								$this->phpcsFile->addError(
+									'The %%i modifier is only supported in WP 6.2 or higher. Found: "%s".',
+									$i,
+									'UnsupportedIdentifierPlaceholder',
+									array( $match )
+								);
+							}
+						}
+					}
+				}
+				unset( $match, $matches );
+			}
+
 			/*
 			 * Analyse the query for single/double quoted simple value placeholders
 			 * Identifiers are checked separately.
@@ -429,23 +448,21 @@ function ( $symbol ) {
 			/*
 			 * Analyse the query for quoted identifier placeholders.
 			 */
-			if ( version_compare( $this->minimum_wp_version, '6.2', '>=' ) ) {
-				$regex = '/(' . $regex_quote . '|`)(?<placeholder>' . self::PREPARE_PLACEHOLDER_REGEX . ')\1/x';
-				if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
-					if ( ! empty( $matches ) ) {
-						foreach ( $matches['placeholder'] as $index => $match ) {
-							if ( 'i' === substr( $match, -1 ) ) {
-								$this->phpcsFile->addError(
-									'Placeholders used for identifiers (%%i) in the query string in $wpdb->prepare() are always quoted automagically. Please remove the surrounding quotes. Found: %s',
-									$i,
-									'QuotedIdentifierPlaceholder',
-									array( $matches[0][ $index ] )
-								);
-							}
+			$regex = '/(' . $regex_quote . '|`)(?<placeholder>' . self::PREPARE_PLACEHOLDER_REGEX . ')\1/x';
+			if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
+				if ( ! empty( $matches ) ) {
+					foreach ( $matches['placeholder'] as $index => $match ) {
+						if ( 'i' === substr( $match, -1 ) ) {
+							$this->phpcsFile->addError(
+								'Placeholders used for identifiers (%%i) in the query string in $wpdb->prepare() are always quoted automagically. Please remove the surrounding quotes. Found: %s',
+								$i,
+								'QuotedIdentifierPlaceholder',
+								array( $matches[0][ $index ] )
+							);
 						}
 					}
-					unset( $index, $match, $matches );
 				}
+				unset( $index, $match, $matches );
 			}
 
 			/*
@@ -455,7 +472,7 @@ function ( $symbol ) {
 			if ( preg_match_all( $regex, $content, $matches ) > 0 ) {
 				if ( ! empty( $matches[0] ) ) {
 					foreach ( $matches[0] as $match ) {
-						if ( preg_match( '`^%[dfFsi]$`', $match ) !== 1 && substr( $match, -1 ) !== 'i' ) { // Identifiers must always be unquoted.
+						if ( substr( $match, -1 ) !== 'i' && preg_match( '`^%[dfFsi]$`', $match ) !== 1 ) { // Identifiers must always be unquoted.
 							$this->phpcsFile->addWarning(
 								'Complex placeholders used for values in the query string in $wpdb->prepare() will NOT be quoted automagically. Found: %s.',
 								$i,
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 634a971c80..5d8ac2aa62 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -273,4 +273,10 @@ $wpdb->prepare( '
 	$fields
 ); // IdentifierWithinIN.
 
+// phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version 5.8
+
+$wpdb->prepare( 'WHERE %1$+10.3i = %s', $field, $value ); // UnsupportedIdentifierPlaceholder.
+$wpdb->prepare( "WHERE '%10i' IS NULL", $field ); // UnsupportedIdentifierPlaceholder + QuotedIdentifierPlaceholder.
+$wpdb->prepare( 'xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' ) ) . ' )', $fields ); // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
+
 // phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 898429e25e..b5383bd810 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -92,6 +92,9 @@ public function getErrorList() {
 			261 => 1, // IdentifierWithinIN.
 			267 => 1, // IdentifierWithinIN.
 			272 => 1, // IdentifierWithinIN.
+			278 => 1, // UnsupportedIdentifierPlaceholder.
+			279 => 2, // UnsupportedIdentifierPlaceholder + QuotedIdentifierPlaceholder.
+			280 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 		);
 	}
 

From fcea43c8c933a94fc87542e2deaacc8f14e57a00 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:47:58 +0100
Subject: [PATCH 658/822] DB/PreparedSQLPlaceholders: add extra tests

... to covered previously uncovered code.

Note: some of the messages generated for these (mostly invalid) code samples are not always that clear, but the fact that the queries are being flagged is still correct.
---
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 52 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  8 +++
 2 files changed, 60 insertions(+)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 5d8ac2aa62..c4ebf915ad 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -280,3 +280,55 @@ $wpdb->prepare( "WHERE '%10i' IS NULL", $field ); // UnsupportedIdentifierPlaceh
 $wpdb->prepare( 'xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' ) ) . ' )', $fields ); // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 
 // phpcs:set WordPress.DB.PreparedSQLPlaceholders minimum_wp_version
+
+$wpdb->prepare(); // Ignore.
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN (\""
+		. implode()
+		. "\") AND {$wpdb->posts}.post_id = %s",
+	$post_id
+); // Bad, dynamic placeholder generation quotes with invalid implode call (no params).
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_status IN ('"
+		. implode( ',' )
+		. '\') AND {$wpdb->posts}.post_id = %s',
+	$post_id
+); // Bad, dynamic placeholder generation quotes with invalid implode call (missing second param).
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_status IN ('"
+		. implode( '|', array_fill( 0, count($post_stati), '%s' ) )
+		. '\') AND {$wpdb->posts}.post_id = %s',
+	$post_id
+); // Bad x2, dynamic placeholder generation quotes with invalid implode call (separator parameter does not contain expected ',' value).
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN (\""
+		. implode( ',', $array_fill )
+		. "\") AND {$wpdb->posts}.post_id = %s",
+	$post_id
+); // Bad, dynamic placeholder generation quotes with invalid implode call (array param is not call to array_fill).
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN (\""
+		. implode( ',', array_fill() )
+		. "\") AND {$wpdb->posts}.post_id = %s",
+	$post_id
+); // Bad, dynamic placeholder generation quotes with invalid implode call (array param is call to array_fill() without params).
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN (\""
+		. implode( ',', array_fill( 0, count($post_types) ) )
+		. "\") AND {$wpdb->posts}.post_id = %s",
+	$post_id
+); // Bad, dynamic placeholder generation quotes with invalid implode call (array param is call to array_fill(), but missing third param).
+
+// Safeguard that short array as $args is handled correctly.
+$wpdb->get_col(
+	$wpdb->prepare(
+		"SELECT term_taxonomy_id FROM {$wpdb->term_taxonomy} WHERE taxonomy = %s LIMIT %d",
+		[ 'taxonomy_name', $limit ]
+	) // Ok.
+);
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 059af40509..252f15ccab 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -95,6 +95,13 @@ public function getErrorList() {
 			278 => 1, // UnsupportedIdentifierPlaceholder.
 			279 => 2, // UnsupportedIdentifierPlaceholder + QuotedIdentifierPlaceholder.
 			280 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
+
+			288 => 1,
+			295 => 1,
+			302 => 1,
+			309 => 1,
+			316 => 1,
+			323 => 1,
 		);
 	}
 
@@ -138,6 +145,7 @@ public function getWarningList() {
 			234 => 1, // UnfinishedPrepare.
 			246 => 1, // UnfinishedPrepare.
 			258 => 1, // ReplacementsWrongNumber.
+			300 => 1,
 		);
 	}
 }

From 671289db4861e2564d7af3deb4dd34e4fa802a2f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 02:27:42 +0200
Subject: [PATCH 659/822] DB/PreparedSQLPlaceholders: make variables used
 explicit

These variables are conditionally set within the `for()` loop. Just declaring them here to be more explicit/complete with the variables in use within the loop.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index e1c3a0abb8..a81615bd96 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -201,6 +201,8 @@ public function process_token( $stackPtr ) {
 			'implode_fill'     => 0,
 			'adjustment_count' => 0,
 		);
+		$skip_from                = null;
+		$skip_to                  = null;
 
 		for ( $i = $query['start']; $i <= $query['end']; $i++ ) {
 			// Skip over groups of tokens if they are part of an inline function call.

From 27ca93514cc505a17c934a60150fce94840630ec Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:57:50 +0100
Subject: [PATCH 660/822] DB/PreparedSQLPlaceholders: implement PHPCSUtils

This change is already covered by existing tests (test case file line 58 and 259).
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index a81615bd96..8060ea62ee 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -10,6 +10,8 @@
 namespace WordPressCS\WordPress\Sniffs\DB;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\MinimumWPVersionTrait;
@@ -552,7 +554,8 @@ function ( $symbol ) {
 
 			if ( false !== $next
 				&& ( \T_ARRAY === $this->tokens[ $next ]['code']
-					|| \T_OPEN_SHORT_ARRAY === $this->tokens[ $next ]['code'] )
+					|| ( isset( Collections::shortArrayListOpenTokensBC()[ $this->tokens[ $next ]['code'] ] )
+						&& Arrays::isShortArray( $this->phpcsFile, $next ) === true ) )
 			) {
 				$replacements = PassedParameters::getParameters( $this->phpcsFile, $next );
 			}

From 0f7b3ad3f1d0df0cc2f04359b13761b348ec7faf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:51:00 +0200
Subject: [PATCH 661/822] DB/PreparedSQLPlaceholders: minor simplification

In both these cases, a "quick check" for the target function call was done prior to walking the tokens, but the token walking with a negative search for `Tokens::$emptyToken` doesn't contain the risk of walking very far, so this quick check isn't really needed and removing it shouldn't impact performance.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 8060ea62ee..a51c870dcb 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -635,10 +635,6 @@ protected function analyse_sprintf( $sprintf_params ) {
 		unset( $sprintf_params[1] );
 
 		foreach ( $sprintf_params as $sprintf_param ) {
-			if ( strpos( strtolower( $sprintf_param['raw'] ), 'implode' ) === false ) {
-				continue;
-			}
-
 			$implode = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
 				$sprintf_param['start'],
@@ -689,10 +685,6 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		if ( strpos( strtolower( $implode_params[2]['raw'] ), 'array_fill' ) === false ) {
-			return false;
-		}
-
 		$array_fill = $this->phpcsFile->findNext(
 			Tokens::$emptyTokens,
 			$implode_params[2]['start'],

From 7004173efdfdc816db4ddb75cad20b64d8c0a4ca Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:54:27 +0200
Subject: [PATCH 662/822] DB/PreparedSQLPlaceholders: prevent false positive
 due to comments in params [1]

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, a potential false positive gets fixed.

Includes unit test demonstrating the issue and safeguarding the fix.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php   | 2 +-
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index a51c870dcb..7f63f2a9c6 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -681,7 +681,7 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		if ( preg_match( '`^(["\']), ?\1$`', $implode_params[1]['raw'] ) !== 1 ) {
+		if ( preg_match( '`^(["\']), ?\1$`', $implode_params[1]['clean'] ) !== 1 ) {
 			return false;
 		}
 
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index c4ebf915ad..f5b7597460 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -332,3 +332,12 @@ $wpdb->get_col(
 		[ 'taxonomy_name', $limit ]
 	) // Ok.
 );
+
+// Disregard comments in the implode() $separator param.
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',' /*comment*/, array_fill( 0, count($post_types), '%s' ) )
+	),
+	$post_types
+); // OK.

From abcba3d391af286cd609cbdf1153107668a279cb Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:56:50 +0200
Subject: [PATCH 663/822] DB/PreparedSQLPlaceholders: prevent false negative
 due to comments in params [2]

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, a potential false negative gets fixed.

Includes unit test demonstrating the issue and safeguarding the fix.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php   | 4 ++--
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 6 ++++++
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 7f63f2a9c6..451729f10f 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -704,8 +704,8 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		if ( "'%i'" === $array_fill_params[3]['raw']
-			|| '"%i"' === $array_fill_params[3]['raw']
+		if ( "'%i'" === $array_fill_params[3]['clean']
+			|| '"%i"' === $array_fill_params[3]['clean']
 		) {
 			$this->phpcsFile->addError(
 				'The %i placeholder cannot be used within SQL `IN()` clauses.',
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index f5b7597460..8be4b9924a 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -341,3 +341,9 @@ $where = $wpdb->prepare(
 	),
 	$post_types
 ); // OK.
+
+// Disregard comments in the array_fill() $value param.
+$wpdb->prepare( '
+	xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' /*comment*/ ) ) . ' )',
+	$fields
+); // IdentifierWithinIN.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 252f15ccab..ef575ddf74 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -102,6 +102,8 @@ public function getErrorList() {
 			309 => 1,
 			316 => 1,
 			323 => 1,
+
+			347 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 		);
 	}
 

From 4fc71c3529dfda718894c3d8e91afdf9f47a06b5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 23:20:36 +0200
Subject: [PATCH 664/822] DB/PreparedSQLPlaceholders: prevent false positive
 due to comments in params [3]

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, a potential false positive gets fixed.

Includes unit test demonstrating the issue and safeguarding the fix.
Also includes unit tests with an unsupported placeholder in the `array_fill()`, which looks like it was so far untested.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       |  2 +-
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 30 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  3 ++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 451729f10f..73895e6309 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -715,6 +715,6 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_params[3]['raw'] );
+		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_params[3]['clean'] );
 	}
 }
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 8be4b9924a..d61c146b89 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -347,3 +347,33 @@ $wpdb->prepare( '
 	xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' /*comment*/ ) ) . ' )',
 	$fields
 ); // IdentifierWithinIN.
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN ("
+		. implode( ',', array_fill( 0, count($post_types), '%C' ) )
+		. ')',
+	array_merge( $post_types )
+); // Bad x 2, UnsupportedPlaceholder + UnfinishedPrepare.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( 0, count($post_types), '%C' ) )
+	),
+	$post_types
+); // Bad, ReplacementsWrongNumber due to unrecognized placeholder in array_fill().
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN ("
+		. implode( ',', array_fill( 0, count($post_types), /*comment*/ '%s' ) )
+		. ')',
+	array_merge( $post_types )
+); // OK.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( 0, count($post_types), "%s" /*comment*/ ) )
+	),
+	$post_types
+); // OK.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index ef575ddf74..2c4f5d55ec 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -104,6 +104,7 @@ public function getErrorList() {
 			323 => 1,
 
 			347 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
+			353 => 1,
 		);
 	}
 
@@ -148,6 +149,8 @@ public function getWarningList() {
 			246 => 1, // UnfinishedPrepare.
 			258 => 1, // ReplacementsWrongNumber.
 			300 => 1,
+			354 => 1,
+			358 => 1,
 		);
 	}
 }

From eee85c05e8d692841892ccf156d2b1a26023b5d7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:44:29 +0200
Subject: [PATCH 665/822] DB/PreparedSQLPlaceholders: bug fix - allow for FQN
 function calls

When looking for a function calls to `implode()` or `array_fill()`, the sniff did not allow for fully qualified function calls, which would lead to false positives.

Fixed now.

Includes unit tests demonstrating the issue and safeguarding the fix.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       |  4 +--
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 73895e6309..554f703cf2 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -636,7 +636,7 @@ protected function analyse_sprintf( $sprintf_params ) {
 
 		foreach ( $sprintf_params as $sprintf_param ) {
 			$implode = $this->phpcsFile->findNext(
-				Tokens::$emptyTokens,
+				Tokens::$emptyTokens + array( \T_NS_SEPARATOR => \T_NS_SEPARATOR ),
 				$sprintf_param['start'],
 				$sprintf_param['end'],
 				true
@@ -686,7 +686,7 @@ protected function analyse_implode( $implode_token ) {
 		}
 
 		$array_fill = $this->phpcsFile->findNext(
-			Tokens::$emptyTokens,
+			Tokens::$emptyTokens + array( \T_NS_SEPARATOR => \T_NS_SEPARATOR ),
 			$implode_params[2]['start'],
 			$implode_params[2]['end'],
 			true
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index d61c146b89..7d223720bd 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -377,3 +377,29 @@ $where = $wpdb->prepare(
 	),
 	$post_types
 ); // OK.
+
+// Safeguard that FQN function calls to implode() and array_fill() are handled correctly.
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		\implode( ',', array_fill( 0, count($post_types), '%s' ) )
+	),
+	$post_types
+); // OK.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', \array_fill( 0, count($post_types), '%s' ) )
+	),
+	$post_types
+); // OK.
+
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN ("
+		. implode( ',', \array_fill( 0, count($post_types), '%s' ) )
+		. ") AND {$wpdb->posts}.post_status IN ("
+		. implode( ',', \array_fill( 0, count($post_statusses), '%s' ) )
+		. ')',
+	array_merge( $post_types, $post_statusses )
+); // OK.

From 7a4259fc9f5df3c03042c5b47cb3d698a90ddd25 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 23:25:37 +0200
Subject: [PATCH 666/822] DB/PreparedSQLPlaceholders: bug fix - sniff could
 skip too much

As things were, the `$skip_to` param would lead to the first token _after_ the parenthesis closer also being skipped. This was not the intention and while - for valid code - this won't lead to false positives/negatives, it should still be fixed.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 554f703cf2..b6a8d005c8 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -208,7 +208,7 @@ public function process_token( $stackPtr ) {
 
 		for ( $i = $query['start']; $i <= $query['end']; $i++ ) {
 			// Skip over groups of tokens if they are part of an inline function call.
-			if ( isset( $skip_from, $skip_to ) && $i >= $skip_from && $i < $skip_to ) {
+			if ( isset( $skip_from, $skip_to ) && $i >= $skip_from && $i <= $skip_to ) {
 				$i = $skip_to;
 				continue;
 			}
@@ -267,7 +267,7 @@ public function process_token( $stackPtr ) {
 									&& isset( $this->tokens[ $next ]['parenthesis_closer'] )
 								) {
 									$skip_from = ( $i + 1 );
-									$skip_to   = ( $this->tokens[ $next ]['parenthesis_closer'] + 1 );
+									$skip_to   = $this->tokens[ $next ]['parenthesis_closer'];
 								}
 							}
 						}

From 7d06fbb066dc9bc3bcbb1568cd290bf1402a6909 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 23:41:32 +0200
Subject: [PATCH 667/822] DB/PreparedSQLPlaceholders: improve error message
 precision for IdentifierWithinIN

Throw the error for `IdentifierWithinIN` error on the actual text string token in the parameter instead of on the function call to `implode()` to give a better indication where the actual error occurred.

Safeguarded by adjusting one of the pre-existing tests.
---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php   | 4 +++-
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index b6a8d005c8..c26efc8a1e 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -707,9 +707,11 @@ protected function analyse_implode( $implode_token ) {
 		if ( "'%i'" === $array_fill_params[3]['clean']
 			|| '"%i"' === $array_fill_params[3]['clean']
 		) {
+			$firstNonEmpty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $array_fill_params[3]['start'], $array_fill_params[3]['end'], true );
+
 			$this->phpcsFile->addError(
 				'The %i placeholder cannot be used within SQL `IN()` clauses.',
-				$implode_token,
+				$firstNonEmpty,
 				'IdentifierWithinIN'
 			);
 			return false;
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 7d223720bd..c50bde4908 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -263,8 +263,8 @@ $wpdb->prepare(
 	$fields
 ); // ReplacementsWrongNumber + IdentifierWithinIN.
 
-$wpdb->prepare( '
-	xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ), '%i' ) ) . ' )',
+$wpdb->prepare( 'xxx IN ( ' . implode( ',', array_fill( 0, count( $post_types ),
+	'%i' ) ) . ' )',
 	$fields
 ); // IdentifierWithinIN.
 

From bc75ffe6475fdf8b967679b9e9075c0c78d1c6a8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Jul 2023 00:02:25 +0200
Subject: [PATCH 668/822] DB/PreparedSQLPlaceholders: improve error message
 precision for QuotedDynamicPlaceholderGeneration

Throw the error for `QuotedDynamicPlaceholderGeneration` error on the actual text string token which contains the open quote instead of on the function call to `implode()` to give a better indication where the actual error occurred.

Safeguarded via the existing tests.
---
 .../Sniffs/DB/PreparedSQLPlaceholdersSniff.php   |  2 +-
 .../Tests/DB/PreparedSQLPlaceholdersUnitTest.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index c26efc8a1e..9a409561b1 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -253,7 +253,7 @@ public function process_token( $stackPtr ) {
 							if ( isset( $match[1] ) && $regex_quote !== $this->regex_quote ) {
 								$this->phpcsFile->addError(
 									'Dynamic placeholder generation should not have surrounding quotes.',
-									$i,
+									$prev,
 									'QuotedDynamicPlaceholderGeneration'
 								);
 							}
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 2c4f5d55ec..1ba40fea81 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -39,8 +39,8 @@ public function getErrorList() {
 			41  => 1,
 			54  => 1,
 			141 => 1,
-			149 => 1,
-			151 => 1,
+			148 => 1,
+			150 => 1,
 			162 => 1,
 			163 => 1,
 			164 => 1,
@@ -96,12 +96,12 @@ public function getErrorList() {
 			279 => 2, // UnsupportedIdentifierPlaceholder + QuotedIdentifierPlaceholder.
 			280 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 
-			288 => 1,
-			295 => 1,
-			302 => 1,
-			309 => 1,
-			316 => 1,
-			323 => 1,
+			287 => 1,
+			294 => 1,
+			301 => 1,
+			308 => 1,
+			315 => 1,
+			322 => 1,
 
 			347 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 			353 => 1,

From 01c5bf4e6e3f245d7508c09277c0a8f670cf05a8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Jul 2023 00:12:16 +0200
Subject: [PATCH 669/822] DB/PreparedSQLPlaceholders: prevent token walking too
 far

When an `implode()` function call is found in a `$query`, the sniff tries to find the preceding text string token to check for quotes around the placeholders.

While it is unlikely that an `implode()` wouldn't be preceded by a text string token + concatenation token, it could still be possible.

This updates the logic to do a negative search for the previous non-empty, non-concat token instead to prevent the sniff from walking too far.

I've not included a test as I couldn't come up with a valid code snippet which would hit a false positive, but it should still be fixed IMO.

:point_right: This commit will be easier to review while ignoring whitespace changes.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 9a409561b1..47c9924a12 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -239,39 +239,43 @@ public function process_token( $stackPtr ) {
 
 					} elseif ( 'implode' === strtolower( $this->tokens[ $i ]['content'] ) ) {
 						$prev = $this->phpcsFile->findPrevious(
-							Tokens::$textStringTokens,
+							Tokens::$emptyTokens + array( \T_STRING_CONCAT => \T_STRING_CONCAT ),
 							( $i - 1 ),
-							$query['start']
+							$query['start'],
+							true
 						);
 
-						$prev_content = TextStrings::stripQuotes( $this->tokens[ $prev ]['content'] );
-						$regex_quote  = $this->get_regex_quote_snippet( $prev_content, $this->tokens[ $prev ]['content'] );
+						if ( isset( Tokens::$textStringTokens[ $this->tokens[ $prev ]['code'] ] ) ) {
+							$prev_content = TextStrings::stripQuotes( $this->tokens[ $prev ]['content'] );
+							$regex_quote  = $this->get_regex_quote_snippet( $prev_content, $this->tokens[ $prev ]['content'] );
 
-						// Only examine the implode if preceded by an ` IN (`.
-						if ( preg_match( '`\s+IN\s*\(\s*(' . $regex_quote . ')?$`i', $prev_content, $match ) > 0 ) {
+							// Only examine the implode if preceded by an ` IN (`.
+							if ( preg_match( '`\s+IN\s*\(\s*(' . $regex_quote . ')?$`i', $prev_content, $match ) > 0 ) {
 
-							if ( isset( $match[1] ) && $regex_quote !== $this->regex_quote ) {
-								$this->phpcsFile->addError(
-									'Dynamic placeholder generation should not have surrounding quotes.',
-									$prev,
-									'QuotedDynamicPlaceholderGeneration'
-								);
-							}
-
-							if ( $this->analyse_implode( $i ) === true ) {
-								++$valid_in_clauses['uses_in'];
-								++$valid_in_clauses['implode_fill'];
+								if ( isset( $match[1] ) && $regex_quote !== $this->regex_quote ) {
+									$this->phpcsFile->addError(
+										'Dynamic placeholder generation should not have surrounding quotes.',
+										$prev,
+										'QuotedDynamicPlaceholderGeneration'
+									);
+								}
 
-								$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
-								if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
-									&& isset( $this->tokens[ $next ]['parenthesis_closer'] )
-								) {
-									$skip_from = ( $i + 1 );
-									$skip_to   = $this->tokens[ $next ]['parenthesis_closer'];
+								if ( $this->analyse_implode( $i ) === true ) {
+									++$valid_in_clauses['uses_in'];
+									++$valid_in_clauses['implode_fill'];
+
+									$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+									if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
+										&& isset( $this->tokens[ $next ]['parenthesis_closer'] )
+									) {
+										$skip_from = ( $i + 1 );
+										$skip_to   = $this->tokens[ $next ]['parenthesis_closer'];
+									}
 								}
 							}
+							unset( $next, $prev_content, $regex_quote, $match );
 						}
-						unset( $prev, $next, $prev_content, $regex_quote, $match );
+						unset( $prev );
 					}
 				}
 

From e2f237fa49a9b18534e03e7271e02379f772d352 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:04:22 +0200
Subject: [PATCH 670/822] DB/PreparedSQLPlaceholders: add tests with PHP 7.3+
 trailing commas in function calls

This is already handled correctly by the PHPCSUtils `PassedParameters` class.

This commit just adjusts some pre-existing tests to safeguard this for this sniff.
---
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index c50bde4908..2392c9d987 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -83,10 +83,10 @@ $where = $wpdb->prepare(
 	sprintf(
 		"{$wpdb->posts}.post_type IN (%s)
 		AND {$wpdb->posts}.post_status IN (%s)",
-		implode( ',', array_fill( 0, count($post_types), '%s' ) ),
-		IMPLODE( ',', Array_Fill( 0, count($post_statusses), '%s' ) )
+		implode( ',', array_fill( 0, count($post_types), '%s' ), ),
+		IMPLODE( ',', Array_Fill( 0, count($post_statusses), '%s' ), ),
 	),
-	array_merge( $post_types, $post_statusses )
+	array_merge( $post_types, $post_statusses, ),
 ); // OK.
 
 $where = $wpdb->prepare(

From d61a6167b080bd02260f15c2291a3d0889828b55 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 21:56:44 +0200
Subject: [PATCH 671/822] DB/PreparedSQLPlaceholders: add tests with PHP 8.0+
 nullsafe object operator [1]

The nullsafe object operator when calling `$wpdb->prepare()` is handled correctly in the `WPDBTrait::is_wpdb_method_call()` method.

Adjusted some pre-existing tests to safeguard this.
---
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 2392c9d987..5617791b63 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -2,7 +2,7 @@
 
 $sql = $wpdb->prepare( $sql, $replacements ); // OK - no query available to examine - this will be handled by the PreparedSQL sniff.
 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", 1, "admin" ); // OK.
-$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, "admin" ) ); // OK.
+$sql = $wpdb?->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, "admin" ) ); // OK.
 $sql = $wpdb->prepare( 'SELECT * FROM `table` WHERE `column` = %s AND `field` = %d', 'foo', 1337 ); // OK.
 $sql = $wpdb->prepare( 'SELECT DATE_FORMAT(`field`, "%%c") FROM `table` WHERE `column` = %s', 'foo' ); // OK.
 
@@ -13,7 +13,7 @@ $sql = $wpdb->prepare( 'SELECT * FROM `table`' ); // Warning.
 $sql = $wpdb->prepare( 'SELECT * FROM `table` WHERE id = ' . $id ); // OK - this will be handled by the PreparedSQL sniff.
 $sql = $wpdb->prepare( "SELECT * FROM `table` WHERE id = $id" ); // OK - this will be handled by the PreparedSQL sniff.
 $sql = $wpdb->prepare( "SELECT * FROM `table` WHERE id = {$id['some%sing']}" ); // OK - this will be handled by the PreparedSQL sniff.
-$sql = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->users ); // Warning.
+$sql = $wpdb?->prepare( 'SELECT * FROM ' . $wpdb->users ); // Warning.
 $sql = $wpdb->prepare( "SELECT * FROM `{$wpdb->users}`" );  // Warning.
 $sql = $wpdb->prepare( "SELECT * FROM `{$wpdb->users}` WHERE id = $id" ); // OK - this will be handled by the PreparedSQL sniff.
 

From b1c9095a7879d7e4e5b522b2019f0f151e82b43f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:02:30 +0200
Subject: [PATCH 672/822] DB/PreparedSQLPlaceholders: add tests with PHP 8.0+
 nullsafe object operator [2]

The sniff looks for variables in a text string, other than `$wpdb`. It doesn't actually look at whether object access is used after the variable.

This just adjusts some pre-existing tests to use the nullsafe object operator on variables within the query to safeguard this behaviour against potential future regressions.
---
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 5617791b63..65996b75a0 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -27,11 +27,11 @@ $sql = $wpdb->prepare( 'SELECT * FROM `table`', $something ); // Warning.
  */
 $sql = $wpdb->prepare( '%d %1$e %%% % %A %h', 1 ); // Bad x 5.
 $sql = $wpdb->prepare( '%%%s', 1 ); // OK.
-$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %1\$d AND user_login = %2\$s", 1, "admin" ); // OK. 2 x warning for unquoted complex placeholders.
-$sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %01.2f AND user_login = %10.10X", 1, "admin" ); // Bad x 1 + 1 warning unquoted complex placeholders + 1 warning nr of replacements.
+$sql = $wpdb->prepare( "SELECT * FROM $wpdb?->users WHERE id = %1\$d AND user_login = %2\$s", 1, "admin" ); // OK. 2 x warning for unquoted complex placeholders.
+$sql = $wpdb->prepare( "SELECT * FROM $wpdb?->users WHERE id = %01.2f AND user_login = %10.10X", 1, "admin" ); // Bad x 1 + 1 warning unquoted complex placeholders + 1 warning nr of replacements.
 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %'.09F AND user_login = %1\$04x", 1, "admin" ); // Bad x 1 + 1 warning unquoted complex placeholders + 1 warning nr of replacements.
 $sql = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = \"%1\$c\" AND user_login = '%2\$e'", 1, "admin" ); // Bad x 2 + 1 warning.
-$sql = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->users . ' WHERE id = \'%1\$b\' AND user_login = "%2\$o"', 1, "admin" ); // Bad x 2 + 1 warning.
+$sql = $wpdb->prepare( 'SELECT * FROM ' . $wpdb?->users . ' WHERE id = \'%1\$b\' AND user_login = "%2\$o"', 1, "admin" ); // Bad x 2 + 1 warning.
 
 /*
  * Test passing quoted simple replacement placeholder and unquoted complex placeholder.
@@ -114,7 +114,7 @@ $results = $wpdb->get_results(
 	$wpdb->prepare( '
 		SELECT ID
 		FROM ' . $wpdb->posts . '
-		WHERE ID NOT IN( SELECT post_id FROM ' . $wpdb->postmeta . ' WHERE meta_key = %s AND meta_value = %s )
+		WHERE ID NOT IN( SELECT post_id FROM ' . $wpdb?->postmeta . ' WHERE meta_key = %s AND meta_value = %s )
 			AND post_status in( "future", "draft", "pending", "private", "publish" )
 			AND post_type in( ' . implode( ',', array_fill( 0, count( $post_types ), '%s' ) ) . ' )
 		LIMIT %d',

From 8f745ff191205d36836695a40a7fd92a9eee2e22 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 17:00:45 +0100
Subject: [PATCH 673/822] DB/PreparedSQLPlaceholders: add support for PHP 8.0+
 named parameters [1]

1. Adjusted the way the correct parameters are retrieved from a call to `wpdb::prepare()` to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.3 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Also note that `wpdb::prepare()` is a variadic function, which by its nature doesn't support named arguments, but that's not the concern of this sniff.

Includes additional unit tests.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 17 ++++++++-----
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 24 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  3 +++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 47c9924a12..a899f13fe2 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -192,7 +192,11 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$query                    = $parameters[1];
+		$query = PassedParameters::getParameterFromStack( $parameters, 1, 'query' );
+		if ( false === $query ) {
+			return;
+		}
+
 		$text_string_tokens_found = false;
 		$variable_found           = false;
 		$sql_wildcard_found       = false;
@@ -545,14 +549,15 @@ function ( $symbol ) {
 		}
 
 		$replacements = $parameters;
-		array_shift( $replacements ); // Remove the query.
+		unset( $replacements['query'], $replacements[1] ); // Remove the query param, whether passed positionally or named.
 
-		// The parameters may have been passed as an array in parameter 2.
-		if ( isset( $parameters[2] ) && 2 === $total_parameters ) {
+		// The parameters may have been passed as an array in the variadic $args parameter.
+		$args_param = PassedParameters::getParameterFromStack( $parameters, 2, 'args' );
+		if ( false !== $args_param && 2 === $total_parameters ) {
 			$next = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				$parameters[2]['start'],
-				( $parameters[2]['end'] + 1 ),
+				$args_param['start'],
+				( $args_param['end'] + 1 ),
 				true
 			);
 
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 65996b75a0..39abea1752 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -403,3 +403,27 @@ $where = $wpdb->prepare(
 		. ')',
 	array_merge( $post_types, $post_statusses )
 ); // OK.
+
+/*
+ * Safeguard support for PHP 8.0+ named parameters.
+ */
+// WPDB::prepare() with named params. Named args not supported with ...$args, but that's not the concern of this sniff.
+$query = $wpdb->prepare(
+	args  : $replacements,
+	query : 'SELECT ID
+		FROM ' . $wpdb->posts . '
+		WHERE post_type = %s',
+); // OK, named args not supported with ...$args, but that's not the concern of this sniff.
+
+$query = $wpdb->prepare(
+	query : 'SELECT ID
+		FROM ' . $wpdb->posts . '
+		WHERE post_type = %s',
+); // Bad, missing replacements.
+
+$query = $wpdb->prepare(
+	args  : $replacements,
+	queri : 'SELECT ID
+		FROM ' . $wpdb->posts . '
+		WHERE post_type = %s',
+); // Ignore, incorrect name used for named param `query`, so param not recognized.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 1ba40fea81..9444208b58 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -105,6 +105,9 @@ public function getErrorList() {
 
 			347 => 2, // UnsupportedIdentifierPlaceholder + IdentifierWithinIN.
 			353 => 1,
+
+			// Named parameter support.
+			418 => 1,
 		);
 	}
 

From 7e13937d109ba0b560a020d15b2f4fad9172b781 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 11 Jan 2023 19:15:56 +0100
Subject: [PATCH 674/822] DB/PreparedSQLPlaceholders: add support for PHP 8.0+
 named parameters [2]

1. Adjusted the way the correct parameters are retrieved from a call to `implode()` to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. The parameter names used for `implode()` are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) are the only relevant names.

Includes additional unit tests.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 15 ++++++---
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 33 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  5 +++
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index a899f13fe2..3a1d1fe4a3 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -685,19 +685,26 @@ protected function analyse_sprintf( $sprintf_params ) {
 	 */
 	protected function analyse_implode( $implode_token ) {
 		$implode_params = PassedParameters::getParameters( $this->phpcsFile, $implode_token );
-
 		if ( empty( $implode_params ) || \count( $implode_params ) !== 2 ) {
 			return false;
 		}
 
-		if ( preg_match( '`^(["\']), ?\1$`', $implode_params[1]['clean'] ) !== 1 ) {
+		$implode_separator_param = PassedParameters::getParameterFromStack( $implode_params, 1, 'separator' );
+		if ( false === $implode_separator_param
+			|| preg_match( '`^(["\']), ?\1$`', $implode_separator_param['clean'] ) !== 1
+		) {
+			return false;
+		}
+
+		$implode_array_param = PassedParameters::getParameterFromStack( $implode_params, 2, 'array' );
+		if ( false === $implode_array_param ) {
 			return false;
 		}
 
 		$array_fill = $this->phpcsFile->findNext(
 			Tokens::$emptyTokens + array( \T_NS_SEPARATOR => \T_NS_SEPARATOR ),
-			$implode_params[2]['start'],
-			$implode_params[2]['end'],
+			$implode_array_param['start'],
+			$implode_array_param['end'],
 			true
 		);
 
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 39abea1752..04b83d40b5 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -427,3 +427,36 @@ $query = $wpdb->prepare(
 		FROM ' . $wpdb->posts . '
 		WHERE post_type = %s',
 ); // Ignore, incorrect name used for named param `query`, so param not recognized.
+
+// Implode() with named params.
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( array: array_fill( 0, count( $post_types ), '%s' ), separator: ',', ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Okay.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( array: $something, separator: ',', ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - `array` param is not an array_fill() function call.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( arrays: array_fill( 0, count( $post_types ), '%s' ), separator: ',', ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - incorrect name used for named param `array`, so param not recognized.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( separator: ',', ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - missing `array` param.
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 9444208b58..a795aee26d 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -154,6 +154,11 @@ public function getWarningList() {
 			300 => 1,
 			354 => 1,
 			358 => 1,
+
+			// Named parameter support.
+			440 => 1,
+			448 => 1,
+			456 => 1,
 		);
 	}
 }

From 995ff4364697cd14518d90da8bf5ebd3e9e0a40b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 8 Apr 2023 20:07:13 +0200
Subject: [PATCH 675/822] DB/PreparedSQLPlaceholders: add support for PHP 8.0+
 named parameters [3]

1. Adjusted the way the correct parameters are retrieved from a call to `array_fill()` to use the PHPCSUtils `PassedParameters::getParameter()` method with named parameter support.
2. The parameter names used for `array_fill()` are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) are the only relevant names.

Includes additional unit tests.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 13 +++---
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    | 43 +++++++++++++++++++
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  4 ++
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 3a1d1fe4a3..d69e59f0ef 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -714,16 +714,15 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		$array_fill_params = PassedParameters::getParameters( $this->phpcsFile, $array_fill );
-
-		if ( empty( $array_fill_params ) || \count( $array_fill_params ) !== 3 ) {
+		$array_fill_value_param = PassedParameters::getParameter( $this->phpcsFile, $array_fill, 3, 'value' );
+		if ( false === $array_fill_value_param ) {
 			return false;
 		}
 
-		if ( "'%i'" === $array_fill_params[3]['clean']
-			|| '"%i"' === $array_fill_params[3]['clean']
+		if ( "'%i'" === $array_fill_value_param['clean']
+			|| '"%i"' === $array_fill_value_param['clean']
 		) {
-			$firstNonEmpty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $array_fill_params[3]['start'], $array_fill_params[3]['end'], true );
+			$firstNonEmpty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $array_fill_value_param['start'], $array_fill_value_param['end'], true );
 
 			$this->phpcsFile->addError(
 				'The %i placeholder cannot be used within SQL `IN()` clauses.',
@@ -733,6 +732,6 @@ protected function analyse_implode( $implode_token ) {
 			return false;
 		}
 
-		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_params[3]['clean'] );
+		return (bool) preg_match( '`^(["\'])%[dfFs]\1$`', $array_fill_value_param['clean'] );
 	}
 }
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 04b83d40b5..78e4061cab 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -460,3 +460,46 @@ $where = $wpdb->prepare(
 	),
 	array_merge( $post_types, $post_statusses )
 ); // Bad - will throw incorrect nr of replacements error - missing `array` param.
+
+// Array_fill() with named params.
+$where = $wpdb->prepare(
+	"{$wpdb->posts}.post_type IN ("
+		. implode( ',', array_fill( start_index: 0, count: count($post_types), value: '%s' ) ) // Expected order.
+		. ") AND {$wpdb->posts}.post_status IN ("
+		. implode( ',', array_fill( value: '%s', start_index: 0, count: count($post_statusses), ) ) // Unconventional order.
+		. ')',
+	array_merge( $post_types, $post_statusses )
+); // OK.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( start_index: 0, count: count($post_types) ) ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - missing $value param in array_fill().
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( start_index: 0, values: '%s', count: count($post_types) ) ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - incorrect $values param name in array_fill().
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( value: 's', start_index: 0, count: count($post_types) ) ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - $value param name in array_fill() does not contain placeholder.
+
+$where = $wpdb->prepare(
+	sprintf(
+		"{$wpdb->posts}.post_type IN (%s)",
+		implode( ',', array_fill( value: $s, start_index: 0, count: count($post_types) ) ),
+	),
+	array_merge( $post_types, $post_statusses )
+); // Bad - will throw incorrect nr of replacements error - $value param name in array_fill() does not contain plain text placeholder.
+
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index a795aee26d..fc491c5080 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -159,6 +159,10 @@ public function getWarningList() {
 			440 => 1,
 			448 => 1,
 			456 => 1,
+			474 => 1,
+			482 => 1,
+			490 => 1,
+			498 => 1,
 		);
 	}
 }

From 6063a6afc8994eb39871228dfeac5e6a7c6f5856 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 21:50:25 +0200
Subject: [PATCH 676/822] DB/PreparedSQLPlaceholders: add support for PHP 8.0+
 named parameters [4]

`sprintf()` does not support named parameters due to its variadic nature and analyzing code which would use named parameters with `sprintf()` is too prone to incorrect sniff results.

So instead of allowing for an incorrect call with named parameters, skip the whole `sprintf()` call if named parameters would be used.

Includes additional unit test.
---
 .../DB/PreparedSQLPlaceholdersSniff.php       | 30 +++++++++++++++++--
 .../DB/PreparedSQLPlaceholdersUnitTest.inc    |  9 ++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index d69e59f0ef..9785809be8 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -232,6 +232,32 @@ public function process_token( $stackPtr ) {
 						$sprintf_parameters = PassedParameters::getParameters( $this->phpcsFile, $i );
 
 						if ( ! empty( $sprintf_parameters ) ) {
+							/*
+							 * Check for named params. sprintf() does not support this due to its variadic nature,
+							 * and we cannot analyse the code correctly if it is used, so skip the whole sprintf()
+							 * in that case.
+							 */
+							$valid_sprintf = true;
+							foreach ( $sprintf_parameters as $param ) {
+								if ( isset( $param['name'] ) ) {
+									$valid_sprintf = false;
+									break;
+								}
+							}
+
+							if ( false === $valid_sprintf ) {
+								$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+								if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
+									&& isset( $this->tokens[ $next ]['parenthesis_closer'] )
+								) {
+									$skip_from = ( $i + 1 );
+									$skip_to   = $this->tokens[ $next ]['parenthesis_closer'];
+								}
+
+								continue;
+							}
+
+							// We know for sure this sprintf() uses positional parameters, so this will be fine.
 							$skip_from  = ( $sprintf_parameters[1]['end'] + 1 );
 							$last_param = end( $sprintf_parameters );
 							$skip_to    = ( $last_param['end'] + 1 );
@@ -239,7 +265,7 @@ public function process_token( $stackPtr ) {
 							$valid_in_clauses['implode_fill']     += $this->analyse_sprintf( $sprintf_parameters );
 							$valid_in_clauses['adjustment_count'] += ( \count( $sprintf_parameters ) - 1 );
 						}
-						unset( $sprintf_parameters, $last_param );
+						unset( $sprintf_parameters, $valid_sprintf, $last_param );
 
 					} elseif ( 'implode' === strtolower( $this->tokens[ $i ]['content'] ) ) {
 						$prev = $this->phpcsFile->findPrevious(
@@ -641,7 +667,7 @@ protected function get_regex_quote_snippet( $stripped_content, $original_content
 	protected function analyse_sprintf( $sprintf_params ) {
 		$found = 0;
 
-		unset( $sprintf_params[1] );
+		unset( $sprintf_params[1] ); // Remove the positionally passed $format param.
 
 		foreach ( $sprintf_params as $sprintf_param ) {
 			$implode = $this->phpcsFile->findNext(
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index 78e4061cab..e748b03291 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -503,3 +503,12 @@ $where = $wpdb->prepare(
 	array_merge( $post_types, $post_statusses )
 ); // Bad - will throw incorrect nr of replacements error - $value param name in array_fill() does not contain plain text placeholder.
 
+// Sprintf() with named params. This is invalid as variadic functions do not support named params.
+// The sniff will ignore the sprintf() as it cannot be analyzed correctly.
+$where = $wpdb->prepare(
+	sprintf(
+		values: implode( ',', array_fill( 0, count($post_types), '%s' ) ),
+		format: "{$wpdb->posts}.post_type IN ('%s')",
+	),
+	array_merge( $post_types, $post_statusses )
+); // OK, well not really, but not something we can reliably analyze.

From 57df20c25b7b1e8877501a046e3c1bb3b6458c5a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:09:03 +0200
Subject: [PATCH 677/822] DB/PreparedSQLPlaceholders: add tests with PHP 8.1+
 first class callable

Just a test to safeguard this won't cause any false positives.
---
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
index e748b03291..bbceb7ce5b 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.inc
@@ -512,3 +512,9 @@ $where = $wpdb->prepare(
 	),
 	array_merge( $post_types, $post_statusses )
 ); // OK, well not really, but not something we can reliably analyze.
+
+/*
+ * Safeguard handling of $wpdb->prepare as PHP 8.1+ first class callable.
+ */
+$callback = $wpdb->prepare(...); // OK.
+

From 9045552484f71ca16bb22521623079c2416a7d02 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 12 Apr 2023 03:45:45 +0200
Subject: [PATCH 678/822] DB/PreparedSQLPlaceholders: minor documentation fix

---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 9785809be8..e3aa609895 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -19,9 +19,9 @@
 use WordPressCS\WordPress\Sniff;
 
 /**
- * Check for incorrect use of the $wpdb->prepare method.
+ * Checks for incorrect use of the $wpdb->prepare method.
  *
- * Check the following issues:
+ * Checks the following issues:
  * - The only placeholders supported are: %d, %f (%F), %s, %i, and their variations.
  * - Literal % signs need to be properly escaped as `%%`.
  * - Simple placeholders (%d, %f, %F, %s, %i) should be left unquoted in the query string.

From 7112225b2806ae55eb80e4ace8ab01b4daad4e1e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:10:14 +0200
Subject: [PATCH 679/822] Docs: various minor tweaks

... mostly based on things I came across while creating the changelog and when updating the "lists".

(and yes, I have verified the `OperatorSpacing` sniff against the PHPCS native sniff again)
---
 WordPress/Helpers/IsUnitTestTrait.php                |  4 ++--
 WordPress/Helpers/MinimumWPVersionTrait.php          |  4 +++-
 WordPress/Helpers/ValidationHelper.php               |  2 ++
 WordPress/Helpers/VariableHelper.php                 |  2 +-
 WordPress/Sniffs/DB/SlowDBQuerySniff.php             |  5 ++---
 .../NamingConventions/PrefixAllGlobalsSniff.php      | 12 ++++++------
 WordPress/Sniffs/WP/ClassNameCaseSniff.php           |  8 ++++++--
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php       |  2 --
 WordPress/Sniffs/WP/PostsPerPageSniff.php            |  2 --
 WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php |  2 +-
 10 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 7714da6176..e06709f22f 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -23,8 +23,8 @@
  * - Add appropriate `use` statement(s) to the file/class which intends to use this functionality.
  * - Now the sniff will automatically support the public `custom_test_classes` property which
  *   users can set in their custom ruleset. Do not add the property to the sniff!
- * - The sniff can call the methods in this trait to verify if certain code was found within
- *   a test method or is a test class and will take the custom property into account.
+ * - The sniff can call the `is_test_class()` method in this trait to verify if a class is
+ *   a test class. The `is_test_class()` method will take the custom property into account.
  *
  * @package WPCS\WordPressCodingStandards
  * @since   3.0.0 The properties and method in this trait were previously contained in the
diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 9c2c09c343..eadf1bab84 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -93,6 +93,8 @@ trait MinimumWPVersionTrait {
 	 * @since 0.14.0
 	 * @since 3.0.0  - Moved from the Sniff class to this dedicated Trait.
 	 *               - Renamed from `get_wp_version_from_cl()` to `set_minimum_wp_version()`.
+	 *
+	 * @return void
 	 */
 	protected function set_minimum_wp_version() {
 		$minimum_wp_version = '';
@@ -140,7 +142,7 @@ protected function wp_version_compare( $version1, $version2, $operator ) {
 	 * Ensures that a version number is comparable via the PHP version_compare() function
 	 * by making sure it complies with the minimum "PHP-standardized" version number requirements.
 	 *
-	 * Presumes the input is a numeric version number string. The behaviour with other input is undetermined.
+	 * Presumes the input is a numeric version number string. The behaviour with other input is undefined.
 	 *
 	 * @since 3.0.0
 	 *
diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 4860d186e5..17627c71e7 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -321,6 +321,8 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 	/**
 	 * Strip quotes of all the values in an array containing only text strings.
 	 *
+	 * @since 3.0.0
+	 *
 	 * @param string[] $text_strings The input array.
 	 *
 	 * @var array
diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 70e438f94f..2b20b60398 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -229,7 +229,7 @@ public static function is_assignment( File $phpcsFile, $stackPtr, $include_coale
 			\T_CLOSE_SQUARE_BRACKET => true,
 		);
 
-		// Must be a variable, constant or closing square bracket (see below).
+		// Must be a variable or closing square bracket (see below).
 		if ( ! isset( $valid[ $tokens[ $stackPtr ]['code'] ] ) ) {
 			return false;
 		}
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index e57409eb1d..68461e8ded 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -46,14 +46,13 @@ public function getGroups() {
 
 	/**
 	 * Callback to process each confirmed key, to check value.
-	 * This must be extended to add the logic to check assignment value.
 	 *
 	 * @param  string $key   Array index / key.
 	 * @param  mixed  $val   Assigned value.
 	 * @param  int    $line  Token line.
 	 * @param  array  $group Group definition.
-	 * @return mixed         FALSE if no match, TRUE if matches, STRING if matches
-	 *                       with custom error message passed to ->process().
+	 *
+	 * @return bool Always returns TRUE as the value is irrelevant.
 	 */
 	public function callback( $key, $val, $line, $group ) {
 		return true;
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 922d54d033..6fccdf30ff 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -134,7 +134,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * @since 0.14.0
 	 * @since 3.0.0 Renamed from `$whitelisted_core_hooks` to `$allowed_core_hooks`.
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	protected $allowed_core_hooks = array(
 		'widget_title'   => true,
@@ -144,16 +144,16 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * A list of core constants that are allowed to be defined by plugins and themes.
 	 *
-	 * @since 1.0.0
-	 * @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
-	 *
 	 * Source: {@link https://core.trac.wordpress.org/browser/trunk/src/wp-includes/default-constants.php#L0}
 	 * The constants are listed in the order they are found in the source file
 	 * to make life easier for future updates.
 	 * Only overrulable constants are listed, i.e. those defined within core within
 	 * a `if ( ! defined() ) {}` wrapper.
 	 *
-	 * @var array
+	 * @since 1.0.0
+	 * @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
+	 *
+	 * @var array<string, bool>
 	 */
 	protected $allowed_core_constants = array(
 		'WP_MEMORY_LIMIT'      => true,
@@ -397,7 +397,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * false negatives from user-defined functions when those would be
 	 * autoloaded via a Composer autoload files directives.
 	 *
-	 * @var array
+	 * @var array<string, int>
 	 */
 	private $built_in_functions;
 
diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index 11a622b073..654f3efa58 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -382,7 +382,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	);
 
 	/**
-	 * List of all PHPMailer classes include in WP Core.
+	 * List of all PHPMailer classes included in WP Core.
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
@@ -476,7 +476,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	);
 
 	/**
-	 * List of all SimplePier classes included in WP Core.
+	 * List of all SimplePie classes included in WP Core.
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
@@ -578,6 +578,8 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Used to dynamically fill in some of the above properties and to generate the getGroups() array.
 	 *
+	 * @since 3.0.0
+	 *
 	 * @var array
 	 */
 	private $class_groups = array(
@@ -657,6 +659,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	/**
 	 * Match a lowercase class name to its proper cased name.
 	 *
+	 * @since 3.0.0
+	 *
 	 * @param string $matched_lc Lowercase class name.
 	 *
 	 * @return string
diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 1220d826d8..645b588dd5 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -25,8 +25,6 @@
  * @since   0.3.0
  * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   3.0.0  Added a check for a complete text string in the case where it
- *                 spans two lines.
  */
 final class EnqueuedResourcesSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index b98e30db89..b3c1321f15 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -30,8 +30,6 @@
 final class PostsPerPageSniff extends AbstractArrayAssignmentRestrictionsSniff {
 
 	/**
-	 * Posts per page property
-	 *
 	 * Posts per page limit to check against.
 	 *
 	 * @since 0.14.0
diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index b6d9c65709..d5db505506 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -32,7 +32,7 @@
  *                 $ignoreNewlines property.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  *
- * Last verified with base class July 2020 at commit a957a73e3533353451eb9fd62ee58bd0aba2773c.
+ * Last verified with base class June 2023 at commit 085b1e091b0f2e451333c0bc26dd50bba39402c4.
  * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
  */
 final class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {

From 824ba431bb533b200b8ffcb795ab157ced5bacda Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 03:16:11 +0200
Subject: [PATCH 680/822] NamingConventions/PrefixAllGlobals: order constants
 list alphabetically

This only changes the order of the list. No constants were added or removed.
---
 .../PrefixAllGlobalsSniff.php                 | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 6fccdf30ff..9a28949278 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -145,8 +145,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * A list of core constants that are allowed to be defined by plugins and themes.
 	 *
 	 * Source: {@link https://core.trac.wordpress.org/browser/trunk/src/wp-includes/default-constants.php#L0}
-	 * The constants are listed in the order they are found in the source file
-	 * to make life easier for future updates.
+	 * The constants are listed in alphabetic order.
 	 * Only overrulable constants are listed, i.e. those defined within core within
 	 * a `if ( ! defined() ) {}` wrapper.
 	 *
@@ -156,43 +155,43 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * @var array<string, bool>
 	 */
 	protected $allowed_core_constants = array(
-		'WP_MEMORY_LIMIT'      => true,
-		'WP_MAX_MEMORY_LIMIT'  => true,
-		'WP_CONTENT_DIR'       => true,
-		'WP_DEBUG'             => true,
-		'WP_DEBUG_DISPLAY'     => true,
-		'WP_DEBUG_LOG'         => true,
-		'WP_CACHE'             => true,
-		'SCRIPT_DEBUG'         => true,
-		'MEDIA_TRASH'          => true,
-		'SHORTINIT'            => true,
-		'WP_CONTENT_URL'       => true,
-		'WP_PLUGIN_DIR'        => true,
-		'WP_PLUGIN_URL'        => true,
-		'PLUGINDIR'            => true,
-		'WPMU_PLUGIN_DIR'      => true,
-		'WPMU_PLUGIN_URL'      => true,
-		'MUPLUGINDIR'          => true,
-		'COOKIEHASH'           => true,
-		'USER_COOKIE'          => true,
-		'PASS_COOKIE'          => true,
+		'ADMIN_COOKIE_PATH'    => true,
 		'AUTH_COOKIE'          => true,
-		'SECURE_AUTH_COOKIE'   => true,
-		'LOGGED_IN_COOKIE'     => true,
-		'TEST_COOKIE'          => true,
+		'AUTOSAVE_INTERVAL'    => true,
+		'COOKIEHASH'           => true,
 		'COOKIEPATH'           => true,
-		'SITECOOKIEPATH'       => true,
-		'ADMIN_COOKIE_PATH'    => true,
-		'PLUGINS_COOKIE_PATH'  => true,
 		'COOKIE_DOMAIN'        => true,
-		'RECOVERY_MODE_COOKIE' => true,
+		'EMPTY_TRASH_DAYS'     => true,
 		'FORCE_SSL_ADMIN'      => true,
 		'FORCE_SSL_LOGIN'      => true,
-		'AUTOSAVE_INTERVAL'    => true,
-		'EMPTY_TRASH_DAYS'     => true,
-		'WP_POST_REVISIONS'    => true,
+		'LOGGED_IN_COOKIE'     => true,
+		'MEDIA_TRASH'          => true,
+		'MUPLUGINDIR'          => true,
+		'PASS_COOKIE'          => true,
+		'PLUGINDIR'            => true,
+		'PLUGINS_COOKIE_PATH'  => true,
+		'RECOVERY_MODE_COOKIE' => true,
+		'SCRIPT_DEBUG'         => true,
+		'SECURE_AUTH_COOKIE'   => true,
+		'SHORTINIT'            => true,
+		'SITECOOKIEPATH'       => true,
+		'TEST_COOKIE'          => true,
+		'USER_COOKIE'          => true,
+		'WPMU_PLUGIN_DIR'      => true,
+		'WPMU_PLUGIN_URL'      => true,
+		'WP_CACHE'             => true,
+		'WP_CONTENT_DIR'       => true,
+		'WP_CONTENT_URL'       => true,
 		'WP_CRON_LOCK_TIMEOUT' => true,
+		'WP_DEBUG'             => true,
+		'WP_DEBUG_DISPLAY'     => true,
+		'WP_DEBUG_LOG'         => true,
 		'WP_DEFAULT_THEME'     => true,
+		'WP_MAX_MEMORY_LIMIT'  => true,
+		'WP_MEMORY_LIMIT'      => true,
+		'WP_PLUGIN_DIR'        => true,
+		'WP_PLUGIN_URL'        => true,
+		'WP_POST_REVISIONS'    => true,
 	);
 
 	/**

From 3fe65af68906a20eb113660289562b516d8b8a78 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 03:46:12 +0200
Subject: [PATCH 681/822] NamingConventions/PrefixAllGlobals: update the
 constants list based on WP 6.3-RC1

Based on a scan of WP Core at commit https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52 using a preliminary sniff created for issue 1803.

Manually verified.

Previous: 1718 (for WPCS 2.2.0)
---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 9a28949278..820bf46432 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -149,6 +149,8 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * Only overrulable constants are listed, i.e. those defined within core within
 	 * a `if ( ! defined() ) {}` wrapper.
 	 *
+	 * Last update: July 2023 for WP 6.3 at https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52
+	 *
 	 * @since 1.0.0
 	 * @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
 	 *
@@ -163,12 +165,12 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 		'COOKIE_DOMAIN'        => true,
 		'EMPTY_TRASH_DAYS'     => true,
 		'FORCE_SSL_ADMIN'      => true,
-		'FORCE_SSL_LOGIN'      => true,
+		'FORCE_SSL_LOGIN'      => true, // Deprecated.
 		'LOGGED_IN_COOKIE'     => true,
 		'MEDIA_TRASH'          => true,
-		'MUPLUGINDIR'          => true,
+		'MUPLUGINDIR'          => true, // Deprecated.
 		'PASS_COOKIE'          => true,
-		'PLUGINDIR'            => true,
+		'PLUGINDIR'            => true, // Deprecated.
 		'PLUGINS_COOKIE_PATH'  => true,
 		'RECOVERY_MODE_COOKIE' => true,
 		'SCRIPT_DEBUG'         => true,
@@ -187,11 +189,13 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 		'WP_DEBUG_DISPLAY'     => true,
 		'WP_DEBUG_LOG'         => true,
 		'WP_DEFAULT_THEME'     => true,
+		'WP_DEVELOPMENT_MODE'  => true,
 		'WP_MAX_MEMORY_LIMIT'  => true,
 		'WP_MEMORY_LIMIT'      => true,
 		'WP_PLUGIN_DIR'        => true,
 		'WP_PLUGIN_URL'        => true,
 		'WP_POST_REVISIONS'    => true,
+		'WP_START_TIMESTAMP'   => true,
 	);
 
 	/**

From aeacb6c74d2f74a0590dc0d84709cf5da78815ad Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 05:46:28 +0200
Subject: [PATCH 682/822] NamingConventions/ValidPostTypeSlug: order reserved
 names alphabetically

This only changes the order of the list. No reserved names were added or removed.

Includes adding a link to the source of the list and adding comments about the items in the "special" list of reserved names, which aren't WP native post types.
---
 .../ValidPostTypeSlugSniff.php                 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 7c5de5e79b..b096f55237 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -63,25 +63,27 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * Array of reserved post type names which can not be used by themes and plugins.
 	 *
+	 * Source: {@link https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types}
+	 *
 	 * @since 2.2.0
 	 *
 	 * @var array
 	 */
 	protected $reserved_names = array(
-		'post'                => true,
-		'page'                => true,
+		'action'              => true, // Not a WP post type, but prevents other problems.
 		'attachment'          => true,
-		'revision'            => true,
-		'nav_menu_item'       => true,
+		'author'              => true, // Not a WP post type, but prevents other problems.
 		'custom_css'          => true,
 		'customize_changeset' => true,
+		'nav_menu_item'       => true,
 		'oembed_cache'        => true,
+		'order'               => true, // Not a WP post type, but prevents other problems.
+		'page'                => true,
+		'post'                => true,
+		'revision'            => true,
+		'theme'               => true, // Not a WP post type, but prevents other problems.
 		'user_request'        => true,
 		'wp_block'            => true,
-		'action'              => true,
-		'author'              => true,
-		'order'               => true,
-		'theme'               => true,
 	);
 
 	/**

From af770df9d21c770b0768a19d776d571675cdb756 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 06:07:43 +0200
Subject: [PATCH 683/822] NamingConventions/ValidPostTypeSlug: update the
 reserved post types list based on WP 6.3-RC1

Based on a scan of WP Core at commit https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52 using a preliminary sniff created for issue 1803.

Manually verified.

Also see: https://wordpress.slack.com/archives/C680YMW9H/p1688270736663219
---
 .../Sniffs/NamingConventions/ValidPostTypeSlugSniff.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index b096f55237..772c51110e 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -65,6 +65,8 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * Source: {@link https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types}
 	 *
+	 * Last update: July 2023 for WP 6.3 at https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52
+	 *
 	 * @since 2.2.0
 	 *
 	 * @var array
@@ -84,6 +86,10 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 		'theme'               => true, // Not a WP post type, but prevents other problems.
 		'user_request'        => true,
 		'wp_block'            => true,
+		'wp_global_styles'    => true,
+		'wp_navigation'       => true,
+		'wp_template'         => true,
+		'wp_template_part'    => true,
 	);
 
 	/**

From 72fd88b6f009064ca1deba24e702d3288cc020b1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 05:25:54 +0200
Subject: [PATCH 684/822] WP/ClassNameCase: update the class lists based on WP
 6.3-RC1

Based on a scan of WP Core at commit https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52 using a preliminary sniff created for issue 1803.

Notes:
* The order of some of these lists have small changes due to non-natural alphabetic sorting being used in the auto-generated lists.
* The WP Core class list now includes various classes which are from non-externally maintained "external" dependencies.
* WP 6.2 and up contains Requests 2.0+. As this is a class name check and the Requests 1.0 class names are still supported, I'm adding the 2.0 class names, instead of replacing the Request 1.x list.
---
 WordPress/Sniffs/WP/ClassNameCaseSniff.php | 190 ++++++++++++++++-----
 1 file changed, 152 insertions(+), 38 deletions(-)

diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index 654f3efa58..6414c08558 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -23,12 +23,11 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	/**
 	 * List of all WP native classes.
 	 *
-	 * List is sorted alphabetically and based on the WIP autoloading PR.
-	 * {@link https://github.com/WordPress/wordpress-develop/pull/3470}
+	 * List is sorted alphabetically and based on a draft sniff to autogenerate this list.
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
-	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
 	 *
 	 * @since 3.0.0
 	 *
@@ -39,6 +38,9 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'_WP_Dependency',
 		'_WP_Editors',
 		'_WP_List_Table_Compat',
+		'AtomEntry',
+		'AtomFeed',
+		'AtomParser',
 		'Automatic_Upgrader_Skin',
 		'Bulk_Plugin_Upgrader_Skin',
 		'Bulk_Theme_Upgrader_Skin',
@@ -46,7 +48,10 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'Core_Upgrader',
 		'Custom_Background',
 		'Custom_Image_Header',
+		'Featured_Content',
 		'File_Upload_Upgrader',
+		'ftp',
+		'ftp_base',
 		'ftp_pure',
 		'ftp_sockets',
 		'Gettext_Translations',
@@ -63,17 +68,38 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'Language_Pack_Upgrader',
 		'Language_Pack_Upgrader_Skin',
 		'MO',
+		'MagpieRSS',
 		'NOOP_Translations',
-		'Plugin_Installer_Skin',
-		'Plugin_Upgrader',
-		'Plugin_Upgrader_Skin',
-		'Plural_Forms',
 		'PO',
 		'POMO_CachedFileReader',
 		'POMO_CachedIntFileReader',
 		'POMO_FileReader',
 		'POMO_Reader',
 		'POMO_StringReader',
+		'POP3',
+		'PasswordHash',
+		'PclZip',
+		'Plugin_Installer_Skin',
+		'Plugin_Upgrader',
+		'Plugin_Upgrader_Skin',
+		'Plural_Forms',
+		'RSSCache',
+		'Services_JSON',
+		'Services_JSON_Error',
+		'Snoopy',
+		'Text_Diff',
+		'Text_Diff_Engine_native',
+		'Text_Diff_Engine_shell',
+		'Text_Diff_Engine_string',
+		'Text_Diff_Engine_xdiff',
+		'Text_Diff_Op',
+		'Text_Diff_Op_add',
+		'Text_Diff_Op_change',
+		'Text_Diff_Op_copy',
+		'Text_Diff_Op_delete',
+		'Text_Diff_Renderer',
+		'Text_Diff_Renderer_inline',
+		'Text_MappedDiff',
 		'Theme_Installer_Skin',
 		'Theme_Upgrader',
 		'Theme_Upgrader_Skin',
@@ -81,8 +107,8 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'Translations',
 		'Walker',
 		'Walker_Category',
-		'Walker_Category_Checklist',
 		'Walker_CategoryDropdown',
+		'Walker_Category_Checklist',
 		'Walker_Comment',
 		'Walker_Nav_Menu',
 		'Walker_Nav_Menu_Checklist',
@@ -109,6 +135,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Block_Template',
 		'WP_Block_Type',
 		'WP_Block_Type_Registry',
+		'WP_Classic_To_Block_Menu_Converter',
 		'WP_Comment',
 		'WP_Comment_Query',
 		'WP_Comments_List_Table',
@@ -156,6 +183,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Date_Query',
 		'WP_Debug_Data',
 		'WP_Dependencies',
+		'WP_Duotone',
 		'WP_Embed',
 		'WP_Error',
 		'WP_Fatal_Error_Handler',
@@ -164,19 +192,23 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Filesystem_Base',
 		'WP_Filesystem_Direct',
 		'WP_Filesystem_FTPext',
-		'WP_Filesystem_ftpsockets',
 		'WP_Filesystem_SSH2',
-		'WP_Hook',
-		'WP_Http',
-		'WP_Http_Cookie',
-		'WP_Http_Curl',
-		'WP_Http_Encoding',
+		'WP_Filesystem_ftpsockets',
+		'WP_HTML_Attribute_Token',
+		'WP_HTML_Span',
+		'WP_HTML_Tag_Processor',
+		'WP_HTML_Text_Replacement',
 		'WP_HTTP_Fsockopen',
 		'WP_HTTP_IXR_Client',
 		'WP_HTTP_Proxy',
 		'WP_HTTP_Requests_Hooks',
 		'WP_HTTP_Requests_Response',
 		'WP_HTTP_Response',
+		'WP_Hook',
+		'WP_Http',
+		'WP_Http_Cookie',
+		'WP_Http_Curl',
+		'WP_Http_Encoding',
 		'WP_Http_Streams',
 		'WP_Image_Editor',
 		'WP_Image_Editor_GD',
@@ -188,19 +220,18 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_List_Util',
 		'WP_Locale',
 		'WP_Locale_Switcher',
+		'WP_MS_Sites_List_Table',
+		'WP_MS_Themes_List_Table',
+		'WP_MS_Users_List_Table',
 		'WP_MatchesMapRegex',
 		'WP_Media_List_Table',
 		'WP_Meta_Query',
 		'WP_Metadata_Lazyloader',
-		'WP_MS_Sites_List_Table',
-		'WP_MS_Themes_List_Table',
-		'WP_MS_Users_List_Table',
 		'WP_Nav_Menu_Widget',
+		'WP_Navigation_Fallback',
 		'WP_Network',
 		'WP_Network_Query',
 		'WP_Object_Cache',
-		'WP_oEmbed',
-		'WP_oEmbed_Controller',
 		'WP_Paused_Extensions_Storage',
 		'WP_Plugin_Install_List_Table',
 		'WP_Plugins_List_Table',
@@ -215,11 +246,6 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Privacy_Policy_Content',
 		'WP_Privacy_Requests_Table',
 		'WP_Query',
-		'WP_Recovery_Mode',
-		'WP_Recovery_Mode_Cookie_Service',
-		'WP_Recovery_Mode_Email_Service',
-		'WP_Recovery_Mode_Key_Service',
-		'WP_Recovery_Mode_Link_Service',
 		'WP_REST_Application_Passwords_Controller',
 		'WP_REST_Attachments_Controller',
 		'WP_REST_Autosaves_Controller',
@@ -234,10 +260,12 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_REST_Controller',
 		'WP_REST_Edit_Site_Export_Controller',
 		'WP_REST_Global_Styles_Controller',
+		'WP_REST_Global_Styles_Revisions_Controller',
 		'WP_REST_Menu_Items_Controller',
 		'WP_REST_Menu_Locations_Controller',
 		'WP_REST_Menus_Controller',
 		'WP_REST_Meta_Fields',
+		'WP_REST_Navigation_Fallback_Controller',
 		'WP_REST_Pattern_Directory_Controller',
 		'WP_REST_Plugins_Controller',
 		'WP_REST_Post_Format_Search_Handler',
@@ -266,6 +294,11 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_REST_Users_Controller',
 		'WP_REST_Widget_Types_Controller',
 		'WP_REST_Widgets_Controller',
+		'WP_Recovery_Mode',
+		'WP_Recovery_Mode_Cookie_Service',
+		'WP_Recovery_Mode_Email_Service',
+		'WP_Recovery_Mode_Key_Service',
+		'WP_Recovery_Mode_Link_Service',
 		'WP_Rewrite',
 		'WP_Role',
 		'WP_Roles',
@@ -300,8 +333,8 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Term',
 		'WP_Term_Query',
 		'WP_Terms_List_Table',
-		'WP_Text_Diff_Renderer_inline',
 		'WP_Text_Diff_Renderer_Table',
+		'WP_Text_Diff_Renderer_inline',
 		'WP_Textdomain_Registry',
 		'WP_Theme',
 		'WP_Theme_Install_List_Table',
@@ -335,12 +368,15 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'WP_Widget_Media_Video',
 		'WP_Widget_Meta',
 		'WP_Widget_Pages',
+		'WP_Widget_RSS',
 		'WP_Widget_Recent_Comments',
 		'WP_Widget_Recent_Posts',
-		'WP_Widget_RSS',
 		'WP_Widget_Search',
 		'WP_Widget_Tag_Cloud',
 		'WP_Widget_Text',
+		'WP_oEmbed',
+		'WP_oEmbed_Controller',
+		'wp_atom_server',
 		'wp_xmlrpc_server',
 		'wpdb',
 	);
@@ -350,7 +386,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
-	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
 	 *
 	 * @since 3.0.0
 	 *
@@ -386,7 +422,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
-	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
 	 *
 	 * @since 3.0.0
 	 *
@@ -404,7 +440,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
-	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
 	 *
 	 * @since 3.0.0
 	 *
@@ -412,13 +448,20 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *               The constructor will add the lowercased class name as a key to each entry.
 	 */
 	private $requests_classes = array(
-		// Interfaces.
+		// Interfaces, Requests v1.
 		'Requests_Auth',
 		'Requests_Hooker',
 		'Requests_Proxy',
 		'Requests_Transport',
 
-		// Classes.
+		// Interfaces, Requests v2.
+		'WpOrg\\Requests\\Auth',
+		'WpOrg\\Requests\\Capability',
+		'WpOrg\\Requests\\HookManager',
+		'WpOrg\\Requests\\Proxy',
+		'WpOrg\\Requests\\Transport',
+
+		// Classes, Requests v1.
 		'Requests',
 		'Requests_Auth_Basic',
 		'Requests_Cookie',
@@ -473,6 +516,67 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'Requests_Transport_fsockopen',
 		'Requests_Utility_CaseInsensitiveDictionary',
 		'Requests_Utility_FilteredIterator',
+
+		// Classes, Requests v2.
+		'WpOrg\Requests\Auth\Basic',
+		'WpOrg\Requests\Autoload',
+		'WpOrg\Requests\Cookie',
+		'WpOrg\Requests\Cookie\Jar',
+		'WpOrg\Requests\Exception',
+		'WpOrg\Requests\Exception\ArgumentCount',
+		'WpOrg\Requests\Exception\Http',
+		'WpOrg\Requests\Exception\Http\Status304',
+		'WpOrg\Requests\Exception\Http\Status305',
+		'WpOrg\Requests\Exception\Http\Status306',
+		'WpOrg\Requests\Exception\Http\Status400',
+		'WpOrg\Requests\Exception\Http\Status401',
+		'WpOrg\Requests\Exception\Http\Status402',
+		'WpOrg\Requests\Exception\Http\Status403',
+		'WpOrg\Requests\Exception\Http\Status404',
+		'WpOrg\Requests\Exception\Http\Status405',
+		'WpOrg\Requests\Exception\Http\Status406',
+		'WpOrg\Requests\Exception\Http\Status407',
+		'WpOrg\Requests\Exception\Http\Status408',
+		'WpOrg\Requests\Exception\Http\Status409',
+		'WpOrg\Requests\Exception\Http\Status410',
+		'WpOrg\Requests\Exception\Http\Status411',
+		'WpOrg\Requests\Exception\Http\Status412',
+		'WpOrg\Requests\Exception\Http\Status413',
+		'WpOrg\Requests\Exception\Http\Status414',
+		'WpOrg\Requests\Exception\Http\Status415',
+		'WpOrg\Requests\Exception\Http\Status416',
+		'WpOrg\Requests\Exception\Http\Status417',
+		'WpOrg\Requests\Exception\Http\Status418',
+		'WpOrg\Requests\Exception\Http\Status428',
+		'WpOrg\Requests\Exception\Http\Status429',
+		'WpOrg\Requests\Exception\Http\Status431',
+		'WpOrg\Requests\Exception\Http\Status500',
+		'WpOrg\Requests\Exception\Http\Status501',
+		'WpOrg\Requests\Exception\Http\Status502',
+		'WpOrg\Requests\Exception\Http\Status503',
+		'WpOrg\Requests\Exception\Http\Status504',
+		'WpOrg\Requests\Exception\Http\Status505',
+		'WpOrg\Requests\Exception\Http\Status511',
+		'WpOrg\Requests\Exception\Http\StatusUnknown',
+		'WpOrg\Requests\Exception\InvalidArgument',
+		'WpOrg\Requests\Exception\Transport',
+		'WpOrg\Requests\Exception\Transport\Curl',
+		'WpOrg\Requests\Hooks',
+		'WpOrg\Requests\IdnaEncoder',
+		'WpOrg\Requests\Ipv6',
+		'WpOrg\Requests\Iri',
+		'WpOrg\Requests\Port',
+		'WpOrg\Requests\Proxy\Http',
+		'WpOrg\Requests\Requests',
+		'WpOrg\Requests\Response',
+		'WpOrg\Requests\Response\Headers',
+		'WpOrg\Requests\Session',
+		'WpOrg\Requests\Ssl',
+		'WpOrg\Requests\Transport\Curl',
+		'WpOrg\Requests\Transport\Fsockopen',
+		'WpOrg\Requests\Utility\CaseInsensitiveDictionary',
+		'WpOrg\Requests\Utility\FilteredIterator',
+		'WpOrg\Requests\Utility\InputValidator',
 	);
 
 	/**
@@ -480,7 +584,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Note: this list will be enhanced in the class constructor.
 	 *
-	 * {@internal To be updated after every major release. Last updated for WordPress 6.1.1.}
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
 	 *
 	 * @since 3.0.0
 	 *
@@ -488,34 +592,44 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 *               The constructor will add the lowercased class name as a key to each entry.
 	 */
 	private $simplepie_classes = array(
+		// Interfaces.
+		'SimplePie_Cache_Base',
+
+		// Classes.
 		'SimplePie',
 		'SimplePie_Author',
 		'SimplePie_Cache',
+		'SimplePie_Cache_DB',
+		'SimplePie_Cache_File',
+		'SimplePie_Cache_Memcache',
+		'SimplePie_Cache_Memcached',
+		'SimplePie_Cache_MySQL',
+		'SimplePie_Cache_Redis',
 		'SimplePie_Caption',
 		'SimplePie_Category',
+		'SimplePie_Content_Type_Sniffer',
 		'SimplePie_Copyright',
 		'SimplePie_Core',
 		'SimplePie_Credit',
+		'SimplePie_Decode_HTML_Entities',
 		'SimplePie_Enclosure',
 		'SimplePie_Exception',
 		'SimplePie_File',
-		'SimplePie_gzdecode',
+		'SimplePie_HTTP_Parser',
 		'SimplePie_IRI',
 		'SimplePie_Item',
 		'SimplePie_Locator',
 		'SimplePie_Misc',
+		'SimplePie_Net_IPv6',
+		'SimplePie_Parse_Date',
 		'SimplePie_Parser',
 		'SimplePie_Rating',
 		'SimplePie_Registry',
 		'SimplePie_Restriction',
 		'SimplePie_Sanitize',
 		'SimplePie_Source',
-		'SimplePie_Content_Type_Sniffer',
-		'SimplePie_Decode_HTML_Entities',
-		'SimplePie_HTTP_Parser',
-		'SimplePie_Net_IPv6',
-		'SimplePie_Parse_Date',
 		'SimplePie_XML_Declaration_Parser',
+		'SimplePie_gzdecode',
 	);
 
 	/**

From f71b5cee177ebdd7c58030f306bada92fae48589 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 05:26:40 +0200
Subject: [PATCH 685/822] WP/ClassNameCase: add list of `Twenty*` themes
 classes

... and scan for those as well.
---
 WordPress/Sniffs/WP/ClassNameCaseSniff.php | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index 6414c08558..079afe7b05 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -381,6 +381,38 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 		'wpdb',
 	);
 
+	/**
+	 * List of all WP native classes as shipped with themes included in WP Core.
+	 *
+	 * Note: this list will be enhanced in the class constructor.
+	 *
+	 * {@internal To be updated after every major release. Last updated for WordPress 6.3-RC1.}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in their "proper" case.
+	 *               The constructor will add the lowercased class name as a key to each entry.
+	 */
+	private $wp_themes_classes = array(
+		'TwentyNineteen_SVG_Icons',
+		'TwentyNineteen_Walker_Comment',
+		'TwentyTwenty_Customize',
+		'TwentyTwenty_Non_Latin_Languages',
+		'TwentyTwenty_SVG_Icons',
+		'TwentyTwenty_Script_Loader',
+		'TwentyTwenty_Separator_Control',
+		'TwentyTwenty_Walker_Comment',
+		'TwentyTwenty_Walker_Page',
+		'Twenty_Eleven_Ephemera_Widget',
+		'Twenty_Fourteen_Ephemera_Widget',
+		'Twenty_Twenty_One_Custom_Colors',
+		'Twenty_Twenty_One_Customize',
+		'Twenty_Twenty_One_Customize_Color_Control',
+		'Twenty_Twenty_One_Customize_Notice_Control',
+		'Twenty_Twenty_One_Dark_Mode',
+		'Twenty_Twenty_One_SVG_Icons',
+	);
+
 	/**
 	 * List of all GetID3 classes include in WP Core.
 	 *
@@ -643,6 +675,17 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 */
 	private $wp_classes_lc = array();
 
+	/**
+	 * List of all WP native classes as shipped with themes in lowercase.
+	 *
+	 * This array is automatically generated in the class constructor based on the $wp_themes_classes property.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var string[] The class names in lowercase.
+	 */
+	private $wp_themes_classes_lc = array();
+
 	/**
 	 * List of all GetID3 classes in lowercase.
 	 *
@@ -698,6 +741,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
 	 */
 	private $class_groups = array(
 		'wp_classes',
+		'wp_themes_classes',
 		'getid3_classes',
 		'phpmailer_classes',
 		'requests_classes',

From 3cae0a4ef6f602fd13b9bfb0aa87605694d4497b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 03:26:13 +0200
Subject: [PATCH 686/822] WP/DeprecatedClasses: update the class list based on
 WP 6.3-RC1

Based on a scan of WP Core at commit https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52 using a preliminary sniff created for issue 1803.

Manually verified.

Includes fixing a typo in the original list.

Previous: 1809 (for WPCS 2.2.0)
---
 .../Sniffs/WP/DeprecatedClassesSniff.php      | 23 +++++++++++++++++--
 .../Tests/WP/DeprecatedClassesUnitTest.inc    |  7 +++++-
 .../Tests/WP/DeprecatedClassesUnitTest.php    |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 3dabfaca77..1257da0aa2 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -43,6 +43,8 @@ final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 	 *
 	 * Version numbers should be fully qualified.
 	 *
+	 * Last update: July 2023 for WP 6.3 at https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52
+	 *
 	 * @var array
 	 */
 	private $deprecated_classes = array(
@@ -53,8 +55,14 @@ final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 			'version' => '3.1.0',
 		),
 
+		// WP 3.7.0.
+		'WP_HTTP_Fsockopen' => array(
+			'alt'     => 'WP_HTTP::request()',
+			'version' => '3.7.0',
+		),
+
 		// WP 4.9.0.
-		'Customize_New_Menu_Section' => array(
+		'WP_Customize_New_Menu_Section' => array(
 			'version' => '4.9.0',
 		),
 		'WP_Customize_New_Menu_Control' => array(
@@ -62,13 +70,24 @@ final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 		),
 
 		// WP 5.3.0.
+		'WP_Privacy_Data_Export_Requests_Table' => array(
+			'alt'     => 'WP_Privacy_Data_Export_Requests_List_Table',
+			'version' => '5.3.0',
+		),
+		'WP_Privacy_Data_Removal_Requests_Table' => array(
+			'alt'     => 'WP_Privacy_Data_Removal_Requests_List_Table',
+			'version' => '5.3.0',
+		),
 		'Services_JSON' => array(
 			'alt'     => 'The PHP native JSON extension',
 			'version' => '5.3.0',
 		),
+		'Services_JSON_Error' => array(
+			'alt'     => 'The PHP native JSON extension',
+			'version' => '5.3.0',
+		),
 	);
 
-
 	/**
 	 * Groups of classes to restrict.
 	 *
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc b/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
index b9b8814f47..7f7f38ef6f 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
@@ -13,8 +13,13 @@ echo \WP_User_Search::prepare_query();
 class My_User_Search extends WP_User_Search {}
 class Our_User_Search implements WP_User_Search {}
 $a = (new WP_User_Search())->query();
+/* ============ WP 3.7 ============ */
+$anon = new class extends WP_HTTP_Fsockopen {};
 /* ============ WP 4.9 ============ */
-class Prefix_Menu_section extends Customize_New_Menu_Section {}
+class Prefix_Menu_section extends WP_Customize_New_Menu_Section {}
 WP_Customize_New_Menu_Control::foo();
 /* ============ WP 5.3 ============ */
 $json = new Services_JSON;
+$json = new Services_JSON_Error;
+class Prefix_Menu_section extends WP_Privacy_Data_Export_Requests_Table {}
+WP_Privacy_Data_Removal_Requests_Table::foo();
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index f993d053a4..a644d3e33d 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -30,11 +30,11 @@ final class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		$start_line = 9;
-		$end_line   = 20;
+		$end_line   = 25;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
-		unset( $errors[16], $errors[19] );
+		unset( $errors[16], $errors[18], $errors[21] );
 
 		return $errors;
 	}

From 090aa176a70c62ff055c084f2683cb11763e7661 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 09:36:59 +0200
Subject: [PATCH 687/822] WP/DeprecatedFunctions: update the functions list
 based on WP 6.3-RC1

Updates the list of deprecated functions in the `WP.DeprecatedFunctions` sniff based on the WP 6.3.0-RC1 release.
Input for this based on @JDGrimes's WP deprecated code scanner, though that is getting more and more difficult to run as it is no longer maintained and is throwing lots of errors.

Previous: 2121
---
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    | 107 +++++++++++++++++-
 .../Tests/WP/DeprecatedFunctionsUnitTest.inc  |  27 +++++
 .../Tests/WP/DeprecatedFunctionsUnitTest.php  |   6 +-
 3 files changed, 136 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index c83aadafe5..9633917b8a 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -40,7 +40,7 @@ final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * List of deprecated functions with alternative when available.
 	 *
 	 * To be updated after every major release.
-	 * Last updated for WordPress 4.8.
+	 * Last updated for WordPress 6.3.
 	 *
 	 * Version numbers should be fully qualified.
 	 * Replacement functions should have parentheses.
@@ -51,7 +51,6 @@ final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	 * @var array
 	 */
 	private $deprecated_functions = array(
-
 		// WP 0.71.
 		'the_category_head' => array(
 			'alt'     => 'get_the_category_by_ID()',
@@ -1496,6 +1495,110 @@ final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 			'alt'     => 'wp_style_engine_get_styles()',
 			'version' => '6.1.0',
 		),
+
+		// WP 6.2.0.
+		'_resolve_home_block_template' => array(
+			'alt'     => '',
+			'version' => '6.2.0',
+		),
+		'get_page_by_title' => array(
+			'alt'     => 'WP_Query',
+			'version' => '6.2.0',
+		),
+
+		// WP 6.3.0.
+		'_wp_tinycolor_bound_alpha' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_get_classic_menu_fallback' => array(
+			'alt'     => 'WP_Navigation_Fallback::get_classic_menu_fallback',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_get_classic_menu_fallback_blocks' => array(
+			'alt'     => 'WP_Navigation_Fallback::get_classic_menu_fallback_blocks',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_get_most_recently_published_navigation' => array(
+			'alt'     => 'WP_Navigation_Fallback::get_most_recently_published_navigation',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_maybe_use_classic_menu_fallback' => array(
+			'alt'     => 'WP_Navigation_Fallback::create_classic_menu_fallback',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_parse_blocks_from_menu_items' => array(
+			'alt'     => 'WP_Navigation_Fallback::parse_blocks_from_menu_items',
+			'version' => '6.3.0',
+		),
+		'block_core_navigation_submenu_build_css_colors' => array(
+			'alt'     => 'wp_apply_colors_support()',
+			'version' => '6.3.0',
+		),
+		'wlwmanifest_link' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_get_duotone_filter_id' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_get_duotone_filter_property' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_get_duotone_filter_svg' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_get_global_styles_svg_filters' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_get_loading_attr_default' => array(
+			'alt'     => 'wp_get_loading_optimization_attributes()',
+			'version' => '6.3.0',
+		),
+		'wp_global_styles_render_svg_filters' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_img_tag_add_loading_attr' => array(
+			'alt'     => 'wp_img_tag_add_loading_optimization_attrs()',
+			'version' => '6.3.0',
+		),
+		'wp_queue_comments_for_comment_meta_lazyload' => array(
+			'alt'     => 'wp_lazyload_comment_meta()',
+			'version' => '6.3.0',
+		),
+		'wp_register_duotone_support' => array(
+			'alt'     => 'WP_Duotone::register_duotone_support()',
+			'version' => '6.3.0',
+		),
+		'wp_render_duotone_support' => array(
+			'alt'     => 'WP_Duotone::render_duotone_support()',
+			'version' => '6.3.0',
+		),
+		'wp_tinycolor_bound01' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_tinycolor_hsl_to_rgb' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_tinycolor_hue_to_rgb' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_tinycolor_rgb_to_rgb' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
+		'wp_tinycolor_string_to_rgb' => array(
+			'alt'     => '',
+			'version' => '6.3.0',
+		),
 	);
 
 	/**
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
index ee7285769c..b06acae352 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
@@ -384,3 +384,30 @@ install_global_terms();
 sync_category_tag_slugs();
 wp_get_attachment_thumb_file();
 wp_typography_get_css_variable_inline_style();
+/* ============ WP 6.2 ============ */
+_resolve_home_block_template();
+get_page_by_title();
+/* ============ WP 6.3 ============ */
+_wp_tinycolor_bound_alpha();
+block_core_navigation_get_classic_menu_fallback();
+block_core_navigation_get_classic_menu_fallback_blocks();
+block_core_navigation_get_most_recently_published_navigation();
+block_core_navigation_maybe_use_classic_menu_fallback();
+block_core_navigation_parse_blocks_from_menu_items();
+block_core_navigation_submenu_build_css_colors();
+wlwmanifest_link();
+wp_get_duotone_filter_id();
+wp_get_duotone_filter_property();
+wp_get_duotone_filter_svg();
+wp_get_global_styles_svg_filters();
+wp_get_loading_attr_default();
+wp_global_styles_render_svg_filters();
+wp_img_tag_add_loading_attr();
+wp_queue_comments_for_comment_meta_lazyload();
+wp_register_duotone_support();
+wp_render_duotone_support();
+wp_tinycolor_bound01();
+wp_tinycolor_hsl_to_rgb();
+wp_tinycolor_hue_to_rgb();
+wp_tinycolor_rgb_to_rgb();
+wp_tinycolor_string_to_rgb();
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 3baf2a909d..46649bd721 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -85,7 +85,7 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		$start_line = 362;
-		$end_line   = 386;
+		$end_line   = 413;
 		$warnings   = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
@@ -95,7 +95,9 @@ public function getWarningList() {
 			$warnings[367],
 			$warnings[373],
 			$warnings[375],
-			$warnings[377]
+			$warnings[377],
+			$warnings[387],
+			$warnings[390]
 		);
 
 		// Temporarily until PHPCS supports PHP 8.2.

From 57bea4d9a57dfa1597231207a282c9faa07c84c6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 21:01:35 +0200
Subject: [PATCH 688/822] WP/DeprecatedParameters: update the list based on WP
 6.3-RC1

Updates the list of deprecated function parameters in the `WP.DeprecatedParameters` sniff based on the WP 6.3.0-RC1 release.

Based on a scan of WP Core at commit https://github.com/WordPress/wordpress-develop/commit/6281ce432c50345a57768bf53854d9b65b6cdd52 using a preliminary sniff created for issue 1803.

Notes:
* All items in the original list have been double-checked and are okay.
* The original list was based on checking for calls to `_deprecated_parameter()`. The prelim sniff also checks the function signature for parameters named `$deprecated*`.
* Where parameters named `$deprecated` were detected without a call to `_deprecated_parameter()` and without a documented good reason not to have that call, the call to `_deprecated_parameter()` should be added and I have a WIP branch ready to add those.
* The "deprecation version" for some of the new additions wasn't always clear, but these have been verified by the Yoast WP Core team based on the above mentioned PR.

Previous: 2173

Also see: WordPress/wordpress-develop 4779
---
 .../Sniffs/WP/DeprecatedParametersSniff.php   | 132 +++++++++++++++++-
 .../Tests/WP/DeprecatedParametersUnitTest.inc |  21 ++-
 .../Tests/WP/DeprecatedParametersUnitTest.php |  10 +-
 3 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index ca1c2f1bf3..1ee2d6b40f 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -51,7 +51,7 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 	 * Array of function, argument, and default value for deprecated argument.
 	 *
 	 * The functions are ordered alphabetically.
-	 * Last updated for WordPress 4.8.0.
+	 * Last updated for WordPress 6.3.
 	 *
 	 * @since 0.12.0
 	 *
@@ -87,6 +87,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '5.9.0',
 			),
 		),
+		'_wp_post_revision_fields' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => false,
+				'version' => '4.5.0',
+			),
+		),
 		'add_option' => array(
 			3 => array(
 				'name'    => 'deprecated',
@@ -113,6 +120,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '0.71',
 			),
 		),
+		'delete_plugins' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '4.0.0',
+			),
+		),
 		'discover_pingback_server_uri' => array(
 			2 => array(
 				'name'    => 'deprecated',
@@ -120,6 +134,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '2.7.0',
 			),
 		),
+		'get_blog_list' => array(
+			3 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '3.0.0', // Was previously part of MU.
+			),
+		),
 		'get_category_parents' => array(
 			5 => array(
 				'name'    => 'deprecated',
@@ -141,6 +162,20 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '3.0.0', // Was previously part of MU.
 			),
 		),
+		'get_site_option' => array(
+			3 => array(
+				'name'    => 'deprecated',
+				'value'   => true,
+				'version' => '4.4.0',
+			),
+		),
+		'get_terms' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '4.5.0',
+			),
+		),
 		'get_the_author' => array(
 			1 => array(
 				'name'    => 'deprecated',
@@ -162,6 +197,27 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '4.4.0',
 			),
 		),
+		'global_terms' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '6.1.0',
+			),
+		),
+		'iframe_header' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => false,
+				'version' => '4.2.0',
+			),
+		),
+		'install_search_form' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => true,
+				'version' => '4.6.0',
+			),
+		),
 		'is_email' => array(
 			2 => array(
 				'name'    => 'deprecated',
@@ -176,6 +232,34 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '2.7.0',
 			),
 		),
+		'newblog_notify_siteadmin' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '3.0.0',
+			),
+		),
+		'permalink_single_rss' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '2.3.0',
+			),
+		),
+		'redirect_this_site' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '3.0.0',
+			),
+		),
+		'register_meta' => array(
+			4 => array(
+				'name'    => 'deprecated',
+				'value'   => null,
+				'version' => '4.6.0',
+			),
+		),
 		'safecss_filter_attr' => array(
 			2 => array(
 				'name'    => 'deprecated',
@@ -183,6 +267,20 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '2.8.1',
 			),
 		),
+		'switch_to_blog' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => null,
+				'version' => '3.5.0', // Was previously part of MU.
+			),
+		),
+		'term_description' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => null,
+				'version' => '4.9.2',
+			),
+		),
 		'the_attachment_link' => array(
 			3 => array(
 				'name'    => 'deprecated',
@@ -223,6 +321,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '2.5.0',
 			),
 		),
+		'unregister_setting' => array(
+			3 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '4.7.0',
+			),
+		),
 		'update_blog_option' => array(
 			4 => array(
 				'name'    => 'deprecated',
@@ -237,6 +342,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '3.1.0',
 			),
 		),
+		'update_posts_count' => array(
+			1 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '3.0.0',
+			),
+		),
 		'update_user_status' => array(
 			4 => array(
 				'name'    => 'deprecated',
@@ -244,11 +356,18 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '3.0.2',
 			),
 		),
-		'unregister_setting' => array(
+		'wp_count_terms' => array(
+			2 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '5.6.0',
+			),
+		),
+		'wp_create_thumbnail' => array(
 			3 => array(
 				'name'    => 'deprecated',
 				'value'   => '',
-				'version' => '4.7.0',
+				'version' => '3.5.0',
 			),
 		),
 		'wp_get_http_headers' => array(
@@ -272,6 +391,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 				'version' => '2.6.0',
 			),
 		),
+		'wp_login' => array(
+			3 => array(
+				'name'    => 'deprecated',
+				'value'   => '',
+				'version' => '2.5.0',
+			),
+		),
 		'wp_new_user_notification' => array(
 			2 => array(
 				'name'    => 'deprecated',
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
index 4ab4ba387b..b76cd9d55e 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
@@ -39,6 +39,8 @@ wp_install( is_public: '', user_name: '', user_email: '', deprecated: 'should be
 
 // All will give an ERROR. The functions are ordered alphabetically.
 
+_future_post_hook( 10, $post );
+_wp_post_revision_fields( $foo, 'deprecated' );
 add_option( '', '', [] );
 add_option( '', '', 1.23 );
 add_option( '', '', 10 );
@@ -46,17 +48,29 @@ add_option( '', '', false );
 add_option( '', '', 'deprecated' );
 comments_link( 'deprecated', 'deprecated' );
 convert_chars( '', 'deprecated' );
+delete_plugins( $foo, 'deprecated' );
 discover_pingback_server_uri( '', 'deprecated' );
+get_blog_list( $foo, $bar, 'deprecated' );
 get_category_parents( '', '', '', '', array( 'deprecated') );
 get_delete_post_link( '', 'deprecated' );
 get_last_updated( 'deprecated' );
+get_site_option( $foo, $bar, 'deprecated' );
+get_terms( $foo, 'deprecated' );
 get_the_author( 'deprecated' );
 get_user_option( '', '', 'deprecated' );
 get_wp_title_rss( 'deprecated' );
+iframe_header( $foo, 'deprecated' );
+install_search_form( 'deprecated' );
 is_email( '', 'deprecated' );
 is_email( '', 'false' ); // False as a string not bool.
 load_plugin_textdomain( '', 'deprecated' );
+newblog_notify_siteadmin( $foo, 'deprecated' );
+permalink_single_rss( 'deprecated' );
+redirect_this_site( 'deprecated' );
+register_meta( '', '', '', 'deprecated' );
 safecss_filter_attr( '', 'deprecated' );
+switch_to_blog( $foo, 'deprecated' );
+term_description( $foo, 'deprecated' );
 the_attachment_link( '', '', 'deprecated' );
 the_author( 'deprecated', 'deprecated' );
 the_author_posts_link( 'deprecated' );
@@ -64,17 +78,22 @@ trackback_rdf( 'deprecated' );
 trackback_url( 'deprecated' );
 unregister_setting( '', '', 'deprecated' );
 update_blog_option( '', '', '', 'deprecated' );
+update_blog_status( '', '', '', 'deprecated' );
+update_posts_count( 'deprecated' );
 update_user_status( '', '', '', 'deprecated' );
+wp_count_terms( $foo, 'deprecated' );
+wp_create_thumbnail( $foo, $bar, 'deprecated' );
 wp_get_http_headers( '', 'deprecated' );
 wp_get_sidebars_widgets( 'deprecated' );
 wp_install( '', '', '', '', 'deprecated', 'password', 'language' );
+wp_login( $foo, $bar, 'deprecated' );
 wp_new_user_notification( '', 'deprecated' );
 wp_notify_postauthor( '', 'deprecated' );
 wp_notify_postauthor( '', 'null' ); // Null as a string not null.
 wp_title_rss( 'deprecated' );
 wp_upload_bits( '', 'deprecated' );
 xfn_check( '', '', 'deprecated' );
-_future_post_hook( 10, $post );
 
 // All will give an WARNING as they have been deprecated after WP 5.8.
 _load_remote_block_patterns( $value );
+global_terms( $foo, 'deprecated' );
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index 4372783b03..46ef2dd1c5 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -30,7 +30,7 @@ final class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		$start_line = 42;
-		$end_line   = 77;
+		$end_line   = 95;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		$errors[22] = 1;
@@ -41,8 +41,8 @@ public function getErrorList() {
 		$errors[38] = 1;
 
 		// Override number of errors.
-		$errors[47] = 2;
-		$errors[61] = 2;
+		$errors[49] = 2;
+		$errors[75] = 2;
 
 		return $errors;
 	}
@@ -53,8 +53,8 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		$start_line = 80;
-		$end_line   = 80;
+		$start_line = 98;
+		$end_line   = 99;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		return $errors;

From 230535a65569d96e79f5af5ea8daf25f647022e8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 26 Jun 2023 23:27:04 +0200
Subject: [PATCH 689/822] Update the `minimum_wp_version` to WP 6.0

The minimum version should be three versions behind the latest WP release, so what with 6.3 being in RC, to be released on August 8th, it should now become 6.0.

Includes updating the tests to match.

Previous: 2121
---
 WordPress/Helpers/MinimumWPVersionTrait.php   |  2 +-
 .../Tests/WP/DeprecatedFunctionsUnitTest.inc  |  8 +++----
 .../Tests/WP/DeprecatedFunctionsUnitTest.php  | 22 +++++++++----------
 .../Tests/WP/DeprecatedParametersUnitTest.inc |  2 +-
 .../Tests/WP/DeprecatedParametersUnitTest.php |  8 +++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index eadf1bab84..e22c6dd601 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -80,7 +80,7 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @var string WordPress version.
 	 */
-	private $default_minimum_wp_version = '5.8';
+	private $default_minimum_wp_version = '6.0';
 
 	/**
 	 * Overrule the minimum supported WordPress version with a command-line/config value.
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
index b06acae352..e0f8483af2 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
@@ -354,16 +354,16 @@ wp_unregister_GLOBALS();
 noindex();
 wp_no_robots();
 wp_sensitive_page_meta();
-
-/*
- * Warning.
- */
 /* ============ WP 5.8 ============ */
 _excerpt_render_inner_columns_blocks();
 /* ============ WP 5.9 ============ */
 readonly();
 /* ============ WP 5.9.1 ============ */
 wp_render_duotone_filter_preset();
+
+/*
+ * Warning.
+ */
 /* ============ WP 6.0 ============ */
 image_attachment_fields_to_save();
 wp_add_iframed_editor_assets_html();
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 46649bd721..7fc8b81a37 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -30,7 +30,7 @@ final class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		$start_line = 8;
-		$end_line   = 356;
+		$end_line   = 362;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
@@ -72,9 +72,17 @@ public function getErrorList() {
 			$errors[340],
 			$errors[344],
 			$errors[346],
-			$errors[353]
+			$errors[353],
+			$errors[357],
+			$errors[359],
+			$errors[361]
 		);
 
+		// Temporarily until PHPCS supports PHP 8.2.
+		if ( \PHP_VERSION_ID >= 80200 ) {
+			unset( $errors[360] ); // Function call to readonly.
+		}
+
 		return $errors;
 	}
 
@@ -84,15 +92,12 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		$start_line = 362;
+		$start_line = 368;
 		$end_line   = 413;
 		$warnings   = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		// Unset the lines related to version comments.
 		unset(
-			$warnings[363],
-			$warnings[365],
-			$warnings[367],
 			$warnings[373],
 			$warnings[375],
 			$warnings[377],
@@ -100,11 +105,6 @@ public function getWarningList() {
 			$warnings[390]
 		);
 
-		// Temporarily until PHPCS supports PHP 8.2.
-		if ( \PHP_VERSION_ID >= 80200 ) {
-			unset( $warnings[364] ); // Function call to readonly.
-		}
-
 		return $warnings;
 	}
 }
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
index b76cd9d55e..7c8c37ab33 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.inc
@@ -40,6 +40,7 @@ wp_install( is_public: '', user_name: '', user_email: '', deprecated: 'should be
 // All will give an ERROR. The functions are ordered alphabetically.
 
 _future_post_hook( 10, $post );
+_load_remote_block_patterns( $value );
 _wp_post_revision_fields( $foo, 'deprecated' );
 add_option( '', '', [] );
 add_option( '', '', 1.23 );
@@ -95,5 +96,4 @@ wp_upload_bits( '', 'deprecated' );
 xfn_check( '', '', 'deprecated' );
 
 // All will give an WARNING as they have been deprecated after WP 5.8.
-_load_remote_block_patterns( $value );
 global_terms( $foo, 'deprecated' );
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index 46ef2dd1c5..a063475ae8 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -30,7 +30,7 @@ final class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		$start_line = 42;
-		$end_line   = 95;
+		$end_line   = 96;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 
 		$errors[22] = 1;
@@ -41,8 +41,8 @@ public function getErrorList() {
 		$errors[38] = 1;
 
 		// Override number of errors.
-		$errors[49] = 2;
-		$errors[75] = 2;
+		$errors[50] = 2;
+		$errors[76] = 2;
 
 		return $errors;
 	}
@@ -53,7 +53,7 @@ public function getErrorList() {
 	 * @return array <int line number> => <int number of warnings>
 	 */
 	public function getWarningList() {
-		$start_line = 98;
+		$start_line = 99;
 		$end_line   = 99;
 		$errors     = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
 

From f04d9d6282d3c0213656f999bbf382f074821bb8 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 22:41:12 +0200
Subject: [PATCH 690/822] .gitattributes: minor update

Verified against the latest status of the repo (removed `bin` dir ref).

Includes improving readability.
---
 .gitattributes | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 1fb51b494d..d39102c771 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,14 +4,14 @@
 # If you develop for WPCS using Composer, use `--prefer-source`.
 # https://blog.madewithlove.be/post/gitattributes/
 #
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/.phpcs.xml.dist export-ignore
-/phpunit.xml.dist export-ignore
-/.github export-ignore
-/bin export-ignore
-/Tests export-ignore
-/WordPress/Tests export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.phpcs.xml.dist    export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/phpunit.xml.dist   export-ignore
+/.github            export-ignore
+/Tests              export-ignore
+/WordPress/Tests    export-ignore
 
 #
 # Auto detect text files and perform LF normalization

From 67d98d21ba670d5882d37bd8674cd6b548a3ba10 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 03:28:14 +0200
Subject: [PATCH 691/822] PHPUnit config: remove file which no longer exists

This class was removed in PR 1922
---
 phpunit.xml.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 34c93a6263..e37b3d44c3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,7 +17,6 @@
 	<filter>
 		<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false">
 			<file>./WordPress/Sniff.php</file>
-			<file>./WordPress/PHPCSHelper.php</file>
 			<file>./WordPress/AbstractArrayAssignmentRestrictionsSniff.php</file>
 			<file>./WordPress/AbstractClassRestrictionsSniff.php</file>
 			<file>./WordPress/AbstractFunctionParameterSniff.php</file>

From 01d23a68cbe350ad65817009843f03304a3765cf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 18:08:32 +0200
Subject: [PATCH 692/822] Core/Extra: tweak the inclusion of the
 `Modernize.FunctionCalls.Dirname` sniff

Follow up on 2137

As  WP Core has now dropped support for PHP < 7.0, it can start using the `dirname()` `$levels` parameters.
Think:
```php
// PHP < 7.0.
$path = dirname( dirname( dirname( __DIR__ ) ) );

// PHP 7.0+.
$path = dirname( __DIR__, 3 );
```

The `Modernize.FunctionCalls.Dirname` sniff we include also includes a check (and fixer) for that, so we can now include that sniff completely in the `Core` ruleset.

For now, I'm proposing to silence the error code related to the PHP 7.0 modernization opportunity (again) for the `Extra` ruleset as not all plugins/themes will have dropped support for PHP < 7.0 yet.

To be on the safe side, I'm explicitly excluding the whole sniff from the ruleset used for WPCS itself as WPCS still has a PHP 5.4 minimum.
---
 .phpcs.xml.dist             | 3 +++
 WordPress-Core/ruleset.xml  | 5 +++--
 WordPress-Extra/ruleset.xml | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 062f9d0e6a..656c8ab925 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -50,6 +50,9 @@
 
 		<!-- Linting is done in a separate CI job, no need to duplicate it. -->
 		<exclude name="Generic.PHP.Syntax"/>
+
+		<!-- WPCS still has a PHP 5.4 minimum. -->
+		<exclude name="Modernize.FunctionCalls.Dirname"/>
 	</rule>
 
 	<!-- Check code for cross-version PHP compatibility. -->
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index f84fcca4d2..e871818cba 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -923,8 +923,9 @@
 	<!-- Check that class name references use the correct case. -->
 	<rule ref="WordPress.WP.ClassNameCase"/>
 
-	<!-- Check that __DIR__ is favoured over dirname(__FILE__).
+	<!-- Check that __DIR__ is favoured over dirname(__FILE__)
+		 and that dirname( __DIR__, $levels ) is favoured over nested calls to dirname().
 		 See: https://core.trac.wordpress.org/ticket/48082 -->
-	<rule ref="Modernize.FunctionCalls.Dirname.FileConstant"/>
+	<rule ref="Modernize.FunctionCalls.Dirname"/>
 
 </ruleset>
diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index bf753e6b95..6d32e45c65 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -5,6 +5,12 @@
 
 	<rule ref="WordPress-Core"/>
 
+	<!-- Silence the "no nested dirnames, use $levels" notice, which is included in Core,
+		 as plugin/themes may still support PHP < 7.0. -->
+	<rule ref="Modernize.FunctionCalls.Dirname.Nested">
+		<severity>0</severity>
+	</rule>
+
 	<!-- Generic PHP best practices.
 		 https://github.com/WordPress/WordPress-Coding-Standards/pull/382 -->
 	<rule ref="Generic.PHP.DeprecatedFunctions"/>

From 208516ef774955152e8b89115555a38a623560be Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 14:07:59 +0200
Subject: [PATCH 693/822] EscapingFunctionsTrait: add esc_xml() to the list of
 escaping functions

This function was introduced in WP 5.5.

As it's been around for about three years now, I'm not going to special case it with a version check.

Ref: https://core.trac.wordpress.org/ticket/50117

Fixes 1937
---
 WordPress/Helpers/EscapingFunctionsTrait.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index d4664775aa..bd850484f9 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -71,6 +71,7 @@ trait EscapingFunctionsTrait {
 		'esc_textarea'               => true,
 		'esc_url_raw'                => true,
 		'esc_url'                    => true,
+		'esc_xml'                    => true,
 		'filter_input'               => true,
 		'filter_var'                 => true,
 		'floatval'                   => true,

From ed8c30de33a22ccd5fa87f364fd75a261a921cba Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 14:08:57 +0200
Subject: [PATCH 694/822] EscapingFunctionsTrait: add wp_timezone_choice() to
 the list of auto-escaped functions

This function was introduced in WP 2.9.0.

I've looked the code of the function over and agree it can be added to the auto-escaped functions list.

Ref: https://developer.wordpress.org/reference/functions/wp_timezone_choice/

Fixes 1904
---
 WordPress/Helpers/EscapingFunctionsTrait.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index bd850484f9..cd66a11251 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -164,6 +164,7 @@ trait EscapingFunctionsTrait {
 		'wp_nav_menu'               => true,
 		'wp_register'               => true,
 		'wp_tag_cloud'              => true,
+		'wp_timezone_choice'        => true,
 		'wp_title'                  => true,
 	);
 

From 38d3d6ecb1447c80bdc1483de00e6855162ce7b1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:09:06 +0200
Subject: [PATCH 695/822] EscapingFunctionsTrait: add wp_readonly() to the list
 of auto-escaped functions

This function was added in WP 5.9 to replace the `readonly()` function as `readonly` became a reserved keyword in PHP 8.1 (though only partially to allow the WP community some time to catch up).

I'm leaving `readonly()` in the list. While it shouldn't be used anymore, if it is, it still is a valid auto-escaped function.

Ref: https://core.trac.wordpress.org/ticket/53858
---
 WordPress/Helpers/EscapingFunctionsTrait.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index cd66a11251..b2df966429 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -162,6 +162,7 @@ trait EscapingFunctionsTrait {
 		'wp_login_form'             => true,
 		'wp_loginout'               => true,
 		'wp_nav_menu'               => true,
+		'wp_readonly'               => true,
 		'wp_register'               => true,
 		'wp_tag_cloud'              => true,
 		'wp_timezone_choice'        => true,

From 73be58abefbe46e6046dc575c83cfce0a87cb046 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:15:49 +0200
Subject: [PATCH 696/822] SanitizingFunctionsTrait: add sanitize_url() to the
 list of sanitization functions

This function was previously deprecated, but has been resurrected in WP 6.1.

Refs:
* https://core.trac.wordpress.org/ticket/55852
* WordPress/WordPress-Coding-Standards 2031
* WordPress/WordPress-Coding-Standards 2189
---
 WordPress/Helpers/SanitizingFunctionsTrait.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizingFunctionsTrait.php
index 1ab8a41dbf..d84b7daf06 100644
--- a/WordPress/Helpers/SanitizingFunctionsTrait.php
+++ b/WordPress/Helpers/SanitizingFunctionsTrait.php
@@ -88,6 +88,7 @@ trait SanitizingFunctionsTrait {
 		'sanitize_title_for_query'   => true,
 		'sanitize_title_with_dashes' => true,
 		'sanitize_title'             => true,
+		'sanitize_url'               => true,
 		'sanitize_user_field'        => true,
 		'sanitize_user'              => true,
 		'validate_file'              => true,

From b1ae7053a41a83de6194513bda66dbf9c39e8ef0 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 20:21:28 +0200
Subject: [PATCH 697/822] [SanitizingFunctions|EscapingFunctions]Trait: add
 wp_kses_one_attr() to function lists

This function was introduced in WP 4.2.3.

I've done a cursory look-over of the code, but I have not gone down the rabbit-hole of examining all functions involved (and yes, `wp_kses_one_attr()` calls a _lot_ of functions under the hood).

Having said that, anastis did do a more detailed analysis and included their write-up of it in the ticket, so I'm satisfied that this function can be added to the list.

Based on this write-up, I believe the function should be added to both the `$sanitizingFunctions` list as well as the `$escapingFunctions` list.

Refs:
* https://developer.wordpress.org/reference/functions/wp_kses_one_attr/
* WordPress/WordPress-Coding-Standards 1765#issuecomment-512192213

Fixes 1765
---
 WordPress/Helpers/EscapingFunctionsTrait.php   | 1 +
 WordPress/Helpers/SanitizingFunctionsTrait.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index b2df966429..4a60974bc4 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -92,6 +92,7 @@ trait EscapingFunctionsTrait {
 		'wp_json_encode'             => true,
 		'wp_kses_allowed_html'       => true,
 		'wp_kses_data'               => true,
+		'wp_kses_one_attr'           => true,
 		'wp_kses_post'               => true,
 		'wp_kses'                    => true,
 	);
diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizingFunctionsTrait.php
index d84b7daf06..eccc959142 100644
--- a/WordPress/Helpers/SanitizingFunctionsTrait.php
+++ b/WordPress/Helpers/SanitizingFunctionsTrait.php
@@ -96,6 +96,7 @@ trait SanitizingFunctionsTrait {
 		'wp_handle_upload'           => true,
 		'wp_kses_allowed_html'       => true,
 		'wp_kses_data'               => true,
+		'wp_kses_one_attr'           => true,
 		'wp_kses_post'               => true,
 		'wp_kses'                    => true,
 		'wp_parse_id_list'           => true,

From 5794920a3cbe71bdb88d11a14dff0046e0650b92 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Jul 2023 23:45:51 +0200
Subject: [PATCH 698/822] Security/EscapeOutput: rename test case file

... to allow for adding additional test case files.
---
 ...nitTest.inc => EscapeOutputUnitTest.1.inc} |   0
 .../Tests/Security/EscapeOutputUnitTest.php   | 144 +++++++++---------
 2 files changed, 76 insertions(+), 68 deletions(-)
 rename WordPress/Tests/Security/{EscapeOutputUnitTest.inc => EscapeOutputUnitTest.1.inc} (100%)

diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
similarity index 100%
rename from WordPress/Tests/Security/EscapeOutputUnitTest.inc
rename to WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 4664245d45..8a65bff2c0 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -32,76 +32,84 @@ final class EscapeOutputUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array <int line number> => <int number of errors>
 	 */
-	public function getErrorList() {
-		return array(
-			17  => 1,
-			19  => 1,
-			36  => 1,
-			39  => 1,
-			40  => 1,
-			41  => 1,
-			43  => 1,
-			46  => 1,
-			53  => 1,
-			59  => 1,
-			60  => 1,
-			65  => 1,
-			68  => 1,
-			71  => 1,
-			73  => 1,
-			75  => 1,
-			101 => 1,
-			103 => 1,
-			111 => 1,
-			112 => 1,
-			113 => 1,
-			114 => 1,
-			125 => 1,
-			126 => 1, // Old-style WPCS ignore comments are no longer supported.
-			127 => 1, // Old-style WPCS ignore comments are no longer supported.
-			128 => 1, // Old-style WPCS ignore comments are no longer supported.
-			131 => 1,
-			135 => 1,
-			138 => 1,
-			145 => 1,
-			147 => 1,
-			149 => 1,
-			152 => 2,
-			159 => 1,
-			162 => 1,
-			169 => 1,
-			172 => 1,
-			173 => 1,
-			182 => 3,
-			190 => 1,
-			191 => 2,
-			205 => 1,
-			206 => 1,
-			207 => 1,
-			223 => 1,
-			225 => 1,
-			226 => 1,
-			241 => 1, // Old-style WPCS ignore comments are no longer supported.
-			245 => 1, // Old-style WPCS ignore comments are no longer supported.
-			249 => 1, // Old-style WPCS ignore comments are no longer supported.
-			252 => 1,
-			253 => 1,
-			263 => 1,
-			264 => 1,
-			266 => 1,
-			282 => 1,
-			286 => 1,
-			289 => 1,
-			294 => 1,
-			297 => 1,
-			307 => 1,
-			313 => 1,
-			314 => 1,
-			315 => 1,
-			319 => 1,
-		);
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'EscapeOutputUnitTest.1.inc':
+				return array(
+					17  => 1,
+					19  => 1,
+					36  => 1,
+					39  => 1,
+					40  => 1,
+					41  => 1,
+					43  => 1,
+					46  => 1,
+					53  => 1,
+					59  => 1,
+					60  => 1,
+					65  => 1,
+					68  => 1,
+					71  => 1,
+					73  => 1,
+					75  => 1,
+					101 => 1,
+					103 => 1,
+					111 => 1,
+					112 => 1,
+					113 => 1,
+					114 => 1,
+					125 => 1,
+					126 => 1, // Old-style WPCS ignore comments are no longer supported.
+					127 => 1, // Old-style WPCS ignore comments are no longer supported.
+					128 => 1, // Old-style WPCS ignore comments are no longer supported.
+					131 => 1,
+					135 => 1,
+					138 => 1,
+					145 => 1,
+					147 => 1,
+					149 => 1,
+					152 => 2,
+					159 => 1,
+					162 => 1,
+					169 => 1,
+					172 => 1,
+					173 => 1,
+					182 => 3,
+					190 => 1,
+					191 => 2,
+					205 => 1,
+					206 => 1,
+					207 => 1,
+					223 => 1,
+					225 => 1,
+					226 => 1,
+					241 => 1, // Old-style WPCS ignore comments are no longer supported.
+					245 => 1, // Old-style WPCS ignore comments are no longer supported.
+					249 => 1, // Old-style WPCS ignore comments are no longer supported.
+					252 => 1,
+					253 => 1,
+					263 => 1,
+					264 => 1,
+					266 => 1,
+					282 => 1,
+					286 => 1,
+					289 => 1,
+					294 => 1,
+					297 => 1,
+					307 => 1,
+					313 => 1,
+					314 => 1,
+					315 => 1,
+					319 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 
 	/**

From 7d39aad0eeb5f909d43fec1ccb51e808ea158be1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 01:37:44 +0200
Subject: [PATCH 699/822] Security/EscapeOutput: move parse error related test
 to separate file

... to prevent it interfering with other tests.
---
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 2 +-
 WordPress/Tests/Security/EscapeOutputUnitTest.2.inc | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.2.inc

diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index b7a606bfc8..f9f1261667 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -181,7 +181,7 @@ echo '<option name="' . esc_attr( $name ) . '"' .
 _deprecated_hook( 'some_filter', '1.3.0', esc_html__( 'The $arg is deprecated.' ), 'some_other_filter' ); // Ok.
 _deprecated_hook( "filter_{$context}", '1.3.0', __( 'The $arg is deprecated.' ), sprintf( __( 'Some parsed message %s', $variable ) ) ); // Bad.
 
-echo add_filter( get_the_excerpt( get_the_ID() ) ; // Bad, but ignored as code contains a parse error.
+
 
 /*
  * Test using custom properties, setting & unsetting (resetting).
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.2.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.2.inc
new file mode 100644
index 0000000000..6a6c094bf3
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.2.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+echo add_filter( get_the_excerpt( get_the_ID() ) ;

From 2b5fa268adb3dbf516466482e39f0ff27967f0f6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:41:30 +0200
Subject: [PATCH 700/822] Security/EscapeOutput: use Tokens::$magicConstants

The `Tokens::$magicConstants` array was introduced to PHPCS in version 3.5.6, so we can now defer to the upstream array.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 0f00efcf0c..38b6beb097 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -59,24 +59,6 @@ class EscapeOutputSniff extends Sniff {
 		'_ex' => 'echo esc_html_x() or echo esc_attr_x()',
 	);
 
-	/**
-	 * List of names of the tokens representing PHP magic constants.
-	 *
-	 * @since 0.10.0
-	 *
-	 * @var array
-	 */
-	private $magic_constant_tokens = array(
-		'T_CLASS_C'  => true, // __CLASS__
-		'T_DIR'      => true, // __DIR__
-		'T_FILE'     => true, // __FILE__
-		'T_FUNC_C'   => true, // __FUNCTION__
-		'T_LINE'     => true, // __LINE__
-		'T_METHOD_C' => true, // __METHOD__
-		'T_NS_C'     => true, // __NAMESPACE__
-		'T_TRAIT_C'  => true, // __TRAIT__
-	);
-
 	/**
 	 * List of names of the native PHP constants which can be considered safe.
 	 *
@@ -296,7 +278,7 @@ public function process_token( $stackPtr ) {
 			}
 
 			// Handle magic constants for debug functions.
-			if ( isset( $this->magic_constant_tokens[ $this->tokens[ $i ]['type'] ] ) ) {
+			if ( isset( Tokens::$magicConstants[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 

From 93033c64bd82256bb087579ec975bffe64d391f9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 01:54:11 +0200
Subject: [PATCH 701/822] Security/EscapeOutput: use PHPCSUtils

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 38b6beb097..6007fea77d 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\Security;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
@@ -267,9 +268,7 @@ public function process_token( $stackPtr ) {
 				continue;
 			}
 
-			if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $i ]['code']
-				|| \T_CLOSE_SHORT_ARRAY === $this->tokens[ $i ]['code']
-			) {
+			if ( isset( Collections::shortArrayTokens()[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 

From 9af97f433e6204a874368bf8ac1a89b18aacdf0c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 01:53:09 +0200
Subject: [PATCH 702/822] Security/EscapeOutput: normalize the
 `$safe_components` array

* Use token constants instead of type strings.
* Have the token constant as both the key and the value.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 6007fea77d..564cd5691f 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -86,20 +86,20 @@ class EscapeOutputSniff extends Sniff {
 	 * @var array
 	 */
 	private $safe_components = array(
-		'T_CONSTANT_ENCAPSED_STRING' => true,
-		'T_LNUMBER'                  => true,
-		'T_MINUS'                    => true,
-		'T_PLUS'                     => true,
-		'T_MULTIPLY'                 => true,
-		'T_DIVIDE'                   => true,
-		'T_MODULUS'                  => true,
-		'T_TRUE'                     => true,
-		'T_FALSE'                    => true,
-		'T_NULL'                     => true,
-		'T_DNUMBER'                  => true,
-		'T_START_NOWDOC'             => true,
-		'T_NOWDOC'                   => true,
-		'T_END_NOWDOC'               => true,
+		\T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
+		\T_LNUMBER                  => \T_LNUMBER,
+		\T_MINUS                    => \T_MINUS,
+		\T_PLUS                     => \T_PLUS,
+		\T_MULTIPLY                 => \T_MULTIPLY,
+		\T_DIVIDE                   => \T_DIVIDE,
+		\T_MODULUS                  => \T_MODULUS,
+		\T_TRUE                     => \T_TRUE,
+		\T_FALSE                    => \T_FALSE,
+		\T_NULL                     => \T_NULL,
+		\T_DNUMBER                  => \T_DNUMBER,
+		\T_START_NOWDOC             => \T_START_NOWDOC,
+		\T_NOWDOC                   => \T_NOWDOC,
+		\T_END_NOWDOC               => \T_END_NOWDOC,
 	);
 
 	/**
@@ -314,7 +314,7 @@ public function process_token( $stackPtr ) {
 
 			// Allow T_CONSTANT_ENCAPSED_STRING eg: echo 'Some String';
 			// Also T_LNUMBER, e.g.: echo 45; exit -1; and booleans.
-			if ( isset( $this->safe_components[ $this->tokens[ $i ]['type'] ] ) ) {
+			if ( isset( $this->safe_components[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 

From 26095efafbf5f5f05b43a0fbf0fd646d49ab4e11 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 02:26:20 +0200
Subject: [PATCH 703/822] Security/EscapeOutput: bug fix - expand the "safe
 components" list

Operator tokens in PHP are not insecure, it is the **_operands_** which are potentially insecure.

As things were, we've seen all sorts of messages in bugs reported, where the sniff would report on `&&` or `===` tokens, which is nonsensical.

The "safe components" list already contained a number of operators, most notably the arithmetic operators (though the PHP 5.6+ `**` (`T_POW`) operator was missing).

I'm proposing to expand this list with a much larger list of operators using the predefined token arrays from PHPCS itself + one of the PHPCSUtils token arrays + the `T_BOOLEAN_NOT` (`!`) operator.

With this expansion, we shouldn't be seeing anymore issues reported for the sniff flagging operators, which should make debugging the issues reported more straight forward.

The only operators I have not (yet) included in the list are the assignment operators as assignments within an output statement should be exceedingly rare anyway.

Note: in all honesty, the sniff should take operator precedence into account properly and, for instance, disregard a `$var` or function call after a boolean operator as that is automatically cast to a boolean. Similarly, the operands before and after an arithmetic operator will always be cast to numeric. Having said that, that's a rabbit hole for a future release as there's enough to fix in the sniff without going down that path.

Includes unit tests, all of which would throw an error on the operator prior to this change.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 17 ++++++-----
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 29 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  1 +
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 564cd5691f..cec1258041 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -81,25 +81,23 @@ class EscapeOutputSniff extends Sniff {
 	/**
 	 * List of tokens which can be considered as safe when directly part of the output.
 	 *
+	 * This list is enhanced with additional tokens in the `register()` method.
+	 *
 	 * @since 0.12.0
 	 *
 	 * @var array
 	 */
 	private $safe_components = array(
-		\T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
 		\T_LNUMBER                  => \T_LNUMBER,
-		\T_MINUS                    => \T_MINUS,
-		\T_PLUS                     => \T_PLUS,
-		\T_MULTIPLY                 => \T_MULTIPLY,
-		\T_DIVIDE                   => \T_DIVIDE,
-		\T_MODULUS                  => \T_MODULUS,
+		\T_DNUMBER                  => \T_DNUMBER,
 		\T_TRUE                     => \T_TRUE,
 		\T_FALSE                    => \T_FALSE,
 		\T_NULL                     => \T_NULL,
-		\T_DNUMBER                  => \T_DNUMBER,
+		\T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
 		\T_START_NOWDOC             => \T_START_NOWDOC,
 		\T_NOWDOC                   => \T_NOWDOC,
 		\T_END_NOWDOC               => \T_END_NOWDOC,
+		\T_BOOLEAN_NOT              => \T_BOOLEAN_NOT,
 	);
 
 	/**
@@ -108,6 +106,11 @@ class EscapeOutputSniff extends Sniff {
 	 * @return array
 	 */
 	public function register() {
+		// Enrich the list of "safe components" tokens.
+		$this->safe_components += Tokens::$comparisonTokens;
+		$this->safe_components += Tokens::$operators;
+		$this->safe_components += Tokens::$booleanOperators;
+		$this->safe_components += Collections::incrementDecrementOperators();
 
 		return array(
 			\T_ECHO,
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index f9f1261667..eff74c0808 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -317,3 +317,32 @@ echo implode( '<br>', map_deep( callback: 'foo', value: $items, ) ); // Bad, non
 // Note: named params not supported due to the `...$arrays` in array_map()`, but that's not the concern of this sniff.
 echo implode( '<br>', array_map( array: $items, callback: 'esc_html', ) ); // Ok.
 echo implode( '<br>', array_map( array: $items, callback: 'foo', ) ); // Bad.
+
+// Operators should be ignored.
+print 10 ** 20;
+print 10 & 20;
+print 10 | 20;
+print 10 ^ 20;
+print 10 << 20;
+print 10 >> 20;
+print 10 == 20;
+print 10 != 20;
+print 10 === 20;
+print 10 !== 20;
+print 10 < 20;
+print 10 > 20;
+print 10 <= 20;
+print 10 >= 20;
+print 10 <=> 20;
+print ! 'hello';
+print 'hello' && 'world';
+print 'hello' || 'world';
+print 'hello' and 'world';
+print 'hello' or 'world';
+print 'hello' xor 'world';
+print 10++;
+print --10;
+
+// This includes the PHP 7.0+ null coalesce operator.
+echo $var ?? 'default'; // Bad.
+echo esc_html( $var ?? 'default' ); // OK.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 8a65bff2c0..05fa16a4e2 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -105,6 +105,7 @@ public function getErrorList( $testFile = '' ) {
 					314 => 1,
 					315 => 1,
 					319 => 1,
+					347 => 1,
 				);
 
 			default:

From 268d4159943929b247ec7611a638d27149e41d39 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Jul 2023 23:51:21 +0200
Subject: [PATCH 704/822] Security/EscapeOutput: split `process_token()` method
 [1]

Split off the code which does the actual output escaping check into a separate `check_code_is_escaped()` method.

No functional changes.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index cec1258041..dd93dc495e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -124,6 +124,8 @@ public function register() {
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
+	 * @since 3.0.0 This method has been split up.
+	 *
 	 * @param int $stackPtr The position of the current token in the stack.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
@@ -217,11 +219,28 @@ public function process_token( $stackPtr ) {
 		// Ignore the function itself.
 		++$stackPtr;
 
+		return $this->check_code_is_escaped( $stackPtr, $end_of_statement, $ternary );
+	}
+
+	/**
+	 * Check whether each relevant part of an arbitrary group of token is output escaped.
+	 *
+	 * @since 3.0.0 Split off from the process_token() method.
+	 *
+	 * @param int       $start   The position to start checking from.
+	 * @param int       $end     The position to stop the check at.
+	 * @param int|false $ternary Stack pointer to the `?` inline then token or
+	 *                           FALSE when no non-parenthesized ternary was found.
+	 *
+	 * @return int Integer stack pointer to skip forward.
+	 */
+	protected function check_code_is_escaped( $start, $end, $ternary = false ) {
+
 		$in_cast = false;
 
 		// Looping through echo'd components.
 		$watch = true;
-		for ( $i = $stackPtr; $i < $end_of_statement; $i++ ) {
+		for ( $i = $start; $i < $end; $i++ ) {
 
 			// Ignore whitespaces and comments.
 			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
@@ -412,6 +431,6 @@ public function process_token( $stackPtr ) {
 			);
 		}
 
-		return $end_of_statement;
+		return $end;
 	}
 }

From 42218322ae36461fd52168522b2348ac02bf5a47 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 24 Jul 2023 02:32:54 +0200
Subject: [PATCH 705/822] Security/EscapeOutput: split `process_token()` method
 [2]

Split off the code which checks for function calls into a separate `process_tstring_token()` method.

No functional changes.

:point_right: This commit will be easier to review while ignoring whitespace changes.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 130 ++++++++++--------
 1 file changed, 74 insertions(+), 56 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index dd93dc495e..320c6a0f43 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -133,51 +133,91 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		$function = $this->tokens[ $stackPtr ]['content'];
+		// If function, not T_ECHO nor T_PRINT.
+		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
+			return $this->process_tstring_token( $stackPtr );
+		}
 
 		// Find the opening parenthesis (if present; T_ECHO might not have it).
 		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
-		// If function, not T_ECHO nor T_PRINT.
-		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
-			// Skip if it is a function but is not one of the printing functions.
-			if ( ! $this->is_printing_function( $this->tokens[ $stackPtr ]['content'] ) ) {
-				return;
-			}
+		$ternary = false;
+
+		$end_of_statement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
+		$last_token       = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end_of_statement - 1 ), null, true );
+
+		// Check for the ternary operator. We only need to do this here if this
+		// echo is lacking parenthesis. Otherwise it will be handled below.
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code'] || \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code'] ) {
 
-			if ( isset( $this->tokens[ $open_paren ]['parenthesis_closer'] ) ) {
-				$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
+			$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end_of_statement );
+
+			// If there is a ternary skip over the part before the ?. However, if
+			// the ternary is within parentheses, it will be handled in the loop.
+			if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
+				$stackPtr = $ternary;
 			}
+		}
 
-			// These functions only need to have the first argument escaped.
-			if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
-				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
-				if ( false === $first_param ) {
-					// First parameter doesn't exist. Nothing to do.
-					return;
-				}
+		// Ignore the function itself.
+		++$stackPtr;
+
+		return $this->check_code_is_escaped( $stackPtr, $end_of_statement, $ternary );
+	}
+
+	/**
+	 * Process a function call token.
+	 *
+	 * @since 3.0.0 Split off from the process_token() method.
+	 *
+	 * @param int $stackPtr The position of the current token in the stack.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process_tstring_token( $stackPtr ) {
+		// Find the opening parenthesis.
+		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+
+		$function = $this->tokens[ $stackPtr ]['content'];
+
+		// Skip if it is a function but is not one of the printing functions.
+		if ( ! $this->is_printing_function( $this->tokens[ $stackPtr ]['content'] ) ) {
+			return;
+		}
 
-				$end_of_statement = ( $first_param['end'] + 1 );
-				unset( $first_param );
+		if ( isset( $this->tokens[ $open_paren ]['parenthesis_closer'] ) ) {
+			$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
+		}
+
+		// These functions only need to have the first argument escaped.
+		if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
+			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
+			if ( false === $first_param ) {
+				// First parameter doesn't exist. Nothing to do.
+				return;
 			}
 
-			/*
-			 * If the first param to `_deprecated_file()` follows the typical `basename( __FILE__ )`
-			 * pattern, it doesn't need to be escaped.
-			 */
-			if ( '_deprecated_file' === $function ) {
-				$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
-				if ( false === $first_param ) {
-					// First parameter doesn't exist. Nothing to do.
-					return;
-				}
+			$end_of_statement = ( $first_param['end'] + 1 );
+			unset( $first_param );
+		}
 
-				// Quick check. This disregards comments.
-				if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
-					$stackPtr = ( $first_param['end'] + 2 );
-				}
-				unset( $first_param );
+		/*
+		 * If the first param to `_deprecated_file()` follows the typical `basename( __FILE__ )`
+		 * pattern, it doesn't need to be escaped.
+		 */
+		if ( '_deprecated_file' === $function ) {
+			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
+			if ( false === $first_param ) {
+				// First parameter doesn't exist. Nothing to do.
+				return;
 			}
+
+			// Quick check. This disregards comments.
+			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
+				$stackPtr = ( $first_param['end'] + 2 );
+			}
+			unset( $first_param );
 		}
 
 		if ( isset( $this->unsafePrintingFunctions[ $function ] ) ) {
@@ -194,32 +234,10 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		$ternary = false;
-
-		// This is already determined if this is a function and not T_ECHO.
-		if ( ! isset( $end_of_statement ) ) {
-
-			$end_of_statement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
-			$last_token       = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end_of_statement - 1 ), null, true );
-
-			// Check for the ternary operator. We only need to do this here if this
-			// echo is lacking parenthesis. Otherwise it will be handled below.
-			if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code'] || \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code'] ) {
-
-				$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end_of_statement );
-
-				// If there is a ternary skip over the part before the ?. However, if
-				// the ternary is within parentheses, it will be handled in the loop.
-				if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
-					$stackPtr = $ternary;
-				}
-			}
-		}
-
 		// Ignore the function itself.
 		++$stackPtr;
 
-		return $this->check_code_is_escaped( $stackPtr, $end_of_statement, $ternary );
+		return $this->check_code_is_escaped( $stackPtr, $end_of_statement );
 	}
 
 	/**

From 51dd36493d9ab9935414371e8689191002abda9a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 24 Jul 2023 02:45:34 +0200
Subject: [PATCH 706/822] Security/EscapeOutput: bug fix - false positives on
 non-function calls

As things were, the sniff would look for `T_STRING` tokens with certain contents, but never do a proper check if those were actually function calls.

This would lead to false positives, but also potentially to an `Internal.Exception` for the `$end_of_statement` not being defined.

This commit is a first step towards fixing this.

Includes tests for select situations fixed by this particular commit.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 13 +++++++++----
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc |  5 +++++
 WordPress/Tests/Security/EscapeOutputUnitTest.3.inc |  5 +++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.3.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 320c6a0f43..1bdcbc386b 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -178,6 +178,13 @@ public function process_token( $stackPtr ) {
 	public function process_tstring_token( $stackPtr ) {
 		// Find the opening parenthesis.
 		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		if ( false === $open_paren
+			|| \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
+			|| isset( $this->tokens[ $open_paren ]['parenthesis_closer'] ) === false
+		) {
+			// Live coding, parse error or not a function _call_.
+			return;
+		}
 
 		$function = $this->tokens[ $stackPtr ]['content'];
 
@@ -186,9 +193,7 @@ public function process_tstring_token( $stackPtr ) {
 			return;
 		}
 
-		if ( isset( $this->tokens[ $open_paren ]['parenthesis_closer'] ) ) {
-			$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
-		}
+		$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
 
 		// These functions only need to have the first argument escaped.
 		if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
@@ -230,7 +235,7 @@ public function process_tstring_token( $stackPtr ) {
 
 			// If the error was reported, don't bother checking the function's arguments.
 			if ( $error ) {
-				return isset( $end_of_statement ) ? $end_of_statement : null;
+				return $end_of_statement;
 			}
 		}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index eff74c0808..5e8ac7420b 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -346,3 +346,8 @@ print --10;
 // This includes the PHP 7.0+ null coalesce operator.
 echo $var ?? 'default'; // Bad.
 echo esc_html( $var ?? 'default' ); // OK.
+
+// Make sure the sniff does not get confused over constants/properties using the same name as one of the target functions.
+$a = _ex; // OK, constant, not function call.
+$a = $obj->wp_dropdown_pages; // OK, property access, not function call.
+use function wp_dropdown_pages; // OK, import use statement, not function call.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.3.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.3.inc
new file mode 100644
index 0000000000..f4cc5d9fec
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.3.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+_deprecated_function(

From 8d1fffba078c7954c1885b7afb04d3d472035caa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:27:49 +0200
Subject: [PATCH 707/822] Helpers/PrintingFunctionsTrait: add
 `get_printing_functions()` method

... which is needed for the switch to another base class is the next commit.
---
 WordPress/Helpers/PrintingFunctionsTrait.php | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
index ff1df2b190..0b210e7131 100644
--- a/WordPress/Helpers/PrintingFunctionsTrait.php
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -87,15 +87,13 @@ trait PrintingFunctionsTrait {
 	private $allPrintingFunctions = array();
 
 	/**
-	 * Check if a particular function is regarded as a printing function.
+	 * Retrieve a list of all known printing functions.
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param string $functionName The name of the function to check.
-	 *
-	 * @return bool
+	 * @return array<string, bool>
 	 */
-	public function is_printing_function( $functionName ) {
+	public function get_printing_functions() {
 		if ( array() === $this->allPrintingFunctions
 			|| $this->customPrintingFunctions !== $this->addedCustomPrintingFunctions
 		) {
@@ -107,6 +105,19 @@ public function is_printing_function( $functionName ) {
 			$this->addedCustomPrintingFunctions = $this->customPrintingFunctions;
 		}
 
-		return isset( $this->allPrintingFunctions[ strtolower( $functionName ) ] );
+		return $this->allPrintingFunctions;
+	}
+
+	/**
+	 * Check if a particular function is regarded as a printing function.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $functionName The name of the function to check.
+	 *
+	 * @return bool
+	 */
+	public function is_printing_function( $functionName ) {
+		return isset( $this->get_printing_functions()[ strtolower( $functionName ) ] );
 	}
 }

From 4f57d4c5a637fc50e11f0ee69bf869a0af439175 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 24 Jul 2023 02:21:32 +0200
Subject: [PATCH 708/822] Security/EscapeOutput: bug fix - false positives on
 non-global function calls

As things were, the sniff would look for `T_STRING` tokens with certain contents, but never do a proper check if those were actually function calls to the WP/PHP native _global_ function.

This would lead to false positives for calls to methods, function declarations etc.

By changing the parent class to the `AbstractFunctionRestrictionsSniff`, we can re-use the "if this a global function call" logic already in place in that abstract, while still maintaining the handling of the other tokens in the pre-existing manner.

There are three caveats to this:
1. The `AbstractFunctionRestrictionsSniff` contains an `exclude` property, which allows to silence notices about certain function for a complete group.
    As this is a security sniff, we don't want end-users to be able to silence notices about groups of functions in that way.
    To that end, the ability for end-users to set the `exclude` property for this sniff is being disabled.
2. The `AbstractFunctionRestrictionsSniff` class will call the `process_matched_token()` method once for each match in each function group.
    As the "unsafe printing functions" are also included in the "printing functions", this would lead to the `process_matched_token()` method being called twice for those methods, leading to duplicate error notices.
    I'm preventing this by removing the "unsafe printing functions" from the "printing functions" list prior to passing it off to the parent class.
3. Lastly, the `AbstractFunctionRestrictionsSniff` class expects the list of target functions to be available when the sniff is instantiated. However, in test situations, that list can fluctuate, as the "printing functions" supports the ability to add "custom printing functions", which is done on the fly in the test case file using `// phpcs:set ...`.
    To get round that, I'm re-registering the "function groups" every time a `T_STRING` (potential function call) triggers the sniff, but only when the tests are being run.
    While it is possible for end-users to use the `// phpcs:set` syntax, it is little known and is not mentioned anywhere in the documentation as a feature for end-users, so just re-registering the function groups for test runs would seem sufficient.

Includes tests for situations fixed by this particular commit.
Includes a test using the PHP 8.0+ nullsafe object operator.

Note: the `PrintingFunctionsTrait::is_printing_function()` has now become unused and _could_ be removed.
For consistency with other traits/helper classes, I'm electing to leave it be (for now) though.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 69 ++++++++++++++-----
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 11 +++
 2 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 1bdcbc386b..407bfd2ddc 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -13,6 +13,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
@@ -20,7 +21,6 @@
 use WordPressCS\WordPress\Helpers\FormattingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\PrintingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\VariableHelper;
-use WordPressCS\WordPress\Sniff;
 
 /**
  * Verifies that all outputted strings are escaped.
@@ -37,12 +37,15 @@
  *                 echo tags `<?=`.
  * @since   0.13.0 Class name changed: this class is now namespaced.
  * @since   1.0.0  This sniff has been moved from the `XSS` category to the `Security` category.
+ * @since   3.0.0  This class now extends the WordPressCS native
+ *                 `AbstractFunctionRestrictionsSniff` class.
+ *                 The parent `exclude` property is disabled.
  *
  * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customEscapingFunctions
  * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customAutoEscapedFunctions
  * @uses    \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait::$customPrintingFunctions
  */
-class EscapeOutputSniff extends Sniff {
+class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 
 	use EscapingFunctionsTrait;
 	use PrintingFunctionsTrait;
@@ -112,12 +115,37 @@ public function register() {
 		$this->safe_components += Tokens::$booleanOperators;
 		$this->safe_components += Collections::incrementDecrementOperators();
 
+		// Set up the tokens the sniff should listen too.
+		$targets   = parent::register();
+		$targets[] = \T_ECHO;
+		$targets[] = \T_PRINT;
+		$targets[] = \T_EXIT;
+		$targets[] = \T_OPEN_TAG_WITH_ECHO;
+
+		return $targets;
+	}
+
+	/**
+	 * Groups of functions this sniff is looking for.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		// Make sure all array keys are lowercase (could contain user provided function names).
+		$printing_functions = array_change_key_case( $this->get_printing_functions(), \CASE_LOWER );
+
+		// Remove the unsafe printing functions to prevent duplicate notices.
+		$printing_functions = array_diff_key( $printing_functions, $this->unsafePrintingFunctions );
+
 		return array(
-			\T_ECHO,
-			\T_PRINT,
-			\T_EXIT,
-			\T_STRING,
-			\T_OPEN_TAG_WITH_ECHO,
+			'unsafe_printing_functions' => array(
+				'functions' => array_keys( $this->unsafePrintingFunctions ),
+			),
+			'printing_functions' => array(
+				'functions' => array_keys( $printing_functions ),
+			),
 		);
 	}
 
@@ -132,10 +160,17 @@ public function register() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
+		// Prevent exclusion of any of the function groups.
+		$this->exclude = array();
 
-		// If function, not T_ECHO nor T_PRINT.
+		// Let the abstract parent class handle the initial function call check.
 		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
-			return $this->process_tstring_token( $stackPtr );
+			// In the tests, custom printing functions may be added/removed on the fly.
+			if ( defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
+				$this->setup_groups( 'functions' );
+			}
+
+			return parent::process_token( $stackPtr );
 		}
 
 		// Find the opening parenthesis (if present; T_ECHO might not have it).
@@ -166,17 +201,20 @@ public function process_token( $stackPtr ) {
 	}
 
 	/**
-	 * Process a function call token.
+	 * Process a matched function call token.
 	 *
 	 * @since 3.0.0 Split off from the process_token() method.
 	 *
-	 * @param int $stackPtr The position of the current token in the stack.
+	 * @param int    $stackPtr        The position of the current token in the stack.
+	 * @param string $group_name      The name of the group which was matched.
+	 * @param string $matched_content The token content (function name) which was matched
+	 *                                in lowercase.
 	 *
 	 * @return int|void Integer stack pointer to skip forward or void to continue
 	 *                  normal file processing.
 	 */
-	public function process_tstring_token( $stackPtr ) {
-		// Find the opening parenthesis.
+	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
+		// Make sure we only deal with actual function calls, not function import use statements.
 		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 		if ( false === $open_paren
 			|| \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
@@ -188,11 +226,6 @@ public function process_tstring_token( $stackPtr ) {
 
 		$function = $this->tokens[ $stackPtr ]['content'];
 
-		// Skip if it is a function but is not one of the printing functions.
-		if ( ! $this->is_printing_function( $this->tokens[ $stackPtr ]['content'] ) ) {
-			return;
-		}
-
 		$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
 
 		// These functions only need to have the first argument escaped.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 5e8ac7420b..77567a9f65 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -351,3 +351,14 @@ echo esc_html( $var ?? 'default' ); // OK.
 $a = _ex; // OK, constant, not function call.
 $a = $obj->wp_dropdown_pages; // OK, property access, not function call.
 use function wp_dropdown_pages; // OK, import use statement, not function call.
+
+// Make sure the sniff does not get confused over methods/namespaced functions etc vs global function calls.
+$obj->_deprecated_file( $file, '1.3.0' ); // OK.
+$obj?->_deprecated_file( $file, '1.3.0' ); // OK.
+MyClass::_deprecated_file( $file, '1.3.0' ); // OK.
+My\NS\_ex( $some_nasty_var, 'context' ); // OK.
+class IgnoreFunctionDeclarations {
+	function wp_die( $foo ) {} // OK.
+	function &trigger_error( $foo ) {} // OK.
+}
+$obj = new User_Error( $foo ); // OK.

From ecbc52f1d2284600c564feaec4abd258bf223bbc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 24 Jul 2023 20:51:15 +0200
Subject: [PATCH 709/822] Security/EscapeOutput: bug fix - function names are
 case-insensitive

While the initial function name check was previously already made case-insensitive in 2273 (commit 53309ac1f26d945268534c8f7f8ccb6080147a13) and remained case-insensitive with the switch to the `AbstractFunctionRestrictionsSniff` base class, the _special casing_ function name checks were **not** done in a case-insensitive manner.

This could lead to false positives as well as false negatives.

Fixed now.

Includes tests proving the bug.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 10 ++++------
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc |  5 +++++
 WordPress/Tests/Security/EscapeOutputUnitTest.php   |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 407bfd2ddc..8ce5250077 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -224,12 +224,10 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			return;
 		}
 
-		$function = $this->tokens[ $stackPtr ]['content'];
-
 		$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
 
 		// These functions only need to have the first argument escaped.
-		if ( \in_array( $function, array( 'trigger_error', 'user_error' ), true ) ) {
+		if ( \in_array( $matched_content, array( 'trigger_error', 'user_error' ), true ) ) {
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 			if ( false === $first_param ) {
 				// First parameter doesn't exist. Nothing to do.
@@ -244,7 +242,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		 * If the first param to `_deprecated_file()` follows the typical `basename( __FILE__ )`
 		 * pattern, it doesn't need to be escaped.
 		 */
-		if ( '_deprecated_file' === $function ) {
+		if ( '_deprecated_file' === $matched_content ) {
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 			if ( false === $first_param ) {
 				// First parameter doesn't exist. Nothing to do.
@@ -258,12 +256,12 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			unset( $first_param );
 		}
 
-		if ( isset( $this->unsafePrintingFunctions[ $function ] ) ) {
+		if ( 'unsafe_printing_functions' === $group_name ) {
 			$error = $this->phpcsFile->addError(
 				"All output should be run through an escaping function (like %s), found '%s'.",
 				$stackPtr,
 				'UnsafePrintingFunction',
-				array( $this->unsafePrintingFunctions[ $function ], $function )
+				array( $this->unsafePrintingFunctions[ $matched_content ], $matched_content )
 			);
 
 			// If the error was reported, don't bother checking the function's arguments.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 77567a9f65..6952031b03 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -362,3 +362,8 @@ class IgnoreFunctionDeclarations {
 	function &trigger_error( $foo ) {} // OK.
 }
 $obj = new User_Error( $foo ); // OK.
+
+// Make sure special casing of select functions is handled case-insensitively.
+Trigger_ERROR( 'This is fine', $second_param_should_be_ignored ); // OK.
+_Deprecated_File( basename( __FILE__ ), '1.3.0' ); // OK.
+_EX( 'all_params_should_be_ignored_if_function_is_reported_as_unsafe', 'another_param' ); // Bad x 1 for unsafe function.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 05fa16a4e2..b17deee01a 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -106,6 +106,7 @@ public function getErrorList( $testFile = '' ) {
 					315 => 1,
 					319 => 1,
 					347 => 1,
+					369 => 1,
 				);
 
 			default:

From 530de77079a59c04257c3cf9cff4c848cea7c15e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 02:15:09 +0200
Subject: [PATCH 710/822] Security/EscapeOutput: prevent false positive due to
 comments in param

The `'raw'` key in the parameter arrays returned from the `PassedParameters` class contains - as per the name - the _raw_ contents of the parameter.

Since PHPCSUtils 1.0.0-alpha4, the return array also contain a `'clean'` index, which contains the contents of the parameter cleaned of comments.

By switching to using that key, a potential false positive gets fixed.

Includes unit test demonstrating the issue and safeguarding the fix.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 4 ++--
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 8ce5250077..fe126aff98 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -249,8 +249,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				return;
 			}
 
-			// Quick check. This disregards comments.
-			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['raw'] ) === 1 ) {
+			// Check for a particular code pattern which can safely be ignored.
+			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['clean'] ) === 1 ) {
 				$stackPtr = ( $first_param['end'] + 2 );
 			}
 			unset( $first_param );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 6952031b03..ad67ebb223 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -367,3 +367,10 @@ $obj = new User_Error( $foo ); // OK.
 Trigger_ERROR( 'This is fine', $second_param_should_be_ignored ); // OK.
 _Deprecated_File( basename( __FILE__ ), '1.3.0' ); // OK.
 _EX( 'all_params_should_be_ignored_if_function_is_reported_as_unsafe', 'another_param' ); // Bad x 1 for unsafe function.
+
+// Allow for comments in the $file parameter.
+_deprecated_file(
+	/* comment */
+	basename( __FILE__ ),
+	'1.3.0'
+); // Ok.

From 616c2c9bcd9b0ef1a52d2a449175dbf6e3e5d8de Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:45:38 +0200
Subject: [PATCH 711/822] Security/EscapeOutput: code readability improvements
 [1]

Minor tweaks to the code in the `process_token()` method for improved comprehensibility of the code.

Rename some variables, add some documentation, split up long conditions.

Includes preventing the code from changing the `$stackPtr` as that is just really confusing.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index fe126aff98..98c6c82346 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -173,31 +173,31 @@ public function process_token( $stackPtr ) {
 			return parent::process_token( $stackPtr );
 		}
 
-		// Find the opening parenthesis (if present; T_ECHO might not have it).
-		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-
+		// Handle the other tokens we're sniffing for.
+		$start   = ( $stackPtr + 1 );
+		$end     = $start;
 		$ternary = false;
 
-		$end_of_statement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
-		$last_token       = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end_of_statement - 1 ), null, true );
+		// Find a potential opening parenthesis (if present).
+		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		$end        = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
+		$last_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
 
 		// Check for the ternary operator. We only need to do this here if this
 		// echo is lacking parenthesis. Otherwise it will be handled below.
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code'] || \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code'] ) {
-
-			$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end_of_statement );
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
+			|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code']
+		) {
+			$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end );
 
 			// If there is a ternary skip over the part before the ?. However, if
 			// the ternary is within parentheses, it will be handled in the loop.
 			if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
-				$stackPtr = $ternary;
+				$start = ( $ternary + 1 );
 			}
 		}
 
-		// Ignore the function itself.
-		++$stackPtr;
-
-		return $this->check_code_is_escaped( $stackPtr, $end_of_statement, $ternary );
+		return $this->check_code_is_escaped( $start, $end, $ternary );
 	}
 
 	/**

From 511787d6fe9f03319ac76f50300f107c71cf28af Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:52:10 +0200
Subject: [PATCH 712/822] Security/EscapeOutput: bug fix - only examine
 exit/die with parentheses

`exit`/`die` are language constructs and can be used as part of an expression.

Additionally, an `exit`/`die` can be stand-alone or can pass a status code/message. If a status code/message is passed, we want it to be escaped for output, but a status code/message can only be passed within parentheses.

As things were, the sniff would not ignore `exit`/`die` statements without status and when used within an expression, would walk the tokens after the `exit`/`die`, leading to false positives.

Fixed now by using custom logic for `T_EXIT` tokens.
Includes parse error/live coding protection, where the sniff should stay silent.

As the method will now use a `switch` control structure, move the special casing for `T_STRING` also into the `switch`.

Includes tests for situations fixed by this particular commit.

:point_right: This commit will be easier to review while ignoring whitespace changes.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 76 ++++++++++++-------
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.4.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.5.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.php   |  1 +
 5 files changed, 63 insertions(+), 29 deletions(-)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.4.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.5.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 98c6c82346..a10a9edbd8 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -160,41 +160,59 @@ public function getGroups() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
-		// Prevent exclusion of any of the function groups.
-		$this->exclude = array();
-
-		// Let the abstract parent class handle the initial function call check.
-		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
-			// In the tests, custom printing functions may be added/removed on the fly.
-			if ( defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
-				$this->setup_groups( 'functions' );
-			}
-
-			return parent::process_token( $stackPtr );
-		}
-
-		// Handle the other tokens we're sniffing for.
 		$start   = ( $stackPtr + 1 );
 		$end     = $start;
 		$ternary = false;
 
-		// Find a potential opening parenthesis (if present).
-		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-		$end        = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
-		$last_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
+		switch ( $this->tokens[ $stackPtr ]['code'] ) {
+			case \T_STRING:
+				// Prevent exclusion of any of the function groups.
+				$this->exclude = array();
 
-		// Check for the ternary operator. We only need to do this here if this
-		// echo is lacking parenthesis. Otherwise it will be handled below.
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
-			|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code']
-		) {
-			$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end );
+				// In the tests, custom printing functions may be added/removed on the fly.
+				if ( defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
+					$this->setup_groups( 'functions' );
+				}
 
-			// If there is a ternary skip over the part before the ?. However, if
-			// the ternary is within parentheses, it will be handled in the loop.
-			if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
-				$start = ( $ternary + 1 );
-			}
+				// Let the abstract parent class handle the initial function call check.
+				return parent::process_token( $stackPtr );
+
+			case \T_EXIT:
+				$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+				if ( false === $next_non_empty
+					|| \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
+					|| isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] ) === false
+				) {
+					// Live coding/parse error or an exit/die which doesn't pass a status code. Ignore.
+					return;
+				}
+
+				// $end is not examined, so make sure the parentheses are balanced.
+				$start = $next_non_empty;
+				$end   = ( $this->tokens[ $next_non_empty ]['parenthesis_closer'] + 1 );
+				break;
+
+			default:
+				// Find a potential opening parenthesis (if present).
+				$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+				$end        = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
+				$last_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
+
+				// Check for the ternary operator. We only need to do this here if this
+				// echo is lacking parenthesis. Otherwise it will be handled below.
+				if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
+					|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code']
+				) {
+					$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end );
+
+					// If there is a ternary skip over the part before the ?. However, if
+					// the ternary is within parentheses, it will be handled in the loop.
+					if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
+						$start = ( $ternary + 1 );
+					}
+				}
+
+				break;
 		}
 
 		return $this->check_code_is_escaped( $start, $end, $ternary );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index ad67ebb223..8575c1ef57 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -374,3 +374,8 @@ _deprecated_file(
 	basename( __FILE__ ),
 	'1.3.0'
 ); // Ok.
+
+// Exit/die should only be examined when there are parentheses.
+$var = (true || exit ) && empty( $bar ) ? $drink_alone : $drink_together; // OK, exit is not passing status.
+$var = (true or die ) and empty( $bar ) ? $drink_alone : $drink_together; // OK, die is not passing status.
+$var = exit( $var ? $ok : $error ); // Bad x 2.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.4.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.4.inc
new file mode 100644
index 0000000000..99df74f22b
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.4.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+exit
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.5.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.5.inc
new file mode 100644
index 0000000000..bf3d234bca
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.5.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+die(
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index b17deee01a..4c1e54ed54 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -107,6 +107,7 @@ public function getErrorList( $testFile = '' ) {
 					319 => 1,
 					347 => 1,
 					369 => 1,
+					381 => 2,
 				);
 
 			default:

From 793fc7ec33c9b882379ea78fea6478b21a2d736d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 02:17:13 +0200
Subject: [PATCH 713/822] Security/EscapeOutput: bug fix - improve start/end
 determination for print statements

`print` is a language construct and can be used as part of an expression.

The sniff did not take this into account correctly. This would lead to the sniff walking too far and examining code which is not part of the `print` statement. This would lead to both false positives as well as false negatives.

This commit improves that situation, but doesn't completely fix it.

First off, the sniff now uses the `BCFile::findEndOfStatement()` method to more accurately retrieve the end token for the expression. This should improve the handling of the most common cases.
This part includes live coding/parse error protection for unfinished `print` statements at the end of a file.

However, the `[BC]File::findEndOfStatement()` method does not take ternaries into account when determining the end of the expression.

So, secondly, code has been added to special case `print` statements in the "then" part of a ternary and determine the end of such an expression correctly.

Includes tests for situations fixed by this particular commit.

Additional notes:
* I can still come up with more (exotic) test cases with `print` in ternaries which would still not be handled correctly.
    I'm leaving those as "future scope".
    Example:
    ```php
    ( $fop === 1 ) ? true && print $foo : print $bar; // The first print will now examine everything to the end of the statement, not to the end of the expression, which means that `$bar` will not be flagged as the sniff bow out before it reached $bar.
    ```

Fixes 2209
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 67 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 15 +++++
 .../Security/EscapeOutputUnitTest.10.inc      |  4 ++
 .../Tests/Security/EscapeOutputUnitTest.6.inc |  4 ++
 .../Tests/Security/EscapeOutputUnitTest.7.inc |  4 ++
 .../Tests/Security/EscapeOutputUnitTest.8.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.9.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.php   |  9 +++
 8 files changed, 113 insertions(+)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.10.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.6.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.7.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.8.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.9.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index a10a9edbd8..39216dacdf 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -10,6 +10,7 @@
 namespace WordPressCS\WordPress\Sniffs\Security;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
@@ -192,6 +193,72 @@ public function process_token( $stackPtr ) {
 				$end   = ( $this->tokens[ $next_non_empty ]['parenthesis_closer'] + 1 );
 				break;
 
+			case \T_PRINT:
+				$end = BCFile::findEndOfStatement( $this->phpcsFile, $stackPtr );
+				if ( \T_COMMA !== $this->tokens[ $end ]['code']
+					&& \T_SEMICOLON !== $this->tokens[ $end ]['code']
+					&& \T_COLON !== $this->tokens[ $end ]['code']
+					&& \T_DOUBLE_ARROW !== $this->tokens[ $end ]['code']
+					&& isset( $this->tokens[ ( $end + 1 ) ] )
+				) {
+					/*
+					 * FindEndOfStatement includes a comma/(semi-)colon/double arrow if that's the end of
+					 * the statement, but for everything else, it returns the last non-empty token _before_
+					 * the end, which would mean the last non-empty token in the statement would not
+					 * be examined. Let's fix that.
+					 */
+					++$end;
+				}
+
+				// Note: no need to check for close tag as close tag will have the token before the tag as the $end.
+				if ( $end >= ( $this->phpcsFile->numTokens - 1 ) ) {
+					$last_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, $end, null, true );
+					if ( \T_SEMICOLON !== $this->tokens[ $last_non_empty ]['code'] ) {
+						// Live coding/parse error at end of file. Ignore.
+						return;
+					}
+				}
+
+				// Special case for a print statement *within* a ternary, where we need to find the "inline else" as the end token.
+				$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+				if ( \T_INLINE_THEN === $this->tokens[ $prev_non_empty ]['code'] ) {
+					$target_nesting_level = 0;
+					if ( empty( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) === false ) {
+						$target_nesting_level = \count( $this->tokens[ $stackPtr ]['nested_parenthesis'] );
+					}
+
+					$inline_else = false;
+					for ( $i = ( $stackPtr + 1 ); $i < $end; $i++ ) {
+						if ( \T_INLINE_ELSE !== $this->tokens[ $i ]['code'] ) {
+							continue;
+						}
+
+						if ( empty( $this->tokens[ $i ]['nested_parenthesis'] )
+							&& 0 === $target_nesting_level
+						) {
+							$inline_else = $i;
+							break;
+						}
+
+						if ( empty( $this->tokens[ $i ]['nested_parenthesis'] ) === false
+							&& \count( $this->tokens[ $i ]['nested_parenthesis'] ) === $target_nesting_level
+						) {
+							$inline_else = $i;
+							break;
+						}
+					}
+
+					if ( false === $inline_else ) {
+						// Live coding/parse error. Bow out.
+						return;
+					}
+
+					$end = $inline_else;
+				}
+
+				break;
+
+			// Echo, open tag with echo.
 			default:
 				// Find a potential opening parenthesis (if present).
 				$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 8575c1ef57..f9ee2d8528 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -379,3 +379,18 @@ _deprecated_file(
 $var = (true || exit ) && empty( $bar ) ? $drink_alone : $drink_together; // OK, exit is not passing status.
 $var = (true or die ) and empty( $bar ) ? $drink_alone : $drink_together; // OK, die is not passing status.
 $var = exit( $var ? $ok : $error ); // Bad x 2.
+
+// Print can be used in expressions, so end of statement can be all sorts.
+if ( print "hello" ) // OK.
+    $var = 'foo'; // OK, not part of the print.
+
+if ( print("hello") && $var ) // Bad x1, `$var`.
+    $var = 'foo'; // OK, not part of the print.
+
+// Bug #2209.
+( 'auto' === $key ) ? print ' disabled ' : print ' enabled '; // OK.
+( $fop === 1 ) ? print $foo : print $bar; // Bad x 2, each print statement should be examined separately.
+( 1 === $foo ) ? print ( $foo ? 'ten' : $twenty ) : print $bar; // Bad x 2, $twenty & $bar.
+
+// Ensure nesting levels are handled correctly.
+( ( $fop === 1 ) ? print ( $var ? 10 : 20 ) : print 100 ); // OK.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.10.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.10.inc
new file mode 100644
index 0000000000..149338a445
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.10.inc
@@ -0,0 +1,4 @@
+<?php
+
+// Live coding/parse error (missing second "else"). The sniff should ignore this.
+if ( ( $fop === 1 ) ? print ( $var ? 10 : 20 ) ) {}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.6.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.6.inc
new file mode 100644
index 0000000000..20e2da2fcd
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.6.inc
@@ -0,0 +1,4 @@
+<?php
+
+// Valid print statement at end of file. This should be examined.
+print $foo; // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.7.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.7.inc
new file mode 100644
index 0000000000..e3e87f96c0
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.7.inc
@@ -0,0 +1,4 @@
+<?php
+
+// Valid print statement at end of file. This should be examined (and flagged).
+print $foo ?>
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.8.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.8.inc
new file mode 100644
index 0000000000..05a328ec13
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.8.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+print $foo
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.9.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.9.inc
new file mode 100644
index 0000000000..5d20a32e22
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.9.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+( 1 === 1 ) ? print $foo
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 4c1e54ed54..5397098aca 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -108,6 +108,15 @@ public function getErrorList( $testFile = '' ) {
 					347 => 1,
 					369 => 1,
 					381 => 2,
+					387 => 1,
+					392 => 2,
+					393 => 2,
+				);
+
+			case 'EscapeOutputUnitTest.6.inc':
+			case 'EscapeOutputUnitTest.7.inc':
+				return array(
+					4 => 1,
 				);
 
 			default:

From f882b53cdcdae880ceb6deefa55f645d48a6fffe Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:53:39 +0200
Subject: [PATCH 714/822] Security/EscapeOutput: efficiency tweak for parse
 errors in echo statements

Bow out earlier in case of a parse error for echo statements and short open echo tag statements.

While the sniff would not throw false positives/negatives as the `for()` loop, which does the token walking in the `check_code_is_escaped()` method, would not get started, as `$i < false` as stop condition would always return `true`, we can (and should) bow out earlier for parse errors/live coding.

Fixed now.

Includes switching the order of the token searches for maximum efficiency.

Includes tests safeguarding the tweak.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php      | 7 ++++++-
 WordPress/Tests/Security/EscapeOutputUnitTest.11.inc | 5 +++++
 WordPress/Tests/Security/EscapeOutputUnitTest.12.inc | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.11.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.12.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 39216dacdf..5bca3cc98a 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -260,9 +260,14 @@ public function process_token( $stackPtr ) {
 
 			// Echo, open tag with echo.
 			default:
+				$end = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
+				if ( false === $end ) {
+					// Live coding/parse error. Bow out.
+					return;
+				}
+
 				// Find a potential opening parenthesis (if present).
 				$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-				$end        = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), $stackPtr );
 				$last_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
 
 				// Check for the ternary operator. We only need to do this here if this
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.11.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.11.inc
new file mode 100644
index 0000000000..23279dcf93
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.11.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+echo $var,
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.12.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.12.inc
new file mode 100644
index 0000000000..48eaa1d0c8
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.12.inc
@@ -0,0 +1,5 @@
+<?php
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+?>
+<?= $var

From 2d76c1d7f23c2ff69f8157115b9321bd5a86c667 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 02:17:13 +0200
Subject: [PATCH 715/822] Security/EscapeOutput: fix up after refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The refactor in the previous few commits "broke" the preliminary check for a non-parenthesized ternary ìn a `print` statement.

There were no tests covering this.

I'm fixing this now by moving that particular code block out of the `switch` and executing it for both `print`, `echo` and `<?=` (though not for `exit`/`die` statements as those will always have parentheses, otherwise there will be nothing to check).

I'm also extracting the actual logic for finding the ternary to a separate method, as this logic will be expanded in follow-up commits.

Includes adding tests safeguarding the logic.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 56 +++++++++++++------
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.php   |  2 +
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 5bca3cc98a..cd90d09245 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -266,25 +266,27 @@ public function process_token( $stackPtr ) {
 					return;
 				}
 
-				// Find a potential opening parenthesis (if present).
-				$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-				$last_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
-
-				// Check for the ternary operator. We only need to do this here if this
-				// echo is lacking parenthesis. Otherwise it will be handled below.
-				if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
-					|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_token ]['code']
-				) {
-					$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $stackPtr, $end );
+				break;
+		}
 
-					// If there is a ternary skip over the part before the ?. However, if
-					// the ternary is within parentheses, it will be handled in the loop.
-					if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
-						$start = ( $ternary + 1 );
-					}
+		if ( \T_EXIT !== $this->tokens[ $stackPtr ]['code'] ) {
+			/*
+			 * Check for a ternary operator.
+			 * We only need to do this here if this echo/print statement is lacking parenthesis.
+			 * Otherwise it will be handled in the `check_code_is_escaped()` method.
+			 */
+			$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+			$last_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
+
+			if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
+				|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_non_empty ]['code']
+			) {
+				// If there is a ternary skip over the part before the ?.
+				$ternary = $this->find_ternary( $start, $end );
+				if ( false !== $ternary ) {
+					$start = ( $ternary + 1 );
 				}
-
-				break;
+			}
 		}
 
 		return $this->check_code_is_escaped( $start, $end, $ternary );
@@ -577,4 +579,24 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 
 		return $end;
 	}
+
+	/**
+	 * Check whether there is a ternary token in an arbitrary set of tokens.
+	 *
+	 * @since 3.0.0 Split off from the process_token() method.
+	 *
+	 * @param int $start The position to start checking from.
+	 * @param int $end   The position to stop the check at.
+	 *
+	 * @return int|false Stack pointer to the ternary or FALSE if no ternary was found.
+	 */
+	private function find_ternary( $start, $end ) {
+		$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $start, $end );
+
+		if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
+			return $ternary;
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index f9ee2d8528..c8e884728b 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -394,3 +394,8 @@ if ( print("hello") && $var ) // Bad x1, `$var`.
 
 // Ensure nesting levels are handled correctly.
 ( ( $fop === 1 ) ? print ( $var ? 10 : 20 ) : print 100 ); // OK.
+
+// Ensure print statements with ternaries and without wrapping parentheses are handled correctly.
+( 1 === 1 ) ? print ( $foo ? 'ten' : 'twenty' ) . $baz : print $bar; // Bad x 2, $baz and $bar.
+$var = true && print $foo ? $bar : $baz; // Bad x 2, `$bar` and `$baz` should be flagged, not $foo.
+print $foo ? 'ten' : 'twenty'; // OK.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5397098aca..33ece492b3 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -111,6 +111,8 @@ public function getErrorList( $testFile = '' ) {
 					387 => 1,
 					392 => 2,
 					393 => 2,
+					399 => 2,
+					400 => 2,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 0167eb71f08e835d41a4b791a694de2849732115 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:01:31 +0200
Subject: [PATCH 716/822] Security/EscapeOutput: bug fix - allow for nested
 statements with ternaries

As things were, the check for statements with ternaries without wrapping parentheses, did not take into account that the whole statement could be nested within parentheses if the statement is a `print`.

This commit updates the code block handling the skipping of the condition for a ternary without wrapping parentheses to allow for the statement being _nested in_ parentheses.

Includes adding tests safeguarding the fix.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 20 +++++++++++++++++--
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  5 +++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index cd90d09245..079b8b1988 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -581,7 +581,7 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 	}
 
 	/**
-	 * Check whether there is a ternary token in an arbitrary set of tokens.
+	 * Check whether there is a ternary token at the right nesting level in an arbitrary set of tokens.
 	 *
 	 * @since 3.0.0 Split off from the process_token() method.
 	 *
@@ -592,8 +592,24 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 	 */
 	private function find_ternary( $start, $end ) {
 		$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $start, $end );
+		if ( false === $ternary ) {
+			return false;
+		}
+
+		$target_nesting_level = 0;
+		if ( empty( $this->tokens[ $start ]['nested_parenthesis'] ) === false ) {
+			$target_nesting_level = \count( $this->tokens[ $start ]['nested_parenthesis'] );
+		}
+
+		if ( empty( $this->tokens[ $ternary ]['nested_parenthesis'] )
+			&& 0 === $target_nesting_level
+		) {
+			return $ternary;
+		}
 
-		if ( false !== $ternary && empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) ) {
+		if ( empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) === false
+			&& \count( $this->tokens[ $ternary ]['nested_parenthesis'] ) === $target_nesting_level
+		) {
 			return $ternary;
 		}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index c8e884728b..cbe0dac934 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -399,3 +399,8 @@ if ( print("hello") && $var ) // Bad x1, `$var`.
 ( 1 === 1 ) ? print ( $foo ? 'ten' : 'twenty' ) . $baz : print $bar; // Bad x 2, $baz and $bar.
 $var = true && print $foo ? $bar : $baz; // Bad x 2, `$bar` and `$baz` should be flagged, not $foo.
 print $foo ? 'ten' : 'twenty'; // OK.
+
+// Ensure print statements with ternaries, without wrapping parentheses, but nested within parentheses are also handled correctly.
+if ( print $foo ? 'ten' : 'twenty' ) {} // OK.
+if ( print $foo ? $bar : $baz ) {} // Bad x 2, `$bar` and `$baz` should be flagged, not $foo.
+$var = ( ( $fop === 1 ) ? ( print $foo ? 'ten' : $twenty ) : print $bar ); // Bad x 2, $twenty & $bar.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 33ece492b3..0e4c6de97a 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -113,6 +113,8 @@ public function getErrorList( $testFile = '' ) {
 					393 => 2,
 					399 => 2,
 					400 => 2,
+					405 => 2,
+					406 => 2,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 6bcb6b0f1dc73b97ef5a5f48b9b7bee54b0d1555 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 03:25:12 +0200
Subject: [PATCH 717/822] Security/EscapeOutput: bug fix - [improved] allow for
 nested statements with ternaries

While the previous commit already prevented a ternary being regarded as the "applicable" ternary when it wasn't at the right nesting level, that still disregarded the fact that ternaries can be chained and that an "applicable" ternary token could be found _after_ a ternary which should be disregarded.

This led to false positives.

This commit changes the logic in the `find_ternary()` method to properly search the token group for an applicable ternary token, which fixes that issue.

Includes tests proving the bug and safeguarding the fix.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 45 ++++++++++++-------
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  6 +++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 079b8b1988..e0457f5691 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -591,26 +591,37 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 	 * @return int|false Stack pointer to the ternary or FALSE if no ternary was found.
 	 */
 	private function find_ternary( $start, $end ) {
-		$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $start, $end );
-		if ( false === $ternary ) {
-			return false;
-		}
+		for ( $i = $start; $i < $end; $i++ ) {
+			// Ignore anything within square brackets.
+			if ( isset( $this->tokens[ $i ]['bracket_opener'], $this->tokens[ $i ]['bracket_closer'] )
+				&& $i === $this->tokens[ $i ]['bracket_opener']
+			) {
+				$i = $this->tokens[ $i ]['bracket_closer'];
+				continue;
+			}
 
-		$target_nesting_level = 0;
-		if ( empty( $this->tokens[ $start ]['nested_parenthesis'] ) === false ) {
-			$target_nesting_level = \count( $this->tokens[ $start ]['nested_parenthesis'] );
-		}
+			// Skip past nested arrays, function calls and arbitrary groupings.
+			if ( \T_OPEN_PARENTHESIS === $this->tokens[ $i ]['code']
+				&& isset( $this->tokens[ $i ]['parenthesis_closer'] )
+			) {
+				$i = $this->tokens[ $i ]['parenthesis_closer'];
+				continue;
+			}
 
-		if ( empty( $this->tokens[ $ternary ]['nested_parenthesis'] )
-			&& 0 === $target_nesting_level
-		) {
-			return $ternary;
-		}
+			// Skip past closures, anonymous classes and anything else scope related.
+			if ( isset( $this->tokens[ $i ]['scope_condition'], $this->tokens[ $i ]['scope_closer'] )
+				&& $this->tokens[ $i ]['scope_condition'] === $i
+			) {
+				$i = $this->tokens[ $i ]['scope_closer'];
+				continue;
+			}
 
-		if ( empty( $this->tokens[ $ternary ]['nested_parenthesis'] ) === false
-			&& \count( $this->tokens[ $ternary ]['nested_parenthesis'] ) === $target_nesting_level
-		) {
-			return $ternary;
+			if ( \T_INLINE_THEN !== $this->tokens[ $i ]['code'] ) {
+				continue;
+			}
+
+			// Okay, we found a ternary and it should be at the correct nesting level.
+			return $i;
 		}
 
 		return false;
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index cbe0dac934..30979a783f 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -404,3 +404,9 @@ print $foo ? 'ten' : 'twenty'; // OK.
 if ( print $foo ? 'ten' : 'twenty' ) {} // OK.
 if ( print $foo ? $bar : $baz ) {} // Bad x 2, `$bar` and `$baz` should be flagged, not $foo.
 $var = ( ( $fop === 1 ) ? ( print $foo ? 'ten' : $twenty ) : print $bar ); // Bad x 2, $twenty & $bar.
+
+// Ternary statements can be chained and nested.
+echo ( ! empty( $var ) && ( $var > 10 ? $foo : $bar ) ) ? 'go' : 'stop'; // OK.
+echo isset( $var[ $keyA ? $keyA : $keyB ] ) ? 'go' : 'stop'; // OK.
+echo '' !== implode( '', [ $valueA ? $valueA : $valueB, $valueC ? $valueD : $valueE ] ) ? 'go' : 'stop'; // OK.
+echo '' !== ${true ? $foo : $bar} ? 'go' : 'stop'; // OK.

From a59a60f1d4c8b580d151cc36a883c1455559779b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:46:57 +0200
Subject: [PATCH 718/822] Security/EscapeOutput: bug fix - allow non-matching
 parentheses

As things were, the prelim check for statements with ternaries without wrapping parentheses, did not take into account that there could be a parentheses at the start and at the end of the statement, which didn't belong together.
In that case, the preliminary ternary check should still be executed.

Fixed now.

Includes adding tests safeguarding the fix.

Fixes 677

This also fixes the third case reported in 1507
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 5 +++++
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 7 +++++++
 WordPress/Tests/Security/EscapeOutputUnitTest.php   | 1 +
 3 files changed, 13 insertions(+)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index e0457f5691..e4cc38e407 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -280,6 +280,11 @@ public function process_token( $stackPtr ) {
 
 			if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
 				|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_non_empty ]['code']
+				|| ( \T_OPEN_PARENTHESIS === $this->tokens[ $next_non_empty ]['code']
+					&& \T_CLOSE_PARENTHESIS === $this->tokens[ $last_non_empty ]['code']
+					&& isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] )
+					&& $this->tokens[ $next_non_empty ]['parenthesis_closer'] !== $last_non_empty
+				)
 			) {
 				// If there is a ternary skip over the part before the ?.
 				$ternary = $this->find_ternary( $start, $end );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 30979a783f..2e2882716f 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -410,3 +410,10 @@ echo ( ! empty( $var ) && ( $var > 10 ? $foo : $bar ) ) ? 'go' : 'stop'; // OK.
 echo isset( $var[ $keyA ? $keyA : $keyB ] ) ? 'go' : 'stop'; // OK.
 echo '' !== implode( '', [ $valueA ? $valueA : $valueB, $valueC ? $valueD : $valueE ] ) ? 'go' : 'stop'; // OK.
 echo '' !== ${true ? $foo : $bar} ? 'go' : 'stop'; // OK.
+
+// Bug #677 (and #1507C).
+echo ( ! empty( $my_bc_title ) ) ? wp_kses( $my_bc_title, allowed_tags() ) : (10 + 20); // OK.
+echo ( ! empty( $my_bc_title ) ) ? wp_kses( $my_bc_title, allowed_tags() ) : get_the_title(); // Bad, should flag get_the_title(), not `!`.
+// Without parentheses wrapping the empty(), this was already okay.
+echo ! empty( $my_bc_title ) ? wp_kses( $my_bc_title, allowed_tags() ) : (10 + 20); // OK.
+echo ( $is_mobile ) ? wp_json_encode( 'true' ) : wp_json_encode( 'false' ); // OK.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 0e4c6de97a..5a5639b62a 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -115,6 +115,7 @@ public function getErrorList( $testFile = '' ) {
 					400 => 2,
 					405 => 2,
 					406 => 2,
+					416 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From fd3101ae60dfbd1db1cdaef47148eeacf7229d9d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 20:06:40 +0200
Subject: [PATCH 719/822] Security/EscapeOutput: bug fix - fix ternary finding
 within the loop

As things were, when an open parenthesis was found in the loop, the sniff would attempt to find a relevant ternary operator and if found, skip over the condition.

However, this check did not take nested parentheses into account correctly, which meant that if the complete ternary was wrapped in parentheses, but the condition was _not_ wrapped in parentheses and the "then" or the "else" part _would_ contain parentheses, the ternary was incorrectly disregarded.

Fixed now by switching the logic used within the loop over to use the new `find_ternary()` method, which should handle the determination of whether the ternary is applicable correctly.

Note: it is important for the `$start` token passed to the `find_ternary()` method to be the token _after_ the open parenthesis, otherwise, the method will not look _within_ the parentheses.

Includes adding tests safeguarding the fix.

Fixes 1219
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 12 ++----------
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 10 ++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index e4cc38e407..9accf18d99 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -417,18 +417,10 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 					$in_cast = false;
 
 				} else {
-
 					// Skip over the condition part of a ternary (i.e., to after the ?).
-					$ternary = $this->phpcsFile->findNext( \T_INLINE_THEN, $i, $this->tokens[ $i ]['parenthesis_closer'] );
-
+					$ternary = $this->find_ternary( ( $i + 1 ), $this->tokens[ $i ]['parenthesis_closer'] );
 					if ( false !== $ternary ) {
-
-						$next_paren = $this->phpcsFile->findNext( \T_OPEN_PARENTHESIS, ( $i + 1 ), $this->tokens[ $i ]['parenthesis_closer'] );
-
-						// We only do it if the ternary isn't within a subset of parentheses.
-						if ( false === $next_paren || ( isset( $this->tokens[ $next_paren ]['parenthesis_closer'] ) && $ternary > $this->tokens[ $next_paren ]['parenthesis_closer'] ) ) {
-							$i = $ternary;
-						}
+						$i = $ternary;
 					}
 				}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 2e2882716f..360388cc3a 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -417,3 +417,13 @@ echo ( ! empty( $my_bc_title ) ) ? wp_kses( $my_bc_title, allowed_tags() ) : get
 // Without parentheses wrapping the empty(), this was already okay.
 echo ! empty( $my_bc_title ) ? wp_kses( $my_bc_title, allowed_tags() ) : (10 + 20); // OK.
 echo ( $is_mobile ) ? wp_json_encode( 'true' ) : wp_json_encode( 'false' ); // OK.
+
+// Bug #1219.
+echo ( $webinar->is_too_late_to_register ? '</a>' : '' ); // OK.
+echo $webinar->is_too_late_to_register ? '</a>' : ''; // OK.
+array_walk(
+	$upcoming_webinars,
+	function ( $webinar ) {
+		echo ( $webinar->is_too_late_to_register ? '<a href="' . esc_url( $webinar->url ) . '">' : '' );
+	}
+); // OK.

From e15a50e6d5e1e6e12f01560d9dd102243d09660c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 03:59:47 +0200
Subject: [PATCH 720/822] Security/EscapeOutput: bug fix - false negatives for
 short ternary

While the use of short ternaries is/will be discouraged in WP, this doesn't mean it won't be used in non-WP Core code.

When a short ternary is used, the sniff should **not** ignore the code before the ternary operator, but should check it for being correctly escaped as the value will be used if it is "truthy".

Fixed by changing the `find_ternary()` method to a `find_long_ternary()` method, which disregards short ternaries.

Includes tests proving the bug and safeguarding the fix.

Fixes 1617
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 23 +++++++++++++------
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 10 ++++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  3 +++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 9accf18d99..cfa89e24e5 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Operators;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
@@ -286,8 +287,8 @@ public function process_token( $stackPtr ) {
 					&& $this->tokens[ $next_non_empty ]['parenthesis_closer'] !== $last_non_empty
 				)
 			) {
-				// If there is a ternary skip over the part before the ?.
-				$ternary = $this->find_ternary( $start, $end );
+				// If there is a (long) ternary skip over the part before the ?.
+				$ternary = $this->find_long_ternary( $start, $end );
 				if ( false !== $ternary ) {
 					$start = ( $ternary + 1 );
 				}
@@ -417,8 +418,8 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 					$in_cast = false;
 
 				} else {
-					// Skip over the condition part of a ternary (i.e., to after the ?).
-					$ternary = $this->find_ternary( ( $i + 1 ), $this->tokens[ $i ]['parenthesis_closer'] );
+					// Skip over the condition part of a (long) ternary (i.e., to after the ?).
+					$ternary = $this->find_long_ternary( ( $i + 1 ), $this->tokens[ $i ]['parenthesis_closer'] );
 					if ( false !== $ternary ) {
 						$i = $ternary;
 					}
@@ -585,9 +586,10 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 	 * @param int $start The position to start checking from.
 	 * @param int $end   The position to stop the check at.
 	 *
-	 * @return int|false Stack pointer to the ternary or FALSE if no ternary was found.
+	 * @return int|false Stack pointer to the ternary or FALSE if no ternary was found or
+	 *                   if this is a short ternary.
 	 */
-	private function find_ternary( $start, $end ) {
+	private function find_long_ternary( $start, $end ) {
 		for ( $i = $start; $i < $end; $i++ ) {
 			// Ignore anything within square brackets.
 			if ( isset( $this->tokens[ $i ]['bracket_opener'], $this->tokens[ $i ]['bracket_closer'] )
@@ -617,7 +619,14 @@ private function find_ternary( $start, $end ) {
 				continue;
 			}
 
-			// Okay, we found a ternary and it should be at the correct nesting level.
+			/*
+			 * Okay, we found a ternary and it should be at the correct nesting level.
+			 * If this is a short ternary, it shouldn't be ignored though.
+			 */
+			if ( Operators::isShortTernary( $this->phpcsFile, $i ) === true ) {
+				return false;
+			}
+
 			return $i;
 		}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 360388cc3a..e3dc0ed91e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -427,3 +427,13 @@ array_walk(
 		echo ( $webinar->is_too_late_to_register ? '<a href="' . esc_url( $webinar->url ) . '">' : '' );
 	}
 ); // OK.
+
+// Bug #1617: code before a ternary should not be ignored if a short ternary is used.
+echo $var ?: ''; // Bad, $var needs escaping.
+echo $var ? /*comment*/ : ''; // Bad, $var needs escaping.
+array_walk(
+	$upcoming_webinars,
+	function ( $webinar ) {
+		echo ( $webinar->is_too_late_to_register ? : '' );
+	}
+); // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5a5639b62a..a2a68bc1a1 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -116,6 +116,9 @@ public function getErrorList( $testFile = '' ) {
 					405 => 2,
 					406 => 2,
 					416 => 1,
+					432 => 1,
+					433 => 1,
+					437 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 05df272c6287f0d25094c79582054e167356d466 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:13:58 +0200
Subject: [PATCH 721/822] Security/EscapeOutput: code readability improvements
 [2]

Minor tweaks to the code in the `process_matched_token()` method for improved comprehensibility of the code.

Rename some variables, simplify/split up long conditions.

Includes preventing the code from changing the `$stackPtr` as that is just really confusing.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index cfa89e24e5..3d7d9658dc 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -313,26 +313,28 @@ public function process_token( $stackPtr ) {
 	 */
 	public function process_matched_token( $stackPtr, $group_name, $matched_content ) {
 		// Make sure we only deal with actual function calls, not function import use statements.
-		$open_paren = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-		if ( false === $open_paren
-			|| \T_OPEN_PARENTHESIS !== $this->tokens[ $open_paren ]['code']
-			|| isset( $this->tokens[ $open_paren ]['parenthesis_closer'] ) === false
+		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+		if ( false === $next_non_empty
+			|| \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
+			|| isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] ) === false
 		) {
 			// Live coding, parse error or not a function _call_.
 			return;
 		}
 
-		$end_of_statement = $this->tokens[ $open_paren ]['parenthesis_closer'];
+		$start = ( $next_non_empty + 1 );
+		$end   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
 
-		// These functions only need to have the first argument escaped.
-		if ( \in_array( $matched_content, array( 'trigger_error', 'user_error' ), true ) ) {
+		// These functions only need to have their first argument escaped.
+		if ( 'trigger_error' === $matched_content || 'user_error' === $matched_content ) {
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 			if ( false === $first_param ) {
 				// First parameter doesn't exist. Nothing to do.
 				return;
 			}
 
-			$end_of_statement = ( $first_param['end'] + 1 );
+			$start = $first_param['start'];
+			$end   = ( $first_param['end'] + 1 );
 			unset( $first_param );
 		}
 
@@ -349,7 +351,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 			// Check for a particular code pattern which can safely be ignored.
 			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['clean'] ) === 1 ) {
-				$stackPtr = ( $first_param['end'] + 2 );
+				$start = ( $first_param['end'] + 2 );
 			}
 			unset( $first_param );
 		}
@@ -364,14 +366,11 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 			// If the error was reported, don't bother checking the function's arguments.
 			if ( $error ) {
-				return $end_of_statement;
+				return $end;
 			}
 		}
 
-		// Ignore the function itself.
-		++$stackPtr;
-
-		return $this->check_code_is_escaped( $stackPtr, $end_of_statement );
+		return $this->check_code_is_escaped( $start, $end );
 	}
 
 	/**

From d49715f8603ec1c0c8c7f86b6f39c08a67f08c47 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:29:04 +0200
Subject: [PATCH 722/822] Security/EscapeOutput: efficiency tweak [1]

Bow out earlier.

There is one function call related check which may bow out without checking parameters, so move that check up for efficiency.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 3d7d9658dc..29a9b1320e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -325,6 +325,20 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		$start = ( $next_non_empty + 1 );
 		$end   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
 
+		if ( 'unsafe_printing_functions' === $group_name ) {
+			$error = $this->phpcsFile->addError(
+				"All output should be run through an escaping function (like %s), found '%s'.",
+				$stackPtr,
+				'UnsafePrintingFunction',
+				array( $this->unsafePrintingFunctions[ $matched_content ], $matched_content )
+			);
+
+			// If the error was reported, don't bother checking the function's arguments.
+			if ( $error ) {
+				return $end;
+			}
+		}
+
 		// These functions only need to have their first argument escaped.
 		if ( 'trigger_error' === $matched_content || 'user_error' === $matched_content ) {
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
@@ -356,20 +370,6 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			unset( $first_param );
 		}
 
-		if ( 'unsafe_printing_functions' === $group_name ) {
-			$error = $this->phpcsFile->addError(
-				"All output should be run through an escaping function (like %s), found '%s'.",
-				$stackPtr,
-				'UnsafePrintingFunction',
-				array( $this->unsafePrintingFunctions[ $matched_content ], $matched_content )
-			);
-
-			// If the error was reported, don't bother checking the function's arguments.
-			if ( $error ) {
-				return $end;
-			}
-		}
-
 		return $this->check_code_is_escaped( $start, $end );
 	}
 

From f3bd49b752f804162c113ae86123fa43c4527fb7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:32:31 +0200
Subject: [PATCH 723/822] Security/EscapeOutput: efficiency tweak [2]

If the parameter which needs to be examined doesn't exist, we can skip the complete function call.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 29a9b1320e..52d5e24a63 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -344,7 +344,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
 			if ( false === $first_param ) {
 				// First parameter doesn't exist. Nothing to do.
-				return;
+				return $end;
 			}
 
 			$start = $first_param['start'];

From b6ec4a2ea7ae78836ec49ac0743ce9c6dce7e49e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 01:13:07 +0200
Subject: [PATCH 724/822] Security/EscapeOutput: bug fix - sniff would skip too
 much

If a non-function call `T_STRING` token would be named the same as any of the escaping/formatting/array walking functions the sniff looks for, the sniff would walk to the next parenthesis opener (if found) and skip everything in between.

Fixed now.

Includes a test proving the bug and safeguarding the fix.

Note: the test shows the sniff now throwing two errors, one for the `$var` and one for the `unrelatedFunction()` function call.
The sniff does not throw an error for the (unescaped) constant being used. This may need to be looked into separately.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 7 ++++---
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 2 ++
 WordPress/Tests/Security/EscapeOutputUnitTest.php   | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 52d5e24a63..852bc746e7 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -496,11 +496,12 @@ protected function check_code_is_escaped( $start, $end, $ternary = false ) {
 
 				$ptr                    = $i;
 				$functionName           = $this->tokens[ $i ]['content'];
-				$function_opener        = $this->phpcsFile->findNext( \T_OPEN_PARENTHESIS, ( $i + 1 ), null, false, null, true );
+				$function_opener        = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
 				$is_formatting_function = FormattingFunctionsHelper::is_formatting_function( $functionName );
 
-				if ( false !== $function_opener ) {
-
+				if ( false !== $function_opener
+					&& \T_OPEN_PARENTHESIS === $this->tokens[ $function_opener ]['code']
+				) {
 					if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
 
 						// Get the callback parameter.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index e3dc0ed91e..bdef80e262 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -437,3 +437,5 @@ array_walk(
 		echo ( $webinar->is_too_late_to_register ? : '' );
 	}
 ); // Bad.
+
+echo ESC_HTML . $var . unrelatedFunction( $var ); // Bad x 3.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index a2a68bc1a1..3d2b79b6f8 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -119,6 +119,7 @@ public function getErrorList( $testFile = '' ) {
 					432 => 1,
 					433 => 1,
 					437 => 1,
+					441 => 2,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 2dcd74271fbd4935338cfb5d8d7db5b893fd0f2b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 03:00:06 +0200
Subject: [PATCH 725/822] Security/EscapeOutput: bug fix - sniff did not handle
 function call parameters correctly

As things were, the sniff would examine all parameters from a function call as one long code block.

This would easily lead to false positives (and possibly also false negatives) largely related to the sniff not correctly starting/stopping the watching for each new parameter and getting confused over ternaries (again).

This commit make two closely related changes to fix this.
1. It changes the behaviour of the sniff to examine each function call parameter individually.
2. It  moves the "should a ternary condition at the start of the code snippet be skipped ?" check, which was previously only used for `echo`/`print`/`<?=` statements/expressions, to the `check_code_is_escaped()` method, which means it will now be applied to each individual parameter.

This gives much higher accuracy when examining parameters.

As a side-effect of this change, function calls to printing functions using named parameters will not yield false positives on the parameter label.

Includes tests proving the bug(s) and safeguarding the fix.

Fixes the issue reported in WordPress/WordPress-Coding-Standards 677#issuecomment-470407780
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 81 +++++++++----------
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 13 +++
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 852bc746e7..abd38c8a4c 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -162,9 +162,8 @@ public function getGroups() {
 	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
-		$start   = ( $stackPtr + 1 );
-		$end     = $start;
-		$ternary = false;
+		$start = ( $stackPtr + 1 );
+		$end   = $start;
 
 		switch ( $this->tokens[ $stackPtr ]['code'] ) {
 			case \T_STRING:
@@ -270,32 +269,7 @@ public function process_token( $stackPtr ) {
 				break;
 		}
 
-		if ( \T_EXIT !== $this->tokens[ $stackPtr ]['code'] ) {
-			/*
-			 * Check for a ternary operator.
-			 * We only need to do this here if this echo/print statement is lacking parenthesis.
-			 * Otherwise it will be handled in the `check_code_is_escaped()` method.
-			 */
-			$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
-			$last_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
-
-			if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
-				|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_non_empty ]['code']
-				|| ( \T_OPEN_PARENTHESIS === $this->tokens[ $next_non_empty ]['code']
-					&& \T_CLOSE_PARENTHESIS === $this->tokens[ $last_non_empty ]['code']
-					&& isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] )
-					&& $this->tokens[ $next_non_empty ]['parenthesis_closer'] !== $last_non_empty
-				)
-			) {
-				// If there is a (long) ternary skip over the part before the ?.
-				$ternary = $this->find_long_ternary( $start, $end );
-				if ( false !== $ternary ) {
-					$start = ( $ternary + 1 );
-				}
-			}
-		}
-
-		return $this->check_code_is_escaped( $start, $end, $ternary );
+		return $this->check_code_is_escaped( $start, $end );
 	}
 
 	/**
@@ -322,8 +296,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			return;
 		}
 
-		$start = ( $next_non_empty + 1 );
-		$end   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
+		$end = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
 
 		if ( 'unsafe_printing_functions' === $group_name ) {
 			$error = $this->phpcsFile->addError(
@@ -339,6 +312,8 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 			}
 		}
 
+		$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
+
 		// These functions only need to have their first argument escaped.
 		if ( 'trigger_error' === $matched_content || 'user_error' === $matched_content ) {
 			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
@@ -347,9 +322,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				return $end;
 			}
 
-			$start = $first_param['start'];
-			$end   = ( $first_param['end'] + 1 );
-			unset( $first_param );
+			return $this->check_code_is_escaped( $first_param['start'], ( $first_param['end'] + 1 ) );
 		}
 
 		/*
@@ -365,12 +338,17 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 			// Check for a particular code pattern which can safely be ignored.
 			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['clean'] ) === 1 ) {
-				$start = ( $first_param['end'] + 2 );
+				unset( $params[1] );
 			}
 			unset( $first_param );
 		}
 
-		return $this->check_code_is_escaped( $start, $end );
+		// Examine each parameter individually.
+		foreach ( $params as $param ) {
+			$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+		}
+
+		return $end;
 	}
 
 	/**
@@ -378,14 +356,35 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @since 3.0.0 Split off from the process_token() method.
 	 *
-	 * @param int       $start   The position to start checking from.
-	 * @param int       $end     The position to stop the check at.
-	 * @param int|false $ternary Stack pointer to the `?` inline then token or
-	 *                           FALSE when no non-parenthesized ternary was found.
+	 * @param int $start The position to start checking from.
+	 * @param int $end   The position to stop the check at.
 	 *
 	 * @return int Integer stack pointer to skip forward.
 	 */
-	protected function check_code_is_escaped( $start, $end, $ternary = false ) {
+	protected function check_code_is_escaped( $start, $end ) {
+		/*
+		 * Check for a ternary operator.
+		 * We only need to do this here if this statement is lacking parenthesis.
+		 * Otherwise it will be handled in the below loop.
+		 */
+		$ternary        = false;
+		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $start + 1 ), null, true );
+		$last_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $end - 1 ), null, true );
+
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code']
+			|| \T_CLOSE_PARENTHESIS !== $this->tokens[ $last_non_empty ]['code']
+			|| ( \T_OPEN_PARENTHESIS === $this->tokens[ $next_non_empty ]['code']
+				&& \T_CLOSE_PARENTHESIS === $this->tokens[ $last_non_empty ]['code']
+				&& isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] )
+				&& $this->tokens[ $next_non_empty ]['parenthesis_closer'] !== $last_non_empty
+			)
+		) {
+			// If there is a (long) ternary skip over the part before the ?.
+			$ternary = $this->find_long_ternary( $start, $end );
+			if ( false !== $ternary ) {
+				$start = ( $ternary + 1 );
+			}
+		}
 
 		$in_cast = false;
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index bdef80e262..96d61a1224 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -439,3 +439,16 @@ array_walk(
 ); // Bad.
 
 echo ESC_HTML . $var . unrelatedFunction( $var ); // Bad x 3.
+
+// Bug #677#issuecomment-470407780: Parameters should be examined individually.
+printf(
+	'<li><a href="#%1$s" class="%2$s"%3$s%4$s>%5$s</a></li>',
+	( '' !== $this->link_title ) ? ' title="' . esc_attr( $this->link_title ) . '"' : '',
+	( '' !== $this->link_aria_label ) ? ' aria-label="' . esc_attr( $this->link_aria_label ) . '"' : '',
+); // OK.
+
+// The fix for #677 will also prevent false positives on parameter labels.
+wp_die(
+	title: 'label',
+	message: 'error message',
+);

From 05de946e306ce51602cd6e33f3ab3bf3bf1f115a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 01:27:52 +0200
Subject: [PATCH 726/822] Security/EscapeOutput: add tests for PHP 7.4 numeric
 literals + PHP 8.1 octal literals

No changes needed. Just making sure.
---
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 96d61a1224..81fc3d16fd 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -452,3 +452,7 @@ wp_die(
 	title: 'label',
 	message: 'error message',
 );
+
+// Safeguard support for PHP 7.4+ numeric literals with underscores and PHP 8.1 octal literals
+// (and throw in some other non-decimal numbers as well).
+echo 1_000_000 + 2_0_0 + 0o12 + 0o20_00, 0XAB953C, 6.674_083e+11, 0b1010;

From f108735a62ea9590dfdbac432e1acce9fa422d28 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 01:44:01 +0200
Subject: [PATCH 727/822] Security/EscapeOutput: add support for PHP 8.0+ named
 parameters [1]

1. Adjusted the way the correct parameters are retrieved from a call to `trigger_error()`/`user_error()` to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. The parameter names used are in line with the names as per the PHP 8.0 release.
    PHP itself renamed a lot of parameters in PHP 8.0. As named parameters did not exist before PHP 8.0, the parameter name as per PHP 8.0 (or above) are the only relevant names.

Includes additional unit tests.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php |  8 ++++----
 .../Tests/Security/EscapeOutputUnitTest.1.inc   | 17 +++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.php     |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index abd38c8a4c..5a57d0f683 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -316,13 +316,13 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		// These functions only need to have their first argument escaped.
 		if ( 'trigger_error' === $matched_content || 'user_error' === $matched_content ) {
-			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
-			if ( false === $first_param ) {
-				// First parameter doesn't exist. Nothing to do.
+			$message_param = PassedParameters::getParameterFromStack( $params, 1, 'message' );
+			if ( false === $message_param ) {
+				// Message parameter doesn't exist. Nothing to do.
 				return $end;
 			}
 
-			return $this->check_code_is_escaped( $first_param['start'], ( $first_param['end'] + 1 ) );
+			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ) );
 		}
 
 		/*
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 81fc3d16fd..961dd2bc71 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -456,3 +456,20 @@ wp_die(
 // Safeguard support for PHP 7.4+ numeric literals with underscores and PHP 8.1 octal literals
 // (and throw in some other non-decimal numbers as well).
 echo 1_000_000 + 2_0_0 + 0o12 + 0o20_00, 0XAB953C, 6.674_083e+11, 0b1010;
+
+/*
+ * Safeguard handling of PHP 8.0+ function calls with named parameters for [trigger|user]_error().
+ */
+user_error( error_level: E_USER_NOTICE ); // OK, well not really, required $message parameter missing, but that's not our concern.
+trigger_error(
+	messege: "There was an error: {$message}",
+	error_level: E_USER_NOTICE,
+); // OK, well not really, typo in $message param name, but that's not our concern.
+user_error(
+	error_level: E_USER_WARNING,
+	message: 'There was an error: ' . esc_html( $message ),
+); // OK.
+trigger_error(
+	error_level: E_USER_WARNING,
+	message: "There was an error: {$message}",
+); // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 3d2b79b6f8..ebf0285f8b 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -120,6 +120,7 @@ public function getErrorList( $testFile = '' ) {
 					433 => 1,
 					437 => 1,
 					441 => 2,
+					474 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 4a4858ceef9f58b0d7123fd37bb8417d923a7595 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 01:54:00 +0200
Subject: [PATCH 728/822] Security/EscapeOutput: add support for PHP 8.0+ named
 parameters [2]

1. Adjusted the way the correct parameters are retrieved from a call to `_deprecated_file()` to use the new PHPCSUtils 1.0.0-alpha4 `PassedParameters::getParameterFromStack()` method.
2. Verified the parameter names used are in line with the name as per the WP 6.3 release.
    WP has been renaming parameters and is probably not done yet, but it doesn't look like those changes (so far) made it into changelog entries....
    For the purposes of this exercise, I've taken the _current_ parameter name as the "truth" as support for named parameters hasn't officially been announced yet, so any renames _after_ this moment are the only ones relevant.

Includes additional unit tests.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php  | 16 +++++++---------
 .../Tests/Security/EscapeOutputUnitTest.1.inc    | 12 ++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.php      |  5 +++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 5a57d0f683..312026fb07 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -330,17 +330,15 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		 * pattern, it doesn't need to be escaped.
 		 */
 		if ( '_deprecated_file' === $matched_content ) {
-			$first_param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1 );
-			if ( false === $first_param ) {
-				// First parameter doesn't exist. Nothing to do.
-				return;
-			}
+			$file_param = PassedParameters::getParameterFromStack( $params, 1, 'file' );
 
-			// Check for a particular code pattern which can safely be ignored.
-			if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $first_param['clean'] ) === 1 ) {
-				unset( $params[1] );
+			if ( false !== $file_param ) {
+				// Check for a particular code pattern which can safely be ignored.
+				if ( preg_match( '`^[\\\\]?basename\s*\(\s*__FILE__\s*\)$`', $file_param['clean'] ) === 1 ) {
+					unset( $params[1], $params['file'] ); // Remove the param, whether passed positionally or named.
+				}
 			}
-			unset( $first_param );
+			unset( $file_param );
 		}
 
 		// Examine each parameter individually.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 961dd2bc71..bb12bf544e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -473,3 +473,15 @@ trigger_error(
 	error_level: E_USER_WARNING,
 	message: "There was an error: {$message}",
 ); // Bad.
+
+/*
+ * Safeguard handling of PHP 8.0+ function calls with named parameters for _deprecated_file().
+ */
+_deprecated_file( version: '1.3.0', file: basename( __FILE__ ) ); // Ok.
+_deprecated_file( version: '1.3.0', files: basename( __FILE__ ) ); // Error, well not really, typo in $file param name, but that's not our concern.
+_deprecated_file( version: '1.3.0', replacement: $name ); // Error. $file param missing, but that's not our concern.
+_deprecated_file(
+	replacement: $name,
+	version: $version,
+	file: $file,
+); // Error x 3.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index ebf0285f8b..3b2ceda435 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -121,6 +121,11 @@ public function getErrorList( $testFile = '' ) {
 					437 => 1,
 					441 => 2,
 					474 => 1,
+					481 => 1,
+					482 => 1,
+					484 => 1,
+					485 => 1,
+					486 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From eab1f2b0af4c90b02c7ef3ff91250bf025e088a6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 21:37:35 +0200
Subject: [PATCH 729/822] Security/EscapeOutput: add support for PHP 8.0+ match
 expressions [1]

PHP 8.0 introduced match expressions, which can be used inline, which means they can be used in an output generating statement.

If the match expression is wrapped inside an escaping function, it is already handled correctly.

This commit is the first step in adding additional support for `match` expressions to the sniff and adds logic to disregard a complete match expression if it is preceded by a "safe cast".

Includes tests.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php    | 14 ++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc      | 13 +++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.13.inc     |  5 +++++
 .../Tests/Security/EscapeOutputUnitTest.14.inc     |  6 ++++++
 .../Tests/Security/EscapeOutputUnitTest.15.inc     |  7 +++++++
 5 files changed, 45 insertions(+)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.13.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.14.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.15.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 312026fb07..32715cc92b 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -484,6 +484,20 @@ protected function check_code_is_escaped( $start, $end ) {
 
 			// Allow int/double/bool casted variables.
 			if ( isset( ContextHelper::get_safe_cast_tokens()[ $this->tokens[ $i ]['code'] ] ) ) {
+				/*
+				 * If the next thing is a match expression, skip over it as whatever is
+				 * being returned will be safe casted.
+				 * Do not set `$in_cast` to `true`.
+				 */
+				$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), $end, true );
+				if ( false !== $next_non_empty
+					&& \T_MATCH === $this->tokens[ $next_non_empty ]['code']
+					&& isset( $this->tokens[ $next_non_empty ]['scope_closer'] )
+				) {
+					$i = $this->tokens[ $next_non_empty ]['scope_closer'];
+					continue;
+				}
+
 				$in_cast = true;
 				continue;
 			}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index bb12bf544e..416b84b8f6 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -485,3 +485,16 @@ _deprecated_file(
 	version: $version,
 	file: $file,
 ); // Error x 3.
+
+/*
+ * Safeguard handling of PHP 8.0+ match expression.
+ */
+echo esc_html( match($var) {
+	$a, $b, $c => $fine,
+	default => $value + $other,
+}); // OK.
+
+echo (int) match($var) {
+	$a, $b, $c => $fine,
+	default => $value + $other,
+}; // OK.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.13.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.13.inc
new file mode 100644
index 0000000000..49b820be8c
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.13.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+echo match($var)
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.14.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.14.inc
new file mode 100644
index 0000000000..8823b6c511
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.14.inc
@@ -0,0 +1,6 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+echo match($var) {
+	$a, $b, $c => $fine,
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.15.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.15.inc
new file mode 100644
index 0000000000..e7e7706efc
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.15.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+echo match($var) {
+	$a,
+};

From 3987f6d40053666d7c34880d3e24418b221a259d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 26 Jul 2023 21:37:35 +0200
Subject: [PATCH 730/822] Security/EscapeOutput: add support for PHP 8.0+ match
 expressions [2]

PHP 8.0 introduced match expressions, which can be used inline, which means they can be used in an output generating statement.

This second commit adds logic to correctly check _inside_ a match expression.

In a `match`, there can be multiple matching conditions before the double arrow and one statement to be returned after the double arrow.
So basically, we should ignore everything _before_ the double arrow as it is effectively a comparison.
And we should verify that everything after the double arrow - up to the first comma at the same "level" as the arrow - is escaped correctly.

Now as the conditions, when there is more than one, are also comma-separated, the parsing of a `match` expression is non-trivial.

With this in mind, I'm introducing a helper method to do the parsing. This helper method will pass each individually identified "return value" part to the `check_code_is_escaped()` method for stand-alone analysis.

Once the method is finished analyzing the `match` expression, it will hand back off to the original call to `check_code_is_escaped()` and continue analyzing the code after the `match` expression.

Note: I'm considering adding a utility method to PHPCSUtils for the parsing of `match` expressions. If and when that method is available, we should be able to simplify the code I've now added to the sniff.

Includes tests.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 94 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 34 +++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  7 ++
 3 files changed, 135 insertions(+)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 32715cc92b..370f678a6e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -424,6 +424,18 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
+			// Handle PHP 8.0+ match expressions.
+			if ( \T_MATCH === $this->tokens[ $i ]['code'] ) {
+				$match_valid = $this->walk_match_expression( $i );
+				if ( false === $match_valid ) {
+					// Live coding or parse error. Shouldn't be possible as PHP[CS] will tokenize the keyword as `T_STRING` in that case.
+					break; // @codeCoverageIgnore
+				}
+
+				$i = $match_valid;
+				continue;
+			}
+
 			// Handle arrays for those functions that accept them.
 			if ( \T_ARRAY === $this->tokens[ $i ]['code'] ) {
 				++$i; // Skip the opening parenthesis.
@@ -643,4 +655,86 @@ private function find_long_ternary( $start, $end ) {
 
 		return false;
 	}
+
+	/**
+	 * Examine a match expression and only check for escaping in the "returned" parts of the match expression.
+	 *
+	 * {@internal PHPCSUtils will likely contain a utility for parsing match expressions in the future.
+	 *            Ref: https://github.com/PHPCSStandards/PHPCSUtils/issues/497}
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param int $stackPtr Pointer to a T_MATCH token.
+	 *
+	 * @return int|false Stack pointer to skip to or FALSE if the match expression contained a parse error.
+	 */
+	private function walk_match_expression( $stackPtr ) {
+		if ( ! isset( $this->tokens[ $stackPtr ]['scope_opener'], $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
+			// Parse error/live coding. Shouldn't be possible as PHP[CS] will tokenize the keyword as `T_STRING` in that case.
+			return false; // @codeCoverageIgnore
+		}
+
+		$current = $this->tokens[ $stackPtr ]['scope_opener'];
+		$end     = $this->tokens[ $stackPtr ]['scope_closer'];
+		do {
+			$current = $this->phpcsFile->findNext( \T_MATCH_ARROW, ( $current + 1 ), $end );
+			if ( false === $current ) {
+				// We must have reached the last match item (or there is a parse error).
+				break;
+			}
+
+			$item_start = ( $current + 1 );
+			$item_end   = false;
+
+			// Find the first comma at the same level.
+			for ( $i = $item_start; $i <= $end; $i++ ) {
+				// Ignore anything within square brackets.
+				if ( isset( $this->tokens[ $i ]['bracket_opener'], $this->tokens[ $i ]['bracket_closer'] )
+					&& $i === $this->tokens[ $i ]['bracket_opener']
+				) {
+					$i = $this->tokens[ $i ]['bracket_closer'];
+					continue;
+				}
+
+				// Skip past nested arrays, function calls and arbitrary groupings.
+				if ( \T_OPEN_PARENTHESIS === $this->tokens[ $i ]['code']
+					&& isset( $this->tokens[ $i ]['parenthesis_closer'] )
+				) {
+					$i = $this->tokens[ $i ]['parenthesis_closer'];
+					continue;
+				}
+
+				// Skip past closures, anonymous classes and anything else scope related.
+				if ( isset( $this->tokens[ $i ]['scope_condition'], $this->tokens[ $i ]['scope_closer'] )
+					&& $this->tokens[ $i ]['scope_condition'] === $i
+				) {
+					$i = $this->tokens[ $i ]['scope_closer'];
+					continue;
+				}
+
+				if ( \T_COMMA !== $this->tokens[ $i ]['code']
+					&& $i !== $end
+				) {
+					continue;
+				}
+
+				$item_end = $i;
+				break;
+			}
+
+			if ( false === $item_end ) {
+				// Parse error/live coding. Shouldn't be possible.
+				return false; // @codeCoverageIgnore
+			}
+
+			// Now check that the value returned by this match "leaf" is correctly escaped.
+			$this->check_code_is_escaped( $item_start, $item_end );
+
+			// Independently of whether or not the check was succesfull or ran into (parse error) problems,
+			// always skip to the identified end of the item.
+			$current = $item_end;
+		} while ( $current < $end );
+
+		return $end;
+	}
 }
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 416b84b8f6..ebdc86ae2c 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -498,3 +498,37 @@ echo (int) match($var) {
 	$a, $b, $c => $fine,
 	default => $value + $other,
 }; // OK.
+
+echo match($var) { // OK.
+	$nr => 10 + 20, // OK.
+	$a, $b, $c => 'this line should NOT be flagged, vars are conditions, not output', // OK.
+	'my array' => [ 1, 2, 'foo' ], // OK.
+	'some value', $key, 'more' => esc_html($escaped), // OK.
+	'callback' => match($foo) {
+		10 => 10,
+		default => 20,
+	}, // OK.
+	false => ( $cond ? esc_html($valueA) : \esc_attr($valueB) ), // OK.
+	101 => sprintf(
+		'some %s format %d',
+		esc_html( $text ), // OK.
+		(int) $nr, // OK.
+	),
+	default => esc_attr($value + $other), // OK.
+};
+
+echo match($var) { // OK.
+	'some value', 'more' => $this_line_SHOULD_be_flagged['key'], // Bad x 1.
+	'other value' => $cond ? $valueA : $valueB['key'], // Bad x 2.
+	false => ( $cond ? $valueA : $valueB ), // Bad x 2.
+	101 => sprintf(
+		'some %s format %d',
+		$text, // Bad.
+		$nr, // Bad.
+	),
+	default => $value . $other, // Bad x 2.
+};
+
+echo match($var) { // OK.
+	'some value', 'more' => $this_line_SHOULD_be_flagged // Bad x 1. Note: no trailing comma!
+};
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 3b2ceda435..f0dad52068 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -126,6 +126,13 @@ public function getErrorList( $testFile = '' ) {
 					484 => 1,
 					485 => 1,
 					486 => 1,
+					521 => 1,
+					522 => 2,
+					523 => 2,
+					526 => 1,
+					527 => 1,
+					529 => 2,
+					533 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 4ee9469ae56081359589f9b461c27d075f86e09c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 01:18:50 +0200
Subject: [PATCH 731/822] Security/EscapeOutput: add support for *::class and
 PHP 8.0+ $obj::class

The result of `Name::class` or the PHP 8.0+ `$obj::class` will always be a plain string, along the same lines as the use of `__CLASS__`, so this should be allowed and not need escaping.

This commit adds support for that code pattern to the sniff, which fixes some false positives.

Includes tests.

Fixes 1989
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 20 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 370f678a6e..2682426a15 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -492,6 +492,26 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
+			// Check for use of *::class.
+			if ( \T_STRING === $this->tokens[ $i ]['code']
+				|| \T_VARIABLE === $this->tokens[ $i ]['code']
+				|| isset( Collections::ooHierarchyKeywords()[ $this->tokens[ $i ]['code'] ] )
+			) {
+				$double_colon = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), $end, true );
+				if ( false !== $double_colon
+					&& \T_DOUBLE_COLON === $this->tokens[ $double_colon ]['code']
+				) {
+					$class_keyword = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $double_colon + 1 ), $end, true );
+					if ( false !== $class_keyword
+						&& \T_STRING === $this->tokens[ $class_keyword ]['code']
+						&& 'class' === strtolower( $this->tokens[ $class_keyword ]['content'] )
+					) {
+						$i = $class_keyword;
+						continue;
+					}
+				}
+			}
+
 			$watch = false;
 
 			// Allow int/double/bool casted variables.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index ebdc86ae2c..5ea50d95d6 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -532,3 +532,10 @@ echo match($var) { // OK.
 echo match($var) { // OK.
 	'some value', 'more' => $this_line_SHOULD_be_flagged // Bad x 1. Note: no trailing comma!
 };
+
+// Bug #1989: allow for Name::class and PHP 8.0+ $obj::class.
+_deprecated_function( __METHOD__, 'x.x.x', ClassName::class ); // OK.
+die( self::CLASS . ' has been abandoned' ); // OK.
+_deprecated_function( __METHOD__, 'x.x.x', parent::Class ); // OK.
+_deprecated_function( __METHOD__, 'x.x.x', static::class ); // OK.
+echo 'Do not use ' . $object::class ); // OK.

From 90f291ccefac61a2233d258e4239b3211382c017 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 03:58:06 +0200
Subject: [PATCH 732/822] Security/EscapeOutput: add support for examining
 throw statements and PHP 8.0+ throw expressions

Any exception which isn't caught runs the risk of being displayed and should therefore be output escaped, along the same lines as is already required for parameters passed to `trigger_error()` function calls.

This commit add the `T_THROW` token to the tokens the sniff listens for. Parameters passed to the exception creation function call/class instantiation will be examined for being correctly escaped.

Notes:
* As custom exceptions may expect different parameters from the PHP native parameters, *all* parameters will be examined, not just the  `$message` parameter.
* When a `throw` statement is wrapped within a `try - catch` control structure, it is presumed that the exception will be caught and the `throw` statement will be ignored.
* The current logic supports a _lot_ of different ways of exception creation, but does not (yet) support variable variables for the exception name and other exotics like that.

Includes tests.

Fixes 884
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 55 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 45 +++++++++++++++
 .../Security/EscapeOutputUnitTest.16.inc      |  5 ++
 .../Security/EscapeOutputUnitTest.17.inc      |  5 ++
 .../Security/EscapeOutputUnitTest.18.inc      |  5 ++
 .../Security/EscapeOutputUnitTest.19.inc      |  5 ++
 .../Tests/Security/EscapeOutputUnitTest.php   | 11 ++++
 7 files changed, 131 insertions(+)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.16.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.17.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.18.inc
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.19.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 2682426a15..487bcd1fd6 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\Operators;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
@@ -121,6 +122,7 @@ public function register() {
 		$targets   = parent::register();
 		$targets[] = \T_ECHO;
 		$targets[] = \T_PRINT;
+		$targets[] = \T_THROW;
 		$targets[] = \T_EXIT;
 		$targets[] = \T_OPEN_TAG_WITH_ECHO;
 
@@ -193,6 +195,59 @@ public function process_token( $stackPtr ) {
 				$end   = ( $this->tokens[ $next_non_empty ]['parenthesis_closer'] + 1 );
 				break;
 
+			case \T_THROW:
+				// Find the open parentheses, while stepping over the exception creation tokens.
+				$ignore  = Tokens::$emptyTokens;
+				$ignore += Collections::namespacedNameTokens();
+				$ignore += Collections::functionCallTokens();
+				$ignore += Collections::objectOperators();
+
+				$next_relevant = $this->phpcsFile->findNext( $ignore, ( $stackPtr + 1 ), null, true );
+				if ( false === $next_relevant ) {
+					return;
+				}
+
+				if ( \T_NEW === $this->tokens[ $next_relevant ]['code'] ) {
+					$next_relevant = $this->phpcsFile->findNext( $ignore, ( $next_relevant + 1 ), null, true );
+					if ( false === $next_relevant ) {
+						return;
+					}
+				}
+
+				if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_relevant ]['code']
+					|| isset( $this->tokens[ $next_relevant ]['parenthesis_closer'] ) === false
+				) {
+					// Live codind/parse error or a pre-created exception. Nothing to do for us.
+					return;
+				}
+
+				$end = $this->tokens[ $next_relevant ]['parenthesis_closer'];
+
+				// Check if the throw is within a `try-catch`.
+				// Doing this here (instead of earlier) to allow skipping to the end of the statement.
+				$search_for           = Collections::closedScopes();
+				$search_for[ \T_TRY ] = \T_TRY;
+
+				$last_condition = Conditions::getLastCondition( $this->phpcsFile, $stackPtr, $search_for );
+				if ( false !== $last_condition && \T_TRY === $this->tokens[ $last_condition ]['code'] ) {
+					// This exception will (probably) be caught, so ignore it.
+					return $end;
+				}
+
+				$call_token = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $next_relevant - 1 ), null, true );
+				$params     = PassedParameters::getParameters( $this->phpcsFile, $call_token );
+				if ( empty( $params ) ) {
+					// No parameters passed, nothing to do.
+					return $end;
+				}
+
+				// Examine each parameter individually.
+				foreach ( $params as $param ) {
+					$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+				}
+
+				return $end;
+
 			case \T_PRINT:
 				$end = BCFile::findEndOfStatement( $this->phpcsFile, $stackPtr );
 				if ( \T_COMMA !== $this->tokens[ $end ]['code']
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 5ea50d95d6..e0281c620e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -539,3 +539,48 @@ die( self::CLASS . ' has been abandoned' ); // OK.
 _deprecated_function( __METHOD__, 'x.x.x', parent::Class ); // OK.
 _deprecated_function( __METHOD__, 'x.x.x', static::class ); // OK.
 echo 'Do not use ' . $object::class ); // OK.
+
+/*
+ * Examine the parameters passed for exception creation via throw.
+ */
+throw new MyException(); // OK.
+throw new Exception( esc_html( $message ), (int) $code ); // OK.
+throw new /*comment*/ parent( esc_html( $message ), (int) $code ); // OK.
+throw MyException::get( esc_html( $message ), (int) $code ); // OK.
+throw $obj->getException( esc_html( $message ), (int) $code ); // OK.
+
+throw new Exception( $message, $code ); // Bad x 2.
+throw new self( $message, $code ); // Bad x 2.
+throw
+	 MyException  ::   get   /*comment*/ ( $message, $code ); // Bad x 2.
+throw $obj?->getException( $message, $code ); // Bad x 2.
+throw new $exceptionName( $message, $code ); // Bad x 2.
+
+throw static::get( esc_html( $message ), $code ); // Bad x 1.
+throw \Vendor\Name\MyException::get( $message, (int) $code ); // Bad x 1.
+throw Name\MyException::get( esc_html( $message ), $code ); // Bad x 1.
+throw namespace\MyException::get( $message, (int) $code ); // Bad x 1.
+throw new class('text', 0) extends Exception {}; // OK.
+
+// Since PHP 8.0, throw can be used as an expression.
+$var = ( ( $fop === 1 ) ? throw new Exception( esc_html( $message ), (int) $code ) : $not_part_of_the_throw ); // OK.
+$var = ( ( $fop === 1 ) ? throw /*comment*/ new Exception( $message ) : $not_part_of_the_throw; // Bad x 1.
+
+// The following should be ignored as this is not exception creation, so we don't have access to the parameters.
+throw $stored_exceptions['key'];
+throw $obj->stored_exception;
+
+// We should also ignore any exception which is being caught straight away.
+try {
+	throw new Exception( $message, $code ); // OK, as exception is being caught.
+} catch ( Exception $e ) {
+} finally {
+}
+
+// .. but only if it is not within a closed scope nested within the try.
+try {
+	$callback = function() {
+		throw new Exception( $message, 10 ); // Bad. Unclear if the exception will be caught or not.
+	};
+} catch ( Exception $e ) {
+}
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.16.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.16.inc
new file mode 100644
index 0000000000..740dcba37b
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.16.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+throw
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.17.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.17.inc
new file mode 100644
index 0000000000..530d535cbd
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.17.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+throw new 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.18.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.18.inc
new file mode 100644
index 0000000000..76f3d50838
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.18.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+throw new MyException(
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.19.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.19.inc
new file mode 100644
index 0000000000..8b9e59bd6a
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.19.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Live coding/parse error. The sniff should ignore this.
+// This must be the last test in the file.
+throw MyException::get(
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index f0dad52068..cdf4fdc8c0 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -133,6 +133,17 @@ public function getErrorList( $testFile = '' ) {
 					527 => 1,
 					529 => 2,
 					533 => 1,
+					552 => 2,
+					553 => 2,
+					555 => 2,
+					556 => 2,
+					557 => 2,
+					559 => 1,
+					560 => 1,
+					561 => 1,
+					562 => 1,
+					567 => 1,
+					583 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From b501cd99e5658f6860c92fbd1dd11040cddfe8ba Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:53:01 +0200
Subject: [PATCH 733/822] Security/EscapeOutput: improve handling of inline
 expressions

When the sniff would encountered one of the keywords the sniff listens to as an inline expression in the statement which was being examined, the sniff would flag the keyword as needing escaping.

This is wrong as that expression should be examined separately by the sniff (but wouldn't be as the sniff skips to the end of the examined code).

This commit fixes that by adjusting the logic in the loop in the `check_code_is_escaped()` method to check for keywords the sniff listens too and then recursing into the sniff again to examine that expression separately, after which the loop for the original statement will continue from the end of the examined expression.

Includes tests.

Fixes 1861
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 31 ++++++++++++++++---
 .../Tests/Security/EscapeOutputUnitTest.1.inc |  9 ++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  3 ++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 487bcd1fd6..21a5c4815e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -106,6 +106,19 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 		\T_BOOLEAN_NOT              => \T_BOOLEAN_NOT,
 	);
 
+	/**
+	 * List of keyword tokens this sniff listens for, which can also be used as an inline expression.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string|int, string|int>
+	 */
+	private $target_keywords = array(
+		\T_EXIT  => \T_EXIT,
+		\T_PRINT => \T_PRINT,
+		\T_THROW => \T_THROW,
+	);
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -119,11 +132,8 @@ public function register() {
 		$this->safe_components += Collections::incrementDecrementOperators();
 
 		// Set up the tokens the sniff should listen too.
-		$targets   = parent::register();
+		$targets   = array_merge( parent::register(), $this->target_keywords );
 		$targets[] = \T_ECHO;
-		$targets[] = \T_PRINT;
-		$targets[] = \T_THROW;
-		$targets[] = \T_EXIT;
 		$targets[] = \T_OPEN_TAG_WITH_ECHO;
 
 		return $targets;
@@ -479,6 +489,19 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
+			/*
+			 * If a keyword is encountered in an inline expression and the keyword is one
+			 * this sniff listens to, recurse into the sniff, handle the expression
+			 * based on the keyword and skip over the code examined.
+			 */
+			if ( isset( $this->target_keywords[ $this->tokens[ $i ]['code'] ] ) ) {
+				$return_value = $this->process_token( $i );
+				if ( isset( $return_value ) ) {
+					$i = $return_value;
+				}
+				continue;
+			}
+
 			// Handle PHP 8.0+ match expressions.
 			if ( \T_MATCH === $this->tokens[ $i ]['code'] ) {
 				$match_valid = $this->walk_match_expression( $i );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index e0281c620e..8502e70e05 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -584,3 +584,12 @@ try {
 	};
 } catch ( Exception $e ) {
 }
+
+// Bug #1861 - don't throw an error for expression examined separately.
+echo $var == 'foo' ? 'bar' : die( 'world' ); // OK.
+echo $var == 'foo' ? throw new Exception( 'message' ) : 'bar'; // OK.
+echo $var == 'foo' ? print 'message' : 'bar'; // OK.
+
+echo $var == 'foo' ? 'bar' : die( $var ); // Bad x 1, $var, not die().
+echo $var == 'foo' ? throw new Exception( $var ) : 'bar'; // Bad x 1, $var, not throw.
+echo $var == 'foo' ? print $var : 'bar'; // Bad x 1, $var, not print.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index cdf4fdc8c0..71d1975da0 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -144,6 +144,9 @@ public function getErrorList( $testFile = '' ) {
 					562 => 1,
 					567 => 1,
 					583 => 1,
+					593 => 1,
+					594 => 1,
+					595 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From ad2b2a16b9e714a91db58c3954f85a450f78a5c5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 21:15:43 +0200
Subject: [PATCH 734/822] Security/EscapeOutput: improve handling of params in
 unsafe printing functions

As things were, the sniff will flag "unsafe printing functions" when encountered, but if the `UnsafePrintingFunction` error code is silenced, the sniff would examine all parameters passed to the function for output escaping, while only the first parameter will actually be used in the output.

This updates the sniff to only examine the first (`$text`) parameter for function calls to any of the unsafe printing functions, which should prevent some (rare) false positives.

Includes named parameter support for these functions.

Note: while the target parameter position and name in this case is the same for both functions, I have set it up to be flexible, in case additional functions with different target parameters would be added to the list.

Includes tests.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 33 ++++++++++++++++---
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 12 +++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  2 ++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 21a5c4815e..79c31d1886 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -58,12 +58,23 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @since 0.4.0
 	 * @since 0.11.0 Changed from public static to protected non-static.
+	 * @since 3.0.0  The format of the array values has changed from plain string to array.
 	 *
 	 * @var array
 	 */
 	protected $unsafePrintingFunctions = array(
-		'_e'  => 'esc_html_e() or esc_attr_e()',
-		'_ex' => 'echo esc_html_x() or echo esc_attr_x()',
+		'_e'  => array(
+			'alternative' => 'esc_html_e() or esc_attr_e()',
+			'params'      => array(
+				1 => 'text',
+			),
+		),
+		'_ex' => array(
+			'alternative' => 'echo esc_html_x() or echo esc_attr_x()',
+			'params'      => array(
+				1 => 'text',
+			),
+		),
 	);
 
 	/**
@@ -368,13 +379,27 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				"All output should be run through an escaping function (like %s), found '%s'.",
 				$stackPtr,
 				'UnsafePrintingFunction',
-				array( $this->unsafePrintingFunctions[ $matched_content ], $matched_content )
+				array( $this->unsafePrintingFunctions[ $matched_content ]['alternative'], $matched_content )
 			);
 
 			// If the error was reported, don't bother checking the function's arguments.
-			if ( $error ) {
+			if ( $error || empty( $this->unsafePrintingFunctions[ $matched_content ]['params'] ) ) {
 				return $end;
 			}
+
+			// If the function was not reported for being unsafe, examine the relevant parameters.
+			$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
+			foreach ( $this->unsafePrintingFunctions[ $matched_content ]['params'] as $position => $name ) {
+				$param = PassedParameters::getParameterFromStack( $params, $position, $name );
+				if ( false === $param ) {
+					// Parameter doesn't exist. Nothing to do.
+					continue;
+				}
+
+				$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+			}
+
+			return $end;
 		}
 
 		$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 8502e70e05..d499ceadc5 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -593,3 +593,15 @@ echo $var == 'foo' ? print 'message' : 'bar'; // OK.
 echo $var == 'foo' ? 'bar' : die( $var ); // Bad x 1, $var, not die().
 echo $var == 'foo' ? throw new Exception( $var ) : 'bar'; // Bad x 1, $var, not throw.
 echo $var == 'foo' ? print $var : 'bar'; // Bad x 1, $var, not print.
+
+/*
+ * When the `UnsafePrintingFunction` error code is ignored, the parameters
+ * for the unsafe functions should still be examined, but only the $text
+ * parameter needs escaping.
+ */
+// phpcs:disable WordPress.Security.EscapeOutput.UnsafePrintingFunction
+_e( $text, $domain ); // Bad x 1, only text param.
+_e( domain: $domain ); // OK, well not really, required $text parameter missing, but that's not our concern.
+_ex( domain: $domain, text: 'plain text', context: $context ); // OK.
+_e( domain: $domain, text: $text, ); // Bad x 1, only text param.
+// phpcs:enable
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 71d1975da0..72a376a5ab 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -147,6 +147,8 @@ public function getErrorList( $testFile = '' ) {
 					593 => 1,
 					594 => 1,
 					595 => 1,
+					603 => 1,
+					606 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 8e7b9a4f481d7614a9dbc207f370e4344c83b6a7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 21:47:09 +0200
Subject: [PATCH 735/822] Security/EscapeOutput: very minor code readability
 improvements [3]

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 79c31d1886..17384a0dd0 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -475,11 +475,10 @@ protected function check_code_is_escaped( $start, $end ) {
 		}
 
 		$in_cast = false;
+		$watch   = true;
 
 		// Looping through echo'd components.
-		$watch = true;
 		for ( $i = $start; $i < $end; $i++ ) {
-
 			// Ignore whitespaces and comments.
 			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
@@ -491,14 +490,12 @@ protected function check_code_is_escaped( $start, $end ) {
 			}
 
 			if ( \T_OPEN_PARENTHESIS === $this->tokens[ $i ]['code'] ) {
-
 				if ( ! isset( $this->tokens[ $i ]['parenthesis_closer'] ) ) {
 					// Live coding or parse error.
 					break;
 				}
 
 				if ( $in_cast ) {
-
 					// Skip to the end of a function call if it has been casted to a safe value.
 					$i       = $this->tokens[ $i ]['parenthesis_closer'];
 					$in_cast = false;
@@ -639,7 +636,6 @@ protected function check_code_is_escaped( $start, $end ) {
 
 			// Now check that next token is a function call.
 			if ( \T_STRING === $this->tokens[ $i ]['code'] ) {
-
 				$ptr                    = $i;
 				$functionName           = $this->tokens[ $i ]['content'];
 				$function_opener        = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
@@ -649,7 +645,6 @@ protected function check_code_is_escaped( $start, $end ) {
 					&& \T_OPEN_PARENTHESIS === $this->tokens[ $function_opener ]['code']
 				) {
 					if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
-
 						// Get the callback parameter.
 						$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $this->phpcsFile, $ptr );
 
@@ -689,8 +684,7 @@ protected function check_code_is_escaped( $start, $end ) {
 				}
 
 				// If this is a safe function, we don't flag it.
-				if (
-					$is_formatting_function
+				if ( $is_formatting_function
 					|| $this->is_escaping_function( $functionName )
 					|| $this->is_auto_escaped_function( $functionName )
 				) {

From 2f40190ab62e6eb5197ebf38318a678566e42297 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 22:12:39 +0200
Subject: [PATCH 736/822] Security/EscapeOutput: bug fix - sniff did not handle
 arrays correctly

In particular when examining the parameters passed to a function call, the sniff may encounter parameters which are arrays.

As things were, the sniff would skip over the array opener and then continue like before.

This is buggy, in the same way as examining all function parameters as one long code block was buggy and would lead to errors throw on the incorrect token and/or false positives when the array item contains a ternary.

To fix this, I'm special casing arrays, parsing the array items and then recursively calling the `check_code_is_escaped()` method to examine each array item individually. After this, the original call to `check_code_is_escaped()` will continue from the array closer onwards.

This gives much higher accuracy when examining array items and fixes the bug.

Includes tests proving the bug(s) and safeguarding the fix.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 22 ++++++++++++++-----
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 15 +++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.php   |  4 ++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 17384a0dd0..19aa07b49e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\BCFile;
 use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\Operators;
 use PHPCSUtils\Utils\PassedParameters;
@@ -536,13 +537,22 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
-			// Handle arrays for those functions that accept them.
-			if ( \T_ARRAY === $this->tokens[ $i ]['code'] ) {
-				++$i; // Skip the opening parenthesis.
-				continue;
-			}
+			// Examine the items in an array individually for array parameters.
+			if ( isset( Collections::arrayOpenTokensBC()[ $this->tokens[ $i ]['code'] ] ) ) {
+				$array_open_close = Arrays::getOpenClose( $this->phpcsFile, $i );
+				if ( false === $array_open_close ) {
+					// Short list or misidentified short array token.
+					continue;
+				}
+
+				$array_items = PassedParameters::getParameters( $this->phpcsFile, $i, 0, true );
+				if ( ! empty( $array_items ) ) {
+					foreach ( $array_items as $array_item ) {
+						$this->check_code_is_escaped( $array_item['start'], ( $array_item['end'] + 1 ) );
+					}
+				}
 
-			if ( isset( Collections::shortArrayTokens()[ $this->tokens[ $i ]['code'] ] ) ) {
+				$i = $array_open_close['closer'];
 				continue;
 			}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index d499ceadc5..0ad21737c6 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -605,3 +605,18 @@ _e( domain: $domain ); // OK, well not really, required $text parameter missing,
 _ex( domain: $domain, text: 'plain text', context: $context ); // OK.
 _e( domain: $domain, text: $text, ); // Bad x 1, only text param.
 // phpcs:enable
+
+// Array keys and values should be examined individually.
+wp_die( esc_html( $message ), '', array() ); // OK.
+wp_die(
+	esc_html( $message ), // OK.
+	'',
+	array(
+		'back_link' => true, // OK.
+		'response'  => $response ?? 200, // Bad.
+		'link_url'  => ( '' !== $this->link_url ) ? $this->link_url : '', // Bad.
+		'link_text' => ( '' !== $link_title ) ? esc_attr( $link_title ) : '', // OK.
+		'charset'   => [$set, $rtl] = $array, // Bad x 2 (silly code, but the list shouldn't be treated as an array).
+		'exit'      => $do_exit, // Bad x 1.
+	)
+);
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 72a376a5ab..d64c3d4319 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -149,6 +149,10 @@ public function getErrorList( $testFile = '' ) {
 					595 => 1,
 					603 => 1,
 					606 => 1,
+					616 => 1,
+					617 => 1,
+					619 => 2,
+					620 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From 3ccc769dd17da7ff668ebea4dcda60be841d044e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 22:23:13 +0200
Subject: [PATCH 737/822] Security/EscapeOutput: group common token check
 together

At various points within the `check_code_is_escaped()` loop, the sniff would check whether the current token is a token which can be ignored.

This commit just groups those simple checks, which are not dependent on other logic in the loop, together and places them at the top of the loop for the highest efficiency.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 19aa07b49e..b4a10727df 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -485,8 +485,12 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
-			// Ignore namespace separators.
-			if ( \T_NS_SEPARATOR === $this->tokens[ $i ]['code'] ) {
+			// Skip over irrelevant tokens.
+			if ( isset( Tokens::$magicConstants[ $this->tokens[ $i ]['code'] ] ) // Magic constants for debug functions.
+				|| \T_NS_SEPARATOR === $this->tokens[ $i ]['code']
+				|| \T_DOUBLE_ARROW === $this->tokens[ $i ]['code']
+				|| \T_CLOSE_PARENTHESIS === $this->tokens[ $i ]['code']
+			) {
 				continue;
 			}
 
@@ -556,15 +560,6 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
-			if ( \in_array( $this->tokens[ $i ]['code'], array( \T_DOUBLE_ARROW, \T_CLOSE_PARENTHESIS ), true ) ) {
-				continue;
-			}
-
-			// Handle magic constants for debug functions.
-			if ( isset( Tokens::$magicConstants[ $this->tokens[ $i ]['code'] ] ) ) {
-				continue;
-			}
-
 			// Handle safe PHP native constants.
 			if ( \T_STRING === $this->tokens[ $i ]['code']
 				&& isset( $this->safe_php_constants[ $this->tokens[ $i ]['content'] ] )

From 1689ea50b66ffac9c43ca2ca17d7bad2ac72679a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Jul 2023 00:46:20 +0200
Subject: [PATCH 738/822] Security/EscapeOutput: improve handling of heredocs,
 include PHP 7.3+ flexible heredocs

As things were, when the sniff would encounter a heredoc, it would throw an error on the heredoc opener (`<<<EOD`) token and be done with it.

However, heredocs _can_, but don't necessarily always contain interpolated variables and expressions and when the heredoc doesn't contain any interpolation, it should be treated the same as any other plain text string.

This commit fixes the sniff to handle heredocs properly and throw errors only on heredoc lines containing interpolation.

Includes tests.
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 19 +++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.1.inc | 21 +++++++++++++++
 .../Security/EscapeOutputUnitTest.20.inc      | 27 +++++++++++++++++++
 .../Tests/Security/EscapeOutputUnitTest.php   | 17 ++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 WordPress/Tests/Security/EscapeOutputUnitTest.20.inc

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index b4a10727df..1b0af45c6e 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -639,6 +639,25 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
+			// Handle heredocs separately as they only need escaping when interpolation is used.
+			if ( \T_START_HEREDOC === $this->tokens[ $i ]['code'] ) {
+				$current = ( $i + 1 );
+				while ( isset( $this->tokens[ $current ] ) && \T_HEREDOC === $this->tokens[ $current ]['code'] ) {
+					$embeds = TextStrings::getEmbeds( $this->tokens[ $current ]['content'] );
+					if ( ! empty( $embeds ) ) {
+						$this->phpcsFile->addError(
+							'All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks), found interpolation in unescaped heredoc.',
+							$current,
+							'HeredocOutputNotEscaped'
+						);
+					}
+					++$current;
+				}
+
+				$i = $current;
+				continue;
+			}
+
 			// Now check that next token is a function call.
 			if ( \T_STRING === $this->tokens[ $i ]['code'] ) {
 				$ptr                    = $i;
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 0ad21737c6..e7d0164b90 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -620,3 +620,24 @@ wp_die(
 		'exit'      => $do_exit, // Bad x 1.
 	)
 );
+
+// Heredocs should only be flagged when they contain interpolated variables or expressions.
+echo <<<EOD
+Some text without interpolation.
+EOD;
+
+echo <<<"EOD"
+Some text without interpolation.
+EOD;
+
+echo <<<EOD
+Some text $with interpolation.
+Some text $with interpolation.
+Some text $with interpolation.
+EOD;
+
+echo <<<"EOD"
+Some text without interpolation.
+Some text {$with->interpolation}.
+Some text without interpolation.
+EOD;
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.20.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.20.inc
new file mode 100644
index 0000000000..baf0e66316
--- /dev/null
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.20.inc
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Tests with PHP 7.3+ flexible heredoc/nowdoc.
+ * This must be a separate test case file as it is a parse error in PHP < 7.3.
+ */
+
+// Heredocs should only be flagged when they contain interpolated variables or expressions.
+echo <<<EOD
+	Some text without interpolation.
+	EOD;
+
+echo <<<"EOD"
+    Some text without interpolation.
+    EOD;
+
+echo <<<EOD
+		Some text $with interpolation.
+		Some text $with interpolation.
+		Some text $with interpolation.
+	EOD; // Bad x 3.
+
+echo <<<"EOD"
+	Some text without interpolation.
+	Some text {$with->interpolation}.
+	Some text without interpolation.
+  EOD; // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index d64c3d4319..30a779c23e 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -153,6 +153,10 @@ public function getErrorList( $testFile = '' ) {
 					617 => 1,
 					619 => 2,
 					620 => 1,
+					634 => 1,
+					635 => 1,
+					636 => 1,
+					641 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':
@@ -161,6 +165,19 @@ public function getErrorList( $testFile = '' ) {
 					4 => 1,
 				);
 
+			case 'EscapeOutputUnitTest.20.inc':
+				// These tests will only yield reliable results when PHPCS is run on PHP 7.3 or higher.
+				if ( \PHP_VERSION_ID < 70300 ) {
+					return array();
+				}
+
+				return array(
+					18 => 1,
+					19 => 1,
+					20 => 1,
+					25 => 1,
+				);
+
 			default:
 				return array();
 		}

From 2db499fc763e32000e371c46e201259592965bfa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Jul 2023 01:10:03 +0200
Subject: [PATCH 739/822] Security/EscapeOutput: improve handling of params in
 formatting functions

Similar to multiple other fixes made before, the parameters passed to a formatting function should be examined individually and not as one big code block.

Fixed now.

Includes tests.
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 17 ++++++++++++-----
 .../Tests/Security/EscapeOutputUnitTest.1.inc   |  7 +++++++
 .../Tests/Security/EscapeOutputUnitTest.php     |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 1b0af45c6e..3fbf587eca 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -693,13 +693,20 @@ protected function check_code_is_escaped( $start, $end ) {
 						}
 					}
 
-					// Skip pointer to after the function.
-					// If this is a formatting function we just skip over the opening
-					// parenthesis. Otherwise we skip all the way to the closing.
+					// If this is a formatting function, we examine the parameters individually.
 					if ( $is_formatting_function ) {
-						$i     = ( $function_opener + 1 );
+						$formatting_params = PassedParameters::getParameters( $this->phpcsFile, $i );
+						if ( ! empty( $formatting_params ) ) {
+							foreach ( $formatting_params as $format_param ) {
+								$this->check_code_is_escaped( $format_param['start'], ( $format_param['end'] + 1 ) );
+							}
+						}
+
 						$watch = true;
-					} elseif ( isset( $this->tokens[ $function_opener ]['parenthesis_closer'] ) ) {
+					}
+
+					// Skip pointer to after the function.
+					if ( isset( $this->tokens[ $function_opener ]['parenthesis_closer'] ) ) {
 						$i = $this->tokens[ $function_opener ]['parenthesis_closer'];
 					} else {
 						// Live coding or parse error.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index e7d0164b90..4c45a48740 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -641,3 +641,10 @@ Some text without interpolation.
 Some text {$with->interpolation}.
 Some text without interpolation.
 EOD;
+
+// Parameters in formatting functions should be examined individually.
+echo sprintf(
+	'<li><a href="#%1$s" class="%2$s"%3$s%4$s>%5$s</a></li>',
+	( '' !== $this->link_title ) ? ' title="' . esc_attr( $this->link_title ) . '"' : '',
+	( '' !== $this->link_aria_label ) ? ' aria-label="' . $this->link_aria_label . '"' : '',
+); // Bad x 1.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 30a779c23e..0f3e971964 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -157,6 +157,7 @@ public function getErrorList( $testFile = '' ) {
 					635 => 1,
 					636 => 1,
 					641 => 1,
+					649 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From f165714a8438101b15d28efe856a0551b26b206d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 28 Jul 2023 02:23:54 +0200
Subject: [PATCH 740/822] Security/EscapeOutput: special case get_search_query(
 false )

As per the reported issue, `get_search_query()` is unsafe when the `$escaped` parameter is set, but not set to `true`.

This commit special cases the function and checks the parameter. If the parameter is passed, but not set to `true`, a custom error message will be thrown.

Includes tests.

Fixes 1354
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php     | 12 ++++++++++++
 WordPress/Tests/Security/EscapeOutputUnitTest.1.inc |  7 +++++++
 WordPress/Tests/Security/EscapeOutputUnitTest.php   |  3 +++
 3 files changed, 22 insertions(+)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 3fbf587eca..3c4f3e0504 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -719,6 +719,18 @@ protected function check_code_is_escaped( $start, $end ) {
 					|| $this->is_escaping_function( $functionName )
 					|| $this->is_auto_escaped_function( $functionName )
 				) {
+					// Special case get_search_query() which is unsafe if $escaped = false.
+					if ( 'get_search_query' === strtolower( $functionName ) ) {
+						$escaped_param = PassedParameters::getParameter( $this->phpcsFile, $ptr, 1, 'escaped' );
+						if ( false !== $escaped_param && 'true' !== $escaped_param['clean'] ) {
+							$this->phpcsFile->addError(
+								'Output from get_search_query() is unsafe due to $escaped parameter being set to "false".',
+								$ptr,
+								'UnsafeSearchQuery'
+							);
+						}
+					}
+
 					continue;
 				}
 
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
index 4c45a48740..cfe20caeee 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.1.inc
@@ -648,3 +648,10 @@ echo sprintf(
 	( '' !== $this->link_title ) ? ' title="' . esc_attr( $this->link_title ) . '"' : '',
 	( '' !== $this->link_aria_label ) ? ' aria-label="' . $this->link_aria_label . '"' : '',
 ); // Bad x 1.
+
+echo '<input type="search" value="' . get_search_query() . '">'; // OK.
+echo '<input type="search" value="' . get_search_query( /*comment*/ true ) . '">'; // OK.
+echo '<input type="search" value="' . get_search_query( false ) . '">'; // Bad.
+echo '<input type="search" value="' . get_search_query( 0 ) . '">'; // Bad.
+echo '<input type="search" value="' . get_search_query( escape: false ) . '">'; // OK, well not really, typo in param name, but that's not our concern.
+echo '<input type="search" value="' . get_search_query( escaped: false ) . '">'; // Bad.
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 0f3e971964..464affd5f2 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -158,6 +158,9 @@ public function getErrorList( $testFile = '' ) {
 					636 => 1,
 					641 => 1,
 					649 => 1,
+					654 => 1,
+					655 => 1,
+					657 => 1,
 				);
 
 			case 'EscapeOutputUnitTest.6.inc':

From bb0b7d6f72c9c05f978f403c64f963cb9dbcf552 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:36:51 +0200
Subject: [PATCH 741/822] Security/EscapeOutput: various minor docs fixes

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 3c4f3e0504..8d3cdcef3c 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -61,7 +61,7 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 	 * @since 0.11.0 Changed from public static to protected non-static.
 	 * @since 3.0.0  The format of the array values has changed from plain string to array.
 	 *
-	 * @var array
+	 * @var array<string, array>
 	 */
 	protected $unsafePrintingFunctions = array(
 		'_e'  => array(
@@ -83,7 +83,7 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @since 1.0.0
 	 *
-	 * @var array
+	 * @var array<string, bool>
 	 */
 	private $safe_php_constants = array(
 		'PHP_EOL'             => true, // String.
@@ -103,7 +103,7 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 	 *
 	 * @since 0.12.0
 	 *
-	 * @var array
+	 * @var array<string|int, string|int>
 	 */
 	private $safe_components = array(
 		\T_LNUMBER                  => \T_LNUMBER,
@@ -134,7 +134,7 @@ class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
-	 * @return array
+	 * @return string|int[]
 	 */
 	public function register() {
 		// Enrich the list of "safe components" tokens.
@@ -560,7 +560,7 @@ protected function check_code_is_escaped( $start, $end ) {
 				continue;
 			}
 
-			// Handle safe PHP native constants.
+			// Ignore safe PHP native constants.
 			if ( \T_STRING === $this->tokens[ $i ]['code']
 				&& isset( $this->safe_php_constants[ $this->tokens[ $i ]['content'] ] )
 				&& ConstantsHelper::is_use_of_global_constant( $this->phpcsFile, $i )

From 72be374fe9cc46210505671d509bfffac3367df9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 10 Aug 2023 03:56:32 +0200
Subject: [PATCH 742/822] Core: properly check formatting of function
 declaration statements

As things were, the `WordPress.WhiteSpace.ControlStructureSpacing` sniff was being _abused_ to also check the formatting of function declaration statements, while it really isn't suitable for this.

There have been numerous issues regarding this and various "plaster on the wound" fixes have been made previously.

This PR is intended to fix the problem once and for all in a more proper fashion.

The checks which were previously done by the `WordPress.WhiteSpace.ControlStructureSpacing` sniff consisted of the following:
* Exactly one space after the `function` keyword (configurable for closures).
* No space between the function _name_ and the open parenthesis.
* Exactly one space after the open parenthesis.
* Exactly one space before the close parenthesis.
* Exactly one space before the open brace/after the close parenthesis.

The above didn't take return type declarations into account properly, would run into problems with function declarations which didn't have an open brace, such as `abstract` functions or interface functions (also see 2204), and handling multi-line function declarations was undefined territory.

It also led to:
* Duplicate messages - the `ControlStructureSpacing` sniff reporting things also reported by the `Squiz.Functions.FunctionDeclarationArgumentSpacing` sniff or by the `Generic.WhiteSpace.LanguageConstructSpacing` sniff.
* Unclear messages [1] - messages were often thrown on the `function` keyword, while the problem was further down the line.
* Unclear messages [2] - messages would refer to control structures instead of functions and would otherwise not always be clear.

This commit:
* Removes all code related to checking function declarations from the `WordPress.WhiteSpace.ControlStructureSpacing` sniff.
    Includes removing the tests which were specific to function declarations.
    This effectively reverts the function related changes in PRs 417, 432, 440, 463, 1319, 1837 in so far as those touched the `ControlStructureSpacing` sniff.
* Adds the `Squiz.Functions.MultiLineFunctionDeclaration` sniff to the `Core` ruleset to do those checks instead.

The change as currently proposed has been extensively researched and tested and should provide a smooth switch over.

Notes about the ruleset changes:
* The `Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeClose` code was previously silenced to prevent duplicate messages, but can now be re-enabled as we'll defer to that sniff for the spacing on the inside of the parentheses.
* The `Squiz.Functions.MultiLineFunctionDeclaration` sniff, by default, expects the opening brace for named functions on the line _after_ the declaration and for closures, it expects the opening brace on the _same_ line as the closure declaration.
    WPCS expects the opening brace on the _same_ line as the function declaration in both cases and enforces this via the `Generic.Functions.OpeningFunctionBraceKernighanRitchie` sniff (which is also used by the `Squiz.Functions.MultiLineFunctionDeclaration` sniff for the closure check).
    The ruleset now contains three error code exclusions to bypass the "brace on new line for named functions" checks.
* As the opening brace for closures is enforced to be on the same line, we can let the new Squiz sniff handle this.
    To that end the `checkClosures` property for the `Generic.Functions.OpeningFunctionBraceKernighanRitchie` sniff is set to `false` to prevent duplicate messages for the same.
* To prevent duplicate messages about code after the open brace for named functions, the `Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace` code has to be silenced.
    We cannot silence the same error code for the Squiz sniff as that would also silence the notice for closures, so silencing it for the `OpeningFunctionBraceKernighanRitchie` sniff, which now only handles named functions, is the only option, but should prevent the duplicate messages.
* Additionally, the `Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterUse` error code is excluded as it overlaps with the `Generic.WhiteSpace.LanguageConstructSpacing` sniff, which also checks this.

Notes about changes in behaviour before/after this change:
* If the open & close parentheses are not on the same line, the space on the inside of the parentheses is no longer checked (as it is seen as a multi-line function declaration for which different rules may apply).
* While not commonly used in WP, for multi-line function declarations, the sniff will now enforce one parameter per line with the first parameter on the line _after_ the open parenthesis and the close parenthesis on the line after the last parameter and indented the same as the start of the function declaration statement.
    A function is considered multi-line when the open and close parentheses are not on the same line, which means that for closures with `use` statements, these rules will apply to both the function parameter list as well as the use parameter list.
* It is no longer possible to choose the spacing between the `function` keyword for closures and the open parenthesis.
    This will no always be enforced to be a single space, which is in line with PSR12.
    A check of WP Core showed that there was no consistency at all regarding this spacing, with approximately 50/50 of closures having no space vs 1 space, so defering to PSR12 and enforcing consistency in this, seems like a reasonable choice.

Other notes:
* The `WordPress.WhiteSpace.ControlStructureSpacing` sniff did not support formatting checks for PHP 7.4 arrow functions.
    At this time, the `Squiz.Functions.MultiLineFunctionDeclaration` sniff does not do so either.
    There is a PR open upstream squizlabs/php_codesniffer 3661 to add support for arrow functions, though that PR still needs an update for the (very inconsistent) rule chosen by PSR-PER to [enforce _no_ space between the `fn` keyword and the open parenthesis for arrow functions](https://github.com/php-fig/per-coding-style/pull/53).
* There is also a PR open upstream - squizlabs/php_codesniffer 3739 - to fix two fixer issues. At this time, these do not pose a problem for WP Core as (aside from the closure keyword spacing), WP Core is "clean", but would be nice if that PR got merged to prevent future issues.
* While doing the research for this PR, I discovered an issue with the `Generic.Functions.OpeningFunctionBraceKernighanRitchie` sniff. It doesn't check the spacing before the open brace for empty functions.
    PR squizlabs/php_codesniffer 3869 has been opened to fix that.
    As empty functions are the exception, not the rule, I'm hoping it will get merged before any issues about this are reported.

Fixes 1101

Note: check 8 identified in issue 1101 is still open, but there is a separate issue open to discuss that in more depth - 1474 - and that issue remains open (for now).
---
 WordPress-Core/ruleset.xml                    |  26 ++-
 .../ControlStructureSpacingSniff.php          | 155 ++----------------
 .../ControlStructureSpacingUnitTest.1.inc     | 125 --------------
 ...ontrolStructureSpacingUnitTest.1.inc.fixed | 123 --------------
 .../ControlStructureSpacingUnitTest.php       |  40 ++---
 5 files changed, 47 insertions(+), 422 deletions(-)

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index e871818cba..c38349e5c4 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -199,9 +199,30 @@
 	<!-- Covers rule: Define a function like so: function my_function( $param1 = 'foo', $param2 = 'bar' ) { -->
 	<rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie">
 		<properties>
-			<property name="checkClosures" value="true"/>
+			<property name="checkClosures" value="false"/>
 		</properties>
 	</rule>
+	<!-- Prevent duplicate message. This is now checked by the Squiz.Functions.MultiLineFunctionDeclaration sniff. -->
+	<rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace">
+		<severity>0</severity>
+	</rule>
+
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration"/>
+	<!-- WP demands brace on same line, not on the next line. Silence errors related to "brace on same line". -->
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration.BraceSpacing">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration.BraceIndent">
+		<severity>0</severity>
+	</rule>
+	<!-- Prevent duplicate message. This is already checked by the Generic.WhiteSpace.LanguageConstructSpacing sniff. -->
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterUse">
+		<severity>0</severity>
+	</rule>
+
 	<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
 		<properties>
 			<property name="equalsSpacing" value="1"/>
@@ -209,9 +230,6 @@
 			<property name="requiredSpacesBeforeClose" value="1"/>
 		</properties>
 	</rule>
-	<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeClose">
-		<severity>0</severity>
-	</rule>
 	<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterVariadic">
 		<severity>0</severity>
 	</rule>
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index c95dc859fc..24cf2f5331 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -11,7 +11,6 @@
 
 use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Utils\UseStatements;
 
 /**
  * Enforces spacing around logical operators and assignments, based upon Squiz code.
@@ -23,6 +22,7 @@
  * @since   0.3.0      This sniff now has the ability to fix most errors it flags.
  * @since   0.7.0      This class now extends the WordPressCS native `Sniff` class.
  * @since   0.13.0     Class name changed: this class is now namespaced.
+ * @since   3.0.0      Checks related to function declarations have been removed from this sniff.
  *
  * Last synced with base class 2017-01-15 at commit b024ad84656c37ef5733c6998ebc1e60957b2277.
  * Note: This class has diverged quite far from the original. All the same, checking occasionally
@@ -52,21 +52,9 @@ final class ControlStructureSpacingSniff extends Sniff {
 	 */
 	public $space_before_colon = 'required';
 
-	/**
-	 * How many spaces should be between a T_CLOSURE and T_OPEN_PARENTHESIS.
-	 *
-	 * `function[*]() {...}`
-	 *
-	 * @since 0.7.0
-	 *
-	 * @var int
-	 */
-	public $spaces_before_closure_open_paren = -1;
-
 	/**
 	 * Tokens for which to ignore extra space on the inside of parenthesis.
 	 *
-	 * For functions, this is already checked by the Squiz.Functions.FunctionDeclarationArgumentSpacing sniff.
 	 * For do / else / try, there are no parenthesis, so skip it.
 	 *
 	 * @since 0.11.0
@@ -74,11 +62,9 @@ final class ControlStructureSpacingSniff extends Sniff {
 	 * @var array
 	 */
 	private $ignore_extra_space_after_open_paren = array(
-		\T_FUNCTION => true,
-		\T_CLOSURE  => true,
-		\T_DO       => true,
-		\T_ELSE     => true,
-		\T_TRY      => true,
+		\T_DO   => true,
+		\T_ELSE => true,
+		\T_TRY  => true,
 	);
 
 	/**
@@ -96,9 +82,6 @@ public function register() {
 			\T_DO,
 			\T_ELSE,
 			\T_ELSEIF,
-			\T_FUNCTION,
-			\T_CLOSURE,
-			\T_USE,
 			\T_TRY,
 			\T_CATCH,
 		);
@@ -112,18 +95,8 @@ public function register() {
 	 * @return void
 	 */
 	public function process_token( $stackPtr ) {
-		$this->spaces_before_closure_open_paren = (int) $this->spaces_before_closure_open_paren;
-
-		if ( \T_USE === $this->tokens[ $stackPtr ]['code']
-			&& UseStatements::isClosureUse( $this->phpcsFile, $stackPtr ) === false
-		) {
-			return;
-		}
-
 		if ( isset( $this->tokens[ ( $stackPtr + 1 ) ] ) && \T_WHITESPACE !== $this->tokens[ ( $stackPtr + 1 ) ]['code']
 			&& ! ( \T_ELSE === $this->tokens[ $stackPtr ]['code'] && \T_COLON === $this->tokens[ ( $stackPtr + 1 ) ]['code'] )
-			&& ! ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code']
-				&& 0 >= $this->spaces_before_closure_open_paren )
 		) {
 			$error = 'Space after opening control structure is required';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceAfterStructureOpen' );
@@ -133,12 +106,8 @@ public function process_token( $stackPtr ) {
 			}
 		}
 
-		if ( ! isset( $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
-
-			if ( \T_USE === $this->tokens[ $stackPtr ]['code'] ) {
-				$scopeOpener = $this->phpcsFile->findNext( \T_OPEN_CURLY_BRACKET, ( $stackPtr + 1 ) );
-				$scopeCloser = $this->tokens[ $scopeOpener ]['scope_closer'];
-			} elseif ( \T_WHILE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( ! isset( $this->tokens[ $stackPtr ]['scope_opener'], $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
+			if ( \T_WHILE !== $this->tokens[ $stackPtr ]['code'] ) {
 				return;
 			}
 		} else {
@@ -174,102 +143,15 @@ public function process_token( $stackPtr ) {
 
 		$parenthesisOpener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
-		// If this is a function declaration.
-		if ( \T_FUNCTION === $this->tokens[ $stackPtr ]['code'] ) {
-
-			if ( \T_STRING === $this->tokens[ $parenthesisOpener ]['code'] ) {
-
-				$function_name_ptr = $parenthesisOpener;
-
-			} elseif ( \T_BITWISE_AND === $this->tokens[ $parenthesisOpener ]['code'] ) {
-
-				// This function returns by reference, i.e. `function &function_name() {}`.
-				$parenthesisOpener = $this->phpcsFile->findNext(
-					Tokens::$emptyTokens,
-					( $parenthesisOpener + 1 ),
-					null,
-					true
-				);
-				$function_name_ptr = $parenthesisOpener;
-			}
-
-			if ( isset( $function_name_ptr ) ) {
-				$parenthesisOpener = $this->phpcsFile->findNext(
-					Tokens::$emptyTokens,
-					( $parenthesisOpener + 1 ),
-					null,
-					true
-				);
-
-				// Checking space between name and open parentheses, i.e. `function my_function[*](...) {}`.
-				if ( ( $function_name_ptr + 1 ) !== $parenthesisOpener ) {
-
-					$error = 'Space between function name and opening parenthesis is prohibited.';
-					$fix   = $this->phpcsFile->addFixableError(
-						$error,
-						$stackPtr,
-						'SpaceBeforeFunctionOpenParenthesis',
-						array( $this->tokens[ ( $function_name_ptr + 1 ) ]['content'] )
-					);
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->replaceToken( ( $function_name_ptr + 1 ), '' );
-					}
-				}
-			}
-		} elseif ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code'] ) {
-
-			// Check if there is a use () statement.
-			if ( isset( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] ) ) {
-
-				$usePtr = $this->phpcsFile->findNext(
-					Tokens::$emptyTokens,
-					( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] + 1 ),
-					null,
-					true,
-					null,
-					true
-				);
-
-				// If it is, we set that as the "scope opener".
-				if ( \T_USE === $this->tokens[ $usePtr ]['code'] ) {
-					$scopeOpener = $usePtr;
-				}
-			}
-		}
-
 		if ( \T_COLON !== $this->tokens[ $parenthesisOpener ]['code']
-			&& \T_FUNCTION !== $this->tokens[ $stackPtr ]['code']
+			&& ( $stackPtr + 1 ) === $parenthesisOpener
 		) {
+			// Checking space between keyword and open parenthesis, i.e. `if[*](...) {}`.
+			$error = 'No space before opening parenthesis is prohibited';
+			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
 
-			if ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code']
-				&& 0 === $this->spaces_before_closure_open_paren
-			) {
-
-				if ( ( $stackPtr + 1 ) !== $parenthesisOpener ) {
-					// Checking space between keyword and open parenthesis, i.e. `function[*](...) {}`.
-					$error = 'Space before closure opening parenthesis is prohibited';
-					$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'SpaceBeforeClosureOpenParenthesis' );
-
-					if ( true === $fix ) {
-						$this->phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
-					}
-				}
-			} elseif (
-				(
-					\T_CLOSURE !== $this->tokens[ $stackPtr ]['code']
-					|| 1 === $this->spaces_before_closure_open_paren
-				)
-				&& ( $stackPtr + 1 ) === $parenthesisOpener
-			) {
-
-				// Checking space between keyword and open parenthesis, i.e. `if[*](...) {}`.
-				$error = 'No space before opening parenthesis is prohibited';
-				$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
-
-				if ( true === $fix ) {
-					$this->phpcsFile->fixer->addContent( $stackPtr, ' ' );
-				}
+			if ( true === $fix ) {
+				$this->phpcsFile->fixer->addContent( $stackPtr, ' ' );
 			}
 		}
 
@@ -292,7 +174,7 @@ public function process_token( $stackPtr ) {
 
 		if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
 			if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
-				// Checking space directly after the open parenthesis, i.e. `$value = my_function([*]...)`.
+				// Checking space directly after the open parenthesis, i.e. `if ([*]...) {}`.
 				$error = 'No space after opening parenthesis is prohibited';
 				$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceAfterOpenParenthesis' );
 
@@ -351,11 +233,6 @@ public function process_token( $stackPtr ) {
 				}
 
 				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-					&& ! ( // Do NOT flag : immediately following ) for return types declarations.
-						\T_COLON === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-						&& ( isset( $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ) === false
-							|| in_array( $this->tokens[ $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ]['code'], array( \T_FUNCTION, \T_CLOSURE ), true ) )
-					)
 					&& ( isset( $scopeOpener ) && \T_COLON !== $this->tokens[ $scopeOpener ]['code'] )
 				) {
 					$error = 'Space between opening control structure and closing parenthesis is required';
@@ -367,10 +244,7 @@ public function process_token( $stackPtr ) {
 				}
 			}
 
-			// Ignore this for function declarations. Handled by the OpeningFunctionBraceKernighanRitchie sniff.
-			if ( \T_FUNCTION !== $this->tokens[ $stackPtr ]['code']
-				&& \T_CLOSURE !== $this->tokens[ $stackPtr ]['code']
-				&& isset( $this->tokens[ $parenthesisOpener ]['parenthesis_owner'] )
+			if ( isset( $this->tokens[ $parenthesisOpener ]['parenthesis_owner'] )
 				&& ( isset( $scopeOpener )
 				&& $this->tokens[ $parenthesisCloser ]['line'] !== $this->tokens[ $scopeOpener ]['line'] )
 			) {
@@ -392,7 +266,6 @@ public function process_token( $stackPtr ) {
 			} elseif ( \T_WHITESPACE === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
 				&& ' ' !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
 			) {
-
 				// Checking space between the close parenthesis and the open brace, i.e. `if (...) [*]{}`.
 				$error = 'Expected exactly one space between closing parenthesis and opening control structure; "%s" found.';
 				$fix   = $this->phpcsFile->addFixableError(
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
index 6e848342a1..1f1b47abf1 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
@@ -45,91 +45,6 @@ endif;
 if ( false ) :
 else :
 endif;
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 1
-$a = function($arg){}; // Bad.
-$a = function ( $arg ) {
-	// Ok.
-};
-
-$a = function () {
-	// Ok.
-};
-
-function something($arg){} // Bad.
-function foo( $arg ) {
-	// Ok.
-}
-
-function no_params() {
-	// Ok.
-}
-
-function another () {} // Bad, space before open parenthesis prohibited.
-function    and_another() {} // Bad, space before function name prohibited.
-function
-bar() {} // Bad.
-function baz()     {} // Bad.
-function testA()
-{} // Bad.
-
-function &return_by_ref() {} // Ok.
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 0
-
-$a = function() {}; // Ok.
-$a = function( $arg ) {}; // Ok.
-$a = function($arg){}; // Bad.
-$a = function () {}; // Bad.
-
-$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad.
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 1
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use( $var1, $var2 ) {}; // Bad, no space before open parenthesis prohibited.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use  ( $var1, $var2 ) {}; // Bad, expected exactly one space before opening parenthesis.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ){}; // Bad, space between closing parenthesis and control structure required.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 )  {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 )use ( $var1, $var2 ) {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-$closureWithArgsAndVars = function ( $arg1, $arg2 )  use ( $var1, $var2 ) {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-
-// Namespaces.
-use Foo\Admin;
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren -1
-
-$a = function( $arg ) {}; // Ok.
-$a = function ( $arg ) {}; // Ok.
-
-$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-
-/*
- * Test for bug where this sniff was triggering a "Blank line found after control structure" error
- * if there is a blank line after the last method in a class.
- *
- * Bug did not trigger when a comment was found after the closing brace of the method.
- *
- * Neither of the below examples should trigger the error.
- */
-class Bar_Foo {
-
-	function foo() {
-	} // Now you won't see the bug.
-
-}
-
-class Foo_Bar {
-
-	// Now you will.
-	function bar() {
-	}
-
-}
 
 // Handle try/catch statements as well.
 try{ // Bad.
@@ -176,9 +91,6 @@ if ( $foo ) {
 // phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
 
 // Check for too many spaces as long as the next non-blank token is on the same line.
-function test( $blah   ) {} // Bad.
-$a = function(   $bar   ) {}; // Bad.
-
 if (    'abc' === $test ) { // Bad.
 	echo 'hi';
 } elseif ( false === $foo    ) { // Bad.
@@ -268,40 +180,3 @@ if ( $foo ) {
 
 
 }
-
-// Issue 1202.
-function hi(): array
-{
-    return [];
-}
-
-// Issue 1420.
-function returntype1(): string {} // Ok.
-function returntype2( $input ): string {} // Ok.
-function returntype3( $input ) : string {} // Ok.
-function returntype4( string $input ): string {} // Ok.
-function returntype5( string $input ) : string {} // Ok.
-function returntype6( string $input, array $inputs ): string {} // Ok.
-function returntype7( string $input, array $inputs ) : string {} // Ok.
-$returntype = function (): string {}; // Ok.
-$returntype = function ( $input ): string {}; // Ok.
-$returntype = function ( $input ) : string {}; // Ok.
-$returntype = function ( string $input ): string {}; // Ok.
-$returntype = function ( string $input ) : string {}; // Ok.
-$returntype = function ( string $input, array $inputs ): string {}; // Ok.
-$returntype = function ( string $input, array $inputs ) : string {}; // Ok.
-
-// Issue 1792.
-$matching_options = array_filter(
-	$imported_options,
-	function ( $option ) use ( $option_id ): bool {
-		return $option['id'] === $option_id;
-	}
-);
-
-$matching_options = array_filter(
-	$imported_options,
-	function ( $option ) use ( $option_id ) : bool {
-		return $option['id'] === $option_id;
-	}
-);
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
index 32c01f655d..c57462793c 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
@@ -43,89 +43,6 @@ endif;
 if ( false ) :
 else :
 endif;
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 1
-$a = function ( $arg ) {}; // Bad.
-$a = function ( $arg ) {
-	// Ok.
-};
-
-$a = function () {
-	// Ok.
-};
-
-function something( $arg ) {} // Bad.
-function foo( $arg ) {
-	// Ok.
-}
-
-function no_params() {
-	// Ok.
-}
-
-function another() {} // Bad, space before open parenthesis prohibited.
-function and_another() {} // Bad, space before function name prohibited.
-function bar() {} // Bad.
-function baz() {} // Bad.
-function testA() {} // Bad.
-
-function &return_by_ref() {} // Ok.
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 0
-
-$a = function() {}; // Ok.
-$a = function( $arg ) {}; // Ok.
-$a = function( $arg ) {}; // Bad.
-$a = function() {}; // Bad.
-
-$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad.
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren 1
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, no space before open parenthesis prohibited.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, expected exactly one space before opening parenthesis.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, space between closing parenthesis and control structure required.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Bad, expected exactly one space between closing parenthesis and control structure.
-
-// Namespaces.
-use Foo\Admin;
-
-// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing spaces_before_closure_open_paren -1
-
-$a = function( $arg ) {}; // Ok.
-$a = function ( $arg ) {}; // Ok.
-
-$closureWithArgsAndVars = function( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-$closureWithArgsAndVars = function ( $arg1, $arg2 ) use ( $var1, $var2 ) {}; // Ok.
-
-/*
- * Test for bug where this sniff was triggering a "Blank line found after control structure" error
- * if there is a blank line after the last method in a class.
- *
- * Bug did not trigger when a comment was found after the closing brace of the method.
- *
- * Neither of the below examples should trigger the error.
- */
-class Bar_Foo {
-
-	function foo() {
-	} // Now you won't see the bug.
-
-}
-
-class Foo_Bar {
-
-	// Now you will.
-	function bar() {
-	}
-
-}
 
 // Handle try/catch statements as well.
 try { // Bad.
@@ -171,9 +88,6 @@ if ( $foo ) {
 // phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
 
 // Check for too many spaces as long as the next non-blank token is on the same line.
-function test( $blah ) {} // Bad.
-$a = function(   $bar ) {}; // Bad.
-
 if ( 'abc' === $test ) { // Bad.
 	echo 'hi';
 } elseif ( false === $foo ) { // Bad.
@@ -257,40 +171,3 @@ if ( $foo ) {
 		// Something
 	} // End try/catch <- Bad: "blank line after".
 }
-
-// Issue 1202.
-function hi(): array
-{
-    return [];
-}
-
-// Issue 1420.
-function returntype1(): string {} // Ok.
-function returntype2( $input ): string {} // Ok.
-function returntype3( $input ) : string {} // Ok.
-function returntype4( string $input ): string {} // Ok.
-function returntype5( string $input ) : string {} // Ok.
-function returntype6( string $input, array $inputs ): string {} // Ok.
-function returntype7( string $input, array $inputs ) : string {} // Ok.
-$returntype = function (): string {}; // Ok.
-$returntype = function ( $input ): string {}; // Ok.
-$returntype = function ( $input ) : string {}; // Ok.
-$returntype = function ( string $input ): string {}; // Ok.
-$returntype = function ( string $input ) : string {}; // Ok.
-$returntype = function ( string $input, array $inputs ): string {}; // Ok.
-$returntype = function ( string $input, array $inputs ) : string {}; // Ok.
-
-// Issue 1792.
-$matching_options = array_filter(
-	$imported_options,
-	function ( $option ) use ( $option_id ): bool {
-		return $option['id'] === $option_id;
-	}
-);
-
-$matching_options = array_filter(
-	$imported_options,
-	function ( $option ) use ( $option_id ) : bool {
-		return $option['id'] === $option_id;
-	}
-);
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 58e7cf7265..2ceeff7cc4 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -41,37 +41,19 @@ public function getErrorList( $testFile = '' ) {
 					37  => 1,
 					41  => 1,
 					42  => 1,
-					49  => 5,
-					58  => 3,
-					67  => 1,
-					68  => 1,
-					69  => 1,
-					71  => 1,
-					72  => 1,
-					81  => 3,
-					82  => 1,
-					85  => 1,
-					91  => 2,
-					92  => 1,
+					50  => 2,
+					52  => 5,
+					59  => 1,
+					67  => 2,
 					94  => 1,
-					95  => 1,
-					97  => 1,
-					98  => 1,
-					135 => 2,
-					137 => 5,
-					144 => 1,
-					152 => 2,
+					96  => 1,
+					102 => 1,
+					104 => 1,
+					108 => 2,
+					112 => 2,
+					159 => 1,
+					169 => 1,
 					179 => 1,
-					180 => 1,
-					182 => 1,
-					184 => 1,
-					190 => 1,
-					192 => 1,
-					196 => 2,
-					200 => 2,
-					247 => 1,
-					257 => 1,
-					267 => 1,
 				);
 
 				return $ret;

From dfc72e4d12a6dc830e961ef4945c49291b6e374b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 10 Aug 2023 04:11:30 +0200
Subject: [PATCH 743/822] CS: fix up closure spacing to comply with new rules

---
 WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 4551973d96..3ec36a706e 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -71,7 +71,7 @@ public function process_token( $stackPtr ) {
 		) {
 			// Retrieve all embeds, but use only the initial variable name part.
 			$interpolated_variables = array_map(
-				function( $embed ) {
+				function ( $embed ) {
 					return '$' . preg_replace( '`^(\{?\$\{?\(?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(.*)$`', '$2', $embed );
 				},
 				TextStrings::getEmbeds( $this->tokens[ $stackPtr ]['content'] )

From 602d9ef96f1b56cc788d062c5a93e8c9b01a169e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 11 Aug 2023 04:28:49 +0200
Subject: [PATCH 744/822] GlobalVariablesOverride: move parse error test to
 separate file

... as it would cause a fixer conflict with the new rules.

As the fixer conflict is directly related to the parse error, I'm not concerned about it and I don't believe a fix is needed for the sniff.

Excluding this particular parse error file from the fixer conflict check should be an acceptable solution.
---
 .github/workflows/basic-qa.yml                |  2 +-
 .../WP/GlobalVariablesOverrideUnitTest.1.inc  | 21 +++++++++----------
 .../WP/GlobalVariablesOverrideUnitTest.7.inc  | 20 ++++++++++++++++++
 .../WP/GlobalVariablesOverrideUnitTest.php    |  6 +++++-
 4 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.7.inc

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 15bcfc518b..8e0b604763 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -152,7 +152,7 @@ jobs:
         continue-on-error: true
         run: |
           set +e
-          $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary --ignore=/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc
+          $(pwd)/vendor/bin/phpcbf -pq ./WordPress/Tests/ --standard=WordPress --extensions=inc --exclude=Generic.PHP.Syntax --report=summary --ignore=/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.inc,/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.7.inc
           exitcode="$?"
           echo "EXITCODE=$exitcode" >> $GITHUB_OUTPUT
           exit "$exitcode"
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
index da9d002194..80603e7e8b 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.1.inc
@@ -183,20 +183,20 @@ function global_vars() {
 	return $closure( $pagenow ); // OK, not an assignment.
 }
 
-// Verify skipping over rest of the function when live coding/parse error in nested scope structure.
-function global_vars() {
-	global $pagenow;
 
-	$closure = function ( $pagenow ) {
-		global $feeds;
 
-		$nested_closure_with_parse_error = function ( $feeds )
 
-		$feeds = 'something'; // Bad, but ignored because of the parse error in the closure.
-	};
 
-	$pagenow = 'something'; // Bad, should be picked up. Tests that skipping on parse error doesn't skip too far.
-}
+
+
+
+
+
+
+
+
+
+
 
 $GLOBALS[] = 'something';
 $GLOBALS[103] = 'something';
@@ -314,4 +314,3 @@ list(
 // Live coding/parse error.
 // This has to be the last test in the file!
 list( $tab, $tabs
-
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.7.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.7.inc
new file mode 100644
index 0000000000..ca21a420fd
--- /dev/null
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.7.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * Separate test file to isolate the parse error test.
+ */
+
+// Verify skipping over rest of the function when live coding/parse error in nested scope structure.
+function global_vars() {
+	global $pagenow;
+
+	$closure = function ( $pagenow ) {
+		global $feeds;
+
+		$nested_closure_with_parse_error = function ( $feeds )
+
+		$feeds = 'something'; // Bad, but ignored because of the parse error in the closure.
+	};
+
+	$pagenow = 'something'; // Bad, should be picked up. Tests that skipping on parse error doesn't skip too far.
+}
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index f7f62834fd..4b462f2c75 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -59,7 +59,6 @@ public function getErrorList( $testFile = '' ) {
 					143 => 1,
 					146 => 1,
 					181 => 1,
-					198 => 1,
 					212 => 4,
 					230 => 2,
 					231 => 2,
@@ -91,6 +90,11 @@ public function getErrorList( $testFile = '' ) {
 					29 => 1,
 				);
 
+			case 'GlobalVariablesOverrideUnitTest.7.inc':
+				return array(
+					19 => 1,
+				);
+
 			default:
 				return array();
 		}

From a025c6dbcda438771a4a23743ae84c1e7b725325 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jun 2023 23:36:03 +0200
Subject: [PATCH 745/822] Composer: make PHP extension dependencies explicit

PR 1856, which was included in WPCS 2.3.0, introduced a check for strings wrapped in HTML in the `WordPress.WP.I18n` sniff.
The underlying code for this check uses the PHP XMLReader extension unconditionally.

This means that the PHP [`XMLReader` extension](https://www.php.net/manual/en/xmlreader.installation.php) and `libxml` are hard requirements for WPCS, but this was not yet annotated as such in the `composer.json` `require` section.

Along the same lines, `iconv` is used conditionally in the `PrefixAllGlobals` sniff, so should be listed as `suggest`.

And well, the dependency on the Tokenizer extension should be obvious ;-)

Fixed now.

Checked using the ComposerRequireChecker tooling: https://github.com/maglnet/ComposerRequireChecker

Note: as this tool relies on an `autoload` requirement in the `composer.json` file, we cannot add it to CI as we use the PHPCS autoloader and should not have the `autoload` directive in our `composer.json` to prevent interference.
---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 28efe020fc..4a287cba2e 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,9 @@
 	"require": {
 		"php": ">=5.4",
 		"ext-filter": "*",
+		"ext-libxml": "*",
+		"ext-tokenizer": "*",
+		"ext-xmlreader": "*",
 		"squizlabs/php_codesniffer": "^3.7.2",
 		"phpcsstandards/phpcsutils": "^1.0.8",
 		"phpcsstandards/phpcsextra": "^1.1.0"
@@ -30,6 +33,7 @@
 		"php-parallel-lint/php-console-highlighter": "^1.0.0"
 	},
 	"suggest": {
+		"ext-iconv": "For improved results",
 		"ext-mbstring": "For improved results"
 	},
 	"config": {

From 38c950e7c45326b6f49796145a0cb3e62d981b1d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 11 Aug 2023 05:01:31 +0200
Subject: [PATCH 746/822] Docs: remove redundant `@package` tags

`@package` tags are an arcane manner to group related files as belonging to one project.

For projects using namespaces, the current recommendation is to only have `@package` tags when they have supplemental information to the namespace.

That is only in a very limited way the case in WPCS, so I'm proposing to remove the `@package` tags from the WPCS class docblocks, though leaving them for now in the file docblocks.

At the very least, this removed duplicate information for which there is no reason for the duplication.

Includes cleaning up (normalizing) the tag description alignments in the class docblocks.

:point_right: reviewing with whitespace changes ignored should make it easier to see that the only real change is the removal of the package tags.

Refs:
* https://docs.phpdoc.org/3.0/guide/references/phpdoc/tags/package.html#package
* https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc-tags.md#59-package
---
 ...stractArrayAssignmentRestrictionsSniff.php | 12 +++----
 WordPress/AbstractClassRestrictionsSniff.php  |  4 +--
 WordPress/AbstractFunctionParameterSniff.php  |  4 +--
 .../AbstractFunctionRestrictionsSniff.php     | 14 ++++----
 .../Helpers/ArrayWalkingFunctionsHelper.php   |  5 ++-
 WordPress/Helpers/ConstantsHelper.php         |  5 ++-
 WordPress/Helpers/ContextHelper.php           |  5 ++-
 WordPress/Helpers/DeprecationHelper.php       |  5 ++-
 WordPress/Helpers/EscapingFunctionsTrait.php  |  7 ++--
 .../Helpers/FormattingFunctionsHelper.php     |  5 ++-
 WordPress/Helpers/IsUnitTestTrait.php         |  5 ++-
 WordPress/Helpers/ListHelper.php              |  5 ++-
 WordPress/Helpers/MinimumWPVersionTrait.php   |  5 ++-
 WordPress/Helpers/PrintingFunctionsTrait.php  |  7 ++--
 WordPress/Helpers/RulesetPropertyHelper.php   |  5 ++-
 .../Helpers/SanitizingFunctionsTrait.php      |  7 ++--
 WordPress/Helpers/SnakeCaseHelper.php         |  5 ++-
 .../Helpers/UnslashingFunctionsHelper.php     |  5 ++-
 WordPress/Helpers/ValidationHelper.php        |  5 ++-
 WordPress/Helpers/VariableHelper.php          |  5 ++-
 WordPress/Helpers/WPDBTrait.php               |  6 ++--
 WordPress/Helpers/WPGlobalVariablesHelper.php |  5 ++-
 WordPress/Helpers/WPHookHelper.php            |  5 ++-
 WordPress/Sniff.php                           |  3 +-
 .../Arrays/ArrayDeclarationSpacingSniff.php   | 32 +++++++++----------
 .../Sniffs/Arrays/ArrayIndentationSniff.php   |  8 ++---
 .../ArrayKeySpacingRestrictionsSniff.php      | 14 ++++----
 .../MultipleStatementAlignmentSniff.php       |  6 ++--
 .../AssignmentInTernaryConditionSniff.php     | 10 +++---
 .../EscapedNotTranslatedSniff.php             |  4 +--
 .../Sniffs/DB/DirectDatabaseQuerySniff.php    | 16 ++++------
 .../DB/PreparedSQLPlaceholdersSniff.php       |  4 +--
 WordPress/Sniffs/DB/PreparedSQLSniff.php      | 10 +++---
 .../Sniffs/DB/RestrictedClassesSniff.php      |  8 ++---
 .../Sniffs/DB/RestrictedFunctionsSniff.php    |  8 ++---
 WordPress/Sniffs/DB/SlowDBQuerySniff.php      | 10 +++---
 .../DateTime/CurrentTimeTimestampSniff.php    |  4 +--
 .../DateTime/RestrictedFunctionsSniff.php     |  2 --
 WordPress/Sniffs/Files/FileNameSniff.php      | 26 +++++++--------
 .../PrefixAllGlobalsSniff.php                 | 14 ++++----
 .../ValidFunctionNameSniff.php                | 18 +++++------
 .../NamingConventions/ValidHookNameSniff.php  | 10 +++---
 .../ValidPostTypeSlugSniff.php                |  2 --
 .../ValidVariableNameSniff.php                | 12 +++----
 .../Sniffs/PHP/DevelopmentFunctionsSniff.php  |  6 ++--
 .../PHP/DiscouragedPHPFunctionsSniff.php      |  8 ++---
 WordPress/Sniffs/PHP/DontExtractSniff.php     | 12 +++----
 WordPress/Sniffs/PHP/IniSetSniff.php          |  2 --
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      |  4 +--
 WordPress/Sniffs/PHP/POSIXFunctionsSniff.php  | 14 ++++----
 .../Sniffs/PHP/PregQuoteDelimiterSniff.php    |  4 +--
 .../PHP/RestrictedPHPFunctionsSniff.php       |  4 +--
 WordPress/Sniffs/PHP/StrictInArraySniff.php   | 16 ++++------
 WordPress/Sniffs/PHP/TypeCastsSniff.php       | 10 +++---
 WordPress/Sniffs/PHP/YodaConditionsSniff.php  | 10 +++---
 .../Sniffs/Security/EscapeOutputSniff.php     | 32 +++++++++----------
 .../Security/NonceVerificationSniff.php       | 16 ++++------
 .../Sniffs/Security/PluginMenuSlugSniff.php   | 14 ++++----
 .../Sniffs/Security/SafeRedirectSniff.php     |  4 +--
 .../Security/ValidatedSanitizedInputSniff.php | 18 +++++------
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php |  4 +--
 .../Sniffs/WP/AlternativeFunctionsSniff.php   | 12 +++----
 WordPress/Sniffs/WP/CapabilitiesSniff.php     |  6 ++--
 WordPress/Sniffs/WP/CapitalPDangitSniff.php   |  8 ++---
 WordPress/Sniffs/WP/ClassNameCaseSniff.php    |  2 --
 WordPress/Sniffs/WP/CronIntervalSniff.php     | 16 ++++------
 .../Sniffs/WP/DeprecatedClassesSniff.php      | 14 ++++----
 .../Sniffs/WP/DeprecatedFunctionsSniff.php    | 14 ++++----
 .../WP/DeprecatedParameterValuesSniff.php     |  6 ++--
 .../Sniffs/WP/DeprecatedParametersSniff.php   | 14 ++++----
 .../Sniffs/WP/DiscouragedConstantsSniff.php   |  4 +--
 .../Sniffs/WP/DiscouragedFunctionsSniff.php   |  6 ++--
 .../WP/EnqueuedResourceParametersSniff.php    |  2 --
 .../Sniffs/WP/EnqueuedResourcesSniff.php      | 10 +++---
 .../WP/GlobalVariablesOverrideSniff.php       | 20 ++++++------
 WordPress/Sniffs/WP/I18nSniff.php             | 32 +++++++++----------
 WordPress/Sniffs/WP/PostsPerPageSniff.php     | 16 ++++------
 .../WhiteSpace/CastStructureSpacingSniff.php  | 20 ++++++------
 .../ControlStructureSpacingSniff.php          | 16 ++++------
 .../WhiteSpace/ObjectOperatorSpacingSniff.php |  2 --
 .../WhiteSpace/OperatorSpacingSniff.php       | 24 +++++++-------
 .../ArrayDeclarationSpacingUnitTest.php       |  6 ++--
 .../Tests/Arrays/ArrayIndentationUnitTest.php |  6 ++--
 .../ArrayKeySpacingRestrictionsUnitTest.php   |  6 ++--
 .../MultipleStatementAlignmentUnitTest.php    |  4 +--
 .../AssignmentInTernaryConditionUnitTest.php  |  4 +--
 .../EscapedNotTranslatedUnitTest.php          |  4 +--
 .../Tests/DB/DirectDatabaseQueryUnitTest.php  |  8 ++---
 .../DB/PreparedSQLPlaceholdersUnitTest.php    |  4 +--
 WordPress/Tests/DB/PreparedSQLUnitTest.php    |  8 ++---
 .../Tests/DB/RestrictedClassesUnitTest.php    |  8 ++---
 .../Tests/DB/RestrictedFunctionsUnitTest.php  |  6 ++--
 WordPress/Tests/DB/SlowDBQueryUnitTest.php    |  8 ++---
 .../DateTime/CurrentTimeTimestampUnitTest.php |  4 +--
 .../DateTime/RestrictedFunctionsUnitTest.php  |  4 +--
 WordPress/Tests/Files/FileNameUnitTest.php    |  8 ++---
 .../PrefixAllGlobalsUnitTest.php              |  6 ++--
 .../ValidFunctionNameUnitTest.php             |  6 ++--
 .../ValidHookNameUnitTest.php                 |  6 ++--
 .../ValidPostTypeSlugUnitTest.php             |  4 +--
 .../ValidVariableNameUnitTest.php             |  6 ++--
 .../PHP/DevelopmentFunctionsUnitTest.php      |  6 ++--
 .../PHP/DiscouragedPHPFunctionsUnitTest.php   |  6 ++--
 WordPress/Tests/PHP/DontExtractUnitTest.php   |  8 ++---
 WordPress/Tests/PHP/IniSetUnitTest.php        |  2 --
 .../Tests/PHP/NoSilencedErrorsUnitTest.php    |  4 +--
 .../Tests/PHP/POSIXFunctionsUnitTest.php      |  6 ++--
 .../Tests/PHP/PregQuoteDelimiterUnitTest.php  |  4 +--
 .../PHP/RestrictedPHPFunctionsUnitTest.php    |  4 +--
 WordPress/Tests/PHP/StrictInArrayUnitTest.php |  6 ++--
 WordPress/Tests/PHP/TypeCastsUnitTest.php     |  2 --
 .../Tests/PHP/YodaConditionsUnitTest.php      |  6 ++--
 .../Tests/Security/EscapeOutputUnitTest.php   |  8 ++---
 .../Security/NonceVerificationUnitTest.php    |  8 ++---
 .../Tests/Security/PluginMenuSlugUnitTest.php |  8 ++---
 .../Tests/Security/SafeRedirectUnitTest.php   |  4 +--
 .../ValidatedSanitizedInputUnitTest.php       |  8 ++---
 .../Utils/I18nTextDomainFixerUnitTest.php     |  4 +--
 .../Tests/WP/AlternativeFunctionsUnitTest.php |  6 ++--
 WordPress/Tests/WP/CapabilitiesUnitTest.php   |  3 +-
 WordPress/Tests/WP/CapitalPDangitUnitTest.php |  6 ++--
 WordPress/Tests/WP/ClassNameCaseUnitTest.php  |  2 --
 WordPress/Tests/WP/CronIntervalUnitTest.php   |  8 ++---
 .../Tests/WP/DeprecatedClassesUnitTest.php    |  6 ++--
 .../Tests/WP/DeprecatedFunctionsUnitTest.php  |  6 ++--
 .../WP/DeprecatedParameterValuesUnitTest.php  |  4 +--
 .../Tests/WP/DeprecatedParametersUnitTest.php |  6 ++--
 .../Tests/WP/DiscouragedConstantsUnitTest.php |  3 +-
 .../Tests/WP/DiscouragedFunctionsUnitTest.php |  6 ++--
 .../WP/EnqueuedResourceParametersUnitTest.php |  4 +--
 .../Tests/WP/EnqueuedResourcesUnitTest.php    |  6 ++--
 .../WP/GlobalVariablesOverrideUnitTest.php    | 10 +++---
 WordPress/Tests/WP/I18nUnitTest.php           |  6 ++--
 WordPress/Tests/WP/PostsPerPageUnitTest.php   | 12 +++----
 .../CastStructureSpacingUnitTest.php          |  6 ++--
 .../ControlStructureSpacingUnitTest.php       |  6 ++--
 .../ObjectOperatorSpacingUnitTest.php         |  2 --
 .../WhiteSpace/OperatorSpacingUnitTest.php    | 10 +++---
 138 files changed, 426 insertions(+), 681 deletions(-)

diff --git a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
index e7cce8bc2c..c72fdd910f 100644
--- a/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
+++ b/WordPress/AbstractArrayAssignmentRestrictionsSniff.php
@@ -20,13 +20,11 @@
 /**
  * Restricts array assignment of certain keys.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.10.0 Class became a proper abstract class. This was already the behaviour.
- *                 Moved the file and renamed the class from
- *                 `\WordPressCS\WordPress\Sniffs\Arrays\ArrayAssignmentRestrictionsSniff` to
- *                 `\WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff`.
+ * @since 0.3.0
+ * @since 0.10.0 Class became a proper abstract class. This was already the behaviour.
+ *               Moved the file and renamed the class from
+ *               `\WordPressCS\WordPress\Sniffs\Arrays\ArrayAssignmentRestrictionsSniff` to
+ *               `\WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff`.
  */
 abstract class AbstractArrayAssignmentRestrictionsSniff extends Sniff {
 
diff --git a/WordPress/AbstractClassRestrictionsSniff.php b/WordPress/AbstractClassRestrictionsSniff.php
index 65af629555..fbc18af36f 100644
--- a/WordPress/AbstractClassRestrictionsSniff.php
+++ b/WordPress/AbstractClassRestrictionsSniff.php
@@ -19,9 +19,7 @@
 /**
  * Restricts usage of some classes.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
+ * @since 0.10.0
  */
 abstract class AbstractClassRestrictionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/AbstractFunctionParameterSniff.php b/WordPress/AbstractFunctionParameterSniff.php
index de3a94fb07..c6395a7014 100644
--- a/WordPress/AbstractFunctionParameterSniff.php
+++ b/WordPress/AbstractFunctionParameterSniff.php
@@ -15,9 +15,7 @@
 /**
  * Advises about parameters used in function calls.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
+ * @since 0.11.0
  */
 abstract class AbstractFunctionParameterSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/AbstractFunctionRestrictionsSniff.php b/WordPress/AbstractFunctionRestrictionsSniff.php
index 186f01e881..dfa97b5a0e 100644
--- a/WordPress/AbstractFunctionRestrictionsSniff.php
+++ b/WordPress/AbstractFunctionRestrictionsSniff.php
@@ -19,14 +19,12 @@
 /**
  * Restricts usage of some functions.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.10.0 Class became a proper abstract class. This was already the behaviour.
- *                 Moved the file and renamed the class from
- *                 `\WordPressCS\WordPress\Sniffs\Functions\FunctionRestrictionsSniff` to
- *                 `\WordPressCS\WordPress\AbstractFunctionRestrictionsSniff`.
- * @since   0.11.0 Extends the WordPressCS native `Sniff` class.
+ * @since 0.3.0
+ * @since 0.10.0 Class became a proper abstract class. This was already the behaviour.
+ *               Moved the file and renamed the class from
+ *               `\WordPressCS\WordPress\Sniffs\Functions\FunctionRestrictionsSniff` to
+ *               `\WordPressCS\WordPress\AbstractFunctionRestrictionsSniff`.
+ * @since 0.11.0 Extends the WordPressCS native `Sniff` class.
  */
 abstract class AbstractFunctionRestrictionsSniff extends Sniff {
 
diff --git a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
index 2324aa3a51..76623d7dd9 100644
--- a/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
+++ b/WordPress/Helpers/ArrayWalkingFunctionsHelper.php
@@ -15,9 +15,8 @@
 /**
  * Helper functions and function lists for checking whether a function applies a callback to an array.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The property in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class ArrayWalkingFunctionsHelper {
 
diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index a24fd2f098..a2082b7f5a 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -28,9 +28,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class ConstantsHelper {
 
diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 7fc9611db2..09b87035ad 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -25,9 +25,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The methods in this class were previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ * @since 3.0.0 The methods in this class were previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and have been moved here.
  */
 final class ContextHelper {
 
diff --git a/WordPress/Helpers/DeprecationHelper.php b/WordPress/Helpers/DeprecationHelper.php
index 2a7a665473..13273496c7 100644
--- a/WordPress/Helpers/DeprecationHelper.php
+++ b/WordPress/Helpers/DeprecationHelper.php
@@ -25,9 +25,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class DeprecationHelper {
 
diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index 4a60974bc4..09ce2d1674 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -19,10 +19,9 @@
  * - `customEscapingFunctions`.
  * - `customAutoEscapedFunctions`
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The properties in this trait were previously contained partially in the
- *                `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
- *                class and have been moved here.
+ * @since 3.0.0 The properties in this trait were previously contained partially in the
+ *              `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
+ *              class and have been moved here.
  */
 trait EscapingFunctionsTrait {
 
diff --git a/WordPress/Helpers/FormattingFunctionsHelper.php b/WordPress/Helpers/FormattingFunctionsHelper.php
index 88430098df..e04298ab46 100644
--- a/WordPress/Helpers/FormattingFunctionsHelper.php
+++ b/WordPress/Helpers/FormattingFunctionsHelper.php
@@ -12,9 +12,8 @@
 /**
  * Helper functions and function lists for checking whether a function is a formatting function.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The property in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class FormattingFunctionsHelper {
 
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index e06709f22f..1ee939c71c 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -26,9 +26,8 @@
  * - The sniff can call the `is_test_class()` method in this trait to verify if a class is
  *   a test class. The `is_test_class()` method will take the custom property into account.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The properties and method in this trait were previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ * @since 3.0.0 The properties and method in this trait were previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and have been moved here.
  */
 trait IsUnitTestTrait {
 
diff --git a/WordPress/Helpers/ListHelper.php b/WordPress/Helpers/ListHelper.php
index c3e344df26..aa1e22477f 100644
--- a/WordPress/Helpers/ListHelper.php
+++ b/WordPress/Helpers/ListHelper.php
@@ -27,9 +27,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class ListHelper {
 
diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index e22c6dd601..2b08beb152 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -22,9 +22,8 @@
  * - After that, the `MinimumWPVersionTrait::$minimum_wp_version` property can be freely used
  *   in the sniff.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property and method in this trait were previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ * @since 3.0.0 The property and method in this trait were previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and have been moved here.
  */
 trait MinimumWPVersionTrait {
 
diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
index 0b210e7131..6f6d9b690f 100644
--- a/WordPress/Helpers/PrintingFunctionsTrait.php
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -18,10 +18,9 @@
  * following `public` property which can be changed from within a custom ruleset:
  * - `customPrintingFunctions`.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The properties in this trait were previously contained partially in the
- *                `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
- *                class and have been moved here.
+ * @since 3.0.0 The properties in this trait were previously contained partially in the
+ *              `WordPressCS\WordPress\Sniff` class and partially in the `EscapeOutputSniff`
+ *              class and have been moved here.
  */
 trait PrintingFunctionsTrait {
 
diff --git a/WordPress/Helpers/RulesetPropertyHelper.php b/WordPress/Helpers/RulesetPropertyHelper.php
index 3722266ac9..7ac43267c3 100644
--- a/WordPress/Helpers/RulesetPropertyHelper.php
+++ b/WordPress/Helpers/RulesetPropertyHelper.php
@@ -19,9 +19,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class RulesetPropertyHelper {
 
diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizingFunctionsTrait.php
index eccc959142..368a6fc5e1 100644
--- a/WordPress/Helpers/SanitizingFunctionsTrait.php
+++ b/WordPress/Helpers/SanitizingFunctionsTrait.php
@@ -19,10 +19,9 @@
  * - `customSanitizingFunctions`.
  * - `customUnslashingSanitizingFunctions`
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The properties in this trait were previously contained partially in the
- *                `WordPressCS\WordPress\Sniff` class and partially in the `NonceVerificationSniff`
- *                and the `ValidatedSanitizedInputSniff` classes and have been moved here.
+ * @since 3.0.0 The properties in this trait were previously contained partially in the
+ *              `WordPressCS\WordPress\Sniff` class and partially in the `NonceVerificationSniff`
+ *              and the `ValidatedSanitizedInputSniff` classes and have been moved here.
  */
 trait SanitizingFunctionsTrait {
 
diff --git a/WordPress/Helpers/SnakeCaseHelper.php b/WordPress/Helpers/SnakeCaseHelper.php
index 8cea3fb0e0..9937e5e22e 100644
--- a/WordPress/Helpers/SnakeCaseHelper.php
+++ b/WordPress/Helpers/SnakeCaseHelper.php
@@ -24,9 +24,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class SnakeCaseHelper {
 
diff --git a/WordPress/Helpers/UnslashingFunctionsHelper.php b/WordPress/Helpers/UnslashingFunctionsHelper.php
index e067b39fca..2946b3acac 100644
--- a/WordPress/Helpers/UnslashingFunctionsHelper.php
+++ b/WordPress/Helpers/UnslashingFunctionsHelper.php
@@ -12,9 +12,8 @@
 /**
  * Helper functions and function lists for checking whether a function is an unslashing function.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The property in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class UnslashingFunctionsHelper {
 
diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 17627c71e7..d63f1bed91 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -21,9 +21,8 @@
 /**
  * Helper function for checking whether a token is validated.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The method in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class ValidationHelper {
 
diff --git a/WordPress/Helpers/VariableHelper.php b/WordPress/Helpers/VariableHelper.php
index 2b20b60398..e1076ee42c 100644
--- a/WordPress/Helpers/VariableHelper.php
+++ b/WordPress/Helpers/VariableHelper.php
@@ -27,9 +27,8 @@
  *
  * @internal
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The methods in this class were previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and have been moved here.
+ * @since 3.0.0 The methods in this class were previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and have been moved here.
  */
 final class VariableHelper {
 
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index eeb613b8dc..d0cc388f11 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -17,10 +17,8 @@
 /**
  * Helper utilities for sniffs which examine WPDB method calls.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   3.0.0 The method in this trait was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The method in this trait was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 trait WPDBTrait {
 
diff --git a/WordPress/Helpers/WPGlobalVariablesHelper.php b/WordPress/Helpers/WPGlobalVariablesHelper.php
index 23565de1eb..b509793164 100644
--- a/WordPress/Helpers/WPGlobalVariablesHelper.php
+++ b/WordPress/Helpers/WPGlobalVariablesHelper.php
@@ -12,9 +12,8 @@
 /**
  * Helper utilities for recognizing WP global variables.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The property in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class WPGlobalVariablesHelper {
 
diff --git a/WordPress/Helpers/WPHookHelper.php b/WordPress/Helpers/WPHookHelper.php
index 70580b60a4..220ad668de 100644
--- a/WordPress/Helpers/WPHookHelper.php
+++ b/WordPress/Helpers/WPHookHelper.php
@@ -14,9 +14,8 @@
 /**
  * Helper utilities for recognizing functions related to the WP Hook mechanism.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0 The property in this class was previously contained in the
- *                `WordPressCS\WordPress\Sniff` class and has been moved here.
+ * @since 3.0.0 The property in this class was previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and has been moved here.
  */
 final class WPHookHelper {
 
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index fa5f343654..fcca9a5b28 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -23,8 +23,7 @@
  *
  * Provides a bootstrap for the sniffs, to reduce code duplication.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   0.4.0
+ * @since 0.4.0
  */
 abstract class Sniff implements PHPCS_Sniff {
 
diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index f6900b09f8..050af33cc2 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -22,24 +22,22 @@
  * - Checks that associative arrays are multi-line.
  * - Checks that each array item in a multi-line array starts on a new line.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0 - The WordPress specific additional checks have now been split off
- *                   from the `WordPress.Arrays.ArrayDeclaration` sniff into this sniff.
- *                 - Added sniffing & fixing for associative arrays.
- * @since   0.12.0 Decoupled this sniff from the upstream sniff completely.
- *                 This sniff now extends the WordPressCS native `Sniff` class instead.
- * @since   0.13.0 Added the last remaining checks from the `WordPress.Arrays.ArrayDeclaration`
- *                 sniff which were not covered elsewhere.
- *                 The `WordPress.Arrays.ArrayDeclaration` sniff has now been deprecated.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 Single item associative arrays are now by default exempt from the
- *                 "must be multi-line" rule. This behaviour can be changed using the
- *                 `allow_single_item_single_line_associative_arrays` property.
- * @since   3.0.0  Removed various whitespace related checks and fixers in favour of the PHPCSExtra
- *                 `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff.
+ * @since 0.11.0 - The WordPress specific additional checks have now been split off
+ *                 from the `WordPress.Arrays.ArrayDeclaration` sniff into this sniff.
+ *               - Added sniffing & fixing for associative arrays.
+ * @since 0.12.0 Decoupled this sniff from the upstream sniff completely.
+ *               This sniff now extends the WordPressCS native `Sniff` class instead.
+ * @since 0.13.0 Added the last remaining checks from the `WordPress.Arrays.ArrayDeclaration`
+ *               sniff which were not covered elsewhere.
+ *               The `WordPress.Arrays.ArrayDeclaration` sniff has now been deprecated.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 Single item associative arrays are now by default exempt from the
+ *               "must be multi-line" rule. This behaviour can be changed using the
+ *               `allow_single_item_single_line_associative_arrays` property.
+ * @since 3.0.0  Removed various whitespace related checks and fixers in favour of the PHPCSExtra
+ *               `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff.
  */
 final class ArrayDeclarationSpacingSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 2fc990c44a..7dc485811d 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -19,12 +19,10 @@
 /**
  * Enforces WordPress array indentation for multi-line arrays.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * {@internal This sniff should eventually be pulled upstream as part of a solution
  * for https://github.com/squizlabs/PHP_CodeSniffer/issues/582 }}
diff --git a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
index 6e4170d8aa..b32fb26ab0 100644
--- a/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php
@@ -15,15 +15,13 @@
 /**
  * Check for proper spacing in array key references.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.7.0  This sniff now has the ability to fix a number of the issues it flags.
- * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   2.2.0  The sniff now also checks the size of the spacing, if applicable.
+ * @since 0.3.0
+ * @since 0.7.0  This sniff now has the ability to fix a number of the issues it flags.
+ * @since 0.12.0 This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 2.2.0  The sniff now also checks the size of the spacing, if applicable.
  */
 final class ArrayKeySpacingRestrictionsSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 482889ff01..1e1a1a4c06 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -22,11 +22,9 @@
  * - Allows for new line(s) before a double arrow (configurable).
  * - Allows for handling multi-line array items differently if so desired (configurable).
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#indentation
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  *
  * {@internal This sniff should eventually be pulled upstream as part of a solution
  * for https://github.com/squizlabs/PHP_CodeSniffer/issues/582 }}
diff --git a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
index c12cb88742..a74b5f29be 100644
--- a/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/AssignmentInTernaryConditionSniff.php
@@ -21,12 +21,10 @@
  *
  * Note: this sniff does not detect variable assignments in ternaries without parentheses!
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
- * @since   3.0.0  - The generic "assignment in condition" logic has been removed from the sniff
- *                   in favour of the upstream `Generic.CodeAnalysis.AssignmentInCondition` sniff.
- *                 - The sniff has been renamed from `AssignmentInCondition` to `AssignmentInTernaryCondition`.
+ * @since 0.14.0
+ * @since 3.0.0  - The generic "assignment in condition" logic has been removed from the sniff
+ *                 in favour of the upstream `Generic.CodeAnalysis.AssignmentInCondition` sniff.
+ *               - The sniff has been renamed from `AssignmentInCondition` to `AssignmentInTernaryCondition`.
  *
  * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/1594 Upstream sniff.
  */
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 76d1d53bc2..4c3879e2af 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -18,9 +18,7 @@
  * as calls to the "translate + escape" sister-function due to the presence of
  * more than one parameter.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  */
 final class EscapedNotTranslatedSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index ead689179c..82abd5ff73 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -19,16 +19,14 @@
 /**
  * Flag Database direct queries.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#direct-database-queries
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#direct-database-queries
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.6.0  Removed the add_unique_message() function as it is no longer needed.
- * @since   0.11.0 This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
- * @since   3.0.0  Support for the very sniff specific WPCS native ignore comment syntax has been removed.
+ * @since 0.3.0
+ * @since 0.6.0  Removed the add_unique_message() function as it is no longer needed.
+ * @since 0.11.0 This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ * @since 3.0.0  Support for the very sniff specific WPCS native ignore comment syntax has been removed.
  */
 final class DirectDatabaseQuerySniff extends Sniff {
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index e3aa609895..1e481d8229 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -44,12 +44,10 @@
  * @link https://core.trac.wordpress.org/changeset/41471
  * @link https://core.trac.wordpress.org/changeset/55151
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 0.14.0
  * @since 3.0.0 Support for the %i placeholder has been added
  *
- * @uses  \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class PreparedSQLPlaceholdersSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 194953584e..7e1dc613b6 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -22,13 +22,11 @@
  *
  * Makes sure that variables aren't directly interpolated into SQL statements.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#formatting-sql-statements
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#formatting-sql-statements
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.8.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
+ * @since 0.8.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  */
 final class PreparedSQLSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/DB/RestrictedClassesSniff.php b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
index c82fda81db..4262889a43 100644
--- a/WordPress/Sniffs/DB/RestrictedClassesSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedClassesSniff.php
@@ -19,12 +19,10 @@
  *  helps keep your code forward-compatible and, in cases where results are cached in memory,
  *  it can be many times faster."
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class RestrictedClassesSniff extends AbstractClassRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
index de46d596d6..7d23adaaab 100644
--- a/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DB/RestrictedFunctionsSniff.php
@@ -19,12 +19,10 @@
  *  helps keep your code forward-compatible and, in cases where results are cached in memory,
  *  it can be many times faster."
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#database-queries
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/DB/SlowDBQuerySniff.php b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
index 68461e8ded..5cbd99ac61 100644
--- a/WordPress/Sniffs/DB/SlowDBQuerySniff.php
+++ b/WordPress/Sniffs/DB/SlowDBQuerySniff.php
@@ -14,13 +14,11 @@
 /**
  * Flag potentially slow queries.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#uncached-pageload
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#uncached-pageload
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  */
 final class SlowDBQuerySniff extends AbstractArrayAssignmentRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index 5d20f5866c..a2297745d0 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -26,9 +26,7 @@
  * @link https://core.trac.wordpress.org/ticket/40657
  * @link https://github.com/WordPress/WordPress-Coding-Standards/issues/1791
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  */
 final class CurrentTimeTimestampSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
index 4a31a4bbd6..279da5735c 100644
--- a/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/DateTime/RestrictedFunctionsSniff.php
@@ -14,8 +14,6 @@
 /**
  * Forbids the use of various native DateTime related PHP/WP functions and suggests alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 2.2.0
  */
 final class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index 4178599dcd..a327bea256 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -18,22 +18,20 @@
 /**
  * Ensures filenames do not contain underscores and where applicable are prefixed with `class-`.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.1.0
- * @since   0.11.0 - This sniff will now also check for all lowercase file names.
- *                 - This sniff will now also verify that files containing a class start with `class-`.
- *                 - This sniff will now also verify that files in `wp-includes` containing
- *                   template tags end in `-template`. Based on @subpackage file DocBlock tag.
- *                 - This sniff will now allow for underscores in file names for certain theme
- *                   specific exceptions if the `$is_theme` property is set to `true`.
- * @since   0.12.0 Now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   3.0.0  Test class files are now completely exempt from this rule.
+ * @since 0.1.0
+ * @since 0.11.0 - This sniff will now also check for all lowercase file names.
+ *               - This sniff will now also verify that files containing a class start with `class-`.
+ *               - This sniff will now also verify that files in `wp-includes` containing
+ *                 template tags end in `-template`. Based on @subpackage file DocBlock tag.
+ *               - This sniff will now allow for underscores in file names for certain theme
+ *                 specific exceptions if the `$is_theme` property is set to `true`.
+ * @since 0.12.0 Now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 3.0.0  Test class files are now completely exempt from this rule.
  *
- * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
+ * @uses \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 final class FileNameSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index 820bf46432..ed55291653 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -36,15 +36,13 @@
 /**
  * Verify that everything defined in the global namespace is prefixed with a theme/plugin specific prefix.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.2.0  Now also checks whether namespaces are prefixed.
- * @since   2.2.0  - Now also checks variables assigned via the list() construct.
- *                 - Now also ignores global functions which are marked as @deprecated.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.2.0  Now also checks whether namespaces are prefixed.
+ * @since 2.2.0  - Now also checks variables assigned via the list() construct.
+ *               - Now also ignores global functions which are marked as @deprecated.
  *
- * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
+ * @uses \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 6f3ac34151..8e45e66fe5 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -21,17 +21,15 @@
 /**
  * Enforces WordPress function name and method name format, based upon Squiz code.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.1.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   2.0.0  The `get_name_suggestion()` method has been moved to the
- *                 WordPress native `Sniff` base class as `get_snake_case_name_suggestion()`.
- * @since   2.2.0  Will now ignore functions and methods which are marked as @deprecated.
- * @since   3.0.0  This sniff has been refactored and no longer extends the upstream
- *                 PEAR.NamingConventions.ValidFunctionName sniff.
+ * @since 0.1.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 2.0.0  The `get_name_suggestion()` method has been moved to the
+ *               WordPress native `Sniff` base class as `get_snake_case_name_suggestion()`.
+ * @since 2.2.0  Will now ignore functions and methods which are marked as @deprecated.
+ * @since 3.0.0  This sniff has been refactored and no longer extends the upstream
+ *               PEAR.NamingConventions.ValidFunctionName sniff.
  */
 final class ValidFunctionNameSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
index 77decc4803..57ce70464a 100644
--- a/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -22,13 +22,11 @@
  *
  * Hook names invoked with `do_action_deprecated()` and `apply_filters_deprecated()` are ignored.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.11.0 Extends the WordPressCS native `AbstractFunctionParameterSniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.11.0 Extends the WordPressCS native `AbstractFunctionParameterSniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 class ValidHookNameSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index 772c51110e..ec8eed8dce 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -23,8 +23,6 @@
  *
  * @link https://developer.wordpress.org/reference/functions/register_post_type/
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 2.2.0
  */
 final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 550a67a38f..140a2431e6 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -22,16 +22,14 @@
 /**
  * Checks the naming of variables and member variables.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.9.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   2.0.0  Now offers name suggestions for variables in violation.
+ * @since 0.9.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 2.0.0  Now offers name suggestions for variables in violation.
  *
  * Last synced with base class January 2022 at commit 4b49a952bf0e2c3863d0a113256bae0d7fe63d52.
- * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
  */
 final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 
diff --git a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
index a41ca2d168..af1c2ebf47 100644
--- a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
@@ -14,10 +14,8 @@
 /**
  * Restrict the use of various development functions.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class DevelopmentFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
index e32e28709c..058fa0d3a7 100644
--- a/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DiscouragedPHPFunctionsSniff.php
@@ -14,11 +14,9 @@
 /**
  * Discourages the use of various native PHP functions and suggests alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 `create_function` was moved to the PHP.RestrictedFunctions sniff.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 `create_function` was moved to the PHP.RestrictedFunctions sniff.
  */
 final class DiscouragedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/PHP/DontExtractSniff.php b/WordPress/Sniffs/PHP/DontExtractSniff.php
index 33ca9b48c3..0d9425273e 100644
--- a/WordPress/Sniffs/PHP/DontExtractSniff.php
+++ b/WordPress/Sniffs/PHP/DontExtractSniff.php
@@ -14,14 +14,12 @@
 /**
  * Restricts the usage of extract().
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#dont-extract
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#dont-extract
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0 Previously this check was contained within the
- *                 `WordPress.VIP.RestrictedFunctions` sniff.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
+ * @since 0.10.0 Previously this check was contained within the
+ *               `WordPress.VIP.RestrictedFunctions` sniff.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
  */
 final class DontExtractSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/PHP/IniSetSniff.php b/WordPress/Sniffs/PHP/IniSetSniff.php
index 0ce252b685..b393fbc1ce 100644
--- a/WordPress/Sniffs/PHP/IniSetSniff.php
+++ b/WordPress/Sniffs/PHP/IniSetSniff.php
@@ -21,8 +21,6 @@
  * - Throws errors for ini directives listed in the disallow-list.
  * - A warning will be thrown in all other cases.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 2.1.0
  */
 final class IniSetSniff extends AbstractFunctionParameterSniff {
diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 6b946c6ff3..282d35203a 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -22,9 +22,7 @@
  * of functions, as no amount of error checking can prevent
  * PHP from throwing errors when those functions are used.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.1.0
+ * @since 1.1.0
  */
 final class NoSilencedErrorsSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
index 71957f210f..72f77ad551 100644
--- a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
@@ -15,15 +15,13 @@
  * Perl compatible regular expressions (PCRE, preg_ functions) should be used in preference
  * to their POSIX counterparts.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#regular-expressions
- * @link    https://php-legacy-docs.zend.com/manual/php5/en/ref.regex
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#regular-expressions
+ * @link https://php-legacy-docs.zend.com/manual/php5/en/ref.regex
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0 Previously this check was contained within the
- *                 `WordPress.VIP.RestrictedFunctions` and the
- *                 `WordPress.PHP.DiscouragedPHPFunctions` sniffs.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0 Previously this check was contained within the
+ *               `WordPress.VIP.RestrictedFunctions` and the
+ *               `WordPress.PHP.DiscouragedPHPFunctions` sniffs.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class POSIXFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index 91c1820ae9..2f791ed7c2 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -15,9 +15,7 @@
 /**
  * Flag calling preg_quote() without the second ($delimiter) parameter.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  */
 final class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
index c3296a1661..f3102e33d5 100644
--- a/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/RestrictedPHPFunctionsSniff.php
@@ -14,9 +14,7 @@
 /**
  * Forbids the use of various native PHP functions and suggests alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  */
 final class RestrictedPHPFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/PHP/StrictInArraySniff.php b/WordPress/Sniffs/PHP/StrictInArraySniff.php
index 6d057a74ff..dc7aa7aace 100644
--- a/WordPress/Sniffs/PHP/StrictInArraySniff.php
+++ b/WordPress/Sniffs/PHP/StrictInArraySniff.php
@@ -15,15 +15,13 @@
 /**
  * Flag calling in_array(), array_search() and array_keys() without true as the third parameter.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.9.0
- * @since   0.10.0 - This sniff not only checks for `in_array()`, but also `array_search()`
- *                   and `array_keys()`.
- *                 - The sniff no longer needlessly extends the `ArrayAssignmentRestrictionsSniff`
- *                   class which it didn't use.
- * @since   0.11.0 Refactored to extend the new WordPressCS native `AbstractFunctionParameterSniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.9.0
+ * @since 0.10.0 - This sniff not only checks for `in_array()`, but also `array_search()`
+ *                 and `array_keys()`.
+ *               - The sniff no longer needlessly extends the `ArrayAssignmentRestrictionsSniff`
+ *                 class which it didn't use.
+ * @since 0.11.0 Refactored to extend the new WordPressCS native `AbstractFunctionParameterSniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class StrictInArraySniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/PHP/TypeCastsSniff.php b/WordPress/Sniffs/PHP/TypeCastsSniff.php
index 7c29af2e79..3e07c7fb51 100644
--- a/WordPress/Sniffs/PHP/TypeCastsSniff.php
+++ b/WordPress/Sniffs/PHP/TypeCastsSniff.php
@@ -19,13 +19,11 @@
  *
  * Additionally, the use of the (unset) and (binary) casts is discouraged.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.2.0
- * @since   2.0.0 No longer checks that type casts are lowercase or short form.
- *                Relevant PHPCS native sniffs have been included in the rulesets instead.
+ * @since 1.2.0
+ * @since 2.0.0 No longer checks that type casts are lowercase or short form.
+ *              Relevant PHPCS native sniffs have been included in the rulesets instead.
  */
 final class TypeCastsSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index 81cf7e7fba..c0853f87b2 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -16,13 +16,11 @@
 /**
  * Enforces Yoda conditional statements.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#yoda-conditions
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#yoda-conditions
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.12.0 This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class YodaConditionsSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 8d3cdcef3c..4aa6996a4a 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -29,25 +29,23 @@
 /**
  * Verifies that all outputted strings are escaped.
  *
- * @link    https://developer.wordpress.org/apis/security/data-validation/ WordPress Developer Docs on Data Validation.
+ * @link https://developer.wordpress.org/apis/security/data-validation/ WordPress Developer Docs on Data Validation.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.4.0  This class now extends the WordPressCS native `Sniff` class.
- * @since   0.5.0  The various function list properties which used to be contained in this class
- *                 have been moved to the WordPressCS native `Sniff` parent class.
- * @since   0.12.0 This sniff will now also check for output escaping when using shorthand
- *                 echo tags `<?=`.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `XSS` category to the `Security` category.
- * @since   3.0.0  This class now extends the WordPressCS native
- *                 `AbstractFunctionRestrictionsSniff` class.
- *                 The parent `exclude` property is disabled.
+ * @since 2013-06-11
+ * @since 0.4.0  This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.5.0  The various function list properties which used to be contained in this class
+ *               have been moved to the WordPressCS native `Sniff` parent class.
+ * @since 0.12.0 This sniff will now also check for output escaping when using shorthand
+ *               echo tags `<?=`.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `XSS` category to the `Security` category.
+ * @since 3.0.0  This class now extends the WordPressCS native
+ *               `AbstractFunctionRestrictionsSniff` class.
+ *               The parent `exclude` property is disabled.
  *
- * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customEscapingFunctions
- * @uses    \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customAutoEscapedFunctions
- * @uses    \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait::$customPrintingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customEscapingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\EscapingFunctionsTrait::$customAutoEscapedFunctions
+ * @uses \WordPressCS\WordPress\Helpers\PrintingFunctionsTrait::$customPrintingFunctions
  */
 class EscapeOutputSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 2d460606da..328492e7bd 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -24,17 +24,15 @@
 /**
  * Checks that nonce verification accompanies form processing.
  *
- * @link    https://developer.wordpress.org/plugins/security/nonces/ Nonces on Plugin Developer Handbook
+ * @link https://developer.wordpress.org/plugins/security/nonces/ Nonces on Plugin Developer Handbook
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.5.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
- * @since   3.0.0  This sniff has received significant updates to its logic and structure.
+ * @since 0.5.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
+ * @since 3.0.0  This sniff has received significant updates to its logic and structure.
  *
- * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
- * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
  */
 class NonceVerificationSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index a1ce2ac9ad..276e4c5009 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -15,15 +15,13 @@
 /**
  * Warn about __FILE__ for page registration.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#using-__file__-for-page-registration
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#using-__file__-for-page-registration
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.11.0 Refactored to extend the new WordPressCS native
- *                 `AbstractFunctionParameterSniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ * @since 0.3.0
+ * @since 0.11.0 Refactored to extend the new WordPressCS native
+ *               `AbstractFunctionParameterSniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  */
 final class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/Security/SafeRedirectSniff.php b/WordPress/Sniffs/Security/SafeRedirectSniff.php
index 7aa8b9778e..88a08313a7 100644
--- a/WordPress/Sniffs/Security/SafeRedirectSniff.php
+++ b/WordPress/Sniffs/Security/SafeRedirectSniff.php
@@ -14,9 +14,7 @@
 /**
  * Encourages use of wp_safe_redirect() to avoid open redirect vulnerabilities.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  */
 final class SafeRedirectSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 3ec36a706e..683abad29d 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -19,18 +19,16 @@
 /**
  * Flag any non-validated/sanitized input ( _GET / _POST / etc. ).
  *
- * @link    https://github.com/WordPress/WordPress-Coding-Standards/issues/69
+ * @link https://github.com/WordPress/WordPress-Coding-Standards/issues/69
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.4.0  This class now extends the WordPressCS native `Sniff` class.
- * @since   0.5.0  Method getArrayIndexKey() has been moved to the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ * @since 0.3.0
+ * @since 0.4.0  This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.5.0  Method getArrayIndexKey() has been moved to the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
- * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
- * @uses    \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
  */
 class ValidatedSanitizedInputSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index 88116e0b6d..d6473ac932 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -25,9 +25,7 @@
  *
  * Note: Without a user-defined configuration in a custom ruleset, this sniff will be ignored.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.2.0
+ * @since 1.2.0
  */
 final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
index 1ec48985a5..afd98fd2ac 100644
--- a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -17,14 +17,12 @@
 /**
  * Discourages the use of various functions and suggests (WordPress) alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  - Takes the minimum supported WP version into account.
- *                 - Takes exceptions based on passed parameters into account.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  - Takes the minimum supported WP version into account.
+ *               - Takes exceptions based on passed parameters into account.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class AlternativeFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index cc185ad795..0b1016db38 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -22,11 +22,9 @@
  *
  * User capabilities should be used, not roles or deprecated capabilities.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   3.0.0
+ * @since 3.0.0
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 346e948f3f..68a651b92f 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -21,11 +21,9 @@
  *
  * Verify the correct spelling of `WordPress` in text strings, comments and OO and namespace names.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   3.0.0  Now also checks namespace names.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 3.0.0  Now also checks namespace names.
  */
 final class CapitalPDangitSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WP/ClassNameCaseSniff.php b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
index 079afe7b05..e1abd225a6 100644
--- a/WordPress/Sniffs/WP/ClassNameCaseSniff.php
+++ b/WordPress/Sniffs/WP/ClassNameCaseSniff.php
@@ -14,8 +14,6 @@
 /**
  * Verify whether references to WP native classes use the proper casing for the class name.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 3.0.0
  */
 final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index b67b9e7bf6..d7edcf6ed8 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -22,16 +22,14 @@
 /**
  * Flag cron schedules less than 15 minutes.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#cron-schedules-less-than-15-minutes-or-expensive-events
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#cron-schedules-less-than-15-minutes-or-expensive-events
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.11.0 - Extends the WordPressCS native `Sniff` class.
- *                 - Now deals correctly with WP time constants.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 The minimum cron interval tested against is now configurable.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
+ * @since 0.3.0
+ * @since 0.11.0 - Extends the WordPressCS native `Sniff` class.
+ *               - Now deals correctly with WP time constants.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 The minimum cron interval tested against is now configurable.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
  */
 final class CronIntervalSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
index 1257da0aa2..4c37043468 100644
--- a/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedClassesSniff.php
@@ -22,15 +22,13 @@
  * By default, it is set to presume that a project will support the current
  * WP version and up to three releases before.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 Now has the ability to handle minimum supported WP version
- *                 being provided via the command-line or as as <config> value
- *                 in a custom ruleset.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 Now has the ability to handle minimum supported WP version
+ *               being provided via the command-line or as as <config> value
+ *               in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
index 9633917b8a..fc7af255e7 100644
--- a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -22,15 +22,13 @@
  * By default, it is set to presume that a project will support the current
  * WP version and up to three releases before.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 Now has the ability to handle minimum supported WP version
- *                 being provided via the command-line or as as <config> value
- *                 in a custom ruleset.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 Now has the ability to handle minimum supported WP version
+ *               being provided via the command-line or as as <config> value
+ *               in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
index 89915bc1d5..0806772be4 100644
--- a/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php
@@ -19,11 +19,9 @@
 /**
  * Check for usage of deprecated parameter values in WP functions and provide alternative based on the parameter passed.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
index 1ee2d6b40f..2675ecfae8 100644
--- a/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
+++ b/WordPress/Sniffs/WP/DeprecatedParametersSniff.php
@@ -24,15 +24,13 @@
  * By default, it is set to presume that a project will support the current
  * WP version and up to three releases before.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 Now has the ability to handle minimum supported WP version
- *                 being provided via the command-line or as as <config> value
- *                 in a custom ruleset.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 Now has the ability to handle minimum supported WP version
+ *               being provided via the command-line or as as <config> value
+ *               in a custom ruleset.
  *
- * @uses    \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
+ * @uses \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait::$minimum_wp_version
  */
 final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index 1f47be3a29..d486b6c594 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -19,9 +19,7 @@
 /**
  * Warns against usage of discouraged WP CONSTANTS and recommends alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  */
 final class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
index 18d338173f..941b992ba5 100644
--- a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
@@ -14,10 +14,8 @@
 /**
  * Discourages the use of various WordPress functions and suggests alternatives.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class DiscouragedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index 47b82247b5..b3f1abcb1b 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -25,8 +25,6 @@
  * @link https://developer.wordpress.org/reference/functions/wp_register_style/
  * @link https://developer.wordpress.org/reference/functions/wp_enqueue_style/
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 1.0.0
  */
 final class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSniff {
diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 645b588dd5..5a38f15e64 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -18,13 +18,11 @@
 /**
  * Makes sure scripts and styles are enqueued and not explicitly echo'd.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#inline-resources
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#inline-resources
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.12.0 This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  */
 final class EnqueuedResourcesSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index 70fa404f9d..af9a1ea8f4 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -27,18 +27,16 @@
 /**
  * Warns about overwriting WordPress native global variables.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.4.0  This class now extends the WordPressCS native `Sniff` class.
- * @since   0.12.0 The $wp_globals property has been moved to the `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
- *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
- * @since   1.1.0  The sniff now also detects variables being overriden in the global namespace.
- * @since   2.2.0  The sniff now also detects variable assignments via the list() construct.
+ * @since 0.3.0
+ * @since 0.4.0  This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.12.0 The $wp_globals property has been moved to the `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `Variables` category to the `WP`
+ *               category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
+ * @since 1.1.0  The sniff now also detects variables being overriden in the global namespace.
+ * @since 2.2.0  The sniff now also detects variable assignments via the list() construct.
  *
- * @uses    \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
+ * @uses \WordPressCS\WordPress\Helpers\IsUnitTestTrait::$custom_test_classes
  */
 final class GlobalVariablesOverrideSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index f835bc34cf..6769753060 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -21,24 +21,22 @@
 /**
  * Makes sure WP internationalization functions are used properly.
  *
- * @link    https://make.wordpress.org/core/handbook/best-practices/internationalization/
- * @link    https://developer.wordpress.org/plugins/internationalization/
+ * @link https://make.wordpress.org/core/handbook/best-practices/internationalization/
+ * @link https://developer.wordpress.org/plugins/internationalization/
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.11.0 - Now also checks for translators comments.
- *                 - Now has the ability to handle text domain set via the command-line
- *                   as a comma-delimited list.
- *                   `phpcs --runtime-set text_domain my-slug,default`
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This class now extends the WordPressCS native
- *                 `AbstractFunctionRestrictionSniff` class.
- *                 The parent `exclude` property is, however, disabled as it
- *                 would disable the whole sniff.
- * @since   3.0.0  This class now extends the WordPressCS native
- *                 `AbstractFunctionParameterSniff` class.
- *                 The parent `exclude` property is still disabled.
+ * @since 0.10.0
+ * @since 0.11.0 - Now also checks for translators comments.
+ *               - Now has the ability to handle text domain set via the command-line
+ *                 as a comma-delimited list.
+ *                 `phpcs --runtime-set text_domain my-slug,default`
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This class now extends the WordPressCS native
+ *               `AbstractFunctionRestrictionSniff` class.
+ *               The parent `exclude` property is, however, disabled as it
+ *               would disable the whole sniff.
+ * @since 3.0.0  This class now extends the WordPressCS native
+ *               `AbstractFunctionParameterSniff` class.
+ *               The parent `exclude` property is still disabled.
  */
 final class I18nSniff extends AbstractFunctionParameterSniff {
 
diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index b3c1321f15..a3f8ce45a7 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -16,16 +16,14 @@
 /**
  * Flag returning high or infinite posts_per_page.
  *
- * @link    https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#no-limit-queries
+ * @link https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#no-limit-queries
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   0.14.0 Added the posts_per_page property.
- * @since   1.0.0  This sniff has been split into two, with the check for high pagination
- *                 limit being part of the WP category, and the check for pagination
- *                 disabling being part of the VIP category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.14.0 Added the posts_per_page property.
+ * @since 1.0.0  This sniff has been split into two, with the check for high pagination
+ *               limit being part of the WP category, and the check for pagination
+ *               disabling being part of the VIP category.
  */
 final class PostsPerPageSniff extends AbstractArrayAssignmentRestrictionsSniff {
 
diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index bf381c23a7..72e20067c1 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -15,18 +15,16 @@
 /**
  * Ensure cast statements are preceded by whitespace.
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.11.0 This sniff now has the ability to fix the issues it flags.
- * @since   0.11.0 The error level for all errors thrown by this sniff has been raised from warning to error.
- * @since   0.12.0 This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.2.0  Removed the `NoSpaceAfterCloseParenthesis` error code in favour of the
- *                 upstream `Generic.Formatting.SpaceAfterCast.NoSpace` error.
- * @since   2.2.0  Added exception for whitespace between spread operator and cast.
+ * @since 0.3.0
+ * @since 0.11.0 This sniff now has the ability to fix the issues it flags.
+ * @since 0.11.0 The error level for all errors thrown by this sniff has been raised from warning to error.
+ * @since 0.12.0 This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.2.0  Removed the `NoSpaceAfterCloseParenthesis` error code in favour of the
+ *               upstream `Generic.Formatting.SpaceAfterCast.NoSpace` error.
+ * @since 2.2.0  Added exception for whitespace between spread operator and cast.
  */
 final class CastStructureSpacingSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 24cf2f5331..1123a4a1c1 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -15,19 +15,17 @@
 /**
  * Enforces spacing around logical operators and assignments, based upon Squiz code.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.1.0
- * @since   2013-06-11 This sniff no longer supports JS.
- * @since   0.3.0      This sniff now has the ability to fix most errors it flags.
- * @since   0.7.0      This class now extends the WordPressCS native `Sniff` class.
- * @since   0.13.0     Class name changed: this class is now namespaced.
- * @since   3.0.0      Checks related to function declarations have been removed from this sniff.
+ * @since 0.1.0
+ * @since 2013-06-11 This sniff no longer supports JS.
+ * @since 0.3.0      This sniff now has the ability to fix most errors it flags.
+ * @since 0.7.0      This class now extends the WordPressCS native `Sniff` class.
+ * @since 0.13.0     Class name changed: this class is now namespaced.
+ * @since 3.0.0      Checks related to function declarations have been removed from this sniff.
  *
  * Last synced with base class 2017-01-15 at commit b024ad84656c37ef5733c6998ebc1e60957b2277.
  * Note: This class has diverged quite far from the original. All the same, checking occasionally
  * to see if there are upstream fixes made from which this sniff can benefit, is warranted.
- * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
  */
 final class ControlStructureSpacingSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index 607035d22e..7337a5b0d2 100644
--- a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -19,8 +19,6 @@
  * Difference with the upstream sniff:
  * - When the `::` operator is used in `::class`, no new line(s) before or after the object operator are allowed.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 3.0.0
  * @link  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
  */
diff --git a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index d5db505506..7824379588 100644
--- a/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -18,22 +18,20 @@
  *
  * "Always put spaces after commas, and on both sides of logical, comparison, string and assignment operators."
  *
- * @link    https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
+ * @link https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#space-usage
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.1.0
- * @since   0.3.0  This sniff now has the ability to fix the issues it flags.
- * @since   0.12.0 This sniff used to be a copy of a very old and outdated version of the
- *                 upstream sniff.
- *                 Now, the sniff defers completely to the upstream sniff, adding just the
- *                 T_BOOLEAN_NOT and the logical operators (`&&` and the like) - via the
- *                 registration method and changing the value of the customizable
- *                 $ignoreNewlines property.
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.1.0
+ * @since 0.3.0  This sniff now has the ability to fix the issues it flags.
+ * @since 0.12.0 This sniff used to be a copy of a very old and outdated version of the
+ *               upstream sniff.
+ *               Now, the sniff defers completely to the upstream sniff, adding just the
+ *               T_BOOLEAN_NOT and the logical operators (`&&` and the like) - via the
+ *               registration method and changing the value of the customizable
+ *               $ignoreNewlines property.
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * Last verified with base class June 2023 at commit 085b1e091b0f2e451333c0bc26dd50bba39402c4.
- * @link    https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
  */
 final class OperatorSpacingSniff extends PHPCS_Squiz_OperatorSpacingSniff {
 
diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index c833d84da9..80d4c78146 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ArrayDeclarationSpacing sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayDeclarationSpacingSniff
  */
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
index 40f093ff25..0841cd611c 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ArrayIndentation sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayIndentationSniff
  */
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 5e9046ef9e..7504a4709d 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ArrayKeySpacingRestrictions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\Arrays\ArrayKeySpacingRestrictionsSniff
  */
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
index f00dd19969..27a8ddd1ad 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
@@ -18,9 +18,7 @@
  * 1. Tab-based indentation, long arrays.
  * 2. Space-based indentation, short arrays.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\Arrays\MultipleStatementAlignmentSniff
  */
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index dbba1575e4..e3e4824b9a 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the AssignmentInTernaryCondition sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\CodeAnalysis\AssignmentInTernaryConditionSniff
  */
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
index 22a98a9613..a0bc185671 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the EscapedNotTranslated sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\CodeAnalysis\EscapedNotTranslatedSniff
  */
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index 5488d4db33..be7cfff212 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the DirectDatabaseQuery sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\RulesetPropertyHelper
  * @covers \WordPressCS\WordPress\Sniffs\DB\DirectDatabaseQuerySniff
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index fc491c5080..77ffea9e19 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the PreparedSQLPlaceholders sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\DB\PreparedSQLPlaceholdersSniff
  */
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index 88e5a23ef9..ce279e8ea8 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the PreparedSQL sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.8.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
+ * @since 0.8.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `WP` category to the `DB` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_safe_casted
  * @covers \WordPressCS\WordPress\Helpers\FormattingFunctionsHelper
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index f062b9e31f..b2f6e0ac1f 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -15,11 +15,9 @@
 /**
  * Unit test class for the DB_RestrictedClasses sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 3.0.0  Renamed the fixtures to create compatibility with PHPCS 4.x/PHPUnit >=8.
  *
  * @covers \WordPressCS\WordPress\AbstractClassRestrictionsSniff
  * @covers \WordPressCS\WordPress\Helpers\RulesetPropertyHelper
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index 43e68f8012..0f8a0eba31 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -15,10 +15,8 @@
 /**
  * Unit test class for the DB_RestrictedFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\DB\RestrictedFunctionsSniff
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index 78112fd45a..f18e9accd1 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the SlowDBQuery sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `DB` category.
  *
  * @covers \WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\DB\SlowDBQuerySniff
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
index 44984710c5..a857fdaf9e 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the CurrentTimeTimestamp sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\DateTime\CurrentTimeTimestampSniff
  */
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
index f46d099aec..217f8d86f0 100644
--- a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the DateTime.RestrictedFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\DateTime\RestrictedFunctionsSniff
  */
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 8c327f96d8..09d66cf00a 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the FileName sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.11.0     Actually added tests ;-)
- * @since   0.13.0     Class name changed: this class is now namespaced.
+ * @since 2013-06-11
+ * @since 0.11.0     Actually added tests ;-)
+ * @since 0.13.0     Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\Files\FileNameSniff
  */
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 444754d96d..77f2966729 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the PrefixAllGlobals sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Helpers\IsUnitTestTrait
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\PrefixAllGlobalsSniff
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 9213827917..987b6bbc33 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ValidFunctionName sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.13.0     Class name changed: this class is now namespaced.
+ * @since 2013-06-11
+ * @since 0.13.0     Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Helpers\DeprecationHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidFunctionNameSniff
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index ff0b7e5093..6a4db70128 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ValidHookName sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Helpers\WPHookHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidHookNameSniff
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index 9e9298a56e..658678bb78 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the PostType sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2.2.0
+ * @since 2.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidPostTypeSlugSniff
  */
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 467924b686..587fa6e82e 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ValidVariableName sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.9.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.9.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Helpers\SnakeCaseHelper
  * @covers \WordPressCS\WordPress\Sniffs\NamingConventions\ValidVariableNameSniff
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
index 4fe6a62f9a..8008238212 100644
--- a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the PHP_DevelopmentFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\DevelopmentFunctionsSniff
  */
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
index 639ff11f09..65e2fb557f 100644
--- a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the PHP_DiscouragedPHPFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\DiscouragedPHPFunctionsSniff
  */
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
index 7079ce6e73..02cc245fc4 100644
--- a/WordPress/Tests/PHP/DontExtractUnitTest.php
+++ b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the DontExtract sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `Functions` category to the `PHP` category.
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\DontExtractSniff
  */
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index 573c24c430..950fa2b431 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit test class for the IniSet sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 2.1.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\IniSetSniff
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
index b4ee45892a..89fa3a16e9 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the PHP.NoSilencedErrors sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.1.0
+ * @since 1.1.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\NoSilencedErrorsSniff
  */
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
index 738c85e7d7..82eb162ec4 100644
--- a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the POSIXFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\POSIXFunctionsSniff
  */
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
index dcb0948838..96939b4b32 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the PregQuoteDelimiter sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\PregQuoteDelimiterSniff
  */
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
index cc3ac3e63e..b5904fd4a6 100644
--- a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the PHP_DiscouragedPHPFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.14.0
+ * @since 0.14.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\RestrictedPHPFunctionsSniff
  */
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index c430d94a34..e5f387e5b0 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the StrictInArray sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.9.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.9.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\AbstractFunctionParameterSniff
  * @covers \WordPressCS\WordPress\Sniffs\PHP\StrictInArraySniff
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index de2dd0d5ad..e93daab07f 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit test class for the TypeCasts sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 1.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\TypeCastsSniff
diff --git a/WordPress/Tests/PHP/YodaConditionsUnitTest.php b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
index 98bd027f86..da4bef8b8d 100644
--- a/WordPress/Tests/PHP/YodaConditionsUnitTest.php
+++ b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the YodaConditions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\PHP\YodaConditionsSniff
  */
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 464affd5f2..5705ba1d29 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the EscapeOutput sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.13.0     Class name changed: this class is now namespaced.
- * @since   1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
+ * @since 2013-06-11
+ * @since 0.13.0     Class name changed: this class is now namespaced.
+ * @since 1.0.0      This sniff has been moved from the `XSS` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::get_safe_cast_tokens
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 5a5bebd94a..8886e3a471 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the NonceVerification sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.5.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
+ * @since 0.5.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_function_call
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::is_in_type_test
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index b77830614e..baab374227 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the PluginMenuSlug sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Sniffs\Security\PluginMenuSlugSniff
  */
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
index faac0d90aa..e13ad5c1c6 100644
--- a/WordPress/Tests/Security/SafeRedirectUnitTest.php
+++ b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the Security_SafeRedirect sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\Security\SafeRedirectSniff
  */
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 90e10b5a8d..87e8776789 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the ValidatedSanitizedInput sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 4da81a10df..391e59f06d 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -15,9 +15,7 @@
 /**
  * Unit test class for the I18nTextDomainFixer sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.2.0
+ * @since 1.2.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\Utils\I18nTextDomainFixerSniff
  */
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index ffe0e4acc1..28d66f6bb6 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the WP_AlternativeFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Helpers\MinimumWPVersionTrait
  * @covers \WordPressCS\WordPress\Sniffs\WP\AlternativeFunctionsSniff
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index ca26338aa4..7d9a48b683 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -15,8 +15,7 @@
 /**
  * Unit test class for the Capabilities sniff.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   3.0.0
+ * @since 3.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\CapabilitiesSniff
  */
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 2c61e7e715..4fce4deac0 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the CapitalPDangit sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\CapitalPDangitSniff
  */
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
index c7a7108a81..0127be8cea 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.php
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit test class for the ClassNameCase sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 3.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\ClassNameCaseSniff
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 06a9cbf389..694418d6fa 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -14,11 +14,9 @@
 /**
  * Unit test class for the CronInterval sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `VIP` category to the `WP` category.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\CronIntervalSniff
  */
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index a644d3e33d..caa5bb174e 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the WP_DeprecatedClasses sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedClassesSniff
  */
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 7fc8b81a37..300671a000 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the WP_DeprecatedFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedFunctionsSniff
  */
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 2685e41a49..6a2271f0d9 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the DeprecatedParameterValues sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedParameterValuesSniff
  */
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index a063475ae8..78ad14cff1 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the DeprecatedParameters sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.12.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.12.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\DeprecatedParametersSniff
  */
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index 605c5cf49a..512d07b7e0 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -14,8 +14,7 @@
 /**
  * Unit test class for the WP_DiscouragedConstants sniff.
  *
- * @package WPCS\WordPressCodingStandards
- * @since   0.14.0
+ * @since 0.14.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\DiscouragedConstantsSniff
  */
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index c5bf9a64b8..8d5c188361 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the WP_DiscouragedFunctions sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.11.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.11.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\AbstractFunctionRestrictionsSniff
  * @covers \WordPressCS\WordPress\Helpers\ContextHelper::has_object_operator_before
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index 59d91d0c44..ce39aa8547 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -14,9 +14,7 @@
 /**
  * Unit test class for the EnqueuedCheck sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   1.0.0
+ * @since 1.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\EnqueuedResourceParametersSniff
  */
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index 0eae7f1bc8..1b38d2e96a 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the EnqueuedResources sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\EnqueuedResourcesSniff
  */
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index 4b462f2c75..928bbbd1f8 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -14,12 +14,10 @@
 /**
  * Unit test class for the GlobalVariables sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been moved from the `Variables` category to the `WP`
- *                 category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been moved from the `Variables` category to the `WP`
+ *               category and renamed from `GlobalVariables` to `GlobalVariablesOverride`.
  *
  * @covers \WordPressCS\WordPress\Helpers\ListHelper
  * @covers \WordPressCS\WordPress\Helpers\WPGlobalVariablesHelper
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index 925eae6d93..d282be252b 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the I18n sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.10.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.10.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WP\I18nSniff
  */
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 3cc98c410a..20237e4418 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -14,13 +14,11 @@
 /**
  * Unit test class for the PostsPerPage sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
- * @since   1.0.0  This sniff has been split into two, with the check for high pagination
- *                 limit being part of the WP category, and the check for pagination
- *                 disabling being part of the VIP category.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
+ * @since 1.0.0  This sniff has been split into two, with the check for high pagination
+ *               limit being part of the WP category, and the check for pagination
+ *               disabling being part of the VIP category.
  *
  * @covers \WordPressCS\WordPress\AbstractArrayAssignmentRestrictionsSniff
  * @covers \WordPressCS\WordPress\Sniffs\WP\PostsPerPageSniff
diff --git a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
index 1b80f7e0aa..634afefcfa 100644
--- a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the CastStructureSpacing sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   0.3.0
- * @since   0.13.0 Class name changed: this class is now namespaced.
+ * @since 0.3.0
+ * @since 0.13.0 Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\CastStructureSpacingSniff
  */
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 2ceeff7cc4..5f93452331 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -14,10 +14,8 @@
 /**
  * Unit test class for the ControlStructureSpacing sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.13.0     Class name changed: this class is now namespaced.
+ * @since 2013-06-11
+ * @since 0.13.0     Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\ControlStructureSpacingSniff
  */
diff --git a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
index cd6d22955f..adfbe1ba9c 100644
--- a/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit test class for the ObjectOperatorSpacing sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
  * @since 3.0.0
  *
  * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index 8fa8dddd3c..21ed0f8ea5 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -14,12 +14,10 @@
 /**
  * Unit test class for the OperatorSpacing sniff.
  *
- * @package WPCS\WordPressCodingStandards
- *
- * @since   2013-06-11
- * @since   0.12.0     Now only tests the WPCS specific addition of T_BOOLEAN_NOT.
- *                     The rest of the sniff is unit tested upstream.
- * @since   0.13.0     Class name changed: this class is now namespaced.
+ * @since 2013-06-11
+ * @since 0.12.0     Now only tests the WPCS specific addition of T_BOOLEAN_NOT.
+ *                   The rest of the sniff is unit tested upstream.
+ * @since 0.13.0     Class name changed: this class is now namespaced.
  *
  * @covers \WordPressCS\WordPress\Sniffs\WhiteSpace\OperatorSpacingSniff
  */

From 3c04dc7fccf1553baac8174dbcfad38424e1a073 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 1 Jul 2023 01:19:37 +0200
Subject: [PATCH 747/822] Add release checklist

While not an officially supported file, in my experience it is helpful to have a release checklist available. This makes the release process more transparent and less dependent on specific maintainers.

The checklist documents the release steps and can be updated via PRs to add additional steps/adjust existing steps whenever needed.

The checklist should be used as the PR description for the release PR from `develop` to `main`.
---
 .github/release-checklist.md | 63 ++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/release-checklist.md

diff --git a/.github/release-checklist.md b/.github/release-checklist.md
new file mode 100644
index 0000000000..affc8afe61
--- /dev/null
+++ b/.github/release-checklist.md
@@ -0,0 +1,63 @@
+# Template to use for release PRs from `develop` to `main`
+
+:warning: **DO NOT MERGE (YET)** :warning:
+
+**Please **do** add approvals if you agree as otherwise we won't be able to release.**
+
+PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH DAY YEAR**.
+
+## Release checklist
+
+### General
+
+- [ ] Verify, and if necessary, update the allowed version ranges for various dependencies in the `composer.json` - PR #xxx
+- [ ] PHPCS: check if there have been releases since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
+- [ ] PHPCSUtils: check if there have been releases since the last WordPressCS release and update WordPressCS code to take advantage of any new utilities - PR #xxx
+- [ ] PHPCSExtra: check if there have been releases since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
+- [ ] Check if the minimum WP version property needs updating in `MinimumWPVersionTrait::$default_minimum_wp_version` and if so, action it - PR #xxx
+- [ ] Check if any of the list based sniffs need updating and if so, action it.
+    List based sniffs:
+    - [ ] `WordPress.WP.ClassNameCase` - PR #xxx
+    - [ ] `WordPress.WP.DeprecatedClasses` - PR #xxx
+    - [ ] `WordPress.WP.DeprecatedFunctions` - PR #xxx
+    - [ ] `WordPress.WP.DeprecatedParameters` - PR #xxx
+    - [ ] `WordPress.WP.DeprecatedParameterValues` - PR #xxx
+- [ ] Check if any of the other lists containing information about WP Core need updating and if so, action it.
+    - [ ] `$allowed_core_constants` in `WordPress.NamingConventions.PrefixAllGlobals` - PR #xxx
+    - [ ] `$pluggable_functions` in `WordPress.NamingConventions.PrefixAllGlobals` - PR #xxx
+    - [ ] `$pluggable_classes` in `WordPress.NamingConventions.PrefixAllGlobals` - PR #xxx
+    - [ ] `$target_functions` in `WordPress.Security.PluginMenuSlug` - PR #xxx
+    - [ ] `$reserved_names` in `WordPress.NamingConventions.ValidPostTypeSlug` - PR #xxx
+    - [ ] `$wp_time_constants` in `WordPress.WP.CronInterval` - PR #xxx
+    - [ ] `$known_test_classes` in `IsUnitTestTrait` - PR #xxx
+    - [ ] ...etc...
+
+### Release prep
+
+- [ ] Add changelog for the release - PR #xxx
+    :pencil2: Remember to add a release link at the bottom!
+- [ ] Update `README` (if applicable) - PR #xxx.
+- [ ] Update wiki (new customizable properties etc) (if applicable)
+
+### Release
+
+- [ ] Merge this PR
+- [ ] Make sure all CI builds are green.
+- [ ] Tag and create a release against `main` (careful, GH defaults to `develop`!) & copy & paste the changelog to it.
+    :pencil2: Check if anything from the link collection at the bottom of the changelog needs to be copied in!
+- [ ] Make sure all CI builds are green.
+- [ ] Close the milestone
+- [ ] Open a new milestone for the next release
+- [ ] If any open PRs/issues which were milestoned for this release did not make it into the release, update their milestone.
+- [ ] Fast-forward `develop` to be equal to `main`
+
+### After release
+
+- [ ] Open a Trac ticket for WordPress Core to update.
+
+### Publicize
+
+- [ ] [Major releases only] Publish post about the release on Make WordPress
+- [ ] Tweet, toot, etc about the release.
+- [ ] Post about it in Slack.
+- [ ] Submit for "Month in WordPress": https://make.wordpress.org/community/month-in-wordpress-submissions/

From 71d8fed5bba5cb73df47762b3eb109496737ed6d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 11 Aug 2023 13:51:23 +0200
Subject: [PATCH 748/822] Release checklist: update for review comments

---
 .github/release-checklist.md | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/release-checklist.md b/.github/release-checklist.md
index affc8afe61..3c39e21ed0 100644
--- a/.github/release-checklist.md
+++ b/.github/release-checklist.md
@@ -11,11 +11,12 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
 ### General
 
 - [ ] Verify, and if necessary, update the allowed version ranges for various dependencies in the `composer.json` - PR #xxx
-- [ ] PHPCS: check if there have been releases since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
-- [ ] PHPCSUtils: check if there have been releases since the last WordPressCS release and update WordPressCS code to take advantage of any new utilities - PR #xxx
-- [ ] PHPCSExtra: check if there have been releases since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
+- [ ] PHPCS: check if there have been [releases][phpcs-releases] since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
+- [ ] PHPCSUtils: check if there have been [releases][phpcsutils-releases] since the last WordPressCS release and update WordPressCS code to take advantage of any new utilities - PR #xxx
+- [ ] PHPCSExtra: check if there have been [releases][phpcsextra-releases] since the last WordPressCS release and check through the changelog to see if there is anything WordPressCS could take advantage of - PR #xxx
 - [ ] Check if the minimum WP version property needs updating in `MinimumWPVersionTrait::$default_minimum_wp_version` and if so, action it - PR #xxx
 - [ ] Check if any of the list based sniffs need updating and if so, action it.
+    :pencil2: Make sure the "last updated" annotation in the docblocks for these lists has also been updated!
     List based sniffs:
     - [ ] `WordPress.WP.ClassNameCase` - PR #xxx
     - [ ] `WordPress.WP.DeprecatedClasses` - PR #xxx
@@ -36,20 +37,20 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
 
 - [ ] Add changelog for the release - PR #xxx
     :pencil2: Remember to add a release link at the bottom!
-- [ ] Update `README` (if applicable) - PR #xxx.
-- [ ] Update wiki (new customizable properties etc) (if applicable)
+- [ ] Update `README` (if applicable) - PR #xxx
+- [ ] Update wiki (new customizable properties etc.) (if applicable)
 
 ### Release
 
-- [ ] Merge this PR
+- [ ] Merge this PR.
 - [ ] Make sure all CI builds are green.
 - [ ] Tag and create a release against `main` (careful, GH defaults to `develop`!) & copy & paste the changelog to it.
     :pencil2: Check if anything from the link collection at the bottom of the changelog needs to be copied in!
 - [ ] Make sure all CI builds are green.
-- [ ] Close the milestone
-- [ ] Open a new milestone for the next release
+- [ ] Close the milestone.
+- [ ] Open a new milestone for the next release.
 - [ ] If any open PRs/issues which were milestoned for this release did not make it into the release, update their milestone.
-- [ ] Fast-forward `develop` to be equal to `main`
+- [ ] Fast-forward `develop` to be equal to `main`.
 
 ### After release
 
@@ -57,7 +58,13 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
 
 ### Publicize
 
-- [ ] [Major releases only] Publish post about the release on Make WordPress
+- [ ] [Major releases only] Publish post about the release on Make WordPress.
 - [ ] Tweet, toot, etc about the release.
 - [ ] Post about it in Slack.
-- [ ] Submit for "Month in WordPress": https://make.wordpress.org/community/month-in-wordpress-submissions/
+- [ ] Submit for ["Month in WordPress"][month-in-wp].
+
+
+[phpcs-releases]:      https://github.com/squizlabs/PHP_CodeSniffer/releases
+[phpcsutils-releases]: https://github.com/PHPCSStandards/PHPCSUtils/releases
+[phpcsextra-releases]: https://github.com/PHPCSStandards/PHPCSExtra/releases
+[month-in-wp]:         https://make.wordpress.org/community/month-in-wordpress-submissions/

From f6adf52ba44e9b998c588c2b371fc632e7474955 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 31 May 2022 09:43:46 +0200
Subject: [PATCH 749/822] Whitespace/ControlStructureSpacing: sync with
 upstream [1]

Add metrics for blank line at start/end of control structure as per https://github.com/squizlabs/PHP_CodeSniffer/commit/4fc2515b3c403e970cab90936ee73f4434f35827 (PHPCS 2.5.1).
---
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 1123a4a1c1..d52b145a29 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -295,6 +295,9 @@ public function process_token( $stackPtr ) {
 			if ( ! isset( $ignore[ $this->tokens[ $firstContent ]['code'] ] )
 				&& $this->tokens[ $firstContent ]['line'] > ( $this->tokens[ $scopeOpener ]['line'] + 1 )
 			) {
+				$gap = ( $this->tokens[ $firstContent ]['line'] - $this->tokens[ $scopeOpener ]['line'] - 1 );
+				$this->phpcsFile->recordMetric( $stackPtr, 'Blank lines at start of control structure', $gap );
+
 				$error = 'Blank line found at start of control structure';
 				$fix   = $this->phpcsFile->addFixableError( $error, $scopeOpener, 'BlankLineAfterStart' );
 
@@ -311,6 +314,8 @@ public function process_token( $stackPtr ) {
 					$this->phpcsFile->fixer->addNewline( $scopeOpener );
 					$this->phpcsFile->fixer->endChangeset();
 				}
+			} else {
+				$this->phpcsFile->recordMetric( $stackPtr, 'Blank lines at start of control structure', 0 );
 			}
 
 			if ( $firstContent !== $scopeCloser ) {
@@ -326,6 +331,9 @@ public function process_token( $stackPtr ) {
 				if ( ! isset( $ignore[ $this->tokens[ $checkToken ]['code'] ] )
 					&& $this->tokens[ $lastContent ]['line'] <= ( $this->tokens[ $scopeCloser ]['line'] - 2 )
 				) {
+					$gap = ( $this->tokens[ $scopeCloser ]['line'] - $this->tokens[ $lastContent ]['line'] - 1 );
+					$this->phpcsFile->recordMetric( $stackPtr, 'Blank lines at end of control structure', $gap );
+
 					for ( $i = ( $scopeCloser - 1 ); $i > $lastContent; $i-- ) {
 						if ( $this->tokens[ $i ]['line'] < $this->tokens[ $scopeCloser ]['line']
 							&& \T_OPEN_TAG !== $this->tokens[ $firstContent ]['code']
@@ -359,6 +367,8 @@ public function process_token( $stackPtr ) {
 							break;
 						}
 					}
+				} else {
+					$this->phpcsFile->recordMetric( $stackPtr, 'Blank lines at end of control structure', 0 );
 				}
 			}
 			unset( $ignore );

From e1ae45be69e3a55728c3fc9822cf1270fe1a5247 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 13 Aug 2023 17:59:41 +0200
Subject: [PATCH 750/822] Whitespace/ControlStructureSpacing: sync with
 upstream [2]

Check the spacing after the `finally` keyword as per https://github.com/squizlabs/PHP_CodeSniffer/commit/eefb31c68e4c9e4c390d08859163ca7e587ca46d (PHPCS 3.2.3).

Handled in a slightly different way as upstream as the sniffs have diverged, but this should work for the most part (aside from pre-existing issues in the sniff anyway).
---
 .../ControlStructureSpacingSniff.php          | 25 ++++++++++++---
 .../ControlStructureSpacingUnitTest.1.inc     | 32 +++++++++++++++++++
 ...ontrolStructureSpacingUnitTest.1.inc.fixed | 29 +++++++++++++++++
 .../ControlStructureSpacingUnitTest.php       |  3 ++
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index d52b145a29..de6b7d484f 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -53,16 +53,17 @@ final class ControlStructureSpacingSniff extends Sniff {
 	/**
 	 * Tokens for which to ignore extra space on the inside of parenthesis.
 	 *
-	 * For do / else / try, there are no parenthesis, so skip it.
+	 * For do / else / try / finally, there are no parenthesis, so skip it.
 	 *
 	 * @since 0.11.0
 	 *
 	 * @var array
 	 */
 	private $ignore_extra_space_after_open_paren = array(
-		\T_DO   => true,
-		\T_ELSE => true,
-		\T_TRY  => true,
+		\T_DO      => true,
+		\T_ELSE    => true,
+		\T_TRY     => true,
+		\T_FINALLY => true,
 	);
 
 	/**
@@ -82,6 +83,7 @@ public function register() {
 			\T_ELSEIF,
 			\T_TRY,
 			\T_CATCH,
+			\T_FINALLY,
 		);
 	}
 
@@ -415,6 +417,21 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		if ( \T_CATCH === $this->tokens[ $trailingContent ]['code'] && \T_TRY === $this->tokens[ $stackPtr ]['code'] ) {
+			// TRY with CATCH.
+			return;
+		}
+
+		if ( \T_FINALLY === $this->tokens[ $trailingContent ]['code'] && \T_CATCH === $this->tokens[ $stackPtr ]['code'] ) {
+			// CATCH with FINALLY.
+			return;
+		}
+
+		if ( \T_FINALLY === $this->tokens[ $trailingContent ]['code'] && \T_TRY === $this->tokens[ $stackPtr ]['code'] ) {
+			// TRY with FINALLY.
+			return;
+		}
+
 		if ( \T_CLOSE_TAG === $this->tokens[ $trailingContent ]['code'] ) {
 			// At the end of the script or embedded code.
 			return;
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
index 1f1b47abf1..7b736e4438 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
@@ -180,3 +180,35 @@ if ( $foo ) {
 
 
 }
+
+// Handle (try/catch/) finally statements as well.
+try {
+	// Something
+} catch ( Exception $e ) {
+	// Something
+} finally { // OK.
+	// Something
+}
+
+try {
+	// Something
+} finally
+
+{ // Bad.
+	// Something
+}
+
+try {
+	// Something
+} finally{ // Bad.
+	// Something
+}
+
+if ( $condition ) {
+	try {
+		// Something
+	} finally {
+		// Something
+	}
+
+} // Bad: blank line between.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
index c57462793c..655b6a8a98 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
@@ -171,3 +171,32 @@ if ( $foo ) {
 		// Something
 	} // End try/catch <- Bad: "blank line after".
 }
+
+// Handle (try/catch/) finally statements as well.
+try {
+	// Something
+} catch ( Exception $e ) {
+	// Something
+} finally { // OK.
+	// Something
+}
+
+try {
+	// Something
+} finally { // Bad.
+	// Something
+}
+
+try {
+	// Something
+} finally { // Bad.
+	// Something
+}
+
+if ( $condition ) {
+	try {
+		// Something
+	} finally {
+		// Something
+	}
+} // Bad: blank line between.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 5f93452331..6a88e0f654 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -52,6 +52,9 @@ public function getErrorList( $testFile = '' ) {
 					159 => 1,
 					169 => 1,
 					179 => 1,
+					195 => 1,
+					203 => 2,
+					212 => 1,
 				);
 
 				return $ret;

From 2b1ba784e2f44604cd04e51835df3d7c787669f1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 14 Aug 2023 08:21:14 +0200
Subject: [PATCH 751/822] Whitespace/ControlStructureSpacing: sync with
 upstream [3]

Check the spacing for `match` control structures as per https://github.com/squizlabs/PHP_CodeSniffer/commit/549899bb93ebb830e0b2ef5d71ead42941b1e362 (PHPCS 3.6.0).
---
 .../ControlStructureSpacingSniff.php          | 11 +++++++
 .../ControlStructureSpacingUnitTest.1.inc     | 30 +++++++++++++++++++
 ...ontrolStructureSpacingUnitTest.1.inc.fixed | 26 ++++++++++++++++
 .../ControlStructureSpacingUnitTest.php       |  4 +++
 4 files changed, 71 insertions(+)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index de6b7d484f..a68caa73ef 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -84,6 +84,7 @@ public function register() {
 			\T_TRY,
 			\T_CATCH,
 			\T_FINALLY,
+			\T_MATCH,
 		);
 	}
 
@@ -380,6 +381,16 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
+		if ( \T_MATCH === $this->tokens[ $stackPtr ]['code'] ) {
+			// Move the scope closer to the semicolon/comma.
+			$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $scopeCloser + 1 ), null, true );
+			if ( false !== $next
+				&& ( \T_SEMICOLON === $this->tokens[ $next ]['code'] || \T_COMMA === $this->tokens[ $next ]['code'] )
+			) {
+				$scopeCloser = $next;
+			}
+		}
+
 		// {@internal This is just for the blank line check. Only whitespace should be considered,
 		// not "other" empty tokens.}}
 		$trailingContent = $this->phpcsFile->findNext( \T_WHITESPACE, ( $scopeCloser + 1 ), null, true );
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
index 7b736e4438..ce5467c1b6 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
@@ -212,3 +212,33 @@ if ( $condition ) {
 	}
 
 } // Bad: blank line between.
+
+// Handle PHP 8.0+ match expressions.
+$expr = match ( $foo ) {
+    1 => 1,
+    2 => 2,
+};
+
+$expr = match($foo){
+    1 => 1,
+    2 => 2,
+} ;
+
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check true
+$expr = match ( $foo ) {
+
+    1 => 1,
+    2 => 2,
+
+};
+
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+if ( $condition ) {
+	$expr = match ( $foo ) {
+	    1 => 1,
+	    2 => 2,
+	};
+
+
+} // Bad: blank line between.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
index 655b6a8a98..f69ea425f5 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
@@ -200,3 +200,29 @@ if ( $condition ) {
 		// Something
 	}
 } // Bad: blank line between.
+
+// Handle PHP 8.0+ match expressions.
+$expr = match ( $foo ) {
+    1 => 1,
+    2 => 2,
+};
+
+$expr = match ( $foo ) {
+    1 => 1,
+    2 => 2,
+} ;
+
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check true
+$expr = match ( $foo ) {
+    1 => 1,
+    2 => 2,
+};
+
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+if ( $condition ) {
+	$expr = match ( $foo ) {
+	    1 => 1,
+	    2 => 2,
+	};
+} // Bad: blank line between.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index 6a88e0f654..d56e56e840 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -55,6 +55,10 @@ public function getErrorList( $testFile = '' ) {
 					195 => 1,
 					203 => 2,
 					212 => 1,
+					222 => 5,
+					228 => 1,
+					232 => 1,
+					241 => 1,
 				);
 
 				return $ret;

From c355ab9ce36a25da2cff27f26364b934641ea35b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 14 Aug 2023 08:36:11 +0200
Subject: [PATCH 752/822] Whitespace/ControlStructureSpacing: sync with
 upstream [4]

Ignore blank line/spacing rules when the next thing (inside/outside) is an enum as per https://github.com/squizlabs/PHP_CodeSniffer/commit/7f11ffc8222b123c06345afd3261221561c3bb29 and https://github.com/squizlabs/PHP_CodeSniffer/commit/b71b4703912d9ed74393f406c80f072cff4c9cae (PHPCS 3.7.0).
---
 .../ControlStructureSpacingSniff.php          |  2 +-
 .../ControlStructureSpacingUnitTest.1.inc     | 21 +++++++++++++++++++
 ...ontrolStructureSpacingUnitTest.1.inc.fixed | 21 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index a68caa73ef..f5b304792a 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -453,7 +453,7 @@ public function process_token( $stackPtr ) {
 		) {
 			// Another control structure's closing brace.
 			$owner = $this->tokens[ $trailingContent ]['scope_condition'];
-			if ( \in_array( $this->tokens[ $owner ]['code'], array( \T_FUNCTION, \T_CLOSURE, \T_CLASS, \T_ANON_CLASS, \T_INTERFACE, \T_TRAIT ), true ) ) {
+			if ( \in_array( $this->tokens[ $owner ]['code'], array( \T_FUNCTION, \T_CLOSURE, \T_CLASS, \T_ANON_CLASS, \T_INTERFACE, \T_TRAIT, \T_ENUM ), true ) ) {
 				// The next content is the closing brace of a function, class, interface or trait
 				// so normal function/class rules apply and we can ignore it.
 				return;
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
index ce5467c1b6..73f4b0a00e 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
@@ -242,3 +242,24 @@ if ( $condition ) {
 
 
 } // Bad: blank line between.
+
+// Ignore spacing rules in combination with enums as they tend to have their own rules.
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check true
+if ( $foo ) {
+
+
+	enum MyEnumA {
+		// Code here
+	}
+
+
+}
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+enum MyEnumB {
+	if ( $foo ) {
+		// Code here
+	}
+
+
+} // OK, defer to enum rules.
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
index f69ea425f5..1a2bf8ad3c 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
@@ -226,3 +226,24 @@ if ( $condition ) {
 	    2 => 2,
 	};
 } // Bad: blank line between.
+
+// Ignore spacing rules in combination with enums as they tend to have their own rules.
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check true
+if ( $foo ) {
+
+
+	enum MyEnumA {
+		// Code here
+	}
+
+
+}
+// phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+enum MyEnumB {
+	if ( $foo ) {
+		// Code here
+	}
+
+
+} // OK, defer to enum rules.

From e5d967ea525763e4a11e746eadcf4c17d4812705 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:41:48 +0200
Subject: [PATCH 753/822] WhiteSpace/ControlStructureSpacing: implement
 PHPCSUtils

Minor code simplifications by using PHPCSUtils.
---
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index f5b304792a..f5b3fa0456 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -9,8 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
 
-use WordPressCS\WordPress\Sniff;
+use PHPCSUtils\Tokens\Collections;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces spacing around logical operators and assignments, based upon Squiz code.
@@ -287,13 +288,11 @@ public function process_token( $stackPtr ) {
 
 			// We ignore spacing for some structures that tend to have their own rules.
 			$ignore  = array(
-				\T_FUNCTION             => true,
-				\T_CLOSURE              => true,
 				\T_DOC_COMMENT_OPEN_TAG => true,
 				\T_CLOSE_TAG            => true,
 				\T_COMMENT              => true,
 			);
-			$ignore += Tokens::$ooScopeTokens;
+			$ignore += Collections::closedScopes();
 
 			if ( ! isset( $ignore[ $this->tokens[ $firstContent ]['code'] ] )
 				&& $this->tokens[ $firstContent ]['line'] > ( $this->tokens[ $scopeOpener ]['line'] + 1 )
@@ -453,7 +452,7 @@ public function process_token( $stackPtr ) {
 		) {
 			// Another control structure's closing brace.
 			$owner = $this->tokens[ $trailingContent ]['scope_condition'];
-			if ( \in_array( $this->tokens[ $owner ]['code'], array( \T_FUNCTION, \T_CLOSURE, \T_CLASS, \T_ANON_CLASS, \T_INTERFACE, \T_TRAIT, \T_ENUM ), true ) ) {
+			if ( isset( Collections::closedScopes()[ $this->tokens[ $owner ]['code'] ] ) === true ) {
 				// The next content is the closing brace of a function, class, interface or trait
 				// so normal function/class rules apply and we can ignore it.
 				return;

From 612b5556f62121036418038082861eb28d0dc146 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 31 May 2022 10:06:14 +0200
Subject: [PATCH 754/822] WhiteSpace/ControlStructureSpacing: fix/update class
 docblock

Last update date is based on the last upstream commit to this sniff.
---
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index f5b3fa0456..234afe45dd 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -14,7 +14,7 @@
 use WordPressCS\WordPress\Sniff;
 
 /**
- * Enforces spacing around logical operators and assignments, based upon Squiz code.
+ * Checks that control structures have the correct spacing around brackets, based upon Squiz code.
  *
  * @since 0.1.0
  * @since 2013-06-11 This sniff no longer supports JS.
@@ -23,10 +23,10 @@
  * @since 0.13.0     Class name changed: this class is now namespaced.
  * @since 3.0.0      Checks related to function declarations have been removed from this sniff.
  *
- * Last synced with base class 2017-01-15 at commit b024ad84656c37ef5733c6998ebc1e60957b2277.
+ * Last synced with base class 2021-11-20 at commit 7f11ffc8222b123c06345afd3261221561c3bb29.
  * Note: This class has diverged quite far from the original. All the same, checking occasionally
  * to see if there are upstream fixes made from which this sniff can benefit, is warranted.
- * @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+ * @link https://github.com/squizlabs/PHP_CodeSniffer/blob/master/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
  */
 final class ControlStructureSpacingSniff extends Sniff {
 

From b42e4287d04c6846166a05ccf6967978c072d117 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Aug 2023 03:50:24 +0200
Subject: [PATCH 755/822] Docs: remove orphaned CommaAfterArrayItem docs

This sniff was removed (replaced) in PR 2310, but the removal of the docs was forgotten.
---
 .../Arrays/CommaAfterArrayItemStandard.xml    | 98 -------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml

diff --git a/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml b/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
deleted file mode 100644
index 0eef18d812..0000000000
--- a/WordPress/Docs/Arrays/CommaAfterArrayItemStandard.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
-    title="Comma After Array Item"
-    >
-    <standard>
-    <![CDATA[
-    There should be no space between an array item and the comma following it.
-    There should be either exactly one space, or a new line, after the comma.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: No space before a comma.">
-        <![CDATA[
-$array = array(
-    'type'   => 'value'<em>,</em>
-    'values' => array( 1 )<em>,</em>
-    'extra'  => 'c'<em>,</em> /* Comment. */
-);
-        ]]>
-        </code>
-        <code title="Invalid: One or more spaces before a comma.">
-        <![CDATA[
-$array = array(
-    'type'   => 'value'<em>  ,</em>
-    'values' => array( 1 ),
-    'extra'  => 'c'<em>       ,</em> /* Comment. */
-);
-        ]]>
-        </code>
-    </code_comparison>
-
-    <code_comparison>
-        <code title="Valid: Exactly one space after a comma in a single line array.">
-        <![CDATA[
-$array = array( 'a'<em>, </em>'b'<em>, </em>'c' );
-        ]]>
-        </code>
-        <code title="Invalid: Multiple or no spaces after a comma in a single line array.">
-        <![CDATA[
-$array = array( 'a'<em>,</em>'b'<em>,    </em>'c' );
-        ]]>
-        </code>
-    </code_comparison>
-
-    <standard>
-    <![CDATA[
-    Single line arrays should not have a trailing comma after the last array item.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: Single line array without a trailing comma.">
-        <![CDATA[
-$array = array( 'a', 'b', <em>'c' </em>);
-        ]]>
-        </code>
-        <code title="Invalid: Single line array with a trailing comma.">
-        <![CDATA[
-$array = array( 'a', 'b', <em>'c', </em>);
-        ]]>
-        </code>
-    </code_comparison>
-
-    <standard>
-    <![CDATA[
-    Multi-line arrays must have a trailing comma after the last array item.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: Comma after each item in a multi-line array.">
-        <![CDATA[
-$array = array(
-    'a',
-    <em>'c',</em>
-);
-
-$assoc = array(
-    'type' => 'value',
-    'key'  => <em>'c'</em>,
-);
-        ]]>
-        </code>
-
-        <code title="Invalid: Missing trailing comma after last item in a multi-line array.">
-        <![CDATA[
-$array = array(
-    'a',
-    <em>'c'</em>
-);
-
-$assoc = array(
-    'type' => 'value',
-    'key' => <em>'c'</em>
-);
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

From 7e9185f6ed32b0d052ff78e457edea18593586b6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Aug 2023 03:51:11 +0200
Subject: [PATCH 756/822] Docs: remove orphaned ClassInstantiation docs

This sniff was removed (replaced) in PR 2133, but the removal of the docs was forgotten.
---
 .../Classes/ClassInstantiationStandard.xml    | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 WordPress/Docs/Classes/ClassInstantiationStandard.xml

diff --git a/WordPress/Docs/Classes/ClassInstantiationStandard.xml b/WordPress/Docs/Classes/ClassInstantiationStandard.xml
deleted file mode 100644
index d016df9b23..0000000000
--- a/WordPress/Docs/Classes/ClassInstantiationStandard.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
-    title="Class Instantiation"
-    >
-    <standard>
-    <![CDATA[
-    Instantiation of an object should be done with parenthesis.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: with parenthesis.">
-        <![CDATA[
-$a = new Foobar<em>()</em>;
-        ]]>
-        </code>
-        <code title="Invalid: without parenthesis.">
-        <![CDATA[
-$a = new Foobar;
-        ]]>
-        </code>
-    </code_comparison>
-    <standard>
-    <![CDATA[
-    Don't use spaces between the object name and the open parenthesis when instantiating new object.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: no whitespace between the object name and the parenthesis.">
-        <![CDATA[
-$a = new Foobar();
-        ]]>
-        </code>
-        <code title="Invalid: a space between the object name and the parenthesis.">
-        <![CDATA[
-$a = new Foobar<em> </em>();
-        ]]>
-        </code>
-    </code_comparison>
-    <standard>
-    <![CDATA[
-    Assigning the return value of "new" by reference was deprecated in PHP 5.3 and removed in PHP 7.0. New by reference should no longer be used.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: object instantiation without reference.">
-        <![CDATA[
-$a = <em>new</em> Foobar();
-        ]]>
-        </code>
-        <code title="Invalid: object instantiation by reference.">
-        <![CDATA[
-$a = <em>& new</em> Foobar();
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

From 09c629f03a06591efbf550d982435ab7d86cb3ff Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 15 Aug 2023 03:43:04 +0200
Subject: [PATCH 757/822] WhiteSpace/ControlStructureSpacing: add documentation

Follow up on closed PR 1736, but now with correct descriptions and standard blocks and code samples for all things being flagged by the sniff.

Related to 1722

Prop to ckanitz for the initial draft.
---
 .../ControlStructureSpacingStandard.xml       | 150 ++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 WordPress/Docs/WhiteSpace/ControlStructureSpacingStandard.xml

diff --git a/WordPress/Docs/WhiteSpace/ControlStructureSpacingStandard.xml b/WordPress/Docs/WhiteSpace/ControlStructureSpacingStandard.xml
new file mode 100644
index 0000000000..943967a620
--- /dev/null
+++ b/WordPress/Docs/WhiteSpace/ControlStructureSpacingStandard.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<documentation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://phpcsstandards.github.io/PHPCSDevTools/phpcsdocs.xsd"
+    title="Control Structure Spacing"
+    >
+    <standard>
+    <![CDATA[
+    Put one space on both sides of the opening and closing parentheses of control structures.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: One space on each side of the open and close parentheses.">
+        <![CDATA[
+while<em> ( </em>have_posts()<em> ) </em>{}
+
+// For multi-line conditions,
+// a new line is also accepted.
+if<em> ( </em>true === $condition
+    && $count > 10
+<em>) </em>{}
+        ]]>
+        </code>
+        <code title="Invalid: Incorrect spacing around the open and close parentheses.">
+        <![CDATA[
+// No spaces.
+while<em>(</em>have_posts()<em>)</em>{}
+
+// Too much space.
+while<em>   (   </em>have_posts()<em>   )   </em>{}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    The open brace for the control structure must be on the same line as the close parenthesis or the control structure keyword, with one space between them.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Open brace on the same line as the keyword/close parenthesis.">
+        <![CDATA[
+try<em> {</em>
+    // Do something.
+} catch (
+    ExceptionA | ExceptionB $e
+<em>) {</em>
+}
+        ]]>
+        </code>
+        <code title="Invalid: Open brace on a different line than the keyword/close parenthesis.">
+        <![CDATA[
+try
+<em>{</em>
+    // Do something.
+} catch ( Exception $e )
+<em>(</em>
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: One space between the keyword/close parenthesis and the open brace.">
+        <![CDATA[
+if ( $condition )<em> </em>{
+    // Do something.
+}
+        ]]>
+        </code>
+        <code title="Invalid: Too much space between the keyword/close parenthesis and the open brace.">
+        <![CDATA[
+if ( $condition )<em>     </em>{
+    // Do something.
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    When using alternative control structure syntaxes, there should be one space between the close parenthesis and the colon opening the control structure body.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: One space before the colon.">
+        <![CDATA[
+foreach ( $types as $type )<em> </em>:
+    // Do something.
+endforeach;
+        ]]>
+        </code>
+        <code title="Invalid: No space before the colon.">
+        <![CDATA[
+foreach ( $types as $type )<em></em>:
+    // Do something.
+endforeach;
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    When a control structure is nested in another control structure and the closing braces follow each other, there should be no blank line between the closing braces.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No blank line between the consecutive close braces.">
+        <![CDATA[
+if ( $a === $b ) {
+    if ( $something ) {
+        // Do something.
+    }
+}
+        ]]>
+        </code>
+        <code title="Invalid: Blank line(s) between the consecutive close braces.">
+        <![CDATA[
+if ( $a === $b ) {
+    if ( $something ) {
+        // Do something.
+    }<em>
+
+
+</em>}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    [Optional, turned off by default]
+    There should be no blank line(s) at the start or end of the control structure body.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No blank lines at the start or end of the control structure body.">
+        <![CDATA[
+if ( $a === $b ) {
+    echo $a;
+}
+        ]]>
+        </code>
+        <code title="Invalid: Blank line(s) at the start and end of the control structure body.">
+        <![CDATA[
+if ( $a === $b ) {
+<em>
+
+</em>    echo $a;
+<em>
+
+</em>}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From 9c23de677fd760ae756b5fb0641cb67330e93fce Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 26 Nov 2022 14:41:00 +0100
Subject: [PATCH 758/822] Docs: update the sample ruleset

* Replace an example of a rule exclusion as excluding security sniffs should be encouraged.
* Remove an example of an "extra rule" as that sniff is now included in WPCS.
* Minor tweak to the example of how to include PHPCompatibilityWP.
    Note: I've raised the minimum PHP version to 5.6, not yet to 7.0 as plugins/themes (which are the typical target public for this example ruleset) often support multiple WP versions.
* Update property name.
* Give a few examples of legitimate selective directory excludes.
---
 phpcs.xml.dist.sample | 46 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/phpcs.xml.dist.sample b/phpcs.xml.dist.sample
index 1365559939..c20d803f77 100644
--- a/phpcs.xml.dist.sample
+++ b/phpcs.xml.dist.sample
@@ -52,13 +52,13 @@
 		Once we know the sniff names, we can opt to exclude sniffs which don't
 		suit our project like so.
 
-		The below two examples just show how you can exclude rules.
+		The below two examples just show how you can exclude rules/error codes.
 		They are not intended as advice about which sniffs to exclude.
 		-->
 
 		<!--
 		<exclude name="WordPress.WhiteSpace.ControlStructureSpacing"/>
-		<exclude name="WordPress.Security.EscapeOutput"/>
+		<exclude name="Modernize.FunctionCalls.Dirname.Nested"/>
 		-->
 	</rule>
 
@@ -66,7 +66,6 @@
 	<rule ref="WordPress-Docs"/>
 
 	<!-- Add in some extra rules from other standards. -->
-	<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
 	<rule ref="Generic.Commenting.Todo"/>
 
 	<!-- Check for PHP cross-version compatibility. -->
@@ -79,8 +78,10 @@
 	https://github.com/PHPCompatibility/PHPCompatibility
 	-->
 	<!--
-	<config name="testVersion" value="5.2-"/>
-	<rule ref="PHPCompatibilityWP"/>
+	<config name="testVersion" value="5.6-"/>
+	<rule ref="PHPCompatibilityWP">
+		<include-pattern>*\.php</include-pattern>
+	</rule>
 	-->
 
 
@@ -91,7 +92,7 @@
 	-->
 
 	<!--
-	To get the optimal benefits of using WPCS, we should add a couple of
+	To get the optimal benefits of using WordPressCS, we should add a couple of
 	custom properties.
 	Adjust the values of these properties to fit our needs.
 
@@ -99,7 +100,7 @@
 	the wiki:
 	https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties
 	-->
-	<config name="minimum_supported_wp_version" value="4.9"/>
+	<config name="minimum_wp_version" value="6.0"/>
 
 	<rule ref="WordPress.WP.I18n">
 		<properties>
@@ -118,4 +119,35 @@
 		</properties>
 	</rule>
 
+
+	<!--
+	#############################################################################
+	SELECTIVE EXCLUSIONS
+	Exclude specific files for specific sniffs and/or exclude sub-groups in sniffs.
+	#############################################################################
+	-->
+
+	<!--
+	Sometimes, you may want to exclude a certain directory, like your tests,
+	for select sniffs.
+	The below examples demonstrate how to do this.
+
+	In the example, the `GlobalVariablesOverride` rule is excluded for test files
+	as it is sometimes necessary to overwrite WP globals in test situations (just
+	don't forget to restore them after the test!).
+
+	Along the same lines, PHPUnit is getting stricter about using PSR-4 file names,
+	so excluding test files from the `WordPress.Files.Filename` sniff can be a
+	legitimate exclusion.
+
+	For more information on ruleset configuration optiones, check out the PHPCS wiki:
+	https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
+	-->
+	<rule ref="WordPress.WP.GlobalVariablesOverride">
+		<exclude-pattern>/path/to/Tests/*Test\.php</exclude-pattern>
+	</rule>
+	<rule ref="WordPress.Files.Filename">
+		<exclude-pattern>/path/to/Tests/*Test\.php</exclude-pattern>
+	</rule>
+
 </ruleset>

From 77cbc3020b878140ef2b1aec62ce5469ba8c31c9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 9 Apr 2020 08:31:15 +0200
Subject: [PATCH 759/822] Code coverage: initial setup for CodeCov

Follow up after PR 2225 and other PRs which added more tests and raised code coverage.

The Codecov service is a way to monitor test vs code coverage of a project over time and allows for the code coverage % + delta to be reported in each PR.

This commit:
* Adds CodeCov configuration and ignores it for creating the package file.
    * Note: by default CodeCov reports back with build statuses (in the table at the bottom of a PR) + posts a really extensive comment on a PR.
        I personally find those comments + mail on each PR terribly annoying and unnecessary when the build statuses are set to required statuses anyway, so I've turned the posting of those comments off (via a setting in the configuration file).
    * Another thing to note is the patch - threshold setting being at `3%` (= 3% deviation allowed). The reason for setting that threshold a little wider is that code removals for fully covered code would otherwise quickly fail builds.
* Adds a badge showing off code coverage to the README.
* Adjusts the GH Actions workflows.
    * For the `test` workflow (PRs), the tests will selectively be run with code coverage (high/low PHP x high/low PHPCS).
    * For the `quicktest` workflow (pushes), which only runs high/low PHP/PHPCS, the code coverage will only be run for (merges to) the `develop` branch.
        This will allow us keep track of code coverage over time, while not slowing down the "quick test" for feature branch pushes.
        Note: I've simplified the conditions a little for this workflow as we only run against two known PHP versions anyway.
* Makes a minor tweak to the code coverage logging config to only display a summary after a code coverage run.

Note: As this is a public repo, we shouldn't need a repo secret for the CodeCov token. The normal GHA token will be used (and should work fine).

Refs:
* https://docs.codecov.com/docs
* https://docs.codecov.com/docs/codecovyml-reference

Note: as this PR can only partially be tested without it being merged, minor touch-up may be needed after this initial setup, but :fingers_crossed: we should be good.
---
 .codecov.yml                     | 25 +++++++++++++++++
 .gitattributes                   |  1 +
 .github/workflows/quicktest.yml  | 25 ++++++++++++-----
 .github/workflows/unit-tests.yml | 46 +++++++++++++++++++++++++++-----
 README.md                        |  6 +++--
 phpunit.xml.dist                 |  2 +-
 6 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 .codecov.yml

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 0000000000..ae9e60d5a6
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,25 @@
+codecov:
+  notify:
+    after_n_builds: 4
+
+coverage:
+  round: nearest
+  # Status will be green when coverage is between 90 and 100%.
+  range: "90...100"
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 1%
+        paths:
+          - "WordPress"
+    patch:
+      default:
+        threshold: 3%
+        paths:
+          - "WordPress"
+
+ignore:
+  - "WordPress/Tests"
+
+comment: false
diff --git a/.gitattributes b/.gitattributes
index d39102c771..77023da83a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
 #
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
+/.codecov.yml       export-ignore
 /.phpcs.xml.dist    export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /phpunit.xml.dist   export-ignore
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 16c58137d9..67613ec256 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '5.4', 'latest' ]
+        php: [ '5.4', '7.4', 'latest' ]
         phpcs_version: [ 'lowest', 'dev-master' ]
 
     name: QTest - PHP ${{ matrix.php }} on PHPCS ${{ matrix.phpcs_version }}
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
-          coverage: none
+          coverage:  ${{ github.ref_name == 'develop' && 'xdebug' || 'none' }}
 
       - name: "Set PHPCS version (master)"
         if: ${{ matrix.phpcs_version != 'lowest' }}
@@ -76,10 +76,23 @@ jobs:
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint -- --checkstyle
 
-      - name: Run the unit tests - PHP 5.4 - 8.0
-        if: ${{ matrix.php < '8.1' && matrix.php != 'latest' }}
+      - name: Run the unit tests without code coverage - PHP 5.4 - 8.0
+        if: ${{ matrix.php == '5.4' && github.ref_name != 'develop' }}
         run: composer run-tests
 
-      - name: Run the unit tests - PHP >= 8.1
-        if: ${{ matrix.php >= '8.1' || matrix.php == 'latest' }}
+      # Until PHPCS supports PHPUnit 9, we cannot run code coverage on PHP 8.0+, so run it on PHP 5.4 and 7.4.
+      - name: Run the unit tests with code coverage - PHP 5.4 - 8.0
+        if: ${{ matrix.php != 'latest' && github.ref_name == 'develop' }}
+        run: composer coverage
+
+      - name: Run the unit tests without code coverage - PHP >= 8.1
+        if: ${{ matrix.php == 'latest' }}
         run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests
+
+      - name: Send coverage report to Codecov
+        if: ${{ success() && github.ref_name == 'develop' }}
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./build/logs/clover.xml
+          fail_ci_if_error: true
+          verbose: true
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a6615ae18e..fc99510c78 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -21,14 +21,35 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        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' ]
+        php: [ '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3' ]
         phpcs_version: [ 'lowest', 'dev-master' ]
         extensions: [ '' ]
+        coverage: [false]
 
         include:
           - php: '7.4'
             phpcs_version: 'dev-master'
             extensions: ':mbstring' # = Disable Mbstring.
+            coverage: true # Make sure coverage is recorded for this too.
+
+          # Run code coverage builds against high/low PHP and high/low PHPCS.
+          # Note: Until PHPCS supports PHPUnit 9, we cannot run code coverage on PHP 8.0+.
+          - php: '5.4'
+            phpcs_version: 'dev-master'
+            extensions: ''
+            coverage: true
+          - php: '5.4'
+            phpcs_version: 'lowest'
+            extensions: ''
+            coverage: true
+          - php: '7.4'
+            phpcs_version: 'dev-master'
+            extensions: ''
+            coverage: true
+          - php: '7.4'
+            phpcs_version: 'lowest'
+            extensions: ''
+            coverage: true
 
           # Add extra build to test against PHPCS 4.
           #- php: '7.4'
@@ -58,7 +79,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
-          coverage: none
+          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
           tools: cs2pr
 
       - name: "Set PHPCS version (master)"
@@ -87,10 +108,23 @@ jobs:
         if: ${{ matrix.phpcs_version == 'dev-master' }}
         run: composer lint -- --checkstyle | cs2pr
 
-      - name: Run the unit tests - PHP 5.4 - 8.0
-        if: ${{ matrix.php < '8.1' }}
+      - name: Run the unit tests without code coverage - PHP 5.4 - 8.0
+        if: ${{ matrix.php < '8.1' && matrix.coverage == false }}
         run: composer run-tests
 
-      - name: Run the unit tests - PHP >= 8.1
-        if: ${{ matrix.php >= '8.1' }}
+      - name: Run the unit tests with code coverage - PHP 5.4 - 8.0
+        if: ${{ matrix.php < '8.1' && matrix.coverage == true  }}
+        run: composer coverage
+
+      # Until PHPCS supports PHPUnit 9, we cannot run code coverage on PHP 8.0+.
+      - name: Run the unit tests without code coverage - PHP >= 8.1
+        if: ${{ matrix.php >= '8.1' && matrix.coverage == false  }}
         run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests
+
+      - name: Send coverage report to Codecov
+        if: ${{ success() && matrix.coverage == true }}
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./build/logs/clover.xml
+          fail_ci_if_error: true
+          verbose: true
diff --git a/README.md b/README.md
index 61cc7ce14e..a9fe9d2c5d 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,12 @@
 [![Latest Unstable Version](https://img.shields.io/badge/unstable-dev--develop-e68718.svg?maxAge=2419200)](https://packagist.org/packages/wp-coding-standards/wpcs#dev-develop)
 [![Last Commit to Unstable](https://img.shields.io/github/last-commit/WordPress/WordPress-Coding-Standards/develop.svg)](https://github.com/WordPress/WordPress-Coding-Standards/commits/develop)
 
-[![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
-[![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 [![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml)
 [![Unit Tests](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
+[![codecov.io](https://codecov.io/gh/WordPress/WordPress-Coding-Standards/branch/stable/graph/badge.svg?branch=develop)](https://codecov.io/gh/WordPress/WordPress-Coding-Standards?branch=develop)
+
+[![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
+[![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 
 [![License: MIT](https://poser.pugx.org/wp-coding-standards/wpcs/license)](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/LICENSE)
 [![Total Downloads](https://poser.pugx.org/wp-coding-standards/wpcs/downloads)](https://packagist.org/packages/wp-coding-standards/wpcs/stats)
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e37b3d44c3..d041cb7d99 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,7 +27,7 @@
 	</filter>
 
 	<logging>
-		<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+		<log type="coverage-text" target="php://stdout" showOnlySummary="true"/>
 		<log type="coverage-clover" target="build/logs/clover.xml"/>
 	</logging>
 

From d3b0a0cadf1275cbf9f2d5c5c9f4ad1ef28cd07f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 03:55:49 +0200
Subject: [PATCH 760/822] Utils/I18nTextDomainFixer: use PHPCSUtils in one more
 place

---
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index d6473ac932..4c2f2b44b4 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
+use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
@@ -815,7 +816,7 @@ public function process_comments( $stackPtr ) {
 						}
 
 						$replacement = $this->phpcsFile->eolChar
-							. $this->phpcsFile->getTokensAsString( $i, ( $last_header_ptr - $i ), true )
+							. GetTokensAsString::origContent( $this->phpcsFile, $i, ( $last_header_ptr - 1 ) )
 							. $replacement;
 					}
 

From 248485ab5a0fd284d0703b389be270474b4e0504 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:07:43 +0200
Subject: [PATCH 761/822] WP/Capabilities: minor clean up

The `MinimumWPVersionTrait::set_minimum_wp_version()` method does not take a parameter.
---
 WordPress/Sniffs/WP/CapabilitiesSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 0b1016db38..7afc97aabc 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -432,7 +432,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		}
 
 		if ( isset( $this->deprecated_capabilities[ $matched_parameter ] ) ) {
-			$this->set_minimum_wp_version( $this->phpcsFile );
+			$this->set_minimum_wp_version();
 			$is_error = $this->wp_version_compare( $this->deprecated_capabilities[ $matched_parameter ], $this->minimum_wp_version, '<' );
 
 			$data = array(

From 3a398c4485ac53eb995ea8a56d3f982d3552aa63 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 04:19:16 +0200
Subject: [PATCH 762/822] DB/DirectDatabaseQuery: minor defensive coding tweak

---
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php   | 3 +++
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 82abd5ff73..2540acdc4a 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -192,6 +192,9 @@ public function process_token( $stackPtr ) {
 		}
 
 		$endOfStatement = $this->phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr + 1 ) );
+		if ( false === $endOfStatement ) {
+			return;
+		}
 
 		// Check for Database Schema Changes/ table truncation.
 		for ( $_pos = ( $stackPtr + 1 ); $_pos < $endOfStatement; $_pos++ ) {
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index 00b969321b..cd5a73907b 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -332,3 +332,7 @@ function method_names_are_caseinsensitive() {
 	global $wpdb;
 	$autoload = $wpdb->Get_Var( $wpdb->Prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option_name ) ); // Warning x 2.
 }
+
+// Live coding/parse error test.
+// This must be the last test in the file.
+$wpdb->get_col( '

From 480b1af4c6276a36e4f1a3e043ce3dcf85ab067e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 04:00:12 +0200
Subject: [PATCH 763/822] Files/FileName: minor defensive coding tweak in test
 code

---
 WordPress/Tests/Files/FileNameUnitTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 09d66cf00a..8ec4146f44 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -133,8 +133,10 @@ protected function getTestFiles( $testFileBase ) {
 		$test_files = glob( dirname( $testFileBase ) . $sep . 'FileNameUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.inc', \GLOB_BRACE );
 
 		$php3_test_files = glob( dirname( $testFileBase ) . $sep . 'FileNameUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.php3', \GLOB_BRACE );
-		foreach ( $php3_test_files as $file ) {
-			$test_files[] = $file;
+		if ( is_array( $php3_test_files ) ) {
+			foreach ( $php3_test_files as $file ) {
+				$test_files[] = $file;
+			}
 		}
 
 		if ( ! empty( $test_files ) ) {

From 782f8fea9c1c47fb878d400f1af7e4cd8cb4d049 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:40:46 +0200
Subject: [PATCH 764/822] DateTime/CurrentTimeTimestamp: rename some local
 variables

... to be more descriptive in the context of named parameters.

Includes defensive coding tweak of making sure the `$content_type` variable is always defined.
---
 .../DateTime/CurrentTimeTimestampSniff.php      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index a2297745d0..af46c4c9a8 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -80,14 +80,15 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
+		$content_type = '';
 		for ( $i = $type_param['start']; $i <= $type_param['end']; $i++ ) {
 			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 
 			if ( isset( Tokens::$textStringTokens[ $this->tokens[ $i ]['code'] ] ) ) {
-				$content_first = trim( TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) );
-				if ( 'U' !== $content_first && 'timestamp' !== $content_first ) {
+				$content_type = trim( TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) );
+				if ( 'U' !== $content_type && 'timestamp' !== $content_type ) {
 					// Most likely valid use of current_time().
 					return;
 				}
@@ -113,10 +114,10 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 */
 		$gmt_param = PassedParameters::getParameterFromStack( $parameters, 2, 'gmt' );
 		if ( is_array( $gmt_param ) ) {
-			$content_second = '';
+			$content_gmt = '';
 			if ( 'true' === $gmt_param['clean'] || '1' === $gmt_param['clean'] ) {
-				$content_second = $gmt_param['clean'];
-				$gmt_true       = true;
+				$content_gmt = $gmt_param['clean'];
+				$gmt_true    = true;
 			}
 		}
 
@@ -140,9 +141,9 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$error       = 'Don\'t use current_time() for retrieving a Unix (UTC) timestamp. Use time() instead. Found: %s';
 		$error_code  = 'RequestedUTC';
 
-		$code_snippet = "current_time( '" . $content_first . "'";
-		if ( isset( $content_second ) ) {
-			$code_snippet .= ', ' . $content_second;
+		$code_snippet = "current_time( '" . $content_type . "'";
+		if ( isset( $content_gmt ) ) {
+			$code_snippet .= ', ' . $content_gmt;
 		}
 		$code_snippet .= ' )';
 

From 29670d7d4eb6c2f7504e126c8d1405454aa34fb9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:08:04 +0200
Subject: [PATCH 765/822] WhiteSpace/ControlStructureSpacing: minor defensive
 coding tweak

---
 WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php  | 2 +-
 .../Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc    | 4 ++++
 .../WhiteSpace/ControlStructureSpacingUnitTest.2.inc.fixed    | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 234afe45dd..842a2f0172 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -320,7 +320,7 @@ public function process_token( $stackPtr ) {
 				$this->phpcsFile->recordMetric( $stackPtr, 'Blank lines at start of control structure', 0 );
 			}
 
-			if ( $firstContent !== $scopeCloser ) {
+			if ( isset( $scopeCloser ) && $firstContent !== $scopeCloser ) {
 				$lastContent = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $scopeCloser - 1 ), null, true );
 
 				$lastNonEmptyContent = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $scopeCloser - 1 ), null, true );
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc
index f35ba950bb..b70e3c658a 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc
@@ -19,3 +19,7 @@ if ( $foo ) {
 
 }
 // phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+// Live coding/parse error.
+// This must be the last test in the file!
+if ( $foo ) {
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc.fixed
index 7e7f8eb7bb..a22751aa5b 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc.fixed
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.2.inc.fixed
@@ -13,3 +13,7 @@ if ( $foo ) {
 	} // phpcs:ignore Standard.Category.Sniff -- this comment should be skipped over for the "blank line after" check.
 }
 // phpcs:set WordPress.WhiteSpace.ControlStructureSpacing blank_line_check false
+
+// Live coding/parse error.
+// This must be the last test in the file!
+if ( $foo ) {

From f119d865559ec0f26bfe3c0bb58613c4737fbb4d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 03:52:44 +0200
Subject: [PATCH 766/822] Docs: array properties expect arrays

Follow up on 1584, which was included in WPCS 2.0.0.

While PHPCS still supports the _old_ array syntax (comma-delimited string), WPCS no longer has a (WPCS native) tolerance for those properties being passed with the `type="array"` attribute, so these public properties should always be arrays.
---
 WordPress/Helpers/IsUnitTestTrait.php                       | 2 +-
 WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php            | 6 +++---
 .../Sniffs/NamingConventions/PrefixAllGlobalsSniff.php      | 4 ++--
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 +-
 WordPress/Sniffs/Security/NonceVerificationSniff.php        | 2 +-
 WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php         | 2 +-
 WordPress/Sniffs/WP/I18nSniff.php                           | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 1ee939c71c..409fb7c06b 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -61,7 +61,7 @@ trait IsUnitTestTrait {
 	 * @since 3.0.0  Moved from the Sniff class to this dedicated Trait.
 	 *               Renamed from `$custom_test_class_whitelist` to `$custom_test_classes`.
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $custom_test_classes = array();
 
diff --git a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
index 82abd5ff73..1ab4b8ce73 100644
--- a/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
+++ b/WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
@@ -35,7 +35,7 @@ final class DirectDatabaseQuerySniff extends Sniff {
 	 *
 	 * @since 0.6.0
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customCacheGetFunctions = array();
 
@@ -44,7 +44,7 @@ final class DirectDatabaseQuerySniff extends Sniff {
 	 *
 	 * @since 0.6.0
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customCacheSetFunctions = array();
 
@@ -53,7 +53,7 @@ final class DirectDatabaseQuerySniff extends Sniff {
 	 *
 	 * @since 0.6.0
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customCacheDeleteFunctions = array();
 
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index ed55291653..a5740b4eab 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -71,9 +71,9 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 0.12.0
 	 *
-	 * @var string[]|string
+	 * @var string[]
 	 */
-	public $prefixes = '';
+	public $prefixes = array();
 
 	/**
 	 * Prefix blocklist.
diff --git a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 140a2431e6..37171540cd 100644
--- a/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -78,7 +78,7 @@ final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * @since 0.11.0
 	 * @since 3.0.0  Renamed from `$customPropertiesWhitelist` to `$allowed_custom_properties`.
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $allowed_custom_properties = array();
 
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 328492e7bd..0909fc257b 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -57,7 +57,7 @@ class NonceVerificationSniff extends Sniff {
 	 *
 	 * @since 0.5.0
 	 *
-	 * @var string|string[]
+	 * @var string[]
 	 */
 	public $customNonceVerificationFunctions = array();
 
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index d6473ac932..77b36a131e 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -46,7 +46,7 @@ final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @var string[]|string
+	 * @var string[]
 	 */
 	public $old_text_domain;
 
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 6769753060..23665cbc44 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -89,7 +89,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 	/**
 	 * Text domain.
 	 *
-	 * @var string[]|string
+	 * @var string[]
 	 */
 	public $text_domain;
 

From fa06a594b08983805df0114b58126804e648fafa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 15:24:08 +0200
Subject: [PATCH 767/822] Sniff: move "missing unslashing" handling to callback
 function

As things were, the "missing unslashing" error was being thrown from the `Sniff::is_sanitized()` method, based on whether the `$require_unslash` parameter was set to `true` or `false`.

In my opinion, it should not be the responsibility of utility functions to throw errors/warning, but always of the originating sniff.

This commit replaces the boolean `$require_unslash` parameter for the `Sniff::is_sanitized()` method to a nullable callable `$unslash_callback` parameter.

Instead of letting the `Sniff::is_sanitized()` method throw the error/warning, the callback will now be called and as the originating sniff passes the callback, the originating sniff can now handle the throwing of the error/warning.

To remove any presumptions of the callback being passed, being in the same context as the utility method/originating sniff and having access to the `$phpcsFile` via a property, the callback will receive both the `$phpcsFile` as well as the `$stackPtr` as parameters.

The "missing unslash" check can still be skipped by not passing the parameter or by passing anything non-callable. This maintains the original behaviour for the method for the default value/`false` case.

The `Sniff::add_unslash_error()` method can with this change now be moved to the `ValidatedSanitizedInput` sniff and that sniff will now have full control over the error message and error code.

Note: the callback is called using `call_user_func()` instead of `$callable` to allow some tolerance for the _partially supported callables_, which were deprecated in PHP 8.2. While WPCS itself does not use these, the `ValidatedSanitizedInputSniff` is one of the exceptions which has not been made `final`, so an extending class _could_ use one of the _partially supported callables_ and the `Sniff::is_sanitized()` method should not be the reason that doesn't work.
---
 WordPress/Sniff.php                           | 41 ++++++++-----------
 .../Security/ValidatedSanitizedInputSniff.php | 27 +++++++++++-
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index fcca9a5b28..7bd96029c7 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -145,14 +145,24 @@ protected function is_only_sanitized( $stackPtr ) {
 	 * Check if something is being sanitized.
 	 *
 	 * @since 0.5.0
+	 * @since 3.0.0 The second ($require_unslash) parameter has been changed from
+	 *              a boolean toggle to a ?callable $unslash_callback parameter to
+	 *              allow a sniff calling this method to handle their "unslashing"
+	 *              related messaging itself.
 	 *
-	 * @param int  $stackPtr        The index of the token in the stack.
-	 * @param bool $require_unslash Whether to give an error if no unslashing function
-	 *                              is used on the variable before sanitization.
+	 * @param int           $stackPtr         The index of the token in the stack.
+	 * @param callable|null $unslash_callback Optional. When passed, this method will check if an unslashing
+	 *                                        function is used on the variable before sanitization and if not,
+	 *                                        the callback will be called to handle the missing unslashing.
+	 *                                        The callback will receive the $phpcsFile object and the $stackPtr.
+	 *                                        When not passed or `null`, this method will **not** check
+	 *                                        for unslashing issues.
+	 *                                        Defaults to `null` (skip unslashing checks).
 	 *
 	 * @return bool Whether the token being sanitized.
 	 */
-	protected function is_sanitized( $stackPtr, $require_unslash = false ) {
+	protected function is_sanitized( $stackPtr, $unslash_callback = null ) {
+		$require_unslash = is_callable( $unslash_callback );
 
 		// First we check if it is being casted to a safe value.
 		if ( ContextHelper::is_safe_casted( $this->phpcsFile, $stackPtr ) ) {
@@ -162,7 +172,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		// If this isn't within a function call, we know already that it's not safe.
 		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
 			if ( $require_unslash ) {
-				$this->add_unslash_error( $stackPtr );
+				call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
 			}
 
 			return false;
@@ -189,7 +199,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 		// If this isn't a call to one of the valid functions, it sure isn't a sanitizing function.
 		if ( false === $functionPtr ) {
 			if ( true === $require_unslash ) {
-				$this->add_unslash_error( $stackPtr );
+				call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
 			}
 
 			return false;
@@ -246,7 +256,7 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 
 		// If slashing is required, give an error.
 		if ( ! $is_unslashed && $require_unslash && ! $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
-			$this->add_unslash_error( $stackPtr );
+			call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
 		}
 
 		// Check if this is a sanitizing function.
@@ -256,21 +266,4 @@ protected function is_sanitized( $stackPtr, $require_unslash = false ) {
 
 		return false;
 	}
-
-	/**
-	 * Add an error for missing use of unslashing.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 */
-	public function add_unslash_error( $stackPtr ) {
-
-		$this->phpcsFile->addError(
-			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
-			$stackPtr,
-			'MissingUnslash',
-			array( $this->tokens[ $stackPtr ]['content'] )
-		);
-	}
 }
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 683abad29d..1bcb5060c2 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\Security;
 
+use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
@@ -160,7 +161,7 @@ function ( $embed ) {
 		}
 
 		// Now look for sanitizing functions.
-		if ( ! $this->is_sanitized( $stackPtr, true ) ) {
+		if ( ! $this->is_sanitized( $stackPtr, array( $this, 'add_unslash_error' ) ) ) {
 			$this->phpcsFile->addError(
 				'Detected usage of a non-sanitized input variable: %s',
 				$stackPtr,
@@ -169,4 +170,28 @@ function ( $embed ) {
 			);
 		}
 	}
+
+	/**
+	 * Add an error for missing use of unslashing.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 - Moved from the `Sniff` class to this class.
+	 *              - The `$phpcsFile` parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack
+	 *                                               which is missing unslashing.
+	 *
+	 * @return void
+	 */
+	public function add_unslash_error( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+
+		$phpcsFile->addError(
+			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
+			$stackPtr,
+			'MissingUnslash',
+			array( $tokens[ $stackPtr ]['content'] )
+		);
+	}
 }

From 754dfd232ec8f61259071862fa53af2ea5b22adc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 15:35:29 +0200
Subject: [PATCH 768/822] README: fix codecov badge

Follow up on 2338.

Sorry, looks like I used an outdated version of the badge code.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a9fe9d2c5d..1179e3f939 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 [![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml)
 [![Unit Tests](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
-[![codecov.io](https://codecov.io/gh/WordPress/WordPress-Coding-Standards/branch/stable/graph/badge.svg?branch=develop)](https://codecov.io/gh/WordPress/WordPress-Coding-Standards?branch=develop)
+[![codecov.io](https://codecov.io/gh/WordPress/WordPress-Coding-Standards/graph/badge.svg?token=UzFYn0RzVG&branch=develop)](https://codecov.io/gh/WordPress/WordPress-Coding-Standards?branch=develop)
 
 [![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
 [![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)

From 315d4e0205824b1141dcd394ef68e628ff09b126 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 19 Mar 2023 01:06:01 +0100
Subject: [PATCH 769/822] QA/CS: various minor tweaks

* Remove some undefined/unused variables.
* Remove some extraneous whitespace from arrays where (longer) entries were removed.
---
 WordPress/Helpers/ConstantsHelper.php         |  18 +--
 WordPress/Helpers/EscapingFunctionsTrait.php  | 120 +++++++++---------
 .../MultipleStatementAlignmentSniff.php       |   2 +-
 .../PrefixAllGlobalsSniff.php                 |   2 +-
 .../ValidFunctionNameSniff.php                |   4 +-
 WordPress/Sniffs/WP/I18nSniff.php             |  15 ++-
 6 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/WordPress/Helpers/ConstantsHelper.php b/WordPress/Helpers/ConstantsHelper.php
index a2082b7f5a..080f3cf223 100644
--- a/WordPress/Helpers/ConstantsHelper.php
+++ b/WordPress/Helpers/ConstantsHelper.php
@@ -70,15 +70,15 @@ public static function is_use_of_global_constant( File $phpcsFile, $stackPtr ) {
 
 		// Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
 		$tokens_to_ignore  = array(
-			\T_NAMESPACE       => true,
-			\T_USE             => true,
-			\T_EXTENDS         => true,
-			\T_IMPLEMENTS      => true,
-			\T_NEW             => true,
-			\T_FUNCTION        => true,
-			\T_INSTANCEOF      => true,
-			\T_INSTEADOF       => true,
-			\T_GOTO            => true,
+			\T_NAMESPACE  => true,
+			\T_USE        => true,
+			\T_EXTENDS    => true,
+			\T_IMPLEMENTS => true,
+			\T_NEW        => true,
+			\T_FUNCTION   => true,
+			\T_INSTANCEOF => true,
+			\T_INSTEADOF  => true,
+			\T_GOTO       => true,
 		);
 		$tokens_to_ignore += Tokens::$ooScopeTokens;
 		$tokens_to_ignore += Collections::objectOperators();
diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index 09ce2d1674..c3ec5f7f00 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -107,66 +107,66 @@ trait EscapingFunctionsTrait {
 	 * @var array<string, bool>
 	 */
 	private $autoEscapedFunctions = array(
-		'allowed_tags'              => true,
-		'bloginfo'                  => true,
-		'body_class'                => true,
-		'calendar_week_mod'         => true,
-		'category_description'      => true,
-		'checked'                   => true,
-		'comment_class'             => true,
-		'count'                     => true,
-		'disabled'                  => true,
-		'do_shortcode'              => true,
-		'do_shortcode_tag'          => true,
-		'get_archives_link'         => true,
-		'get_attachment_link'       => true,
-		'get_avatar'                => true,
-		'get_bookmark_field'        => true,
-		'get_calendar'              => true,
-		'get_comment_author_link'   => true,
-		'get_current_blog_id'       => true,
-		'get_delete_post_link'      => true,
-		'get_search_form'           => true,
-		'get_search_query'          => true,
-		'get_the_author_link'       => true,
-		'get_the_author'            => true,
-		'get_the_date'              => true,
-		'get_the_ID'                => true,
-		'get_the_post_thumbnail'    => true,
-		'get_the_term_list'         => true,
-		'post_type_archive_title'   => true,
-		'readonly'                  => true,
-		'selected'                  => true,
-		'single_cat_title'          => true,
-		'single_month_title'        => true,
-		'single_post_title'         => true,
-		'single_tag_title'          => true,
-		'single_term_title'         => true,
-		'tag_description'           => true,
-		'term_description'          => true,
-		'the_author'                => true,
-		'the_date'                  => true,
-		'the_title_attribute'       => true,
-		'walk_nav_menu_tree'        => true,
-		'wp_dropdown_categories'    => true,
-		'wp_dropdown_users'         => true,
-		'wp_generate_tag_cloud'     => true,
-		'wp_get_archives'           => true,
-		'wp_get_attachment_image'   => true,
-		'wp_get_attachment_link'    => true,
-		'wp_link_pages'             => true,
-		'wp_list_authors'           => true,
-		'wp_list_bookmarks'         => true,
-		'wp_list_categories'        => true,
-		'wp_list_comments'          => true,
-		'wp_login_form'             => true,
-		'wp_loginout'               => true,
-		'wp_nav_menu'               => true,
-		'wp_readonly'               => true,
-		'wp_register'               => true,
-		'wp_tag_cloud'              => true,
-		'wp_timezone_choice'        => true,
-		'wp_title'                  => true,
+		'allowed_tags'            => true,
+		'bloginfo'                => true,
+		'body_class'              => true,
+		'calendar_week_mod'       => true,
+		'category_description'    => true,
+		'checked'                 => true,
+		'comment_class'           => true,
+		'count'                   => true,
+		'disabled'                => true,
+		'do_shortcode'            => true,
+		'do_shortcode_tag'        => true,
+		'get_archives_link'       => true,
+		'get_attachment_link'     => true,
+		'get_avatar'              => true,
+		'get_bookmark_field'      => true,
+		'get_calendar'            => true,
+		'get_comment_author_link' => true,
+		'get_current_blog_id'     => true,
+		'get_delete_post_link'    => true,
+		'get_search_form'         => true,
+		'get_search_query'        => true,
+		'get_the_author_link'     => true,
+		'get_the_author'          => true,
+		'get_the_date'            => true,
+		'get_the_ID'              => true,
+		'get_the_post_thumbnail'  => true,
+		'get_the_term_list'       => true,
+		'post_type_archive_title' => true,
+		'readonly'                => true,
+		'selected'                => true,
+		'single_cat_title'        => true,
+		'single_month_title'      => true,
+		'single_post_title'       => true,
+		'single_tag_title'        => true,
+		'single_term_title'       => true,
+		'tag_description'         => true,
+		'term_description'        => true,
+		'the_author'              => true,
+		'the_date'                => true,
+		'the_title_attribute'     => true,
+		'walk_nav_menu_tree'      => true,
+		'wp_dropdown_categories'  => true,
+		'wp_dropdown_users'       => true,
+		'wp_generate_tag_cloud'   => true,
+		'wp_get_archives'         => true,
+		'wp_get_attachment_image' => true,
+		'wp_get_attachment_link'  => true,
+		'wp_link_pages'           => true,
+		'wp_list_authors'         => true,
+		'wp_list_bookmarks'       => true,
+		'wp_list_categories'      => true,
+		'wp_list_comments'        => true,
+		'wp_login_form'           => true,
+		'wp_loginout'             => true,
+		'wp_nav_menu'             => true,
+		'wp_readonly'             => true,
+		'wp_register'             => true,
+		'wp_tag_cloud'            => true,
+		'wp_timezone_choice'      => true,
+		'wp_title'                => true,
 	);
 
 	/**
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 1e1a1a4c06..603529d9a7 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -336,7 +336,7 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 				++$double_arrow_cols[ $this->tokens[ $double_arrow ]['column'] ];
 			}
 		}
-		unset( $key, $item, $double_arrow, $has_array_opener, $last_index_token );
+		unset( $key, $item, $double_arrow, $last_index_token );
 
 		if ( empty( $items ) || empty( $index_end_cols ) ) {
 			// No actionable array items found.
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index a5740b4eab..bbfa75f524 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -960,7 +960,7 @@ protected function process_variable_assignment( $stackPtr, $in_list = false ) {
 					}
 				}
 
-				unset( $has_global, $end_of_statement, $ptr, $imported );
+				unset( $has_global, $end_of_statement, $ptr );
 			}
 		}
 
diff --git a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 8e45e66fe5..a925de6fde 100644
--- a/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -9,7 +9,7 @@
 
 namespace WordPressCS\WordPress\Sniffs\NamingConventions;
 
-use PHPCSUtils\BackCompat\BCTokens;
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\NamingConventions;
 use PHPCSUtils\Utils\ObjectDeclarations;
@@ -76,7 +76,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$ooPtr = Scopes::validDirectScope( $this->phpcsFile, $stackPtr, BCTokens::ooScopeTokens() );
+		$ooPtr = Scopes::validDirectScope( $this->phpcsFile, $stackPtr, Tokens::$ooScopeTokens );
 		if ( false === $ooPtr ) {
 			$this->process_function_declaration( $stackPtr, $name );
 		} else {
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 23665cbc44..47d3e43005 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -274,12 +274,21 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 
 		if ( 'typos' === $group_name && '_' === $matched_content ) {
-			$this->phpcsFile->addError( 'Found single-underscore "_()" function when double-underscore expected.', $stackPtr, 'SingleUnderscoreGetTextFunction' );
+			$this->phpcsFile->addError(
+				'Found single-underscore "_()" function when double-underscore expected.',
+				$stackPtr,
+				'SingleUnderscoreGetTextFunction'
+			);
 			return;
 		}
 
-		if ( \in_array( $matched_content, array( 'translate', 'translate_with_gettext_context' ), true ) ) {
-			$this->phpcsFile->addWarning( 'Use of the "%s()" function is reserved for low-level API usage.', $stackPtr, 'LowLevelTranslationFunction', array( $matched_content ) );
+		if ( 'translate' === $matched_content || 'translate_with_gettext_context' === $matched_content ) {
+			$this->phpcsFile->addWarning(
+				'Use of the "%s()" function is reserved for low-level API usage.',
+				$stackPtr,
+				'LowLevelTranslationFunction',
+				array( $matched_content )
+			);
 		}
 
 		parent::process_matched_token( $stackPtr, $group_name, $matched_content );

From dcdd602e7888411a0da8507c6b4b2b3e2f978d61 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 19 Mar 2023 01:06:01 +0100
Subject: [PATCH 770/822] QA/CS: alphabetize import use statements

---
 WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php     | 2 +-
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php            | 2 +-
 WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php  | 2 +-
 WordPress/Sniffs/Files/FileNameSniff.php                     | 2 +-
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 2 +-
 WordPress/Sniffs/PHP/YodaConditionsSniff.php                 | 2 +-
 WordPress/Sniffs/Security/EscapeOutputSniff.php              | 2 +-
 WordPress/Sniffs/WP/CapitalPDangitSniff.php                  | 2 +-
 WordPress/Sniffs/WP/I18nSniff.php                            | 2 +-
 WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php    | 2 +-
 WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php | 2 +-
 WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
index 050af33cc2..de35bdff65 100644
--- a/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
@@ -9,12 +9,12 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Fixers\SpacesFixer;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces WordPress array spacing format.
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 7dc485811d..a161be3537 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -9,12 +9,12 @@
 
 namespace WordPressCS\WordPress\Sniffs\Arrays;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Arrays;
 use PHPCSUtils\Utils\PassedParameters;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces WordPress array indentation for multi-line arrays.
diff --git a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
index 4c3879e2af..45084498a0 100644
--- a/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
+++ b/WordPress/Sniffs/CodeAnalysis/EscapedNotTranslatedSniff.php
@@ -9,9 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\CodeAnalysis;
 
-use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\GetTokensAsString;
+use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 
 /**
  * Flag calls to escaping functions which look like they may have been intended
diff --git a/WordPress/Sniffs/Files/FileNameSniff.php b/WordPress/Sniffs/Files/FileNameSniff.php
index a327bea256..63fc917440 100644
--- a/WordPress/Sniffs/Files/FileNameSniff.php
+++ b/WordPress/Sniffs/Files/FileNameSniff.php
@@ -12,8 +12,8 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\TextStrings;
-use WordPressCS\WordPress\Sniff;
 use WordPressCS\WordPress\Helpers\IsUnitTestTrait;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Ensures filenames do not contain underscores and where applicable are prefixed with `class-`.
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index bbfa75f524..9df5a0057d 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -17,8 +17,8 @@
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\Lists;
 use PHPCSUtils\Utils\MessageHelper;
-use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Parentheses;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\Scopes;
diff --git a/WordPress/Sniffs/PHP/YodaConditionsSniff.php b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
index c0853f87b2..150993c6a4 100644
--- a/WordPress/Sniffs/PHP/YodaConditionsSniff.php
+++ b/WordPress/Sniffs/PHP/YodaConditionsSniff.php
@@ -9,9 +9,9 @@
 
 namespace WordPressCS\WordPress\Sniffs\PHP;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Enforces Yoda conditional statements.
diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 4aa6996a4a..886e06b141 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -19,8 +19,8 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
-use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\ConstantsHelper;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\EscapingFunctionsTrait;
 use WordPressCS\WordPress\Helpers\FormattingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\PrintingFunctionsTrait;
diff --git a/WordPress/Sniffs/WP/CapitalPDangitSniff.php b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
index 68a651b92f..c183f156a0 100644
--- a/WordPress/Sniffs/WP/CapitalPDangitSniff.php
+++ b/WordPress/Sniffs/WP/CapitalPDangitSniff.php
@@ -11,8 +11,8 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
-use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\ObjectDeclarations;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Sniff;
 
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 47d3e43005..c3d3ea4634 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -14,9 +14,9 @@
 use PHPCSUtils\Utils\MessageHelper;
 use PHPCSUtils\Utils\PassedParameters;
 use PHPCSUtils\Utils\TextStrings;
-use XMLReader;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use XMLReader;
 
 /**
  * Makes sure WP internationalization functions are used properly.
diff --git a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
index 72e20067c1..b00303ed3f 100755
--- a/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php
@@ -9,8 +9,8 @@
 
 namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
 
-use WordPressCS\WordPress\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use WordPressCS\WordPress\Sniff;
 
 /**
  * Ensure cast statements are preceded by whitespace.
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 842a2f0172..11fecd6491 100644
--- a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -9,8 +9,8 @@
 
 namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
 
-use PHPCSUtils\Tokens\Collections;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use WordPressCS\WordPress\Sniff;
 
 /**
diff --git a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index 7337a5b0d2..b54d3c421b 100644
--- a/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/WordPress/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -9,8 +9,8 @@
 
 namespace WordPressCS\WordPress\Sniffs\WhiteSpace;
 
-use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff as Squiz_ObjectOperatorSpacingSniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff as Squiz_ObjectOperatorSpacingSniff;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**

From 1bed57edae7048891c5a889b700b8d44e1075bb7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 17:58:20 +0200
Subject: [PATCH 771/822] GH Actions: fix quicktest for `develop`

Another follow up on 2338

Small tweak to the codecov upload step to not run for PHP `latest`.

_I had to tweak the code a couple of times because of the PHPUnit constraints and clearly forgot to update this condition._
---
 .github/workflows/quicktest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 67613ec256..ebe3121f0d 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -90,7 +90,7 @@ jobs:
         run: composer run-tests -- --no-configuration --bootstrap=./Tests/bootstrap.php --dont-report-useless-tests
 
       - name: Send coverage report to Codecov
-        if: ${{ success() && github.ref_name == 'develop' }}
+        if: ${{ success() && github.ref_name == 'develop' && matrix.php != 'latest' }}
         uses: codecov/codecov-action@v3
         with:
           files: ./build/logs/clover.xml

From d18074211bedcae30a8a388ee2accff55b16bf13 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 18:11:23 +0200
Subject: [PATCH 772/822] Issue template: minor tweaks

Updates for the issue templates in anticipation of the WPCS 3.0.0 release.
---
 .github/ISSUE_TEMPLATE/bug_report.md        | 29 ++++++++++++---------
 .github/ISSUE_TEMPLATE/dependency-change.md |  4 +--
 .github/ISSUE_TEMPLATE/feature_request.md   |  2 ++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6804dffcc7..7e7884e138 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -47,10 +47,14 @@ The error code for the sniff that is (or should be) being triggered (you
 can see the sniff error codes by running `phpcs` with the `-s` flag).
 e.g. `WordPress.PHP.NoSilencedErrors.Discouraged`
 
+Note: only report issues for error codes starting with `WordPress` to this repo!
+If the error code starts with `Universal`, `NormalizedArrays` or `Modernize` report the issue to PHPCSExtra.
+If the error code starts with `Generic`, `PEAR`, `PSR1`, `PSR2`, `PSR12`, `Squiz` or `Zend` report the issue to PHP_CodeSniffer itself.
+
 You can leave this section empty if you are reporting a false negative.
 -->
 
-## Custom ruleset
+## Custom Ruleset
 <!--
 If the issue cannot be reproduced when using `--standard=WordPress` on the command line,
 please post the relevant part of your custom ruleset here.
@@ -67,21 +71,22 @@ please post the relevant part of your custom ruleset here.
 <!--
 To find out the versions used:
 * PHP: run `php -v`.
-* PHPCS: run `[vendor/bin/]phpcs --version`
-* WPCS: run `composer [global] info` for a Composer install.
+* Packages: run `composer info` or run `composer [global] info` to see the installed versions.
 -->
 
-| Question               | Answer
-| ------------------------| -------
-| PHP version             | x.y.z
-| PHP_CodeSniffer version | x.y.z
-| WPCS version            | x.y.z
-| WPCS install type       | e.g. Composer global, Composer project local, git clone, other (please expand)
-| IDE (if relevant)       | Name and version e.g. PhpStorm 2018.2.2
+| Question                 | Answer
+| ------------------------ | -------
+| PHP version              | x.y.z
+| PHP_CodeSniffer version  | x.y.z
+| WordPressCS version      | x.y.z
+| PHPCSUtils version       | x.y.z
+| PHPCSExtra version       | x.y.z
+| WordPressCS install type | e.g. Composer global, Composer project local, other (please expand)
+| IDE (if relevant)        | Name and version e.g. PhpStorm 2018.2.2
 
 
 ## Additional Context (optional)
 <!-- Add any other context about the problem here. -->
 
-## Tested Against `develop` branch?
-- [ ] I have verified the issue still exists in the `develop` branch of WPCS.
+## Tested Against `develop` Branch?
+- [ ] I have verified the issue still exists in the `develop` branch of WordPressCS.
diff --git a/.github/ISSUE_TEMPLATE/dependency-change.md b/.github/ISSUE_TEMPLATE/dependency-change.md
index a8ce13adbe..0dfbf51ed3 100644
--- a/.github/ISSUE_TEMPLATE/dependency-change.md
+++ b/.github/ISSUE_TEMPLATE/dependency-change.md
@@ -1,6 +1,6 @@
 ---
 name: Dependency Change
-about: A reminder to take action when a WPCS dependency changes
+about: A reminder to take action when a WordPressCS dependency changes
 
 ---
 
@@ -8,7 +8,7 @@ about: A reminder to take action when a WPCS dependency changes
 
 ## Rationale
 
-<!-- Why should this change be made in WPCS? -->
+<!-- Why should this change be made in WordPressCS? -->
 
 ## References
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 34b43e7bf8..d3a6bf3d42 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -17,3 +17,5 @@ And preferably also code samples of code which shouldn't be flagged.
 
 ## Additional context (optional)
 <!-- Add any other context or screenshots about the feature request here. -->
+
+- [ ] I intend to create a pull request to implement this feature.

From 15a790b6dfd5051b309ed122cdb679ab4208ea27 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 18:18:13 +0200
Subject: [PATCH 773/822] Changelog: update references to the Composer PHPCS
 plugin

The repo has moved and changed its name, so make sure old references to it won't confuse people.

Note: similar changes for the README and CONTRIBUTING guide will be made in the PRs updating those files.
---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21beb5be8d..43ed6e38a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ _No documentation available about unreleased changes as of yet._
 - The `sanitize_hex_color()` and the `sanitize_hex_color_no_hash()` functions to the `escapingFunctions` list used by the `WordPress.Security.EscapeOutput` sniff.
 
 ### Changed
-- The recommended version of the suggested DealerDirect PHPCS Composer plugin is now `^0.6`.
+- The recommended version of the suggested [Composer PHPCS plugin] is now `^0.6`.
 
 ### Fixed
 - `WordPress.PHP.NoSilencedErrors`: depending on the custom properties set, the metrics would be different.
@@ -152,7 +152,7 @@ The move does not affect the package name for Packagist. This remains the same:
 - The error message for the `WordPress.Security.ValidatedSanitizedInput.MissingUnslash` has been reworded.
 - The `Sniff::is_comparison()` method now has a new `$include_coalesce` parameter to allow for toggling whether the null coalesce operator should be seen as a comparison operator. Defaults to `true`.
 - All sniffs are now also being tested against PHP 7.4 (unstable) for consistent sniff results.
-- The recommended version of the suggested DealerDirect PHPCS Composer plugin is now `^0.5.0`.
+- The recommended version of the suggested [Composer PHPCS plugin] is now `^0.5.0`.
 - Various minor code tweaks and clean up.
 
 ### Removed
@@ -274,7 +274,7 @@ If you are a maintainer of an external standard based on WordPressCS and any of
 - Dev: The command to run the unit tests has changed. Please see the updated instructions in the [CONTRIBUTING.md](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/.github/CONTRIBUTING.md) file.
     The `bin/pre-commit` example git hook has been updated to match. Additionally a `run-tests` script has been added to the `composer.json` file for your convenience.
 	To facilitate this, PHPUnit has been added to `require-dev`, even though it is strictly speaking a dependency of PHPCS, not of WPCS.
-- Dev: The DealerDirect PHPCS Composer plugin has been added to `require-dev`.
+- Dev: The [Composer PHPCS plugin] has been added to `require-dev`.
 - Various code tweaks and clean up.
 - User facing documentation, including the wiki, as well as inline documentation has been updated for all the changes contained in WordPressCS 2.0 and other recommended best practices for `PHP_CodeSniffer` 3.3.1+.
 
@@ -1179,6 +1179,8 @@ See the comparison for full list.
 
 Initial tagged release.
 
+[Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
+
 [Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/master...HEAD
 [2.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.0...2.2.1

From 84cb2092a01fc756a8d95b39a210ec04fd85cd7a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 18:39:09 +0200
Subject: [PATCH 774/822] Codecov config: tweak patch config

I'm proposing we turn patch coverage off as it is clearly sprouting nonsense (reporting 66% on changes which didn't touch any code under test (GH Actions changes, doc changes)).
---
 .codecov.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index ae9e60d5a6..edc525d281 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -13,11 +13,7 @@ coverage:
         threshold: 1%
         paths:
           - "WordPress"
-    patch:
-      default:
-        threshold: 3%
-        paths:
-          - "WordPress"
+    patch: off
 
 ignore:
   - "WordPress/Tests"

From 21d8cae7344cc0095e69883f6b2ef89a66651b89 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 05:46:04 +0200
Subject: [PATCH 775/822] Rename `SanitizingFunctionsTrait` to
 `SanitizationHelperTrait`

The `Sniff:;is_*sanitized()` utility methods are about to be moved to this trait, but once they have been, the trait name is no longer correct as all other `*Functions[Helper|Trait]` classes/traits _only_ deal with function lists and checking whether something is in those lists, while this trait will now do more than that.

With that in mind, I propose to rename the trait to `SanitizationHelperTrait`.
---
 ...nitizingFunctionsTrait.php => SanitizationHelperTrait.php} | 2 +-
 WordPress/Sniff.php                                           | 4 ++--
 WordPress/Sniffs/Security/NonceVerificationSniff.php          | 4 ++--
 WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php    | 4 ++--
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename WordPress/Helpers/{SanitizingFunctionsTrait.php => SanitizationHelperTrait.php} (99%)

diff --git a/WordPress/Helpers/SanitizingFunctionsTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
similarity index 99%
rename from WordPress/Helpers/SanitizingFunctionsTrait.php
rename to WordPress/Helpers/SanitizationHelperTrait.php
index 368a6fc5e1..222f642c6e 100644
--- a/WordPress/Helpers/SanitizingFunctionsTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -23,7 +23,7 @@
  *              `WordPressCS\WordPress\Sniff` class and partially in the `NonceVerificationSniff`
  *              and the `ValidatedSanitizedInputSniff` classes and have been moved here.
  */
-trait SanitizingFunctionsTrait {
+trait SanitizationHelperTrait {
 
 	/**
 	 * Custom list of functions that sanitize the values passed to them.
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 7bd96029c7..e25591c794 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -15,7 +15,7 @@
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
-use WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait;
+use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
 use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
 
 /**
@@ -27,7 +27,7 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	use SanitizingFunctionsTrait;
+	use SanitizationHelperTrait;
 
 	/**
 	 * A list of superglobals that incorporate user input.
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index 0909fc257b..a80d5d1767 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -31,8 +31,8 @@
  * @since 1.0.0  This sniff has been moved from the `CSRF` category to the `Security` category.
  * @since 3.0.0  This sniff has received significant updates to its logic and structure.
  *
- * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
- * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizationHelperTrait::$customSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizationHelperTrait::$customUnslashingSanitizingFunctions
  */
 class NonceVerificationSniff extends Sniff {
 
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 1bcb5060c2..eff761e635 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -28,8 +28,8 @@
  * @since 0.13.0 Class name changed: this class is now namespaced.
  * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
- * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customSanitizingFunctions
- * @uses \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait::$customUnslashingSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizationHelperTrait::$customSanitizingFunctions
+ * @uses \WordPressCS\WordPress\Helpers\SanitizationHelperTrait::$customUnslashingSanitizingFunctions
  */
 class ValidatedSanitizedInputSniff extends Sniff {
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 87e8776789..dd320c8a3f 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -19,7 +19,7 @@
  * @since 1.0.0  This sniff has been moved from the `VIP` category to the `Security` category.
  *
  * @covers \WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper
- * @covers \WordPressCS\WordPress\Helpers\SanitizingFunctionsTrait
+ * @covers \WordPressCS\WordPress\Helpers\SanitizationHelperTrait
  * @covers \WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper
  * @covers \WordPressCS\WordPress\Helpers\ValidationHelper
  * @covers \WordPressCS\WordPress\Helpers\VariableHelper

From 50e1fe9cf9404c359b56c26644458879052e370c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:08:59 +0200
Subject: [PATCH 776/822] Move sanitization methods to
 `SanitizationHelperTrait`

This moves the last utility functions from the `Sniff` class to a dedicated trait.

I am also explicitly marking the trait as internal API to allow us to iterate on this (not so very clean) solution in future 3.x releases without being forced to wait for a 4.0 release.

The methods have been made stand-alone, as in, the presumption that the WPCS `Sniff` class is being extended has been removed by adding the `$phpcsFile` parameter.

Closes 1465
---
 WordPress/Helpers/SanitizationHelperTrait.php | 186 ++++++++++++++++++
 WordPress/Sniff.php                           | 169 +---------------
 .../Security/NonceVerificationSniff.php       |   5 +-
 .../Security/ValidatedSanitizedInputSniff.php |   5 +-
 4 files changed, 195 insertions(+), 170 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 222f642c6e..ccbf23890a 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -9,7 +9,13 @@
 
 namespace WordPressCS\WordPress\Helpers;
 
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
+use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
+use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
 
 /**
  * Helper functions and function lists for checking whether a sanitizing function is being used.
@@ -19,9 +25,18 @@
  * - `customSanitizingFunctions`.
  * - `customUnslashingSanitizingFunctions`
  *
+ * ---------------------------------------------------------------------------------------------
+ * This trait is only intended for internal use by WordPressCS and is not part of the public API.
+ * This also means that it has no promise of backward compatibility. Use at your own risk.
+ * ---------------------------------------------------------------------------------------------
+ *
+ * @internal
+ *
  * @since 3.0.0 The properties in this trait were previously contained partially in the
  *              `WordPressCS\WordPress\Sniff` class and partially in the `NonceVerificationSniff`
  *              and the `ValidatedSanitizedInputSniff` classes and have been moved here.
+ *              The pre-existing methods in this trait were previously contained in the
+ *              `WordPressCS\WordPress\Sniff` class and have been moved here.
  */
 trait SanitizationHelperTrait {
 
@@ -236,4 +251,175 @@ public function is_sanitizing_function( $functionName ) {
 	public function is_sanitizing_and_unslashing_function( $functionName ) {
 		return isset( $this->get_sanitizing_and_unslashing_functions()[ strtolower( $functionName ) ] );
 	}
+
+	/**
+	 * Check if something is only being sanitized.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public`.
+	 *              - The `$phpcsFile` parameter was added.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The index of the token in the stack.
+	 *
+	 * @return bool Whether the token is only within a sanitization.
+	 */
+	public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
+		$tokens = $phpcsFile->getTokens();
+
+		// If it isn't being sanitized at all.
+		if ( ! $this->is_sanitized( $phpcsFile, $stackPtr ) ) {
+			return false;
+		}
+
+		// If the token isn't in parentheses, we know the value must have only been casted, because
+		// is_sanitized() would have returned `false` otherwise.
+		if ( ! isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			return true;
+		}
+
+		// At this point we're expecting the value to have not been casted. If it
+		// was, it wasn't *only* casted, because it's also in a function.
+		if ( ContextHelper::is_safe_casted( $phpcsFile, $stackPtr ) ) {
+			return false;
+		}
+
+		// The only parentheses should belong to the sanitizing function. If there's
+		// more than one set, this isn't *only* sanitization.
+		return ( \count( $tokens[ $stackPtr ]['nested_parenthesis'] ) === 1 );
+	}
+
+	/**
+	 * Check if something is being sanitized.
+	 *
+	 * @since 0.5.0
+	 * @since 3.0.0 - Moved from the Sniff class to this class.
+	 *              - The method visibility was changed from `protected` to `public`.
+	 *              - The `$phpcsFile` parameter was added.
+	 *              - The $require_unslash parameter has been changed from
+	 *                a boolean toggle to a ?callable $unslash_callback parameter to
+	 *                allow a sniff calling this method to handle their "unslashing"
+	 *                related messaging itself.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile        The file being scanned.
+	 * @param int                         $stackPtr         The index of the token in the stack.
+	 * @param callable|null               $unslash_callback Optional. When passed, this method will check if
+	 *                                                      an unslashing function is used on the variable before
+	 *                                                      sanitization and if not, the callback will be called
+	 *                                                      to handle the missing unslashing.
+	 *                                                      The callback will receive the $phpcsFile object and
+	 *                                                      the $stackPtr.
+	 *                                                      When not passed or `null`, this method will **not**
+	 *                                                      check for unslashing issues.
+	 *                                                      Defaults to `null` (skip unslashing checks).
+	 *
+	 * @return bool Whether the token being sanitized.
+	 */
+	public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
+		$tokens          = $phpcsFile->getTokens();
+		$require_unslash = is_callable( $unslash_callback );
+
+		// First we check if it is being casted to a safe value.
+		if ( ContextHelper::is_safe_casted( $phpcsFile, $stackPtr ) ) {
+			return true;
+		}
+
+		// If this isn't within a function call, we know already that it's not safe.
+		if ( ! isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			if ( $require_unslash ) {
+				call_user_func( $unslash_callback, $phpcsFile, $stackPtr );
+			}
+
+			return false;
+		}
+
+		// Get the function that it's in.
+		$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_openers     = array_keys( $nested_parenthesis );
+		$function_opener    = array_pop( $nested_openers );
+		$functionPtr        = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $function_opener - 1 ), null, true, null, true );
+
+		// If it is just being unset, the value isn't used at all, so it's safe.
+		if ( \T_UNSET === $tokens[ $functionPtr ]['code'] ) {
+			return true;
+		}
+
+		$valid_functions  = $this->get_sanitizing_functions();
+		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
+		$valid_functions += UnslashingFunctionsHelper::get_functions();
+		$valid_functions += ArrayWalkingFunctionsHelper::get_functions();
+
+		$functionPtr = ContextHelper::is_in_function_call( $phpcsFile, $stackPtr, $valid_functions );
+
+		// If this isn't a call to one of the valid functions, it sure isn't a sanitizing function.
+		if ( false === $functionPtr ) {
+			if ( true === $require_unslash ) {
+				call_user_func( $unslash_callback, $phpcsFile, $stackPtr );
+			}
+
+			return false;
+		}
+
+		$functionName = $tokens[ $functionPtr ]['content'];
+
+		// Check if an unslashing function is being used.
+		if ( UnslashingFunctionsHelper::is_unslashing_function( $functionName ) ) {
+
+			$is_unslashed = true;
+
+			// Remove the unslashing functions.
+			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_functions() );
+
+			// Check is any of the remaining (sanitizing) functions is used.
+			$higherFunctionPtr = ContextHelper::is_in_function_call( $phpcsFile, $functionPtr, $valid_functions );
+
+			// If there is no other valid function being used, this value is unsanitized.
+			if ( false === $higherFunctionPtr ) {
+				return false;
+			}
+
+			$functionPtr  = $higherFunctionPtr;
+			$functionName = $tokens[ $functionPtr ]['content'];
+
+		} else {
+			$is_unslashed = false;
+		}
+
+		// Arrays might be sanitized via an array walking function using a callback.
+		if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
+
+			// Get the callback parameter.
+			$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $phpcsFile, $functionPtr );
+
+			if ( ! empty( $callback ) ) {
+				/*
+				 * If this is a function callback (not a method callback array) and we're able
+				 * to resolve the function name, do so.
+				 */
+				$first_non_empty = $phpcsFile->findNext(
+					Tokens::$emptyTokens,
+					$callback['start'],
+					( $callback['end'] + 1 ),
+					true
+				);
+
+				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $tokens[ $first_non_empty ]['code'] ) {
+					$functionName = TextStrings::stripQuotes( $tokens[ $first_non_empty ]['content'] );
+				}
+			}
+		}
+
+		// If slashing is required, give an error.
+		if ( ! $is_unslashed && $require_unslash && ! $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
+			call_user_func( $unslash_callback, $phpcsFile, $stackPtr );
+		}
+
+		// Check if this is a sanitizing function.
+		if ( $this->is_sanitizing_function( $functionName ) || $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index e25591c794..8b3ad0507d 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -9,14 +9,8 @@
 
 namespace WordPressCS\WordPress;
 
-use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Utils\TextStrings;
-use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
-use WordPressCS\WordPress\Helpers\ContextHelper;
-use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
-use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
+use PHP_CodeSniffer\Sniffs\Sniff as PHPCS_Sniff;
 
 /**
  * Represents a PHP_CodeSniffer sniff for sniffing WordPress coding standards.
@@ -27,8 +21,6 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	use SanitizationHelperTrait;
-
 	/**
 	 * A list of superglobals that incorporate user input.
 	 *
@@ -107,163 +99,4 @@ protected function init( File $phpcsFile ) {
 		$this->phpcsFile = $phpcsFile;
 		$this->tokens    = $phpcsFile->getTokens();
 	}
-
-	/**
-	 * Check if something is only being sanitized.
-	 *
-	 * @since 0.5.0
-	 *
-	 * @param int $stackPtr The index of the token in the stack.
-	 *
-	 * @return bool Whether the token is only within a sanitization.
-	 */
-	protected function is_only_sanitized( $stackPtr ) {
-
-		// If it isn't being sanitized at all.
-		if ( ! $this->is_sanitized( $stackPtr ) ) {
-			return false;
-		}
-
-		// If this isn't set, we know the value must have only been casted, because
-		// is_sanitized() would have returned false otherwise.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			return true;
-		}
-
-		// At this point we're expecting the value to have not been casted. If it
-		// was, it wasn't *only* casted, because it's also in a function.
-		if ( ContextHelper::is_safe_casted( $this->phpcsFile, $stackPtr ) ) {
-			return false;
-		}
-
-		// The only parentheses should belong to the sanitizing function. If there's
-		// more than one set, this isn't *only* sanitization.
-		return ( \count( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) === 1 );
-	}
-
-	/**
-	 * Check if something is being sanitized.
-	 *
-	 * @since 0.5.0
-	 * @since 3.0.0 The second ($require_unslash) parameter has been changed from
-	 *              a boolean toggle to a ?callable $unslash_callback parameter to
-	 *              allow a sniff calling this method to handle their "unslashing"
-	 *              related messaging itself.
-	 *
-	 * @param int           $stackPtr         The index of the token in the stack.
-	 * @param callable|null $unslash_callback Optional. When passed, this method will check if an unslashing
-	 *                                        function is used on the variable before sanitization and if not,
-	 *                                        the callback will be called to handle the missing unslashing.
-	 *                                        The callback will receive the $phpcsFile object and the $stackPtr.
-	 *                                        When not passed or `null`, this method will **not** check
-	 *                                        for unslashing issues.
-	 *                                        Defaults to `null` (skip unslashing checks).
-	 *
-	 * @return bool Whether the token being sanitized.
-	 */
-	protected function is_sanitized( $stackPtr, $unslash_callback = null ) {
-		$require_unslash = is_callable( $unslash_callback );
-
-		// First we check if it is being casted to a safe value.
-		if ( ContextHelper::is_safe_casted( $this->phpcsFile, $stackPtr ) ) {
-			return true;
-		}
-
-		// If this isn't within a function call, we know already that it's not safe.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			if ( $require_unslash ) {
-				call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
-			}
-
-			return false;
-		}
-
-		// Get the function that it's in.
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
-		$nested_openers     = array_keys( $nested_parenthesis );
-		$function_opener    = array_pop( $nested_openers );
-		$functionPtr        = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $function_opener - 1 ), null, true, null, true );
-
-		// If it is just being unset, the value isn't used at all, so it's safe.
-		if ( \T_UNSET === $this->tokens[ $functionPtr ]['code'] ) {
-			return true;
-		}
-
-		$valid_functions  = $this->get_sanitizing_functions();
-		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
-		$valid_functions += UnslashingFunctionsHelper::get_functions();
-		$valid_functions += ArrayWalkingFunctionsHelper::get_functions();
-
-		$functionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, $valid_functions );
-
-		// If this isn't a call to one of the valid functions, it sure isn't a sanitizing function.
-		if ( false === $functionPtr ) {
-			if ( true === $require_unslash ) {
-				call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
-			}
-
-			return false;
-		}
-
-		$functionName = $this->tokens[ $functionPtr ]['content'];
-
-		// Check if an unslashing function is being used.
-		if ( UnslashingFunctionsHelper::is_unslashing_function( $functionName ) ) {
-
-			$is_unslashed = true;
-
-			// Remove the unslashing functions.
-			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_functions() );
-
-			// Check is any of the remaining (sanitizing) functions is used.
-			$higherFunctionPtr = ContextHelper::is_in_function_call( $this->phpcsFile, $functionPtr, $valid_functions );
-
-			// If there is no other valid function being used, this value is unsanitized.
-			if ( false === $higherFunctionPtr ) {
-				return false;
-			}
-
-			$functionPtr  = $higherFunctionPtr;
-			$functionName = $this->tokens[ $functionPtr ]['content'];
-
-		} else {
-			$is_unslashed = false;
-		}
-
-		// Arrays might be sanitized via an array walking function using a callback.
-		if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
-
-			// Get the callback parameter.
-			$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $this->phpcsFile, $functionPtr );
-
-			if ( ! empty( $callback ) ) {
-				/*
-				 * If this is a function callback (not a method callback array) and we're able
-				 * to resolve the function name, do so.
-				 */
-				$first_non_empty = $this->phpcsFile->findNext(
-					Tokens::$emptyTokens,
-					$callback['start'],
-					( $callback['end'] + 1 ),
-					true
-				);
-
-				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
-					$functionName = TextStrings::stripQuotes( $this->tokens[ $first_non_empty ]['content'] );
-				}
-			}
-		}
-
-		// If slashing is required, give an error.
-		if ( ! $is_unslashed && $require_unslash && ! $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
-			call_user_func( $unslash_callback, $this->phpcsFile, $stackPtr );
-		}
-
-		// Check if this is a sanitizing function.
-		if ( $this->is_sanitizing_function( $functionName ) || $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
-			return true;
-		}
-
-		return false;
-	}
 }
diff --git a/WordPress/Sniffs/Security/NonceVerificationSniff.php b/WordPress/Sniffs/Security/NonceVerificationSniff.php
index a80d5d1767..0241147327 100644
--- a/WordPress/Sniffs/Security/NonceVerificationSniff.php
+++ b/WordPress/Sniffs/Security/NonceVerificationSniff.php
@@ -17,6 +17,7 @@
 use PHPCSUtils\Utils\Scopes;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\RulesetPropertyHelper;
+use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
 use WordPressCS\WordPress\Helpers\UnslashingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -36,6 +37,8 @@
  */
 class NonceVerificationSniff extends Sniff {
 
+	use SanitizationHelperTrait;
+
 	/**
 	 * Superglobals to notify about when not accompanied by an nonce check.
 	 *
@@ -234,7 +237,7 @@ protected function needs_nonce_check( $stackPtr, array $cache_keys ) {
 			|| VariableHelper::is_assignment( $this->phpcsFile, $stackPtr, true )
 			|| ContextHelper::is_in_array_comparison( $this->phpcsFile, $stackPtr )
 			|| ContextHelper::is_in_function_call( $this->phpcsFile, $stackPtr, UnslashingFunctionsHelper::get_functions() ) !== false
-			|| $this->is_only_sanitized( $stackPtr )
+			|| $this->is_only_sanitized( $this->phpcsFile, $stackPtr )
 		) {
 			$needs_nonce = 'after';
 		}
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index eff761e635..cbbcab1059 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
+use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
 use WordPressCS\WordPress\Helpers\ValidationHelper;
 use WordPressCS\WordPress\Helpers\VariableHelper;
 use WordPressCS\WordPress\Sniff;
@@ -33,6 +34,8 @@
  */
 class ValidatedSanitizedInputSniff extends Sniff {
 
+	use SanitizationHelperTrait;
+
 	/**
 	 * Check for validation functions for a variable within its own parenthesis only.
 	 *
@@ -161,7 +164,7 @@ function ( $embed ) {
 		}
 
 		// Now look for sanitizing functions.
-		if ( ! $this->is_sanitized( $stackPtr, array( $this, 'add_unslash_error' ) ) ) {
+		if ( ! $this->is_sanitized( $this->phpcsFile, $stackPtr, array( $this, 'add_unslash_error' ) ) ) {
 			$this->phpcsFile->addError(
 				'Detected usage of a non-sanitized input variable: %s',
 				$stackPtr,

From e72ca2cf86508c9a68afa4ecd5a73687384fc8dc Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 06:26:28 +0200
Subject: [PATCH 777/822] SanitizationHelperTrait::is_sanitized(): add some
 defensive coding

As this method is now stand-alone, we'd better make sure the token being examined exists.

Note: no need to do the same for the `is_only_sanitized()` method as the first thing that method calls is this method and if this method returns `false`, the `is_only_sanitized()` method will too.
---
 WordPress/Helpers/SanitizationHelperTrait.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index ccbf23890a..14631e3eaa 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -320,6 +320,10 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 		$tokens          = $phpcsFile->getTokens();
 		$require_unslash = is_callable( $unslash_callback );
 
+		if ( isset( $tokens[ $stackPtr ] ) === false ) {
+			return false;
+		}
+
 		// First we check if it is being casted to a safe value.
 		if ( ContextHelper::is_safe_casted( $phpcsFile, $stackPtr ) ) {
 			return true;

From b217ebc3b3477d5ac2e99b96ab79502398d7bc22 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:26:25 +0200
Subject: [PATCH 778/822] SanitizationHelperTrait::is_sanitized(): implement
 PHPCSUtils

Note: The `$functionPtr` variable is overwritten a few lines later and the other variables being set are effectively unused (other than in these lines), so this code can be safely removed/replaced.
---
 WordPress/Helpers/SanitizationHelperTrait.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 14631e3eaa..760e63c7b0 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ArrayWalkingFunctionsHelper;
 use WordPressCS\WordPress\Helpers\ContextHelper;
@@ -338,14 +339,8 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 			return false;
 		}
 
-		// Get the function that it's in.
-		$nested_parenthesis = $tokens[ $stackPtr ]['nested_parenthesis'];
-		$nested_openers     = array_keys( $nested_parenthesis );
-		$function_opener    = array_pop( $nested_openers );
-		$functionPtr        = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $function_opener - 1 ), null, true, null, true );
-
 		// If it is just being unset, the value isn't used at all, so it's safe.
-		if ( \T_UNSET === $tokens[ $functionPtr ]['code'] ) {
+		if ( Context::inUnset( $phpcsFile, $stackPtr ) ) {
 			return true;
 		}
 

From 0834f59e58ef96c0ae5198e3001d1c53c47ccce9 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 06:11:47 +0200
Subject: [PATCH 779/822] SanitizationHelperTrait::is_sanitized(): efficiency
 tweak - move unset check up

A variable which is being unset, doesn't need to be unslashed or sanitized, so bow out early.
---
 WordPress/Helpers/SanitizationHelperTrait.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 760e63c7b0..6aa28b6d9a 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -325,6 +325,11 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 			return false;
 		}
 
+		// If the variable is just being unset, the value isn't used at all, so it's safe.
+		if ( Context::inUnset( $phpcsFile, $stackPtr ) ) {
+			return true;
+		}
+
 		// First we check if it is being casted to a safe value.
 		if ( ContextHelper::is_safe_casted( $phpcsFile, $stackPtr ) ) {
 			return true;
@@ -339,11 +344,6 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 			return false;
 		}
 
-		// If it is just being unset, the value isn't used at all, so it's safe.
-		if ( Context::inUnset( $phpcsFile, $stackPtr ) ) {
-			return true;
-		}
-
 		$valid_functions  = $this->get_sanitizing_functions();
 		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
 		$valid_functions += UnslashingFunctionsHelper::get_functions();

From 1bf115b51f109c60fd331b95b632a31393a968dd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 06:13:01 +0200
Subject: [PATCH 780/822] SanitizationHelperTrait::is_sanitized(): efficiency
 fix/improve performance

Remove the need for a call to the performance negative `array_diff_key()` function by setting up the original arrays in a better way.
---
 WordPress/Helpers/SanitizationHelperTrait.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 6aa28b6d9a..00fa571908 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -344,11 +344,12 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 			return false;
 		}
 
-		$valid_functions  = $this->get_sanitizing_functions();
-		$valid_functions += $this->get_sanitizing_and_unslashing_functions();
-		$valid_functions += UnslashingFunctionsHelper::get_functions();
-		$valid_functions += ArrayWalkingFunctionsHelper::get_functions();
+		$sanitizing_functions  = $this->get_sanitizing_functions();
+		$sanitizing_functions += $this->get_sanitizing_and_unslashing_functions();
+		$sanitizing_functions += ArrayWalkingFunctionsHelper::get_functions();
+		$valid_functions       = $sanitizing_functions + UnslashingFunctionsHelper::get_functions();
 
+		// Get the function that it's in.
 		$functionPtr = ContextHelper::is_in_function_call( $phpcsFile, $stackPtr, $valid_functions );
 
 		// If this isn't a call to one of the valid functions, it sure isn't a sanitizing function.
@@ -367,11 +368,8 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 
 			$is_unslashed = true;
 
-			// Remove the unslashing functions.
-			$valid_functions = array_diff_key( $valid_functions, UnslashingFunctionsHelper::get_functions() );
-
 			// Check is any of the remaining (sanitizing) functions is used.
-			$higherFunctionPtr = ContextHelper::is_in_function_call( $phpcsFile, $functionPtr, $valid_functions );
+			$higherFunctionPtr = ContextHelper::is_in_function_call( $phpcsFile, $functionPtr, $sanitizing_functions );
 
 			// If there is no other valid function being used, this value is unsanitized.
 			if ( false === $higherFunctionPtr ) {

From 6440bed1a8fe2b936e5fee64737c750c2a9c674a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 06:56:13 +0200
Subject: [PATCH 781/822] SanitizationHelperTrait::is_sanitized(): minor code
 tweaks

* Get rid of an unnecessary `else`.
* Improve readability of long condition.
* Get rid of unnecessary true/false condition code.
---
 WordPress/Helpers/SanitizationHelperTrait.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 00fa571908..1d63f603c7 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -364,8 +364,8 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 		$functionName = $tokens[ $functionPtr ]['content'];
 
 		// Check if an unslashing function is being used.
+		$is_unslashed = false;
 		if ( UnslashingFunctionsHelper::is_unslashing_function( $functionName ) ) {
-
 			$is_unslashed = true;
 
 			// Check is any of the remaining (sanitizing) functions is used.
@@ -378,14 +378,10 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 
 			$functionPtr  = $higherFunctionPtr;
 			$functionName = $tokens[ $functionPtr ]['content'];
-
-		} else {
-			$is_unslashed = false;
 		}
 
 		// Arrays might be sanitized via an array walking function using a callback.
 		if ( ArrayWalkingFunctionsHelper::is_array_walking_function( $functionName ) ) {
-
 			// Get the callback parameter.
 			$callback = ArrayWalkingFunctionsHelper::get_callback_parameter( $phpcsFile, $functionPtr );
 
@@ -408,15 +404,14 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 		}
 
 		// If slashing is required, give an error.
-		if ( ! $is_unslashed && $require_unslash && ! $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
+		if ( false === $is_unslashed
+			&& true === $require_unslash
+			&& ! $this->is_sanitizing_and_unslashing_function( $functionName )
+		) {
 			call_user_func( $unslash_callback, $phpcsFile, $stackPtr );
 		}
 
 		// Check if this is a sanitizing function.
-		if ( $this->is_sanitizing_function( $functionName ) || $this->is_sanitizing_and_unslashing_function( $functionName ) ) {
-			return true;
-		}
-
-		return false;
+		return ( $this->is_sanitizing_function( $functionName ) || $this->is_sanitizing_and_unslashing_function( $functionName ) );
 	}
 }

From 2d019df783e077b811f9af506f1ae16a717de6b4 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 06:25:40 +0200
Subject: [PATCH 782/822] SanitizationHelperTrait::is_sanitized(): minor doc
 tweaks

---
 WordPress/Helpers/SanitizationHelperTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 1d63f603c7..9760eca67c 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -315,7 +315,7 @@ public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
 	 *                                                      check for unslashing issues.
 	 *                                                      Defaults to `null` (skip unslashing checks).
 	 *
-	 * @return bool Whether the token being sanitized.
+	 * @return bool Whether the token is being sanitized.
 	 */
 	public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
 		$tokens          = $phpcsFile->getTokens();
@@ -368,7 +368,7 @@ public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = nu
 		if ( UnslashingFunctionsHelper::is_unslashing_function( $functionName ) ) {
 			$is_unslashed = true;
 
-			// Check is any of the remaining (sanitizing) functions is used.
+			// Check whether this function call is wrapped within a sanitizing function.
 			$higherFunctionPtr = ContextHelper::is_in_function_call( $phpcsFile, $functionPtr, $sanitizing_functions );
 
 			// If there is no other valid function being used, this value is unsanitized.

From 659e3d3996c116951bc5720710b15eed30ccb2cf Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 7 Aug 2023 03:19:27 +0200
Subject: [PATCH 783/822] Various minor doc fixes

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 4aa6996a4a..cbfee903bc 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -403,7 +403,10 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		$params = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );
 
-		// These functions only need to have their first argument escaped.
+		/*
+		 * These functions only need to have their first argument - `$message` - escaped.
+		 * Note: user_error() is an alias for trigger_error(), so the param names are the same.
+		 */
 		if ( 'trigger_error' === $matched_content || 'user_error' === $matched_content ) {
 			$message_param = PassedParameters::getParameterFromStack( $params, 1, 'message' );
 			if ( false === $message_param ) {
@@ -415,7 +418,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 
 		/*
-		 * If the first param to `_deprecated_file()` follows the typical `basename( __FILE__ )`
+		 * If the first param to `_deprecated_file()` - `$file` - follows the typical `basename( __FILE__ )`
 		 * pattern, it doesn't need to be escaped.
 		 */
 		if ( '_deprecated_file' === $matched_content ) {

From 2e73ebac8c9ad1b7b03a11b8407711f9e3c13444 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:31:57 +0200
Subject: [PATCH 784/822] Docs: improve test `@return` tags

... and use consistent spacing (blank line between param and return tags).
---
 WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php  | 4 ++--
 WordPress/Tests/Arrays/ArrayIndentationUnitTest.php         | 4 ++--
 .../Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php    | 4 ++--
 .../Tests/Arrays/MultipleStatementAlignmentUnitTest.php     | 4 ++--
 .../CodeAnalysis/AssignmentInTernaryConditionUnitTest.php   | 4 ++--
 .../Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php     | 4 ++--
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php          | 4 ++--
 WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php      | 4 ++--
 WordPress/Tests/DB/PreparedSQLUnitTest.php                  | 4 ++--
 WordPress/Tests/DB/RestrictedClassesUnitTest.php            | 5 +++--
 WordPress/Tests/DB/RestrictedFunctionsUnitTest.php          | 4 ++--
 WordPress/Tests/DB/SlowDBQueryUnitTest.php                  | 4 ++--
 WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php   | 4 ++--
 WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php    | 4 ++--
 WordPress/Tests/Files/FileNameUnitTest.php                  | 5 +++--
 .../Tests/NamingConventions/PrefixAllGlobalsUnitTest.php    | 6 ++++--
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.php   | 4 ++--
 WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php | 6 ++++--
 .../Tests/NamingConventions/ValidPostTypeSlugUnitTest.php   | 4 ++--
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php   | 4 ++--
 WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php        | 4 ++--
 WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php     | 4 ++--
 WordPress/Tests/PHP/DontExtractUnitTest.php                 | 4 ++--
 WordPress/Tests/PHP/IniSetUnitTest.php                      | 4 ++--
 WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php            | 4 ++--
 WordPress/Tests/PHP/POSIXFunctionsUnitTest.php              | 4 ++--
 WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php          | 4 ++--
 WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php      | 4 ++--
 WordPress/Tests/PHP/StrictInArrayUnitTest.php               | 4 ++--
 WordPress/Tests/PHP/TypeCastsUnitTest.php                   | 4 ++--
 WordPress/Tests/PHP/YodaConditionsUnitTest.php              | 4 ++--
 WordPress/Tests/Security/EscapeOutputUnitTest.php           | 4 ++--
 WordPress/Tests/Security/NonceVerificationUnitTest.php      | 4 ++--
 WordPress/Tests/Security/PluginMenuSlugUnitTest.php         | 4 ++--
 WordPress/Tests/Security/SafeRedirectUnitTest.php           | 4 ++--
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php      | 4 ++--
 WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php       | 6 ++++--
 WordPress/Tests/WP/AlternativeFunctionsUnitTest.php         | 4 ++--
 WordPress/Tests/WP/CapabilitiesUnitTest.php                 | 4 ++--
 WordPress/Tests/WP/CapitalPDangitUnitTest.php               | 4 ++--
 WordPress/Tests/WP/ClassNameCaseUnitTest.php                | 4 ++--
 WordPress/Tests/WP/CronIntervalUnitTest.php                 | 4 ++--
 WordPress/Tests/WP/DeprecatedClassesUnitTest.php            | 4 ++--
 WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php          | 4 ++--
 WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php    | 4 ++--
 WordPress/Tests/WP/DeprecatedParametersUnitTest.php         | 4 ++--
 WordPress/Tests/WP/DiscouragedConstantsUnitTest.php         | 4 ++--
 WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php         | 4 ++--
 WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php   | 4 ++--
 WordPress/Tests/WP/EnqueuedResourcesUnitTest.php            | 4 ++--
 WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php      | 4 ++--
 WordPress/Tests/WP/I18nUnitTest.php                         | 6 ++++--
 WordPress/Tests/WP/PostsPerPageUnitTest.php                 | 4 ++--
 WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php | 4 ++--
 .../Tests/WhiteSpace/ControlStructureSpacingUnitTest.php    | 4 ++--
 WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php      | 4 ++--
 56 files changed, 122 insertions(+), 112 deletions(-)

diff --git a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
index 80d4c78146..9a289959e6 100644
--- a/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.php
@@ -26,7 +26,7 @@ final class ArrayDeclarationSpacingUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 
@@ -84,7 +84,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
index 0841cd611c..2e392f7296 100644
--- a/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayIndentationUnitTest.php
@@ -48,7 +48,7 @@ public function setCliValues( $testFile, $config ) {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -154,7 +154,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
index 7504a4709d..aa2dc27890 100644
--- a/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
+++ b/WordPress/Tests/Arrays/ArrayKeySpacingRestrictionsUnitTest.php
@@ -24,7 +24,7 @@ final class ArrayKeySpacingRestrictionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -65,7 +65,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
index 27a8ddd1ad..11a839fc13 100644
--- a/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
+++ b/WordPress/Tests/Arrays/MultipleStatementAlignmentUnitTest.php
@@ -51,7 +51,7 @@ public function setCliValues( $testFile, $config ) {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -62,7 +62,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
index e3e4824b9a..642a8a70fc 100644
--- a/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/AssignmentInTernaryConditionUnitTest.php
@@ -23,7 +23,7 @@ final class AssignmentInTernaryConditionUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
index a0bc185671..4218e90dc9 100644
--- a/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
+++ b/WordPress/Tests/CodeAnalysis/EscapedNotTranslatedUnitTest.php
@@ -23,7 +23,7 @@ final class EscapedNotTranslatedUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
index be7cfff212..e12828a1aa 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
@@ -26,7 +26,7 @@ final class DirectDatabaseQueryUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -35,7 +35,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
index 77ffea9e19..10acc9493d 100644
--- a/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLPlaceholdersUnitTest.php
@@ -23,7 +23,7 @@ final class PreparedSQLPlaceholdersUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -112,7 +112,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/DB/PreparedSQLUnitTest.php b/WordPress/Tests/DB/PreparedSQLUnitTest.php
index ce279e8ea8..0a296ff984 100644
--- a/WordPress/Tests/DB/PreparedSQLUnitTest.php
+++ b/WordPress/Tests/DB/PreparedSQLUnitTest.php
@@ -30,7 +30,7 @@ final class PreparedSQLUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -86,7 +86,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index b2f6e0ac1f..f17c3cba63 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -63,7 +63,8 @@ protected function resetGroups() {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -155,7 +156,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index 0f8a0eba31..e80fa335de 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -60,7 +60,7 @@ protected function resetGroups() {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -118,7 +118,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index f18e9accd1..e0832726ae 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -26,7 +26,7 @@ final class SlowDBQueryUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -35,7 +35,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
index a857fdaf9e..c667af8234 100644
--- a/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
+++ b/WordPress/Tests/DateTime/CurrentTimeTimestampUnitTest.php
@@ -23,7 +23,7 @@ final class CurrentTimeTimestampUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -37,7 +37,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
index 217f8d86f0..f5e160bc62 100644
--- a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -23,7 +23,7 @@ final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -35,7 +35,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Files/FileNameUnitTest.php b/WordPress/Tests/Files/FileNameUnitTest.php
index 8ec4146f44..905147956d 100644
--- a/WordPress/Tests/Files/FileNameUnitTest.php
+++ b/WordPress/Tests/Files/FileNameUnitTest.php
@@ -150,7 +150,8 @@ protected function getTestFiles( $testFileBase ) {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 
@@ -166,7 +167,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
index 77f2966729..b9beb09ff6 100644
--- a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
+++ b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -26,7 +26,8 @@ final class PrefixAllGlobalsUnitTest extends AbstractSniffUnitTest {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 
@@ -116,7 +117,8 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 	 * Returns the lines where warnings should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of warnings>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
 
diff --git a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 987b6bbc33..6dbd5e8cf1 100644
--- a/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -25,7 +25,7 @@ final class ValidFunctionNameUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -62,7 +62,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
index 6a4db70128..aac97da195 100644
--- a/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidHookNameUnitTest.php
@@ -26,7 +26,8 @@ final class ValidHookNameUnitTest extends AbstractSniffUnitTest {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 
@@ -87,7 +88,8 @@ public function getErrorList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 	 * Returns the lines where warnings should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of warnings>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = 'ValidHookNameUnitTest.1.inc' ) {
 
diff --git a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
index 658678bb78..821b73ef24 100644
--- a/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidPostTypeSlugUnitTest.php
@@ -37,7 +37,7 @@ public function setCliValues( $filename, $config ) {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -79,7 +79,7 @@ public function getErrorList( $testFile = '' ) {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 587fa6e82e..c26a4936e7 100644
--- a/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -25,7 +25,7 @@ final class ValidVariableNameUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -103,7 +103,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
index 8008238212..8be090a5bf 100644
--- a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -24,7 +24,7 @@ final class DevelopmentFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -33,7 +33,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
index 65e2fb557f..ee28c4fe42 100644
--- a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.php
@@ -24,7 +24,7 @@ final class DiscouragedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -33,7 +33,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
index 02cc245fc4..3efee7c9a8 100644
--- a/WordPress/Tests/PHP/DontExtractUnitTest.php
+++ b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -25,7 +25,7 @@ final class DontExtractUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -36,7 +36,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/PHP/IniSetUnitTest.php b/WordPress/Tests/PHP/IniSetUnitTest.php
index 950fa2b431..fede4955b2 100644
--- a/WordPress/Tests/PHP/IniSetUnitTest.php
+++ b/WordPress/Tests/PHP/IniSetUnitTest.php
@@ -23,7 +23,7 @@ final class IniSetUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -55,7 +55,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
index 89fa3a16e9..7a576b992c 100644
--- a/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/WordPress/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -23,7 +23,7 @@ final class NoSilencedErrorsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
index 82eb162ec4..7dbfcd6100 100644
--- a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.php
@@ -24,7 +24,7 @@ final class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -41,7 +41,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
index 96939b4b32..63d4e0eb9f 100644
--- a/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
+++ b/WordPress/Tests/PHP/PregQuoteDelimiterUnitTest.php
@@ -23,7 +23,7 @@ final class PregQuoteDelimiterUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
index b5904fd4a6..d930ba4329 100644
--- a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -23,7 +23,7 @@ final class RestrictedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -34,7 +34,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/PHP/StrictInArrayUnitTest.php b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
index e5f387e5b0..41aa9d37c4 100644
--- a/WordPress/Tests/PHP/StrictInArrayUnitTest.php
+++ b/WordPress/Tests/PHP/StrictInArrayUnitTest.php
@@ -25,7 +25,7 @@ final class StrictInArrayUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -34,7 +34,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/TypeCastsUnitTest.php b/WordPress/Tests/PHP/TypeCastsUnitTest.php
index e93daab07f..878b089927 100644
--- a/WordPress/Tests/PHP/TypeCastsUnitTest.php
+++ b/WordPress/Tests/PHP/TypeCastsUnitTest.php
@@ -23,7 +23,7 @@ final class TypeCastsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -39,7 +39,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/PHP/YodaConditionsUnitTest.php b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
index da4bef8b8d..3cb8604025 100644
--- a/WordPress/Tests/PHP/YodaConditionsUnitTest.php
+++ b/WordPress/Tests/PHP/YodaConditionsUnitTest.php
@@ -24,7 +24,7 @@ final class YodaConditionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -53,7 +53,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Security/EscapeOutputUnitTest.php b/WordPress/Tests/Security/EscapeOutputUnitTest.php
index 5705ba1d29..6150a4eeb4 100644
--- a/WordPress/Tests/Security/EscapeOutputUnitTest.php
+++ b/WordPress/Tests/Security/EscapeOutputUnitTest.php
@@ -32,7 +32,7 @@ final class EscapeOutputUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -188,7 +188,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Security/NonceVerificationUnitTest.php b/WordPress/Tests/Security/NonceVerificationUnitTest.php
index 8886e3a471..edb18099c4 100644
--- a/WordPress/Tests/Security/NonceVerificationUnitTest.php
+++ b/WordPress/Tests/Security/NonceVerificationUnitTest.php
@@ -31,7 +31,7 @@ final class NonceVerificationUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -98,7 +98,7 @@ public function getErrorList( $testFile = '' ) {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
index baab374227..6741d048a1 100644
--- a/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
+++ b/WordPress/Tests/Security/PluginMenuSlugUnitTest.php
@@ -25,7 +25,7 @@ final class PluginMenuSlugUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -34,7 +34,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
index e13ad5c1c6..b62e6f86c8 100644
--- a/WordPress/Tests/Security/SafeRedirectUnitTest.php
+++ b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -23,7 +23,7 @@ final class SafeRedirectUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index dd320c8a3f..92ec32566e 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -32,7 +32,7 @@ final class ValidatedSanitizedInputUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -118,7 +118,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
index 391e59f06d..8da63235c1 100644
--- a/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
+++ b/WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.php
@@ -49,7 +49,8 @@ public function setCliValues( $testFile, $config ) {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 
@@ -158,7 +159,8 @@ public function getErrorList( $testFile = '' ) {
 	 * Returns the lines where warnings should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of warnings>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
index 28d66f6bb6..b0f1bf96aa 100644
--- a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -25,7 +25,7 @@ final class AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -34,7 +34,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/CapabilitiesUnitTest.php b/WordPress/Tests/WP/CapabilitiesUnitTest.php
index 7d9a48b683..42113c2a24 100644
--- a/WordPress/Tests/WP/CapabilitiesUnitTest.php
+++ b/WordPress/Tests/WP/CapabilitiesUnitTest.php
@@ -51,7 +51,7 @@ public function setCliValues( $filename, $config ) {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -99,7 +99,7 @@ public function getErrorList( $testFile = '' ) {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/WP/CapitalPDangitUnitTest.php b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
index 4fce4deac0..ea1cfcf65e 100644
--- a/WordPress/Tests/WP/CapitalPDangitUnitTest.php
+++ b/WordPress/Tests/WP/CapitalPDangitUnitTest.php
@@ -24,7 +24,7 @@ final class CapitalPDangitUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -35,7 +35,7 @@ public function getErrorList() {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/WP/ClassNameCaseUnitTest.php b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
index 0127be8cea..7869ea7f6f 100644
--- a/WordPress/Tests/WP/ClassNameCaseUnitTest.php
+++ b/WordPress/Tests/WP/ClassNameCaseUnitTest.php
@@ -23,7 +23,7 @@ final class ClassNameCaseUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/CronIntervalUnitTest.php b/WordPress/Tests/WP/CronIntervalUnitTest.php
index 694418d6fa..81f02c2768 100644
--- a/WordPress/Tests/WP/CronIntervalUnitTest.php
+++ b/WordPress/Tests/WP/CronIntervalUnitTest.php
@@ -25,7 +25,7 @@ final class CronIntervalUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -34,7 +34,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
index caa5bb174e..0b82daff65 100644
--- a/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedClassesUnitTest.php
@@ -24,7 +24,7 @@ final class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		$start_line = 9;
@@ -40,7 +40,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
index 300671a000..f12b805780 100644
--- a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -24,7 +24,7 @@ final class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		$start_line = 8;
@@ -87,7 +87,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		$start_line = 368;
diff --git a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
index 6a2271f0d9..eb08d7d40c 100644
--- a/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParameterValuesUnitTest.php
@@ -23,7 +23,7 @@ final class DeprecatedParameterValuesUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -58,7 +58,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
index 78ad14cff1..5f4a6432a8 100644
--- a/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
+++ b/WordPress/Tests/WP/DeprecatedParametersUnitTest.php
@@ -24,7 +24,7 @@ final class DeprecatedParametersUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		$start_line = 42;
@@ -48,7 +48,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		$start_line = 99;
diff --git a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
index 512d07b7e0..e27fd838c2 100644
--- a/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedConstantsUnitTest.php
@@ -23,7 +23,7 @@ final class DiscouragedConstantsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -32,7 +32,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
index 8d5c188361..825ff39702 100644
--- a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -27,7 +27,7 @@ final class DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -36,7 +36,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
index ce39aa8547..b5bd511201 100644
--- a/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourceParametersUnitTest.php
@@ -23,7 +23,7 @@ final class EnqueuedResourceParametersUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -46,7 +46,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
index 1b38d2e96a..d329549306 100644
--- a/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
+++ b/WordPress/Tests/WP/EnqueuedResourcesUnitTest.php
@@ -26,7 +26,7 @@ final class EnqueuedResourcesUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -79,7 +79,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
index 928bbbd1f8..954b65ee4e 100644
--- a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
+++ b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.php
@@ -30,7 +30,7 @@ final class GlobalVariablesOverrideUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 		switch ( $testFile ) {
@@ -101,7 +101,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
index d282be252b..3834eb189f 100644
--- a/WordPress/Tests/WP/I18nUnitTest.php
+++ b/WordPress/Tests/WP/I18nUnitTest.php
@@ -43,7 +43,8 @@ public function setCliValues( $testFile, $config ) {
 	 * Returns the lines where errors should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of errors>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 
@@ -181,7 +182,8 @@ public function getErrorList( $testFile = '' ) {
 	 * Returns the lines where warnings should occur.
 	 *
 	 * @param string $testFile The name of the file being tested.
-	 * @return array <int line number> => <int number of warnings>
+	 *
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList( $testFile = '' ) {
 		switch ( $testFile ) {
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.php b/WordPress/Tests/WP/PostsPerPageUnitTest.php
index 20237e4418..bf3296ce25 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.php
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.php
@@ -28,7 +28,7 @@ final class PostsPerPageUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array();
@@ -37,7 +37,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array(
diff --git a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
index 634afefcfa..5392cf4852 100644
--- a/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/CastStructureSpacingUnitTest.php
@@ -24,7 +24,7 @@ final class CastStructureSpacingUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -41,7 +41,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index d56e56e840..e173ae0ec9 100644
--- a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -26,7 +26,7 @@ final class ControlStructureSpacingUnitTest extends AbstractSniffUnitTest {
 	 *
 	 * @param string $testFile The name of the file being tested.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList( $testFile = '' ) {
 
@@ -78,7 +78,7 @@ public function getErrorList( $testFile = '' ) {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();
diff --git a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index 21ed0f8ea5..d7343f1ec2 100644
--- a/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/WordPress/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -26,7 +26,7 @@ final class OperatorSpacingUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -48,7 +48,7 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
-	 * @return array <int line number> => <int number of warnings>
+	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
 	public function getWarningList() {
 		return array();

From b0fc0c082a07da248fe767c10486a7fa27cc7c57 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:39:20 +0200
Subject: [PATCH 785/822] Docs: more `@var`/`@param`/`@return` tag improvements

Definitely not claiming completeness. This is just another iteration step in improving the documented types.
---
 WordPress/Helpers/ContextHelper.php                | 10 +++++-----
 WordPress/Helpers/IsUnitTestTrait.php              |  4 ++--
 WordPress/Helpers/SanitizationHelperTrait.php      |  6 +++---
 WordPress/Helpers/ValidationHelper.php             |  2 +-
 WordPress/Helpers/WPHookHelper.php                 |  4 ++--
 .../Sniffs/DateTime/CurrentTimeTimestampSniff.php  |  2 +-
 .../NamingConventions/PrefixAllGlobalsSniff.php    | 14 +++++++-------
 .../NamingConventions/ValidPostTypeSlugSniff.php   |  8 ++++----
 WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php     |  6 +++---
 WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php   |  2 +-
 WordPress/Sniffs/Security/PluginMenuSlugSniff.php  |  6 +++---
 .../Sniffs/Utils/I18nTextDomainFixerSniff.php      | 10 +++++-----
 WordPress/Sniffs/WP/CapabilitiesSniff.php          |  6 +++---
 WordPress/Sniffs/WP/DiscouragedConstantsSniff.php  |  4 ++--
 .../Sniffs/WP/EnqueuedResourceParametersSniff.php  |  6 +++---
 WordPress/Sniffs/WP/EnqueuedResourcesSniff.php     |  3 ++-
 .../Sniffs/WP/GlobalVariablesOverrideSniff.php     |  2 +-
 WordPress/Sniffs/WP/I18nSniff.php                  |  4 ++--
 18 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/WordPress/Helpers/ContextHelper.php b/WordPress/Helpers/ContextHelper.php
index 09b87035ad..8b5c178666 100644
--- a/WordPress/Helpers/ContextHelper.php
+++ b/WordPress/Helpers/ContextHelper.php
@@ -37,7 +37,7 @@ final class ContextHelper {
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The property visibility was changed from `protected` to `private static`.
 	 *
-	 * @var array
+	 * @var array<int|string, true> Key is token constant, value irrelevant.
 	 */
 	private static $safe_casts = array(
 		\T_INT_CAST    => true,
@@ -58,7 +58,7 @@ final class ContextHelper {
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The property visibility was changed from `protected` to `private static`.
 	 *
-	 * @var array
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	private static $typeTestFunctions = array(
 		'is_array'     => true,
@@ -85,7 +85,7 @@ final class ContextHelper {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	private static $key_exists_functions = array(
 		'array_key_exists' => true,
@@ -102,7 +102,7 @@ final class ContextHelper {
 	 * @since 3.0.0 - Moved from the Sniff class to this class.
 	 *              - The property visibility was changed from `protected` to `private static`.
 	 *
-	 * @var array <string function name> => <true|array>
+	 * @var array<string, bool|array>
 	 */
 	private static $arrayCompareFunctions = array(
 		'in_array'     => true,
@@ -327,7 +327,7 @@ public static function is_in_isset_or_empty( File $phpcsFile, $stackPtr ) {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @return array<string, bool>
+	 * @return array<int|string, true>
 	 */
 	public static function get_safe_cast_tokens() {
 		return self::$safe_casts;
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 409fb7c06b..6eda9005ae 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -76,7 +76,7 @@ trait IsUnitTestTrait {
 	 *               - Renamed from `$test_class_whitelist` to `$known_test_classes`.
 	 *               - Visibility changed from protected to private.
 	 *
-	 * @var string[]
+	 * @var array<string, true> Key is class name, value irrelevant.
 	 */
 	private $known_test_classes = array(
 		// Base test cases.
@@ -125,7 +125,7 @@ trait IsUnitTestTrait {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array<string, bool>
+	 * @return array<string, bool>
 	 */
 	protected function get_all_test_classes() {
 		if ( array() === $this->all_test_classes
diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index 9760eca67c..f4467148ab 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -75,7 +75,7 @@ trait SanitizationHelperTrait {
 	 * @since 3.0.0  - Moved from the Sniff class to this trait.
 	 *               - Visibility changed from protected to private.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, true>
 	 */
 	private $sanitizingFunctions = array(
 		'_wp_handle_upload'          => true,
@@ -188,7 +188,7 @@ trait SanitizationHelperTrait {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array<string, bool>
+	 * @return array<string, bool>
 	 */
 	public function get_sanitizing_functions() {
 		if ( array() === $this->allSanitizingFunctions
@@ -210,7 +210,7 @@ public function get_sanitizing_functions() {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array<string, bool>
+	 * @return array<string, bool>
 	 */
 	public function get_sanitizing_and_unslashing_functions() {
 		if ( array() === $this->allUnslashingSanitizingFunctions
diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index d63f1bed91..d8cece8205 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -324,7 +324,7 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 	 *
 	 * @param string[] $text_strings The input array.
 	 *
-	 * @var array
+	 * @return string[]
 	 */
 	private static function strip_quotes_from_array_values( array $text_strings ) {
 		return array_map( array( 'PHPCSUtils\Utils\TextStrings', 'stripQuotes' ), $text_strings );
diff --git a/WordPress/Helpers/WPHookHelper.php b/WordPress/Helpers/WPHookHelper.php
index 220ad668de..b5b4f4a133 100644
--- a/WordPress/Helpers/WPHookHelper.php
+++ b/WordPress/Helpers/WPHookHelper.php
@@ -30,8 +30,8 @@ final class WPHookHelper {
 	 *               - The format of the value has changed from a non-relevant boolean to
 	 *                 an array with the parameter position and name(s) for the hook name parameter.
 	 *
-	 * @var array<string, <string, int|string|array>> Function name as key, array with target
-	 *                                                parameter position and name(s) as value.
+	 * @var array<string, array<string, int|string|string[]>> Function name as key, array with target
+	 *                                                        parameter position and name(s) as value.
 	 */
 	private static $hookInvokeFunctions = array(
 		'do_action' => array(
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
index af46c4c9a8..34bfe514f7 100644
--- a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
+++ b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -44,7 +44,7 @@ final class CurrentTimeTimestampSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var array <string function_name> => <bool always needed ?>
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $target_functions = array(
 		'current_time' => true,
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index a5740b4eab..e06c01d201 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -81,7 +81,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * @since 0.12.0
 	 * @since 3.0.0  Renamed from `$prefix_blacklist` to `$prefix_blocklist`.
 	 *
-	 * @var string[]
+	 * @var array<string, true> Key is prefix, value irrelevant.
 	 */
 	protected $prefix_blocklist = array(
 		'wordpress' => true,
@@ -97,7 +97,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 0.12.0
 	 *
-	 * @var string[]
+	 * @var array<string, string>
 	 */
 	private $validated_prefixes = array();
 
@@ -111,7 +111,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @var array
+	 * @var array<string, array<string, mixed>>
 	 */
 	private $validated_namespace_prefixes = array();
 
@@ -132,7 +132,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * @since 0.14.0
 	 * @since 3.0.0 Renamed from `$whitelisted_core_hooks` to `$allowed_core_hooks`.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, true> Key is hook name, value irrelevant.
 	 */
 	protected $allowed_core_hooks = array(
 		'widget_title'   => true,
@@ -152,7 +152,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 * @since 1.0.0
 	 * @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, true> Key is constant name, value irrelevant.
 	 */
 	protected $allowed_core_constants = array(
 		'ADMIN_COOKIE_PATH'    => true,
@@ -203,7 +203,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 3.0.0.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $pluggable_functions = array(
 		'auth_redirect'                                  => true,
@@ -376,7 +376,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 3.0.0.
 	 *
-	 * @var array<string, bool>
+	 * @var array<string, true> Key is class name, value irrelevant.
 	 */
 	protected $pluggable_classes = array(
 		'TwentyTwenty_Customize'           => true,
diff --git a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
index ec8eed8dce..2e01da8abf 100644
--- a/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
+++ b/WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php
@@ -52,7 +52,7 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var array List of function names as keys. Value irrelevant.
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $target_functions = array(
 		'register_post_type' => true,
@@ -67,7 +67,7 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var array
+	 * @var array<string, true> Key is reserved post type name, value irrelevant.
 	 */
 	protected $reserved_names = array(
 		'action'              => true, // Not a WP post type, but prevents other problems.
@@ -97,7 +97,7 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var string
+	 * @var array<int|string, int|string>
 	 */
 	private $valid_tokens = array();
 
@@ -122,7 +122,7 @@ public function register() {
 	 * @since 2.2.0
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
-	 * @param array  $group_name      The name of the group which was matched.
+	 * @param string $group_name      The name of the group which was matched.
 	 * @param string $matched_content The token content (function name) which was matched
 	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
diff --git a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
index 282d35203a..4817f82652 100644
--- a/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -60,7 +60,7 @@ final class NoSilencedErrorsSniff extends Sniff {
 	 * @since 1.1.0
 	 * @since 3.0.0 Renamed from `$custom_whitelist` to `$customAllowedFunctionsList`.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	public $customAllowedFunctionsList = array();
 
@@ -81,7 +81,7 @@ final class NoSilencedErrorsSniff extends Sniff {
 	 * @since 1.1.0
 	 * @since 3.0.0 Renamed from `$function_whitelist` to `$allowedFunctionsList`.
 	 *
-	 * @var array <string function name> => <bool true>
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $allowedFunctionsList = array(
 		// Directory extension.
@@ -154,7 +154,7 @@ final class NoSilencedErrorsSniff extends Sniff {
 	 *
 	 * @since 1.1.0
 	 *
-	 * @var array
+	 * @var array<int|string, int|string>
 	 */
 	private $empty_tokens = array();
 
diff --git a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
index 2f791ed7c2..3a1ab1eaf7 100644
--- a/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
+++ b/WordPress/Sniffs/PHP/PregQuoteDelimiterSniff.php
@@ -35,7 +35,7 @@ final class PregQuoteDelimiterSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.0.0
 	 *
-	 * @var array <string function_name> => <bool>
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $target_functions = array(
 		'preg_quote' => true,
diff --git a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
index 276e4c5009..64711da29c 100644
--- a/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
+++ b/WordPress/Sniffs/Security/PluginMenuSlugSniff.php
@@ -44,9 +44,9 @@ final class PluginMenuSlugSniff extends AbstractFunctionParameterSniff {
 	 *               array containing parameter positions to an array with the parameter
 	 *               position as the index and the parameter name as value.
 	 *
-	 * @var array<string, <int, string|array>> Key is the name of the functions being targetted.
-	 *                                         Value is an array with parameter positions as the
-	 *                                         keys and parameter names as the values
+	 * @var array<string, array<int, string|array>> Key is the name of the functions being targetted.
+	 *                                              Value is an array with parameter positions as the
+	 *                                              keys and parameter names as the values
 	 */
 	protected $target_functions = array(
 		'add_comments_page'   => array(
diff --git a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
index a6149929d7..d87f338dd0 100644
--- a/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+++ b/WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
@@ -262,8 +262,8 @@ final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @var array Array key is the header name, the value indicated whether it is a
-	 *            required (true) or optional (false) header.
+	 * @var array<string, bool> Array key is the header name, the value indicated whether it is a
+	 *                          required (true) or optional (false) header.
 	 */
 	private $theme_headers = array(
 		'Theme Name'        => true,
@@ -289,8 +289,8 @@ final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @var array Array key is the header name, the value indicated whether it is a
-	 *            required (true) or optional (false) header.
+	 * @var array<string, bool> Array key is the header name, the value indicated whether it is a
+	 *                          required (true) or optional (false) header.
 	 */
 	private $plugin_headers = array(
 		'Plugin Name'       => true,
@@ -345,7 +345,7 @@ final class I18nTextDomainFixerSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	private $tab_width = null;
 
diff --git a/WordPress/Sniffs/WP/CapabilitiesSniff.php b/WordPress/Sniffs/WP/CapabilitiesSniff.php
index 7afc97aabc..3a86562dfa 100644
--- a/WordPress/Sniffs/WP/CapabilitiesSniff.php
+++ b/WordPress/Sniffs/WP/CapabilitiesSniff.php
@@ -152,7 +152,7 @@ final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array<string, bool> Role available in WP Core.
+	 * @var array<string, true> Key is role available in WP Core, value irrelevant.
 	 */
 	private $core_roles = array(
 		'super_admin'   => true,
@@ -177,7 +177,7 @@ final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array<string, bool> All capabilities available in core.
+	 * @var array<string, true> All capabilities available in core.
 	 */
 	private $core_capabilities = array(
 		'activate_plugin'             => true,
@@ -349,7 +349,7 @@ final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
 	 * @since 3.0.0
 	 *
 	 * @param int    $stackPtr        The position of the current token in the stack.
-	 * @param array  $group_name      The name of the group which was matched.
+	 * @param string $group_name      The name of the group which was matched.
 	 * @param string $matched_content The token content (function name) which was matched
 	 *                                in lowercase.
 	 * @param array  $parameters      Array with information about the parameters.
diff --git a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
index d486b6c594..7db5a37854 100644
--- a/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
+++ b/WordPress/Sniffs/WP/DiscouragedConstantsSniff.php
@@ -51,8 +51,8 @@ final class DiscouragedConstantsSniff extends AbstractFunctionParameterSniff {
 	 * @since 3.0.0  The format of the value has changed from an integer parameter
 	 *               position to an array with the parameter position and name.
 	 *
-	 * @var array<string, <string, in|string>> Function name as key, array with target
-	 *                                         parameter and name as value.
+	 * @var array<string, array<string, int|string>> Function name as key, array with target
+	 *                                               parameter and name as value.
 	 */
 	protected $target_functions = array(
 		'define' => array(
diff --git a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
index b3f1abcb1b..6e4385a923 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourceParametersSniff.php
@@ -43,7 +43,7 @@ final class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSni
 	 *
 	 * @since 1.0.0
 	 *
-	 * @var array <string function_name> => <bool true>
+	 * @var array<string, true> Key is function name, value irrelevant.
 	 */
 	protected $target_functions = array(
 		'wp_register_script' => true,
@@ -57,7 +57,7 @@ final class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSni
 	 *
 	 * This array is enriched with the $emptyTokens array in the register() method.
 	 *
-	 * @var array
+	 * @var array<int|string, int|string>
 	 */
 	private $false_tokens = array(
 		\T_FALSE => \T_FALSE,
@@ -68,7 +68,7 @@ final class EnqueuedResourceParametersSniff extends AbstractFunctionParameterSni
 	 *
 	 * This array is enriched with the several of the PHPCS token arrays in the register() method.
 	 *
-	 * @var array
+	 * @var array<int|string, int|string>
 	 */
 	private $safe_tokens = array(
 		\T_NULL                     => \T_NULL,
diff --git a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
index 5a38f15e64..c7ed63c303 100644
--- a/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
+++ b/WordPress/Sniffs/WP/EnqueuedResourcesSniff.php
@@ -43,7 +43,8 @@ public function register() {
 	 *
 	 * @param int $stackPtr The position of the current token in the stack.
 	 *
-	 * @return int Integer stack pointer to skip forward to.
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
 	 */
 	public function process_token( $stackPtr ) {
 
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
index af9a1ea8f4..038aba6aef 100644
--- a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
+++ b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -66,7 +66,7 @@ final class GlobalVariablesOverrideSniff extends Sniff {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @var array
+	 * @var array<string, true> Key is variable name, value irrelevant.
 	 */
 	protected $override_allowed = array(
 		'content_width'     => true,
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
index 23665cbc44..9ad5785ed3 100644
--- a/WordPress/Sniffs/WP/I18nSniff.php
+++ b/WordPress/Sniffs/WP/I18nSniff.php
@@ -99,7 +99,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 	 * @since 0.10.0
 	 * @since 0.11.0 Changed visibility from public to protected.
 	 *
-	 * @var array <string function name> => <string function type>
+	 * @var array<string, string> Key is function name, value is the function type.
 	 */
 	protected $i18n_functions = array(
 		'translate'                      => 'simple',
@@ -146,7 +146,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var array Array of the parameter positions and names.
+	 * @var array<string, array> Array of the parameter positions and names.
 	 */
 	private $parameter_specs = array(
 		'simple' => array(

From 6a9da70413e93c3dd2b93d2821671fa0c84f932b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:29:21 +0200
Subject: [PATCH 786/822] Docs: add missing `@return` tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While WP tends to omit `@return void` statements, this is not WP and documenting the function return type is a good thing™.
---
 WordPress/Sniff.php                                          | 2 ++
 WordPress/Sniffs/Arrays/ArrayIndentationSniff.php            | 4 ++++
 WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php  | 2 ++
 WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php | 2 ++
 WordPress/Sniffs/WP/CronIntervalSniff.php                    | 2 ++
 WordPress/Tests/DB/RestrictedClassesUnitTest.php             | 4 ++++
 WordPress/Tests/DB/RestrictedFunctionsUnitTest.php           | 4 ++++
 7 files changed, 20 insertions(+)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 8b3ad0507d..8e642108ae 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -94,6 +94,8 @@ abstract public function process_token( $stackPtr );
 	 * @since 0.4.0
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file currently being processed.
+	 *
+	 * @return void
 	 */
 	protected function init( File $phpcsFile ) {
 		$this->phpcsFile = $phpcsFile;
diff --git a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
index 7dc485811d..2658aa25fc 100644
--- a/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
+++ b/WordPress/Sniffs/Arrays/ArrayIndentationSniff.php
@@ -521,6 +521,8 @@ protected function get_indentation_string( $nr ) {
 	 * @param int    $expected   Expected nr of spaces (tabs translated to space value).
 	 * @param int    $found      Found nr of spaces (tabs translated to space value).
 	 * @param string $new_indent Whitespace indent replacement content.
+	 *
+	 * @return void
 	 */
 	protected function add_array_alignment_error( $ptr, $error, $error_code, $expected, $found, $new_indent ) {
 
@@ -535,6 +537,8 @@ protected function add_array_alignment_error( $ptr, $error, $error_code, $expect
 	 *
 	 * @param int    $ptr        Stack pointer to the first content on the line.
 	 * @param string $new_indent Whitespace indent replacement content.
+	 *
+	 * @return void
 	 */
 	protected function fix_alignment_error( $ptr, $new_indent ) {
 		if ( 1 === $this->tokens[ $ptr ]['column'] ) {
diff --git a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
index 1e1a1a4c06..6b896e927f 100644
--- a/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
+++ b/WordPress/Sniffs/Arrays/MultipleStatementAlignmentSniff.php
@@ -543,6 +543,8 @@ protected function process_multi_line_array( $stackPtr, $items, $opener, $closer
 	 * This message may be thrown more than once if the property is being changed inline in a file.
 	 *
 	 * @since 0.14.0
+	 *
+	 * @return void
 	 */
 	protected function validate_align_multiline_items() {
 		$alignMultilineItems = $this->alignMultilineItems;
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
index e06c01d201..69c8f00753 100644
--- a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
+++ b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -1186,6 +1186,8 @@ private function variable_prefixed_or_allowed( $stackPtr, $name ) {
 	 * - complies with the PHP rules for valid function, class, variable, constant names.
 	 *
 	 * @since 0.12.0
+	 *
+	 * @return void
 	 */
 	private function validate_prefixes() {
 		if ( $this->previous_prefixes === $this->prefixes ) {
diff --git a/WordPress/Sniffs/WP/CronIntervalSniff.php b/WordPress/Sniffs/WP/CronIntervalSniff.php
index d7edcf6ed8..fd48e1a2f2 100644
--- a/WordPress/Sniffs/WP/CronIntervalSniff.php
+++ b/WordPress/Sniffs/WP/CronIntervalSniff.php
@@ -308,6 +308,8 @@ private function find_function_by_name( $functionName ) {
 	 * Add warning about unclear cron schedule change.
 	 *
 	 * @param int $stackPtr The position of the current token in the stack.
+	 *
+	 * @return void
 	 */
 	public function confused( $stackPtr ) {
 		$this->phpcsFile->addWarning(
diff --git a/WordPress/Tests/DB/RestrictedClassesUnitTest.php b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
index f17c3cba63..91fb95574d 100644
--- a/WordPress/Tests/DB/RestrictedClassesUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedClassesUnitTest.php
@@ -33,6 +33,8 @@ final class RestrictedClassesUnitTest extends AbstractSniffUnitTest {
 	 * where we are passing the parameters to.
 	 *
 	 * @before
+	 *
+	 * @return void
 	 */
 	protected function enhanceGroups() {
 		parent::setUp();
@@ -53,6 +55,8 @@ protected function enhanceGroups() {
 	 * Reset the $groups property.
 	 *
 	 * @after
+	 *
+	 * @return void
 	 */
 	protected function resetGroups() {
 		AbstractFunctionRestrictionsSniff::$unittest_groups = array();
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
index e80fa335de..5bb1fee9af 100644
--- a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.php
@@ -28,6 +28,8 @@ final class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 	 * AbstractFunctionRestrictionsSniff class.
 	 *
 	 * @before
+	 *
+	 * @return void
 	 */
 	protected function enhanceGroups() {
 		parent::setUp();
@@ -51,6 +53,8 @@ protected function enhanceGroups() {
 	 * Reset the $groups property.
 	 *
 	 * @after
+	 *
+	 * @return void
 	 */
 	protected function resetGroups() {
 		AbstractFunctionRestrictionsSniff::$unittest_groups = array();

From d6e47abba3a96b46c4499c81c4623bd62b64c821 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 19:42:21 +0200
Subject: [PATCH 787/822] Add PHPStan to QA checks

PHPStan is a good addition to our QA toolkit and with improvements PHPStan has made over the years is now a viable tool for us to use (previously it would give way too many false positives).

This commit:
* Adds a separate job to the `basic-qa` workflow in GH Actions.
    Notes:
    - I've chosen **not** to add PHPStan to the Compose dependencies for two reasons:
        1. It doesn't allow for installation on PHP < 7.2, which would break/block the `composer install` for our test runs.
        2. It would add dependencies which could conflict/cause problems for our test runs due to those defining token constants too.
    - We could potentially use [Phive](https://phar.io/) to still have a setup which can be used locally, but just running locally from a PHPStan PHAR file should work just fine.
    - For CI, PHPStan will be installed as a PHAR file by `setup-php` now.
        This does carry a risk _if_ PHPStan would make breaking changes or if a new release adds rules for the levels being scanned as, in that case, builds could unexpectedly start failing.
        We could fix the version `setup-php` action installs to the current release `1.10.29`, but that adds an additional maintenance burden of having to keep updating the version as PHPStan releases pretty often.
        So, for now, I've elected to run the risk of random failures. If and when those start happening, we can re-evaluate.
    - The PHP version for the CI run is set to PHP 7.4 to prevent PHPStan throwing some errors/notices related to the outdated PHPUnit version being used.
* Adds a configuration file for PHPStan.
    Notes:
    - PHPStan needs to know about our dependencies (PHPCS et al), so I'm (re-)using the bootstrap file we have for our tests to load the PHPCS autoloader and register the standard with the PHPCS autoloader as we can't add an `autoload` directive to our `composer.json` file as it would cause problems with the PHPCS autoloader.
    - PHPStan flags type checks on properties with a documented type, while - especially for the `public` properties - we cannot always be sure the properties set will be of the correct type. For that reason, I've set `treatPhpDocTypesAsCertain` to `false` (which silences those notices).
    - I've very selectively silenced a number of errors.
        - Level 0: this is about the use of `return $this->method()` when the return type of the `process_token()` method is `int|void`. For consistency, I believe keeping those returns makes for less confusing code (they will still be `void`).
        - Level 4: I believe those are false positives.
        - Level 5: This error is not relevant as we don't use `strict_types`.
* Adds the configuration file to `.gitattributes` and the typical overload file for the configuration file to `.gitignore`.

Refs:
* https://phpstan.org/
* https://phpstan.org/config-reference
---
 .gitattributes                 |  1 +
 .github/workflows/basic-qa.yml | 28 ++++++++++++++++++++++++++++
 .gitignore                     |  1 +
 phpstan.neon.dist              | 26 ++++++++++++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 phpstan.neon.dist

diff --git a/.gitattributes b/.gitattributes
index 77023da83a..224ffba10a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@
 /.codecov.yml       export-ignore
 /.phpcs.xml.dist    export-ignore
 /CODE_OF_CONDUCT.md export-ignore
+/phpstan.neon.dist  export-ignore
 /phpunit.xml.dist   export-ignore
 /.github            export-ignore
 /Tests              export-ignore
diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 8e0b604763..859cc0566d 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -160,3 +160,31 @@ jobs:
       - name: Fail the build on fixer conflicts and other errors
         if: ${{ steps.phpcbf.outputs.EXITCODE != 0 && steps.phpcbf.outputs.EXITCODE != 1 }}
         run: exit ${{ steps.phpcbf.outputs.EXITCODE }}
+
+  phpstan:
+    name: "PHPStan"
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+          tools: phpstan
+
+      # 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
+      - 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")
+
+      - name: Run PHPStan
+        run: phpstan analyse
diff --git a/.gitignore b/.gitignore
index 9e9c75d11d..f4a8c2e298 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ build/
 phpunit.xml
 phpcs.xml
 .phpcs.xml
+phpstan.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 0000000000..3aafa9a3db
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,26 @@
+parameters:
+    #phpVersion: 50400 # Needs to be 70100 or higher... sigh...
+    level: 5
+    paths:
+        - WordPress
+    bootstrapFiles:
+        - Tests/bootstrap.php
+    treatPhpDocTypesAsCertain: false
+
+    ignoreErrors:
+        # Level 0
+        - '#^Result of method \S+ \(void\) is used\.$#'
+
+        # Level 4
+        - '#^Property \S+::\$\S+ \([^)]+\) in isset\(\) is not nullable\.$#'
+        -
+            count: 1
+            message: '#^Result of && is always true\.$#'
+            path: WordPress/Sniffs/Security/EscapeOutputSniff.php
+        -
+            count: 1
+            message: '#^Strict comparison using === between true and false will always evaluate to false\.$#'
+            path: WordPress/Sniffs/Utils/I18nTextDomainFixerSniff.php
+
+        # Level 5
+        - '#^Parameter \#3 \$value of method \S+File::recordMetric\(\) expects string, \(?(float|int|bool)(\|(float|int|bool))*\)? given\.$#'

From 36c2df63786d29c9756a54065fd7a771a0e426a7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 26 Nov 2022 17:10:25 +0100
Subject: [PATCH 788/822] Updates related to branch rename from `master` to
 `main`

Note: install instructions in the README will be replaced still in a future commit.

Closes 1916
---
 .github/CONTRIBUTING.md          | 4 ++--
 .github/workflows/quicktest.yml  | 2 +-
 .github/workflows/unit-tests.yml | 2 +-
 CHANGELOG.md                     | 2 +-
 README.md                        | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 1715e8fe82..27b965192d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -17,11 +17,11 @@ Since WPCS employs many sniffs that are part of PHPCS, sometimes an issue will b
 
 ## Branches
 
-Ongoing development will be done in the `develop` branch with merges done into `master` once considered stable.
+Ongoing development will be done in the `develop` branch with merges to `main` once considered stable.
 
 To contribute an improvement to this project, fork the repo and open a pull request to the `develop` branch. Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
 
-Once a commit is made to `develop`, a PR should be opened from `develop` into `master` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
+Once a commit is made to `develop`, a PR should be opened from `develop` to `main` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
 
 # Considerations when writing sniffs
 
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index ebe3121f0d..52f0d3bb8d 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -3,7 +3,7 @@ name: Quick Tests
 on:
   push:
     branches-ignore:
-      - master
+      - main
     paths-ignore:
       - '**.md'
   # Allow manually triggering the workflow.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index fc99510c78..384bfa226e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -3,7 +3,7 @@ name: Unit Tests
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
   # Allow manually triggering the workflow.
   workflow_dispatch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43ed6e38a7..4019ff4b60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1181,7 +1181,7 @@ Initial tagged release.
 
 [Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
 
-[Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/master...HEAD
+[Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/main...HEAD
 [2.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.1.1...2.2.0
diff --git a/README.md b/README.md
index 1179e3f939..303562de2c 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ It is strongly suggested to `require` one of these plugins in your project to ha
 
 2. Clone the WordPress standards repository:
 
-        git clone -b master https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
+        git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
 
 3. Add its path to the PHP_CodeSniffer configuration:
 
@@ -111,7 +111,7 @@ To summarize:
 ```bash
 cd ~/projects
 git clone https://github.com/squizlabs/PHP_CodeSniffer.git phpcs
-git clone -b master https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
+git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
 cd phpcs
 ./bin/phpcs --config-set installed_paths ../wpcs
 ```

From ea871fbd996e536ca27df39dd06cf294592c0dfa Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 14 Jun 2023 21:36:05 +0200
Subject: [PATCH 789/822] Make methods in traits `final`

Traits cannot be made `final`, but the methods therein _can_.

There is a caveat though: the class `use`-ing the trait can still overload the method. Also see: https://externals.io/message/120576

In other words: the `final` keyword, in this case, only protects against _child_ classes of the class `use`-ing the trait overloading the method. And as most sniff are now `final` by design, this could be seen as a redundant change.

Having said that, I still think it has value to add the keyword, if only to signal that these method shouldn't be overloaded.

Includes adding a sniff to the WPCS native PHPCS ruleset to enforce this.
---
 .phpcs.xml.dist                               |  3 +++
 WordPress/Helpers/EscapingFunctionsTrait.php  |  4 ++--
 WordPress/Helpers/IsUnitTestTrait.php         |  4 ++--
 WordPress/Helpers/MinimumWPVersionTrait.php   |  4 ++--
 WordPress/Helpers/PrintingFunctionsTrait.php  |  4 ++--
 WordPress/Helpers/SanitizationHelperTrait.php | 12 ++++++------
 WordPress/Helpers/WPDBTrait.php               |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 656c8ab925..0bbcd4b7ab 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -80,6 +80,9 @@
 		<exclude-pattern>/WordPress/Sniffs/Security/(EscapeOutput|NonceVerification|ValidatedSanitizedInput)Sniff\.php$</exclude-pattern>
 	</rule>
 
+	<!-- Enforce that methods in traits are always final. -->
+	<rule ref="Universal.FunctionDeclarations.RequireFinalMethodsInTraits"/>
+
 
 	<!--
 	#############################################################################
diff --git a/WordPress/Helpers/EscapingFunctionsTrait.php b/WordPress/Helpers/EscapingFunctionsTrait.php
index c3ec5f7f00..4ebff51396 100644
--- a/WordPress/Helpers/EscapingFunctionsTrait.php
+++ b/WordPress/Helpers/EscapingFunctionsTrait.php
@@ -214,7 +214,7 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @return bool
 	 */
-	public function is_escaping_function( $functionName ) {
+	final public function is_escaping_function( $functionName ) {
 		if ( array() === $this->allEscapingFunctions
 			|| $this->customEscapingFunctions !== $this->addedCustomEscapingFunctions['escape']
 		) {
@@ -238,7 +238,7 @@ public function is_escaping_function( $functionName ) {
 	 *
 	 * @return bool
 	 */
-	public function is_auto_escaped_function( $functionName ) {
+	final public function is_auto_escaped_function( $functionName ) {
 		if ( array() === $this->allAutoEscapedFunctions
 			|| $this->customAutoEscapedFunctions !== $this->addedCustomEscapingFunctions['autoescape']
 		) {
diff --git a/WordPress/Helpers/IsUnitTestTrait.php b/WordPress/Helpers/IsUnitTestTrait.php
index 6eda9005ae..a6e3b36d32 100644
--- a/WordPress/Helpers/IsUnitTestTrait.php
+++ b/WordPress/Helpers/IsUnitTestTrait.php
@@ -127,7 +127,7 @@ trait IsUnitTestTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	protected function get_all_test_classes() {
+	final protected function get_all_test_classes() {
 		if ( array() === $this->all_test_classes
 			|| $this->custom_test_classes !== $this->added_custom_test_classes
 		) {
@@ -179,7 +179,7 @@ protected function get_all_test_classes() {
 	 *
 	 * @return bool True if the class is a unit test class, false otherwise.
 	 */
-	protected function is_test_class( File $phpcsFile, $stackPtr ) {
+	final protected function is_test_class( File $phpcsFile, $stackPtr ) {
 
 		$tokens = $phpcsFile->getTokens();
 
diff --git a/WordPress/Helpers/MinimumWPVersionTrait.php b/WordPress/Helpers/MinimumWPVersionTrait.php
index 2b08beb152..92df2a4a6e 100644
--- a/WordPress/Helpers/MinimumWPVersionTrait.php
+++ b/WordPress/Helpers/MinimumWPVersionTrait.php
@@ -95,7 +95,7 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @return void
 	 */
-	protected function set_minimum_wp_version() {
+	final protected function set_minimum_wp_version() {
 		$minimum_wp_version = '';
 
 		// Use a ruleset provided value if available.
@@ -128,7 +128,7 @@ protected function set_minimum_wp_version() {
 	 *
 	 * @return bool
 	 */
-	protected function wp_version_compare( $version1, $version2, $operator ) {
+	final protected function wp_version_compare( $version1, $version2, $operator ) {
 		$version1 = $this->normalize_version_number( $version1 );
 		$version2 = $this->normalize_version_number( $version2 );
 
diff --git a/WordPress/Helpers/PrintingFunctionsTrait.php b/WordPress/Helpers/PrintingFunctionsTrait.php
index 6f6d9b690f..edd6dbe211 100644
--- a/WordPress/Helpers/PrintingFunctionsTrait.php
+++ b/WordPress/Helpers/PrintingFunctionsTrait.php
@@ -92,7 +92,7 @@ trait PrintingFunctionsTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_printing_functions() {
+	final public function get_printing_functions() {
 		if ( array() === $this->allPrintingFunctions
 			|| $this->customPrintingFunctions !== $this->addedCustomPrintingFunctions
 		) {
@@ -116,7 +116,7 @@ public function get_printing_functions() {
 	 *
 	 * @return bool
 	 */
-	public function is_printing_function( $functionName ) {
+	final public function is_printing_function( $functionName ) {
 		return isset( $this->get_printing_functions()[ strtolower( $functionName ) ] );
 	}
 }
diff --git a/WordPress/Helpers/SanitizationHelperTrait.php b/WordPress/Helpers/SanitizationHelperTrait.php
index f4467148ab..c041dfe5c1 100644
--- a/WordPress/Helpers/SanitizationHelperTrait.php
+++ b/WordPress/Helpers/SanitizationHelperTrait.php
@@ -190,7 +190,7 @@ trait SanitizationHelperTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_sanitizing_functions() {
+	final public function get_sanitizing_functions() {
 		if ( array() === $this->allSanitizingFunctions
 			|| $this->customSanitizingFunctions !== $this->addedCustomSanitizingFunctions['sanitize']
 		) {
@@ -212,7 +212,7 @@ public function get_sanitizing_functions() {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_sanitizing_and_unslashing_functions() {
+	final public function get_sanitizing_and_unslashing_functions() {
 		if ( array() === $this->allUnslashingSanitizingFunctions
 			|| $this->customUnslashingSanitizingFunctions !== $this->addedCustomSanitizingFunctions['unslashsanitize']
 		) {
@@ -236,7 +236,7 @@ public function get_sanitizing_and_unslashing_functions() {
 	 *
 	 * @return bool
 	 */
-	public function is_sanitizing_function( $functionName ) {
+	final public function is_sanitizing_function( $functionName ) {
 		return isset( $this->get_sanitizing_functions()[ strtolower( $functionName ) ] );
 	}
 
@@ -249,7 +249,7 @@ public function is_sanitizing_function( $functionName ) {
 	 *
 	 * @return bool
 	 */
-	public function is_sanitizing_and_unslashing_function( $functionName ) {
+	final public function is_sanitizing_and_unslashing_function( $functionName ) {
 		return isset( $this->get_sanitizing_and_unslashing_functions()[ strtolower( $functionName ) ] );
 	}
 
@@ -266,7 +266,7 @@ public function is_sanitizing_and_unslashing_function( $functionName ) {
 	 *
 	 * @return bool Whether the token is only within a sanitization.
 	 */
-	public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
+	final public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
 		// If it isn't being sanitized at all.
@@ -317,7 +317,7 @@ public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
 	 *
 	 * @return bool Whether the token is being sanitized.
 	 */
-	public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
+	final public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
 		$tokens          = $phpcsFile->getTokens();
 		$require_unslash = is_callable( $unslash_callback );
 
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index d0cc388f11..9a3a908eb8 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -47,7 +47,7 @@ trait WPDBTrait {
 	 *
 	 * @return bool Whether this is a $wpdb method call.
 	 */
-	protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
+	final protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
 		$tokens = $phpcsFile->getTokens();
 		if ( isset( $tokens[ $stackPtr ] ) === false ) {
 			return false;

From bd66ced3fdd35cd7a289db227a4c809d9532d281 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:38:38 +0200
Subject: [PATCH 790/822] ValidationHelper: bug fix - unsetting is not
 validation

A superglobal key being unset doesn't need sanitization or validation, however, the unset should _not_ be seen as validation for use of the superglobal key later on.

This bug was introduced long ago (0.3.0 - https://github.com/WordPress/WordPress-Coding-Standards/commit/64fab4f2c8e566987b7da8a5fa42d03c1ece35c9) and later moved into the `is_validated()` method via https://github.com/WordPress/WordPress-Coding-Standards/commit/ba15db93e5526f21da979e6cbb4f7139c8a74e34

Discovered when making some changes to the tests for the `ValidatedSanitizedInput` sniff.

Includes dedicated test for this situation.
---
 WordPress/Helpers/ValidationHelper.php                    | 1 -
 .../Sniffs/Security/ValidatedSanitizedInputSniff.php      | 6 ++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc  | 8 ++++++++
 .../Tests/Security/ValidatedSanitizedInputUnitTest.php    | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index d8cece8205..2ee0df4783 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -36,7 +36,6 @@ final class ValidationHelper {
 	private static $targets = array(
 		\T_ISSET          => 'construct',
 		\T_EMPTY          => 'construct',
-		\T_UNSET          => 'construct',
 		\T_STRING         => 'function_call',
 		\T_COALESCE       => 'coalesce',
 		\T_COALESCE_EQUAL => 'coalesce',
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index cbbcab1059..a5342aa5f4 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
@@ -91,6 +92,11 @@ function ( $embed ) {
 			return;
 		}
 
+		// If the variable is being unset, we don't care about it.
+		if ( Context::inUnset( $this->phpcsFile, $stackPtr ) ) {
+			return;
+		}
+
 		// If we're overriding a superglobal with an assignment, no need to test.
 		if ( VariableHelper::is_assignment( $this->phpcsFile, $stackPtr ) ) {
 			return;
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 90dfd3322b..4b22cc39ec 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -404,3 +404,11 @@ function test_ignore_array_key_exists_as_first_class_callable() {
 	$callback = array_key_exists(...);
 	$id = (int) $_POST['foo']; // Bad.
 }
+
+/*
+ * Unsetting a superglobal key is not the same as validating it.
+ */
+function test_unset_is_not_validation() {
+	unset( $_REQUEST['key'] );
+	$id = (int) $_REQUEST['key']; // Bad, missing validation.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 92ec32566e..7ff4f48742 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -100,6 +100,7 @@ public function getErrorList( $testFile = '' ) {
 					387 => 1,
 					397 => 1,
 					405 => 1,
+					413 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 08835964255519df861f1994c770e2a41eb77ff3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:22:43 +0200
Subject: [PATCH 791/822] ValidationHelper: bug fix - validation done in
 another scope

Discovered when making some changes to the tests for the `ValidatedSanitizedInput` sniff.

A number of the tests in that file are in the _global_ scope.
As things were, if validation was encountered for a particular superglobal key in a _closed_ scope (function, class) prior to the use of the superglobal key in the _global_ scope, the superglobal key would be seen as correctly validated, even though the code within the closed scope may not have been executed.

IMO tracking whether the code within the closed scope is executed is outside the scope of this sniff and a "missing validation" error should be thrown for those cases.

And while PHP 7.4+ arrow functions are _open_ scopes, validation done within an arrow function should not be counted as valid for superglobals used _outside the arrow function, though validation done outside an arrow function should IMO be okay for superglobals used _within_ an arrow function.

Fixed now.

Includes a minor tweak to the pre-existing tests for the case which made me discover the bug (superglobal use in global scope).
Includes additional tests with closed scopes within an already closed scope.
Includes additional tests documenting the behaviour around arrow functions.
---
 WordPress/Helpers/ValidationHelper.php        | 18 ++++++++++
 .../ValidatedSanitizedInputUnitTest.1.inc     | 35 +++++++++++++++++--
 .../ValidatedSanitizedInputUnitTest.php       |  1 +
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/ValidationHelper.php b/WordPress/Helpers/ValidationHelper.php
index 2ee0df4783..d5a22d7d56 100644
--- a/WordPress/Helpers/ValidationHelper.php
+++ b/WordPress/Helpers/ValidationHelper.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Conditions;
 use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\PassedParameters;
@@ -155,6 +156,23 @@ public static function is_validated( File $phpcsFile, $stackPtr, $array_keys = a
 		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
 		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
 
+			if ( isset( Collections::closedScopes()[ $tokens[ $i ]['code'] ] )
+				&& isset( $tokens[ $i ]['scope_closer'] )
+			) {
+				// Jump over nested closed scopes as validation done within those does not apply.
+				$i = $tokens[ $i ]['scope_closer'];
+				continue;
+			}
+
+			if ( \T_FN === $tokens[ $i ]['code']
+				&& isset( $tokens[ $i ]['scope_closer'] )
+				&& $tokens[ $i ]['scope_closer'] < $scope_end
+			) {
+				// Jump over nested arrow functions as long as the current variable isn't *in* the arrow function.
+				$i = $tokens[ $i ]['scope_closer'];
+				continue;
+			}
+
 			if ( isset( self::$targets[ $tokens[ $i ]['code'] ] ) === false ) {
 				continue;
 			}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 4b22cc39ec..7c58affb82 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -64,7 +64,7 @@ unset( $_GET['test'] ); // Ok.
 
 output( "some string {$_POST['some_var']}" ); // Bad.
 
-echo (int) $_GET['test']; // Ok.
+echo isset( $_GET['test'] ) ? (int) $_GET['test'] : 0; // Ok.
 some_func( $some_arg, (int) $_GET['test'] ); // Ok.
 
 function zebra() {
@@ -105,7 +105,7 @@ echo sanitize_text_field( $_POST['foo545'] ); // Error for no validation, unslas
 echo array_map( 'sanitize_text_field', $_GET['test'] ); // Bad, no unslashing.
 echo Array_Map( 'sanitize_key', $_GET['test'] ); // Ok.
 
-foo( AbsINT( $_GET['foo'] ) ); // Ok.
+isset( $_GET['foo'] ) && foo( AbsINT( $_GET['foo'] ) ); // Ok.
 $ids = array_map( 'absint', $_GET['test'] ); // Ok.
 
 if ( is_array( $_GET['test'] ) ) {} // Ok.
@@ -412,3 +412,34 @@ function test_unset_is_not_validation() {
 	unset( $_REQUEST['key'] );
 	$id = (int) $_REQUEST['key']; // Bad, missing validation.
 }
+
+/*
+ * Only count a variable as validated if the validation happened in the same scope.
+ */
+function test_nested_closed_scopes() {
+	$closure = function() {
+		return isset( $_POST['bar'] );
+	};
+
+	$anon = new class() {
+		public function __construct() {
+			if ( isset( $_POST['bar'] ) ) {
+				// Do something.
+			}
+		}
+	};
+
+	$arrow = fn() => isset( $_POST['bar'] );
+
+	$id = (int) $_POST['bar']; // Bad x 1 - validate.
+}
+
+function test_arrow_open_scope() {
+	if ( ! isset( $_SERVER['key'] ) ) {
+		return;
+	}
+
+	$arrow = fn() => (int) $_SERVER['key']; // OK, validation outside the scope of the arrow function counts.
+
+	$arrow = fn() => isset( $_SERVER['abc'] ) ? (int) $_SERVER['abc'] : 0; // OK.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 7ff4f48742..dba11ce558 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -101,6 +101,7 @@ public function getErrorList( $testFile = '' ) {
 					397 => 1,
 					405 => 1,
 					413 => 1,
+					434 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 087249dbcf73d5ae9e74623e58b6c07ae900f334 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:37:30 +0200
Subject: [PATCH 792/822] Security/ValidatedSanitizedInput: make sure all
 superglobals being examined are used in tests

The `$_SERVER` and `$_COOKIE` superglobals are being examined by the sniff, but there were no tests safeguarding this.

Fixed now by adjusting some pre-existing tests.
---
 .../ValidatedSanitizedInputUnitTest.1.inc     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 7c58affb82..4c5117c1c5 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -232,17 +232,17 @@ function test_allow_array_key_exists_alias() {
 	}
 }
 function test_correct_multi_level_array_validation() {
-	if ( isset( $_POST['toplevel']['sublevel'] ) ) {
-		$id = (int) $_POST['toplevel']; // OK, if a subkey exists, the top level key *must* also exist.
-		$id = (int) $_POST['toplevel']['sublevel']; // OK.
-		$id = (int) $_POST['toplevel']['sublevel']['subsub']; // Bad x1 - validate, this sub has not been validated.
+	if ( isset( $_COOKIE['toplevel']['sublevel'] ) ) {
+		$id = (int) $_COOKIE['toplevel']; // OK, if a subkey exists, the top level key *must* also exist.
+		$id = (int) $_COOKIE['toplevel']['sublevel']; // OK.
+		$id = (int) $_COOKIE['toplevel']['sublevel']['subsub']; // Bad x1 - validate, this sub has not been validated.
 	}
 
-	if ( array_key_exists( 'bar', $_POST['foo'] ) ) {
-		$id = (int) $_POST['bar']; // Bad x 1 - validate.
-		$id = (int) $_POST['foo']; // OK.
-		$id = (int) $_POST['foo']['bar']; // OK.
-		$id = (int) $_POST['foo']['bar']['baz']; // Bad x 1 - validate.
+	if ( array_key_exists( 'bar', $_COOKIE['foo'] ) ) {
+		$id = (int) $_COOKIE['bar']; // Bad x 1 - validate.
+		$id = (int) $_COOKIE['foo']; // OK.
+		$id = (int) $_COOKIE['foo']['bar']; // OK.
+		$id = (int) $_COOKIE['foo']['bar']['baz']; // Bad x 1 - validate.
 	}
 }
 
@@ -380,11 +380,11 @@ function test_allow_array_key_exists_with_named_params_multilevel_access_wrong_p
 }
 
 function test_allow_array_key_exists_with_named_params_multilevel_access_test() {
-	if ( array_key_exists( array: $_POST['foo'], key: 'bar' ) ) {
-		$id = (int) $_POST['bar']; // Bad x 1 - validate.
-		$id = (int) $_POST['foo']; // OK.
-		$id = (int) $_POST['foo']['bar']; // OK.
-		$id = (int) $_POST['foo']['bar']['baz']; // Bad x 1 - validate.
+	if ( array_key_exists( array: $_SERVER['foo'], key: 'bar' ) ) {
+		$id = (int) $_SERVER['bar']; // Bad x 1 - validate.
+		$id = (int) $_SERVER['foo']; // OK.
+		$id = (int) $_SERVER['foo']['bar']; // OK.
+		$id = (int) $_SERVER['foo']['bar']['baz']; // Bad x 1 - validate.
 	}
 }
 

From a5941360bbb7c99268c855417df027af4de3a07a Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:44:17 +0200
Subject: [PATCH 793/822] Security/ValidatedSanitizedInput: use PHPCSUtils for
 superglobal determination [1]

Previously, the sniff would disregard the `$_SESSION` and `$_ENV` superglobals. This is now no longer the case when examining variables embedded in text strings.

This may have been on purpose, but I could not find any discussion about this and it seems more consistent (and more correct) to flag the unvalidated/unsanitized use of **all** superglobals.

Note: the `$GLOBALS` superglobal is exempt as in that case, any variable may be accessed (`$GLOBALS['var']`), not just superglobals (`$GLOBALS['_GET']`).

Includes tests.
---
 .../Security/ValidatedSanitizedInputSniff.php       | 13 +++++++++++--
 .../Security/ValidatedSanitizedInputUnitTest.1.inc  |  7 +++++++
 .../Security/ValidatedSanitizedInputUnitTest.php    |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index a5342aa5f4..19db59068e 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\Context;
 use PHPCSUtils\Utils\TextStrings;
+use PHPCSUtils\Utils\Variables;
 use WordPressCS\WordPress\Helpers\ContextHelper;
 use WordPressCS\WordPress\Helpers\SanitizationHelperTrait;
 use WordPressCS\WordPress\Helpers\ValidationHelper;
@@ -75,12 +76,20 @@ public function process_token( $stackPtr ) {
 			// Retrieve all embeds, but use only the initial variable name part.
 			$interpolated_variables = array_map(
 				function ( $embed ) {
-					return '$' . preg_replace( '`^(\{?\$\{?\(?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(.*)$`', '$2', $embed );
+					return preg_replace( '`^(\{?\$\{?\(?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(.*)$`', '$2', $embed );
 				},
 				TextStrings::getEmbeds( $this->tokens[ $stackPtr ]['content'] )
 			);
 
-			foreach ( array_intersect( $interpolated_variables, $superglobals ) as $bad_variable ) {
+			// Filter the embeds down to superglobals only.
+			$interpolated_superglobals = array_filter(
+				$interpolated_variables,
+				function ( $var_name ) {
+					return ( 'GLOBALS' !== $var_name && Variables::isSuperglobalName( $var_name ) );
+				}
+			);
+
+			foreach ( $interpolated_superglobals as $bad_variable ) {
 				$this->phpcsFile->addError( 'Detected usage of a non-sanitized, non-validated input variable %s: %s', $stackPtr, 'InputNotValidatedNotSanitized', array( $bad_variable, $this->tokens[ $stackPtr ]['content'] ) );
 			}
 
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 4c5117c1c5..a6ae62accf 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -443,3 +443,10 @@ function test_arrow_open_scope() {
 
 	$arrow = fn() => isset( $_SERVER['abc'] ) ? (int) $_SERVER['abc'] : 0; // OK.
 }
+
+// Ensure the sniff flags $_ENV and $_SESSION too.
+function test_examine_additional_superglobals_in_textstrings() {
+	$text = "Use {$_SESSION['key']} for something"; // Bad.
+	$text = "Use {$_ENV['key']} for something"; // Bad.
+	$text = "Use {$GLOBALS['key']} for something"; // OK.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index dba11ce558..781449feff 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -102,6 +102,8 @@ public function getErrorList( $testFile = '' ) {
 					405 => 1,
 					413 => 1,
 					434 => 1,
+					449 => 1,
+					450 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From d2a52ce43d611b2b8705c13b87b06e306d73d52c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:49:08 +0200
Subject: [PATCH 794/822] Security/ValidatedSanitizedInput: use PHPCSUtils for
 superglobal determination [2]

Previously, the sniff would disregard the `$_SESSION` and `$_ENV` superglobals. This will now no longer be the case when the sniff examines variable tokens.

I suspect these superglobals were originally disregarded as the values in these superglobals are not slashed by WP (see the below refs), but that doesn't mean the values shouldn't be validated and sanitized before use.

The strange thing is that `$_FILES` _was_ already being examined, even though it also isn't slashed by WP.
The sniff, however, would throw an incorrect "requires unslashing" error when the `$_FILES` superglobal was being used. Also see bug report 1720.

Either way, along the same lines of the previous commit, when examining variable tokens, the `ValidatedSanitizedInput` sniff will now take all superglobals into account, with the exception of the `$GLOBALS` superglobal (this last bit is the same as before).

As the values in the `$_FILES`, `$_SESSION` and `$_ENV` superglobals aren't slashed by WP, they get an exception for the "unslash" error.

And as the `Sniff::$input_superglobals` property is now unused, I'm removing it.

Includes tests.

Fixes 1720

Refs:
* https://developer.wordpress.org/reference/functions/wp_magic_quotes/
* https://github.com/WordPress/wordpress-develop/blob/trunk/src/wp-includes/load.php#L1229-L1238
---
 WordPress/Sniff.php                           | 17 ---------
 .../Security/ValidatedSanitizedInputSniff.php | 37 ++++++++++++++++---
 .../ValidatedSanitizedInputUnitTest.1.inc     | 25 +++++++++++++
 .../ValidatedSanitizedInputUnitTest.php       |  6 +++
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 8e642108ae..369ecf0fc2 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -21,23 +21,6 @@
  */
 abstract class Sniff implements PHPCS_Sniff {
 
-	/**
-	 * A list of superglobals that incorporate user input.
-	 *
-	 * @since 0.5.0
-	 * @since 0.11.0 Changed from static to non-static.
-	 *
-	 * @var string[]
-	 */
-	protected $input_superglobals = array(
-		'$_COOKIE',
-		'$_GET',
-		'$_FILES',
-		'$_POST',
-		'$_REQUEST',
-		'$_SERVER',
-	);
-
 	/**
 	 * The current file being sniffed.
 	 *
diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 19db59068e..2d87c6fc14 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -45,6 +45,23 @@ class ValidatedSanitizedInputSniff extends Sniff {
 	 */
 	public $check_validation_in_scope_only = false;
 
+	/**
+	 * Superglobals for which the values will be slashed by WP.
+	 *
+	 * @link https://developer.wordpress.org/reference/functions/wp_magic_quotes/
+	 *
+	 * @since 3.0.0
+	 *
+	 * @var array<string, true>
+	 */
+	private $slashed_superglobals = array(
+		'$_COOKIE'  => true,
+		'$_GET'     => true,
+		'$_POST'    => true,
+		'$_REQUEST' => true,
+		'$_SERVER'  => true,
+	);
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -67,8 +84,6 @@ public function register() {
 	 */
 	public function process_token( $stackPtr ) {
 
-		$superglobals = $this->input_superglobals;
-
 		// Handling string interpolation.
 		if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $stackPtr ]['code']
 			|| \T_HEREDOC === $this->tokens[ $stackPtr ]['code']
@@ -96,8 +111,12 @@ function ( $var_name ) {
 			return;
 		}
 
-		// Check if this is a superglobal.
-		if ( ! \in_array( $this->tokens[ $stackPtr ]['content'], $superglobals, true ) ) {
+		/* Handle variables */
+
+		// Check if this is a superglobal we want to examine.
+		if ( '$GLOBALS' === $this->tokens[ $stackPtr ]['content']
+			|| Variables::isSuperglobalName( $this->tokens[ $stackPtr ]['content'] ) === false
+		) {
 			return;
 		}
 
@@ -203,13 +222,19 @@ function ( $var_name ) {
 	 * @return void
 	 */
 	public function add_unslash_error( File $phpcsFile, $stackPtr ) {
-		$tokens = $phpcsFile->getTokens();
+		$tokens   = $phpcsFile->getTokens();
+		$var_name = $tokens[ $stackPtr ]['content'];
+
+		if ( isset( $this->slashed_superglobals[ $var_name ] ) === false ) {
+			// WP doesn't slash these, so they don't need unslashing.
+			return;
+		}
 
 		$phpcsFile->addError(
 			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
 			$stackPtr,
 			'MissingUnslash',
-			array( $tokens[ $stackPtr ]['content'] )
+			array( $var_name )
 		);
 	}
 }
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index a6ae62accf..c6a49c5254 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -450,3 +450,28 @@ function test_examine_additional_superglobals_in_textstrings() {
 	$text = "Use {$_ENV['key']} for something"; // Bad.
 	$text = "Use {$GLOBALS['key']} for something"; // OK.
 }
+
+function test_examine_additional_superglobals_as_vars() {
+	$key = sanitize_text_field( $_SESSION['key'] ); // Bad - missing validation.
+	$key = sanitize_text_field( $_ENV['key'] ); // Bad - missing validation.
+	$key = sanitize_text_field( $_FILES['key'] ); // Bad - missing validation.
+
+	if ( isset( $_SESSION['key'], $_ENV['key'], $_FILES['key'] ) === false ) {
+		return;
+	}
+
+	// OK.
+	$key = sanitize_text_field( wp_unslash( $_SESSION['key'] ) );
+	$key = sanitize_text_field( wp_unslash( $_ENV['key'] ) );
+	$key = sanitize_text_field( wp_unslash( $_FILES['key'] ) );
+
+	// OK - unslashing not needed for $_SESSION, $_ENV and $_FILES.
+	$key = sanitize_text_field( $_SESSION['key'] );
+	$key = sanitize_text_field( $_ENV['key'] );
+	$key = sanitize_text_field( $_FILES['key'] );
+
+	// Bad - missing sanitization.
+	do_something( $_SESSION['key'] );
+	do_something( $_ENV['key'] );
+	do_something( $_FILES['key'] );
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 781449feff..7a4ee9771e 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -104,6 +104,12 @@ public function getErrorList( $testFile = '' ) {
 					434 => 1,
 					449 => 1,
 					450 => 1,
+					455 => 1,
+					456 => 1,
+					457 => 1,
+					474 => 1,
+					475 => 1,
+					476 => 1,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 57db689fe5bb887d248af25fc1ff5f526d591425 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:17:49 +0200
Subject: [PATCH 795/822] Security/ValidatedSanitizedInput: add extra test for
 PHP 7.4+ null coalesce equals

PR 1684 (WPCS 2.1.0) already took care of the handling of validation via the null coalesce equals assignment operator, but there was one test case missing.

This adds that extra test as an additional safeguard.
---
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc     | 5 +++++
 WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index c6a49c5254..74c2ecaa93 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -475,3 +475,8 @@ function test_examine_additional_superglobals_as_vars() {
 	do_something( $_ENV['key'] );
 	do_something( $_FILES['key'] );
 }
+
+function test_null_coalesce_equals_validation_extra_safeguard() {
+	$_POST['key'] ??= 'default'; // OK, assignment.
+	$key            = $_POST['key']; // Bad, missing unslash + sanitization, validation okay.
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index 7a4ee9771e..e9c35e41ea 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -110,6 +110,7 @@ public function getErrorList( $testFile = '' ) {
 					474 => 1,
 					475 => 1,
 					476 => 1,
+					481 => 2,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From 6e0a6c9f1667439daa55366ccecf31c60b66016c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:48:42 +0200
Subject: [PATCH 796/822] Security/ValidatedSanitizedInput: add test with PHP
 8.0+ match [1]

When a superglobal is used in a match condition, it doesn't need to be unslashed/sanitized.

This is already handled correctly, this just adds a test to safeguard this.
---
 .../Tests/Security/ValidatedSanitizedInputUnitTest.1.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 74c2ecaa93..138f497085 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -480,3 +480,12 @@ function test_null_coalesce_equals_validation_extra_safeguard() {
 	$_POST['key'] ??= 'default'; // OK, assignment.
 	$key            = $_POST['key']; // Bad, missing unslash + sanitization, validation okay.
 }
+
+function test_in_match_condition_is_regarded_as_comparison() {
+	if ( isset( $_REQUEST['key'] ) ) {
+		$test = match( $_REQUEST['key'] ) {
+			'valueA' => 'A',
+			default  => 'B',
+		};
+	}
+}

From be30b5e8c6c188b7859c4134b22690453f8e9c3b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:49:23 +0200
Subject: [PATCH 797/822] Security/ValidatedSanitizedInput: add tests with PHP
 8.0+ match [2]

When a superglobal is used in the match return expressions, it should be validated, unslashed and sanitized.

This is already handled correctly, this just adds a test to safeguard this.
---
 .../Security/ValidatedSanitizedInputUnitTest.1.inc    | 11 +++++++++++
 .../Security/ValidatedSanitizedInputUnitTest.php      |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
index 138f497085..cc4edc147a 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.1.inc
@@ -489,3 +489,14 @@ function test_in_match_condition_is_regarded_as_comparison() {
 		};
 	}
 }
+
+function test_in_match_condition_is_regarded_as_comparison() {
+	if ( isset( $_REQUEST['keyA'], $_REQUEST['keyB'], $_REQUEST['keyC'] ) ) {
+		$test = match( $toggle ) {
+			true    => sanitize_text_field( wp_unslash( $_REQUEST['keyA'] ) ), // OK.
+			false   => sanitize_text_field( $_REQUEST['keyB'] ), // Bad - missing unslash.
+			10      => wp_unslash( $_REQUEST['keyC'] ), // Bad - missing sanitization.
+			default => $_REQUEST['keyD'], // Bad - missing sanitization, unslash, validation.
+		};
+	}
+}
diff --git a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
index e9c35e41ea..065162c2a8 100644
--- a/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
+++ b/WordPress/Tests/Security/ValidatedSanitizedInputUnitTest.php
@@ -111,6 +111,9 @@ public function getErrorList( $testFile = '' ) {
 					475 => 1,
 					476 => 1,
 					481 => 2,
+					497 => 1,
+					498 => 1,
+					499 => 3,
 				);
 
 			case 'ValidatedSanitizedInputUnitTest.2.inc':

From f69e5959663b2ecc742eac010978bec2dd511660 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:33:25 +0200
Subject: [PATCH 798/822] Security/ValidatedSanitizedInput: make
 `MissingUnslash` message more informative

Previously, the error would read `$_POST data not unslashed...`. Now, the error message will show the exact variable with keys we're talking about like `$_POST['key'] not unslashed...`.
---
 .../Sniffs/Security/ValidatedSanitizedInputSniff.php      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index 2d87c6fc14..e0034b3fe8 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -230,11 +230,15 @@ public function add_unslash_error( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
+		// We know there will be array keys as that's checked in the process_token() method.
+		$array_keys = VariableHelper::get_array_access_keys( $phpcsFile, $stackPtr );
+		$error_data = array( $var_name . '[' . implode( '][', $array_keys ) . ']' );
+
 		$phpcsFile->addError(
-			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
+			'%s not unslashed before sanitization. Use wp_unslash() or similar',
 			$stackPtr,
 			'MissingUnslash',
-			array( $var_name )
+			$error_data
 		);
 	}
 }

From 5f8fe49a26cd91103894f87af5d73e362b59f30e Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 19 Aug 2023 01:43:44 +0200
Subject: [PATCH 799/822] Security/ValidatedSanitizedInput: make closures
 static

---
 WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
index e0034b3fe8..6f46261b56 100644
--- a/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
+++ b/WordPress/Sniffs/Security/ValidatedSanitizedInputSniff.php
@@ -90,7 +90,7 @@ public function process_token( $stackPtr ) {
 		) {
 			// Retrieve all embeds, but use only the initial variable name part.
 			$interpolated_variables = array_map(
-				function ( $embed ) {
+				static function ( $embed ) {
 					return preg_replace( '`^(\{?\$\{?\(?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)(.*)$`', '$2', $embed );
 				},
 				TextStrings::getEmbeds( $this->tokens[ $stackPtr ]['content'] )
@@ -99,7 +99,7 @@ function ( $embed ) {
 			// Filter the embeds down to superglobals only.
 			$interpolated_superglobals = array_filter(
 				$interpolated_variables,
-				function ( $var_name ) {
+				static function ( $var_name ) {
 					return ( 'GLOBALS' !== $var_name && Variables::isSuperglobalName( $var_name ) );
 				}
 			);

From 8c81cc62abe207f1a1568b6bfae9e6adb14177ba Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 19 Aug 2023 01:47:36 +0200
Subject: [PATCH 800/822] CS: closures not using `$this` should be static

---
 WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php | 2 +-
 WordPress/Sniffs/DB/PreparedSQLSniff.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
index 1e481d8229..043175d8fb 100644
--- a/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLPlaceholdersSniff.php
@@ -327,7 +327,7 @@ public function process_token( $stackPtr ) {
 				if ( $stripped_content !== $content ) {
 					$vars_without_wpdb = array_filter(
 						TextStrings::getEmbeds( $content ),
-						function ( $symbol ) {
+						static function ( $symbol ) {
 							return preg_match( '`^\{?\$\{?wpdb\??->`', $symbol ) !== 1;
 						}
 					);
diff --git a/WordPress/Sniffs/DB/PreparedSQLSniff.php b/WordPress/Sniffs/DB/PreparedSQLSniff.php
index 7e1dc613b6..7b6529ef90 100644
--- a/WordPress/Sniffs/DB/PreparedSQLSniff.php
+++ b/WordPress/Sniffs/DB/PreparedSQLSniff.php
@@ -176,7 +176,7 @@ public function process_token( $stackPtr ) {
 
 				$bad_variables = array_filter(
 					TextStrings::getEmbeds( $this->tokens[ $this->i ]['content'] ),
-					function ( $symbol ) {
+					static function ( $symbol ) {
 						return preg_match( '`^\{?\$\{?wpdb\??->`', $symbol ) !== 1;
 					}
 				);

From 0b548b93fb11eb7c552f02627efd15aa214ec854 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:39:25 +0200
Subject: [PATCH 801/822] Helpers: add type declarations whenever possible

... which isn't that often...
---
 WordPress/Helpers/RulesetPropertyHelper.php | 2 +-
 WordPress/Helpers/WPDBTrait.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Helpers/RulesetPropertyHelper.php b/WordPress/Helpers/RulesetPropertyHelper.php
index 7ac43267c3..b20c6ed3bf 100644
--- a/WordPress/Helpers/RulesetPropertyHelper.php
+++ b/WordPress/Helpers/RulesetPropertyHelper.php
@@ -51,7 +51,7 @@ final class RulesetPropertyHelper {
 	 *                      Defaults to true.
 	 * @return array
 	 */
-	public static function merge_custom_array( $custom, $base = array(), $flip = true ) {
+	public static function merge_custom_array( $custom, array $base = array(), $flip = true ) {
 		if ( true === $flip ) {
 			$base = array_filter( $base );
 		}
diff --git a/WordPress/Helpers/WPDBTrait.php b/WordPress/Helpers/WPDBTrait.php
index 9a3a908eb8..1f325effc0 100644
--- a/WordPress/Helpers/WPDBTrait.php
+++ b/WordPress/Helpers/WPDBTrait.php
@@ -47,7 +47,7 @@ trait WPDBTrait {
 	 *
 	 * @return bool Whether this is a $wpdb method call.
 	 */
-	final protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
+	final protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, array $target_methods ) {
 		$tokens = $phpcsFile->getTokens();
 		if ( isset( $tokens[ $stackPtr ] ) === false ) {
 			return false;

From 977e3f2f63e3b253c7fc979ccb5bf135423a1d51 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 20 Aug 2023 03:23:44 +0200
Subject: [PATCH 802/822] Sniff: remove `init()` method

As pointed out by GaryJones, as all utility methods have now been made self-contained, it is no longer necessary to have a separate `initi()` method in the `Sniff` class.
---
 WordPress/Sniff.php | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
index 369ecf0fc2..eaa7c22b55 100644
--- a/WordPress/Sniff.php
+++ b/WordPress/Sniff.php
@@ -52,7 +52,9 @@ abstract class Sniff implements PHPCS_Sniff {
 	 *                  normal file processing.
 	 */
 	public function process( File $phpcsFile, $stackPtr ) {
-		$this->init( $phpcsFile );
+		$this->phpcsFile = $phpcsFile;
+		$this->tokens    = $phpcsFile->getTokens();
+
 		return $this->process_token( $stackPtr );
 	}
 
@@ -67,21 +69,4 @@ public function process( File $phpcsFile, $stackPtr ) {
 	 *                  normal file processing.
 	 */
 	abstract public function process_token( $stackPtr );
-
-	/**
-	 * Initialize the class for the current process.
-	 *
-	 * This method must be called by child classes before using many of the methods
-	 * below.
-	 *
-	 * @since 0.4.0
-	 *
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file currently being processed.
-	 *
-	 * @return void
-	 */
-	protected function init( File $phpcsFile ) {
-		$this->phpcsFile = $phpcsFile;
-		$this->tokens    = $phpcsFile->getTokens();
-	}
 }

From d3a58e9effeb6c3fed9cdb023db17b2cfce9ea32 Mon Sep 17 00:00:00 2001
From: Gary Jones <github@garyjones.io>
Date: Sun, 20 Aug 2023 18:01:04 +0100
Subject: [PATCH 803/822] Tests: Remove redundant placeholder function

It's the only error flagged by a non-inclusive terminology checker.
---
 WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
index cd5a73907b..eb2d0e7473 100644
--- a/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
+++ b/WordPress/Tests/DB/DirectDatabaseQueryUnitTest.inc
@@ -16,8 +16,8 @@ function bar() {
 	return $listofthings;
 }
 
-function dummy() {
-}
+
+
 
 function baz() {
 	global $wpdb;

From d8473175594446446e9be2498681573905868e29 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 20 Aug 2023 19:59:43 +0200
Subject: [PATCH 804/822] README: updates for WordPressCS 3.0.0

This commit updates the README guide to be in line with WordPressCS 3.0.0.

This commit:
* Removes the "Last commit to stable" and "Nr of contributors" badges.
* Updates the "Tested on PHP..." badges.
* Updates the table of contents to match the new content of the file.
* Removes the "Project history" section (has been moved to the wiki).
* Makes the pre-requisites for the package more explicit and puts them in a separate section.
* Updates the installation instructions and adds update instructions.
    - Removes the instructions related to stand-alone installs and using `composer create-project`.
    - The new installation instructions take the changes in Composer 2.2 (permission required for plugins to run) into account.
    - The new installation instructions include a link to the end user/ruleset maintainer upgrade guide for WPCS 3.0.0 as the initial upgrade may need extra work.
* Updates references to the Composer PHPCS plugin to make sure these reference the new name and link to the correct GH repo (as the repo has moved).
* Removes the reference to the VIP ruleset which was removed in WPCS 2.0.0 from the "Rulesets" section.
* Adds links to the "customizable properties" section for where to find customizable properties for PHPCS native sniffs and sniffs from PHPCSExtra.
* Adds the `VariableAnalysis` standard and the `VIP Coding Standards` to the list of optional additional rulesets to use.
* Updates the command and output for the example run.
* Removes the links to IDE related tutorials in favour of a link to the wiki (to save us having to maintain this list in multiple places).
* Ensures the text consistently uses `WordPressCS` instead of `WPCS`.

Closes #481
Closes #1821
Closes #1901
---
 README.md | 247 ++++++++++++++++++++++++++----------------------------
 1 file changed, 121 insertions(+), 126 deletions(-)

diff --git a/README.md b/README.md
index 303562de2c..459adb0414 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,16 @@
 [![Release Date of the Latest Version](https://img.shields.io/github/release-date/WordPress/WordPress-Coding-Standards.svg?maxAge=1800)](https://github.com/WordPress/WordPress-Coding-Standards/releases)
 :construction:
 [![Latest Unstable Version](https://img.shields.io/badge/unstable-dev--develop-e68718.svg?maxAge=2419200)](https://packagist.org/packages/wp-coding-standards/wpcs#dev-develop)
-[![Last Commit to Unstable](https://img.shields.io/github/last-commit/WordPress/WordPress-Coding-Standards/develop.svg)](https://github.com/WordPress/WordPress-Coding-Standards/commits/develop)
 
 [![Basic QA checks](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/basic-qa.yml)
 [![Unit Tests](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 [![codecov.io](https://codecov.io/gh/WordPress/WordPress-Coding-Standards/graph/badge.svg?token=UzFYn0RzVG&branch=develop)](https://codecov.io/gh/WordPress/WordPress-Coding-Standards?branch=develop)
 
 [![Minimum PHP Version](https://img.shields.io/packagist/php-v/wp-coding-standards/wpcs.svg?maxAge=3600)](https://packagist.org/packages/wp-coding-standards/wpcs)
-[![Tested on PHP 5.4 to 7.4 snapshot](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4snapshot-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
+[![Tested on PHP 5.4 to 8.3](https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3-green.svg?maxAge=2419200)](https://github.com/WordPress/WordPress-Coding-Standards/actions/workflows/unit-tests.yml)
 
 [![License: MIT](https://poser.pugx.org/wp-coding-standards/wpcs/license)](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/LICENSE)
 [![Total Downloads](https://poser.pugx.org/wp-coding-standards/wpcs/downloads)](https://packagist.org/packages/wp-coding-standards/wpcs/stats)
-[![Number of Contributors](https://img.shields.io/github/contributors/WordPress/WordPress-Coding-Standards.svg?maxAge=3600)](https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors)
 
 </div>
 
@@ -23,11 +21,12 @@
 # WordPress Coding Standards for PHP_CodeSniffer
 
 * [Introduction](#introduction)
-* [Project history](#project-history)
+* [Minimum Requirements](#minimum-requirements)
 * [Installation](#installation)
-    + [Requirements](#requirements)
-    + [Composer](#composer)
-    + [Standalone](#standalone)
+    + [Composer Project-based Installation](#composer-project-based-installation)
+    + [Composer Global Installation](#composer-global-installation)
+    + [Updating your WordPressCS install to a newer version](#updating-your-wordpresscs-install-to-a-newer-version)
+    + [Using your WordPressCS install](#using-your-wordpresscs-install)
 * [Rulesets](#rulesets)
     + [Standards subsets](#standards-subsets)
     + [Using a custom ruleset](#using-a-custom-ruleset)
@@ -35,90 +34,80 @@
     + [Recommended additional rulesets](#recommended-additional-rulesets)
 * [How to use](#how-to-use)
     + [Command line](#command-line)
-    + [Using PHPCS and WPCS from within your IDE](#using-phpcs-and-wpcs-from-within-your-ide)
-* [Running your code through WPCS automatically using CI tools](#running-your-code-through-wpcs-automatically-using-ci-tools)
+    + [Using PHPCS and WordPressCS from within your IDE](#using-phpcs-and-wordpresscs-from-within-your-ide)
+* [Running your code through WordPressCS automatically using Continuous Integration tools](#running-your-code-through-wordpresscs-automatically-using-continuous-integration-tools)
 * [Fixing errors or ignoring them](#fixing-errors-or-ignoring-them)
-    + [Tools shipped with WPCS](#tools-shipped-with-wpcs)
+    + [Tools shipped with WordPressCS](#tools-shipped-with-wordpresscs)
 * [Contributing](#contributing)
 * [License](#license)
 
+
 ## Introduction
 
 This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) rules (sniffs) to validate code developed for WordPress. It ensures code quality and adherence to coding conventions, especially the official [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/).
 
-## Project history
-
- - On 22nd April 2009, the original project from [Urban Giraffe](https://urbangiraffe.com/articles/wordpress-codesniffer-standard/) was packaged and published.
- - In May 2011 the project was forked and [added](https://github.com/WordPress/WordPress-Coding-Standards/commit/04fd547c691ca2baae3fa8e195a46b0c9dd671c5) to GitHub by [Chris Adams](https://chrisadams.me.uk/).
- - In April 2012 [XWP](https://xwp.co/) started to dedicate resources to develop and lead the creation of the sniffs and rulesets for `WordPress-Core`, `WordPress-VIP` (WordPress.com VIP), and `WordPress-Extra`.
- - In May 2015, an initial documentation ruleset was [added](https://github.com/WordPress/WordPress-Coding-Standards/commit/b1a4bf8232a22563ef66f8a529357275a49f47dc#diff-a17c358c3262a26e9228268eb0a7b8c8) as `WordPress-Docs`.
- - In 2015, [J.D. Grimes](https://github.com/JDGrimes) began significant contributions, along with maintenance from [Gary Jones](https://github.com/GaryJones).
- - In 2016, [Juliette Reinders Folmer](https://github.com/jrfnl) began contributing heavily, adding more commits in a year than anyone else in the five years since the project was added to GitHub.
- - In July 2018, version [`1.0.0`](https://github.com/WordPress/WordPress-Coding-Standards/releases/tag/1.0.0) of the project was released.
-
-## Installation
-
-### Requirements
-
-The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.7.2** or higher.
-
-### Composer
-
-Standards can be installed with the [Composer](https://getcomposer.org/) dependency manager:
-
-    composer create-project wp-coding-standards/wpcs --no-dev
-
-Running this command will:
+## Minimum Requirements
 
-1. Install WordPress standards into `wpcs` directory.
-2. Install PHP_CodeSniffer.
-3. Register WordPress standards in PHP_CodeSniffer configuration.
-4. Make `phpcs` command available from `wpcs/vendor/bin`.
+The WordPress Coding Standards package requires:
+* PHP 5.4 or higher with the following extensions enabled:
+    - [Filter](https://www.php.net/book.filter)
+    - [libxml](https://www.php.net/book.libxml)
+    - [Tokenizer](https://www.php.net/book.tokenizer)
+    - [XMLReader](https://www.php.net/book.xmlreader)
+* [Composer](https://getcomposer.org/)
 
-For the convenience of using `phpcs` as a global command, you may want to add the path to the `wpcs/vendor/bin` directory to a `PATH` environment variable for your operating system.
+For the best results, it is recommended to also ensure the following additional PHP extensions are enabled:
+    - [iconv](https://www.php.net/book.iconv)
+    - [Multibyte String](https://www.php.net/book.mbstring)
 
-#### Installing WPCS as a dependency
-
-When installing the WordPress Coding Standards as a dependency in a larger project, the above mentioned step 3 will not be executed automatically.
+## Installation
 
-There are two actively maintained Composer plugins which can handle the registration of standards with PHP_CodeSniffer for you:
-* [composer-phpcodesniffer-standards-plugin](https://github.com/higidi/composer-phpcodesniffer-standards-plugin)
-* [phpcodesniffer-composer-installer](https://github.com/DealerDirect/phpcodesniffer-composer-installer):"^0.6"
+As of WordPressCS 3.0.0, installation via Composer using the below instructions is the only supported type of installation.
 
-It is strongly suggested to `require` one of these plugins in your project to handle the registration of external standards with PHPCS for you.
+[Composer](https://getcomposer.org/) will automatically install the project dependencies and register the rulesets from WordPressCS and other external standards with PHP_CodeSniffer using the [Composer PHPCS plugin](https://github.com/PHPCSStandards/composer-installer).
 
-### Standalone
+> If you are upgrading from an older WordPressCS version to version 3.0.0, please read the [Upgrade guide for ruleset maintainers and end-users](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-ruleset-maintainers) first!
 
-1. Install PHP_CodeSniffer by following its [installation instructions](https://github.com/squizlabs/PHP_CodeSniffer#installation) (via Composer, Phar file, PEAR, or Git checkout).
+### Composer Project-based Installation
 
-   Do ensure that PHP_CodeSniffer's version matches our [requirements](#requirements), if, for example, you're using [VVV](https://github.com/Varying-Vagrant-Vagrants/VVV).
+Run the following from the root of your project:
+```bash
+composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+composer require --dev wp-coding-standards/wpcs:"^3.0"
+```
 
-2. Clone the WordPress standards repository:
+### Composer Global Installation
 
-        git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
+Alternatively, you may want to install this standard globally:
+```bash
+composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+composer global require --dev wp-coding-standards/wpcs:"^3.0"
+```
 
-3. Add its path to the PHP_CodeSniffer configuration:
+### Updating your WordPressCS install to a newer version
 
-        phpcs --config-set installed_paths /path/to/wpcs
+If you installed WordPressCS using either of the above commands, you can upgrade to a newer version as follows:
+```bash
+# Project local install
+composer update wp-coding-standards/wpcs --with-dependencies
 
-   **Pro-tip:** Alternatively, you can tell PHP_CodeSniffer the path to the WordPress standards by adding the following snippet to your custom ruleset:
-   ```xml
-   <config name="installed_paths" value="/path/to/wpcs" />
-   ```
+# Global install
+composer global update wp-coding-standards/wpcs --with-dependencies
+```
 
-To summarize:
+### Using your WordPressCS install
 
+Once you have installed WordPressCS using either of the above commands, use it as follows:
 ```bash
-cd ~/projects
-git clone https://github.com/squizlabs/PHP_CodeSniffer.git phpcs
-git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
-cd phpcs
-./bin/phpcs --config-set installed_paths ../wpcs
+# Project local install
+vendor/bin/phpcs -ps . --standard=WordPress
+
+# Global install
+%USER_DIRECTORY%/Composer/vendor/bin/phpcs -ps . --standard=WordPress
 ```
 
-And then add the `~/projects/phpcs/bin` directory to your `PATH` environment variable via your `.bashrc`.
+> **Pro-tip**: For the convenience of using `phpcs` as a global command, use the _Global install_ method and add the path to the `%USER_DIRECTORY%/Composer/vendor/bin` directory to the `PATH` environment variable for your operating system.
 
-You should then see `WordPress-Core` et al listed when you run `phpcs -i`.
 
 ##  Rulesets
 
@@ -131,117 +120,123 @@ You can use the following as standard names when invoking `phpcs` to select snif
 * `WordPress` - complete set with all of the sniffs in the project
   - `WordPress-Core` - main ruleset for [WordPress core coding standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/)
   - `WordPress-Docs` - additional ruleset for [WordPress inline documentation standards](https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/)
-  - `WordPress-Extra` - extended ruleset for recommended best practices, not sufficiently covered in the WordPress core coding standards
+  - `WordPress-Extra` - extended ruleset with recommended best practices, not sufficiently covered in the WordPress core coding standards
     - includes `WordPress-Core`
 
-**Note:** The WPCS package used to include a `WordPress-VIP` ruleset and associated sniffs, prior to WPCS 2.0.0.
-The `WordPress-VIP` ruleset was originally intended to aid with the [WordPress.com VIP coding requirements](https://docs.wpvip.com/technical-references/code-review/), but has been superseded. It is recommended to use the [official VIP coding standards](https://github.com/Automattic/VIP-Coding-Standards) ruleset instead for checking code against the VIP platform requirements.
-
 ### Using a custom ruleset
 
-If you need to further customize the selection of sniffs for your project - you can create a custom ruleset file. When you name this file either `.phpcs.xml`, `phpcs.xml`, `.phpcs.xml.dist` or `phpcs.xml.dist`, PHP_CodeSniffer will automatically locate it as long as it is placed in the directory from which you run the CodeSniffer or in a directory above it. If you follow these naming conventions you don't have to supply a `--standard` arg. For more info, read about [using a default configuration file](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file). See also provided [`phpcs.xml.dist.sample`](phpcs.xml.dist.sample) file and [fully annotated example](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml) in the PHP_CodeSniffer documentation.
+If you need to further customize the selection of sniffs for your project - you can create a custom ruleset file.
+
+When you name this file either `.phpcs.xml`, `phpcs.xml`, `.phpcs.xml.dist` or `phpcs.xml.dist`, PHP_CodeSniffer will automatically locate it as long as it is placed in the directory from which you run the CodeSniffer or in a directory above it. If you follow these naming conventions you don't have to supply a `--standard` CLI argument.
+
+For more info, read about [using a default configuration file](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file). See also the provided WordPressCS [`phpcs.xml.dist.sample`](phpcs.xml.dist.sample) file and the [fully annotated example ruleset](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml) in the PHP_CodeSniffer documentation.
 
 ### Customizing sniff behaviour
 
-The WordPress Coding Standard contains a number of sniffs which are configurable. This means that you can turn parts of the sniff on or off, or change the behaviour by setting a property for the sniff in your custom `.phpcs.xml.dist` file.
+The WordPress Coding Standard contains a number of sniffs which are configurable. This means that you can turn parts of the sniff on or off, or change the behaviour by setting a property for the sniff in your custom `[.]phpcs.xml[.dist]` file.
+
+You can find a complete list of all the properties you can change for the WordPressCS sniffs in the [wiki](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties).
+
+WordPressCS also uses sniffs from PHPCSExtra and from PHP_CodeSniffer itself.
+The [README for PHPCSExtra](https://github.com/PHPCSStandards/PHPCSExtra) contains information on the properties which can be set for the sniff from PHPCSExtra.
+Information on custom properties which can be set for sniffs from PHP_CodeSniffer can be found in the [PHP_CodeSniffer wiki](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties).
 
-You can find a complete list of all the properties you can change in the [wiki](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties).
 
 ### Recommended additional rulesets
 
+#### PHPCompatibility
+
 The [PHPCompatibility](https://github.com/PHPCompatibility/PHPCompatibility) ruleset and its subset [PHPCompatibilityWP](https://github.com/PHPCompatibility/PHPCompatibilityWP) come highly recommended.
-The [PHPCompatibility](https://github.com/PHPCompatibility/PHPCompatibility) sniffs are designed to analyse your code for cross-PHP version compatibility.
+The [PHPCompatibility](https://github.com/PHPCompatibility/PHPCompatibility) sniffs are designed to analyse your code for cross-version PHP compatibility.
 
 The [PHPCompatibilityWP](https://github.com/PHPCompatibility/PHPCompatibilityWP) ruleset is based on PHPCompatibility, but specifically crafted to prevent false positives for projects which expect to run within the context of WordPress, i.e. core, plugins and themes.
 
 Install either as a separate ruleset and run it separately against your code or add it to your custom ruleset, like so:
 ```xml
-<config name="testVersion" value="5.6-"/>
+<config name="testVersion" value="7.0-"/>
 <rule ref="PHPCompatibilityWP">
     <include-pattern>*\.php$</include-pattern>
 </rule>
 ```
 
-Whichever way you run it, do make sure you set the `testVersion` to run the sniffs against. The `testVersion` determines for which PHP versions you will receive compatibility information. The recommended setting for this at this moment is  `5.6-` to support the same PHP versions as WordPress Core supports.
+Whichever way you run it, do make sure you set the `testVersion` to run the sniffs against. The `testVersion` determines for which PHP versions you will receive compatibility information. The recommended setting for this at this moment is  `7.0-` to support the same PHP versions as WordPress Core supports.
 
 For more information about setting the `testVersion`, see:
 * [PHPCompatibility: Sniffing your code for compatibility with specific PHP version(s)](https://github.com/PHPCompatibility/PHPCompatibility#sniffing-your-code-for-compatibility-with-specific-php-versions)
 * [PHPCompatibility: Using a custom ruleset](https://github.com/PHPCompatibility/PHPCompatibility#using-a-custom-ruleset)
 
+#### VariableAnalysis
+
+For some additional checks around (undefined/unused) variables, the [`VariableAnalysis`](https://github.com/sirbrillig/phpcs-variable-analysis/) standard is a handy addition.
+
+#### VIP Coding Standards
+
+For those projects which deploy to the WordPress VIP platform, it is recommended to also use the [official WordPress VIP coding standards](https://github.com/Automattic/VIP-Coding-Standards) ruleset.
+
+
 ## How to use
 
 ### Command line
 
 Run the `phpcs` command line tool on a given file or directory, for example:
-
-    phpcs --standard=WordPress wp-load.php
+```bash
+vendor/bin/phpcs --standard=WordPress wp-load.php
+```
 
 Will result in following output:
+```
+--------------------------------------------------------------------------------
+FOUND 6 ERRORS AND 4 WARNINGS AFFECTING 5 LINES
+--------------------------------------------------------------------------------
+  36 | WARNING | error_reporting() can lead to full path disclosure.
+  36 | WARNING | error_reporting() found. Changing configuration values at
+     |         | runtime is strongly discouraged.
+  52 | WARNING | Silencing errors is strongly discouraged. Use proper error
+     |         | checking instead. Found: @file_exists( dirname(...
+  52 | WARNING | Silencing errors is strongly discouraged. Use proper error
+     |         | checking instead. Found: @file_exists( dirname(...
+  75 | ERROR   | Overriding WordPress globals is prohibited. Found assignment
+     |         | to $path
+  78 | ERROR   | Detected usage of a possibly undefined superglobal array
+     |         | index: $_SERVER['REQUEST_URI']. Use isset() or empty() to
+     |         | check the index exists before using it
+  78 | ERROR   | $_SERVER['REQUEST_URI'] not unslashed before sanitization. Use
+     |         | wp_unslash() or similar
+  78 | ERROR   | Detected usage of a non-sanitized input variable:
+     |         | $_SERVER['REQUEST_URI']
+ 104 | ERROR   | All output should be run through an escaping function (see the
+     |         | Security sections in the WordPress Developer Handbooks), found
+     |         | '$die'.
+ 104 | ERROR   | All output should be run through an escaping function (see the
+     |         | Security sections in the WordPress Developer Handbooks), found
+     |         | '__'.
+--------------------------------------------------------------------------------
+```
 
-	------------------------------------------------------------------------------------------
-	FOUND 8 ERRORS AND 10 WARNINGS AFFECTING 11 LINES
-	------------------------------------------------------------------------------------------
-	 24 | WARNING | [ ] error_reporting() can lead to full path disclosure.
-	 24 | WARNING | [ ] error_reporting() found. Changing configuration at runtime is rarely
-	    |         |     necessary.
-	 37 | WARNING | [x] "require_once" is a statement not a function; no parentheses are
-	    |         |     required
-	 39 | WARNING | [ ] Silencing errors is discouraged
-	 39 | WARNING | [ ] Silencing errors is discouraged
-	 42 | WARNING | [x] "require_once" is a statement not a function; no parentheses are
-	    |         |     required
-	 46 | ERROR   | [ ] Inline comments must end in full-stops, exclamation marks, or
-	    |         |     question marks
-	 46 | ERROR   | [x] There must be no blank line following an inline comment
-	 49 | WARNING | [x] "require_once" is a statement not a function; no parentheses are
-	    |         |     required
-	 54 | WARNING | [x] "require_once" is a statement not a function; no parentheses are
-	    |         |     required
-	 63 | WARNING | [ ] Detected access of super global var $_SERVER, probably needs manual
-	    |         |     inspection.
-	 63 | ERROR   | [ ] Detected usage of a non-validated input variable: $_SERVER
-	 63 | ERROR   | [ ] Missing wp_unslash() before sanitization.
-	 63 | ERROR   | [ ] Detected usage of a non-sanitized input variable: $_SERVER
-	 69 | WARNING | [x] "require_once" is a statement not a function; no parentheses are
-	    |         |     required
-	 74 | ERROR   | [ ] Inline comments must end in full-stops, exclamation marks, or
-	    |         |     question marks
-	 92 | ERROR   | [ ] All output should be run through an escaping function (see the
-	    |         |     Security sections in the WordPress Developer Handbooks), found
-	    |         |     '$die'.
-	 92 | ERROR   | [ ] All output should be run through an escaping function (see the
-	    |         |     Security sections in the WordPress Developer Handbooks), found '__'.
-	------------------------------------------------------------------------------------------
-	PHPCBF CAN FIX THE 6 MARKED SNIFF VIOLATIONS AUTOMATICALLY
-	------------------------------------------------------------------------------------------
-
-### Using PHPCS and WPCS from within your IDE
-
-* **PhpStorm** : Please see "[PHP Code Sniffer with WordPress Coding Standards Integration](https://confluence.jetbrains.com/display/PhpStorm/WordPress+Development+using+PhpStorm#WordPressDevelopmentusingPhpStorm-PHPCodeSnifferwithWordPressCodingStandardsIntegrationinPhpStorm)" in the PhpStorm documentation.
-* **Sublime Text** : Please see "[Setting up WPCS to work in Sublime Text](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Setting-up-WPCS-to-work-in-Sublime-Text)" in the wiki.
-* **Atom**: Please see "[Setting up WPCS to work in Atom](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Setting-up-WPCS-to-work-in-Atom)" in the wiki.
-* **Visual Studio**: Please see "[Setting up PHP CodeSniffer in Visual Studio Code](https://tommcfarlin.com/php-codesniffer-in-visual-studio-code/)", a tutorial by Tom McFarlin.
-* **Eclipse with XAMPP**: Please see "[Setting up WPCS when using Eclipse with XAMPP](https://github.com/WordPress/WordPress-Coding-Standards/wiki/How-to-use-WPCS-with-Eclipse-and-XAMPP)" in the wiki.
-
-
-## Running your code through WPCS automatically using CI tools
+### Using PHPCS and WordPressCS from within your IDE
+
+The [wiki](https://github.com/WordPress/WordPress-Coding-Standards/wiki) contains links to various in- and external tutorials about setting up WordPressCS to work in your IDE.
+
+
+## Running your code through WordPressCS automatically using Continuous Integration tools
 
 - [Running in GitHub Actions](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-GitHub-Actions)
 - [Running in Travis](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Running-in-Travis)
 
+
 ## Fixing errors or ignoring them
 
 You can find information on how to deal with some of the more frequent issues in the [wiki](https://github.com/WordPress/WordPress-Coding-Standards/wiki).
 
-### Tools shipped with WPCS
+### Tools shipped with WordPressCS
 
-Since version 1.2.0, WPCS has a special sniff category `Utils`.
+Since version 1.2.0, WordPressCS has a special sniff category `Utils`.
 
 This sniff category contains some tools which, generally speaking, will only be needed to be run once over a codebase and for which the fixers can be considered _risky_, i.e. very careful review by a developer is needed before accepting the fixes made by these sniffs.
 
 The sniffs in this category are disabled by default and can only be activated by adding some properties for each sniff via a custom ruleset.
 
-At this moment, WPCS offer the following tools:
+At this moment, WordPressCS offer the following tools:
 * `WordPress.Utils.I18nTextDomainFixer` - This sniff can replace the text domain used in a code-base.
     The sniff will fix the text domains in both I18n function calls as well as in a plugin/theme header.
     Passing the following properties will activate the sniff:

From 4a33d468821f805a1cd222990c46ad9d632b0bd7 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 20 Aug 2023 19:03:03 +0200
Subject: [PATCH 805/822] CONTRIBUTING: updates for WordPressCS 3.0.0

This commit updates the CONTRIBUTING guide to be in line with WordPressCS 3.0.0.

This commit:
* Updates the information about usage of upstream sniffs and reporting upstream issues.
* Updates the information on creating a pull request.
* Removes the information about the use of a long running release PR (as we don't do this anymore in practice).
* Updates the information on running the unit tests, including the information on how to get set up with cloned dependencies.
* Updates the examples test run output and removes the outdated the asciinema image.
* Updates the code fragments and example output used in the tutorial part to be in line with the current code and run instructions.
* Ensures the text consistently uses `WordPressCS` instead of `WPCS`.
* Replaced some ablist language.
---
 .github/CONTRIBUTING.md | 136 +++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 70 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 27b965192d..e65dae451a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -11,7 +11,11 @@ Bug reports containing a minimal code sample which can be used to reproduce the
 
 ## Upstream Issues
 
-Since WPCS employs many sniffs that are part of PHPCS, sometimes an issue will be caused by a bug in PHPCS and not in WPCS itself. If the error message in question doesn't come from a sniff whose name starts with `WordPress`, the issue is probably a bug in PHPCS itself, and should be [reported there](https://github.com/squizlabs/PHP_CodeSniffer/issues).
+Since WordPressCS employs many sniffs that are part of PHP_CodeSniffer itself or PHPCSExtra, sometimes an issue will be caused by a bug in PHPCS or PHPCSExtra and not in WordPressCS itself.
+If the error message in question doesn't come from a sniff whose name starts with `WordPress`, the issue is probably a bug in PHPCS or PHPCSExtra.
+
+* Bugs for sniffs starting with `Generic`, `PEAR`, `PSR1`, `PSR2`, `PSR12`, `Squiz` or `Zend` should be [reported to PHPCS](https://github.com/squizlabs/PHP_CodeSniffer/issues).
+* Bugs for sniffs starting with `Modernize`, `NormalizedArrays` or `Universal` should be [reported to PHPCSExtra](https://github.com/PHPCSStandards/PHPCSExtra/issues).
 
 # Contributing patches and new features
 
@@ -19,9 +23,8 @@ Since WPCS employs many sniffs that are part of PHPCS, sometimes an issue will b
 
 Ongoing development will be done in the `develop` branch with merges to `main` once considered stable.
 
-To contribute an improvement to this project, fork the repo and open a pull request to the `develop` branch. Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
-
-Once a commit is made to `develop`, a PR should be opened from `develop` to `main` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
+To contribute an improvement to this project, fork the repo, run `composer install`, make your changes to the code, run the unit tests and code style checks by running `composer check-all`, and if all is good, open a pull request to the `develop` branch.
+Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
 
 # Considerations when writing sniffs
 
@@ -37,72 +40,65 @@ When you introduce new `public` sniff properties, or your sniff extends a class
 ## Pre-requisites
 * WordPress-Coding-Standards
 * PHP_CodeSniffer 3.7.2 or higher
+* PHPCSUtils 1.0.8 or higher
+* PHPCSExtra 1.1.0 or higher
 * PHPUnit 4.x, 5.x, 6.x or 7.x
 
-The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
-
-Presuming you have installed `PHP_CodeSniffer` and the WordPress-Coding-Standards as [noted in the README](https://github.com/WordPress/WordPress-Coding-Standards#how-to-use-this), all you need now is `PHPUnit`.
-
-> N.B.: If you installed WPCS using Composer, make sure you used `--prefer-source` or run `composer install --prefer-source` now to make sure the unit tests are available.
-> Other than that, you're all set already as Composer will have installed PHPUnit for you.
-
-If you already have PHPUnit installed on your system: Congrats, you're all set.
-
-## Installing PHPUnit
+The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test framework for unit testing the sniffs.
 
-N.B.: _If you used Composer to install the WordPress Coding Standards, you can skip this step._
+## Getting ready to test
 
-You can either navigate to the directory where the `PHP_CodeSniffer` repo is checked out and do `composer install` to install the `dev` dependencies or you can [install PHPUnit](https://phpunit.readthedocs.io/en/7.4/installation.html) as a PHAR file.
+Presuming you have cloned WordPressCS for development, to run the unit tests you need to make sure you have run `composer install` from the root directory of your WordPressCS git clone.
 
-You may want to add the directory where PHPUnit is installed to a `PATH` environment variable for your operating system to make the command available everywhere on your system.
+## Custom develop setups
 
-## Before running the unit tests
-
-N.B.: _If you used Composer to install the WordPress Coding Standards, you can skip this step._
-
-For the unit tests to work, you need to make sure PHPUnit can find your `PHP_CodeSniffer` install.
-
-The easiest way to do this is to add a `phpunit.xml` file to the root of your WPCS installation and set a `PHPCS_DIR` environment variable from within this file.
-Copy the existing `phpunit.xml.dist` file and add the below `<env>` directive within the `<php>` section. Make sure to adjust the path to reflect your local setup.
-```xml
-	<php>
-		<env name="PHPCS_DIR" value="/path/to/PHP_CodeSniffer/"/>
-	</php>
-```
+If you are developing with a stand-alone PHP_CodeSniffer (git clone) installation and want to use that git clone to test WordPressCS, there are three extra things you need to do:
+1. Install [PHPCSUtils](https://github.com/PHPCSStandards/PHPCSUtils).
+    If you are using a git clone of PHPCS, you may want to `git clone` PHPCSUtils as well.
+2. Register PHPCSUtils with your stand-alone PHP_CodeSniffer installation by running the following commands:
+    ```bash
+    phpcs --config-show
+    ```
+    Copy the value from "installed_paths" and add the path to your local install of PHPCSUtils to it (and the path to WordPressCS if it's not registered with PHPCS yet).
+    Now use the adjusted value to run:
+    ```bash
+    phpcs --config-set installed_paths /path/1,/path/2,/path/3
+    ```
+3. Make sure PHPUnit can find your `PHP_CodeSniffer` install.
+    The most straight-forward way to do this is to add a `phpunit.xml` file to the root of your WordPressCS installation and set a `PHPCS_DIR` environment variable from within this file.
+    Copy the existing `phpunit.xml.dist` file and add the below `<env>` directive within the `<php>` section. Make sure to adjust the path to reflect your local setup.
+    ```xml
+        <php>
+            <env name="PHPCS_DIR" value="/path/to/PHP_CodeSniffer/"/>
+        </php>
+    ```
 
 ## Running the unit tests
 
-* If you didn't install WPCS using Composer, make sure you have registered the directory in which you installed WPCS with PHPCS using:
-    ```sh
-    phpcs --config-set installed_paths path/to/WPCS
-    ```
-* Navigate to the directory in which you installed WPCS.
-* To run the unit tests:
-    ```sh
-    phpunit --filter WordPress --bootstrap="/path/to/PHP_CodeSniffer/tests/bootstrap.php" /path/to/PHP_CodeSniffer/tests/AllTests.php
+From the root of your WordPressCS install, run the unit tests like so:
+```bash
+composer run-tests
 
-    # Or if you've installed WPCS with Composer:
-    composer run-tests
-    ```
+# Or if you want to use a globally installed version of PHPUnit:
+phpunit --filter WordPress /path/to/PHP_CodeSniffer/tests/AllTests.php
+```
 
 Expected output:
 ```
-PHPUnit 7.5.0 by Sebastian Bergmann and contributors.
+PHPUnit 7.5.20 by Sebastian Bergmann and contributors.
 
-Runtime:       PHP 7.2.13
-Configuration: /WordPressCS/phpunit.xml
+Runtime:       PHP 7.4.33
+Configuration: /WordPressCS/phpunit.xml.dist
 
-........................................................          56 / 56 (100%)
+.........................................................         57 / 57 (100%)
 
-152 sniff test files generated 487 unique error codes; 52 were fixable (10.68%)
+201 sniff test files generated 744 unique error codes; 50 were fixable (6%)
 
-Time: 21.36 seconds, Memory: 22.00MB
+Time: 10.19 seconds, Memory: 40.00 MB
 
-OK (56 tests, 0 assertions)
+OK (57 tests, 0 assertions)
 ```
 
-[![asciicast](https://asciinema.org/a/98078.png)](https://asciinema.org/a/98078)
-
 ## Unit Testing conventions
 
 If you look inside the `WordPress/Tests` subdirectory, you'll see the structure mimics the `WordPress/Sniffs` subdirectory structure. For example, the `WordPress/Sniffs/PHP/POSIXFunctionsSniff.php` sniff has its unit test class defined in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.php` which checks the `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc` test case file. See the file naming convention?
@@ -110,17 +106,16 @@ If you look inside the `WordPress/Tests` subdirectory, you'll see the structure
 Lets take a look at what's inside `POSIXFunctionsUnitTest.php`:
 
 ```php
-...
 namespace WordPressCS\WordPress\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
+final class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
 	 *
-	 * @return array <int line number> => <int number of errors>
+	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
 	public function getErrorList() {
 		return array(
@@ -132,17 +127,18 @@ class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
 			24 => 1,
 			26 => 1,
 		);
-
 	}
-...
+
+    ...
+}
 ```
 
-Also note the class name convention. The method `getErrorList()` MUST return an array of line numbers indicating errors (when running `phpcs`) found in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc`.
-If you run:
+Also note the class name convention. The method `getErrorList()` MUST return an array of line numbers indicating errors (when running `phpcs`) found in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc`. Similarly, the `getWarningList()` method must return an array of line numbers with the number of expected warnings.
+
+If you run the following from the root directory of your WordPressCS clone:
 
 ```sh
-$ cd /path-to-cloned/phpcs
-$ ./bin/phpcs --standard=Wordpress -s /path/to/WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc --sniffs=WordPress.PHP.POSIXFunctions
+$ "vendor/bin/phpcs" --standard=Wordpress -s ./Tests/PHP/POSIXFunctionsUnitTest.inc --sniffs=WordPress.PHP.POSIXFunctions
 ...
 --------------------------------------------------------------------------------
 FOUND 7 ERRORS AFFECTING 7 LINES
@@ -153,23 +149,23 @@ FOUND 7 ERRORS AFFECTING 7 LINES
  16 | ERROR | eregi() has been deprecated since PHP 5.3 and removed in PHP 7.0,
     |       | please use preg_match() instead.
     |       | (WordPress.PHP.POSIXFunctions.ereg_eregi)
- 18 | ERROR | ereg_replace() has been deprecated since PHP 5.3 and removed in PHP
-    |       | 7.0, please use preg_replace() instead.
+ 18 | ERROR | ereg_replace() has been deprecated since PHP 5.3 and removed in
+    |       | PHP 7.0, please use preg_replace() instead.
     |       | (WordPress.PHP.POSIXFunctions.ereg_replace_ereg_replace)
- 20 | ERROR | eregi_replace() has been deprecated since PHP 5.3 and removed in PHP
-    |       | 7.0, please use preg_replace() instead.
+ 20 | ERROR | eregi_replace() has been deprecated since PHP 5.3 and removed in
+    |       | PHP 7.0, please use preg_replace() instead.
     |       | (WordPress.PHP.POSIXFunctions.ereg_replace_eregi_replace)
  22 | ERROR | split() has been deprecated since PHP 5.3 and removed in PHP 7.0,
     |       | please use explode(), str_split() or preg_split() instead.
     |       | (WordPress.PHP.POSIXFunctions.split_split)
- 24 | ERROR | spliti() has been deprecated since PHP 5.3 and removed in PHP 7.0,
-    |       | please use explode(), str_split() or preg_split() instead.
-    |       | (WordPress.PHP.POSIXFunctions.split_spliti)
- 26 | ERROR | sql_regcase() has been deprecated since PHP 5.3 and removed in PHP
-    |       | 7.0, please use preg_match() instead.
+ 24 | ERROR | spliti() has been deprecated since PHP 5.3 and removed in PHP
+    |       | 7.0, please use explode(), str_split() or preg_split()
+    |       | instead. (WordPress.PHP.POSIXFunctions.split_spliti)
+ 26 | ERROR | sql_regcase() has been deprecated since PHP 5.3 and removed in
+    |       | PHP 7.0, please use preg_match() instead.
     |       | (WordPress.PHP.POSIXFunctions.ereg_sql_regcase)
 --------------------------------------------------------------------------------
-....
+...
 ```
 You'll see the line number and number of ERRORs we need to return in the `getErrorList()` method.
 
@@ -177,4 +173,4 @@ The `--sniffs=...` directive limits the output to the sniff you are testing.
 
 ## Code Standards for this project
 
-The sniffs and test files - not test _case_ files! - for WPCS should be written such that they pass the `WordPress-Extra` and the `WordPress-Docs` code standards using the custom ruleset as found in `/.phpcs.xml.dist`.
+The sniffs and test files - not test _case_ files! - for WordPressCS should be written such that they pass the `WordPress-Extra` and the `WordPress-Docs` code standards using the custom ruleset as found in `/.phpcs.xml.dist`.

From 71dc238e63617f060c81d6367ab45d2415e8e3db Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 17 Aug 2023 18:13:41 +0200
Subject: [PATCH 806/822] Docs: miscellaneous changes

Change `WPCS` to `WordPressCS` in miscellaneous files.
---
 .gitattributes                            | 2 +-
 .phpcs.xml.dist                           | 2 +-
 Tests/RulesetCheck/class-ruleset-test.inc | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 224ffba10a..3472eccbfa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 #
 # Exclude these files from release archives.
 # This will also make them unavailable when using Composer with `--prefer-dist`.
-# If you develop for WPCS using Composer, use `--prefer-source`.
+# If you develop for WordPressCS using Composer, use `--prefer-source`.
 # https://blog.madewithlove.be/post/gitattributes/
 #
 /.gitattributes     export-ignore
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 0bbcd4b7ab..af658a72a5 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -51,7 +51,7 @@
 		<!-- Linting is done in a separate CI job, no need to duplicate it. -->
 		<exclude name="Generic.PHP.Syntax"/>
 
-		<!-- WPCS still has a PHP 5.4 minimum. -->
+		<!-- WordPressCS still has a PHP 5.4 minimum. -->
 		<exclude name="Modernize.FunctionCalls.Dirname"/>
 	</rule>
 
diff --git a/Tests/RulesetCheck/class-ruleset-test.inc b/Tests/RulesetCheck/class-ruleset-test.inc
index 86cc3770cc..b674946ded 100644
--- a/Tests/RulesetCheck/class-ruleset-test.inc
+++ b/Tests/RulesetCheck/class-ruleset-test.inc
@@ -1,14 +1,14 @@
 <?php
 /**
- * Simple file which should not have any issues when testing against the WPCS rulesets.
+ * Simple file which should not have any issues when testing against the WordPressCS rulesets.
  *
  * Most - if not all - sniffs should be triggered by this file.
  *
  * Used to do a simple CI test on the rulesets.
  *
  * Currently covered - based on the rulesets as of July 24 2018:
- * - Every WPCS native sniff is triggered.
- * - Every WPCS + PHPCS sniff within the Core ruleset is triggered.
+ * - Every WordPressCS native sniff is triggered.
+ * - Every WordPressCS + PHPCS sniff within the Core ruleset is triggered.
  *
  * @package WPCS\WordPressCodingStandards
  */

From e36e0eada7955867e35a5ccd4857179985dd38b4 Mon Sep 17 00:00:00 2001
From: Juliette <663378+jrfnl@users.noreply.github.com>
Date: Mon, 21 Aug 2023 16:23:38 +0200
Subject: [PATCH 807/822] Changelog for WordPressCS 3.0.0 (#2368)

This changelog is based on going through every single PR merged in the WordPressCS 3.0.0 milestone.

The changelog includes only limited, high-level information about the internal changes. More detailed information about the changes to the internals have been included in the upgrade guide for developers/extenders.
This means that things like removing a method from a class which is now `final` has not been listed in the changelog (as the `final` keyword prevents extension anyway, so the method removal is not relevant for extenders).

In contrast to earlier changelogs, I have chosen to credit people who have contributed to the release with "Props" mentions.
Note: the "Props" have only been added for contributions from people outside of the WPCS team.
---
 CHANGELOG.md | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 389 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4019ff4b60..d2e0cb8c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,380 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 _No documentation available about unreleased changes as of yet._
 
+## [3.0.0] - 2023-08-21
+
+### Important information about this release:
+
+At long last... WordPressCS 3.0.0 is here.
+
+This is an important release which makes significant changes to improve the accuracy, performance, stability and maintainability of all sniffs, as well as making WordPressCS much better at handling modern PHP.
+
+WordPressCS 3.0.0 contains breaking changes, both for people using ignore annotations, people maintaining custom rulesets, as well as for sniff developers who maintain a custom PHPCS standard based on WordPressCS.
+
+If you are an end-user or maintain a custom WordPressCS based ruleset, please start by reading the [Upgrade Guide to WordPressCS 3.0.0 for end-users](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-end-users) which lists the most important changes and contains a step by step guide for upgrading.
+
+If you are a maintainer of an external standard based on WordPressCS and any of your custom sniffs are based on or extend WordPressCS sniffs, please read the [Upgrade Guide to WordPressCS 3.0.0 for Developers](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-Developers-of-external-standards).
+
+In all cases, please read the complete changelog carefully before you upgrade.
+
+
+### Added
+
+- Dependencies on the following packages: [PHPCSUtils](https://phpcsutils.com/), [PHPCSExtra](https://github.com/PHPCSStandards/PHPCSExtra) and the [Composer PHPCS plugin].
+- A best effort has been made to add support for the new PHP syntaxes/features to all WordPressCS native sniffs and utility functions (or to verify/improve existing support).
+    While support in external sniffs used by WordPressCS has not be exhaustively verified, a lot of work has been done to try and add support for new PHP syntaxes to those as well.
+    WordPressCS native sniffs and utilities have received fixes for the following syntaxes:
+    * PHP 7.2
+        - Keyed lists.
+    * PHP 7.3
+        - Flexible heredoc/nowdoc (providing the PHPCS scan is run on PHP 7.3 or higher).
+        - Trailing commas in function calls.
+    * PHP 7.4
+        - Arrow functions.
+        - Array unpacking in array expressions.
+        - Numeric literals with underscores.
+        - Typed properties.
+        - Null coalesce equals operator.
+    * PHP 8.0
+        - Nullsafe object operators.
+        - Match expressions.
+        - Named arguments in function calls.
+        - Attributes.
+        - Union types // including supporting the `false` and `null` types.
+        - Constructor property promotion.
+        - `$object::class`
+        - Throw as an expression.
+    * PHP 8.1
+        - Enumerations.
+        - Explicit octal notation.
+        - Final class constants
+        - First class callables.
+        - Intersection types.
+    * PHP 8.2
+        - Constants in traits.
+- New `WordPress.CodeAnalysis.AssignmentInTernaryCondition` sniff to the `WordPress-Core` ruleset which partially replaces the removed `WordPress.CodeAnalysis.AssignmentInCondition` sniff.
+- New `WordPress.WhiteSpace.ObjectOperatorSpacing` sniff which replaces the use of the `Squiz.WhiteSpace.ObjectOperatorSpacing` sniff in the `WordPress-Core` ruleset.
+- New `WordPress.WP.ClassNameCase` sniff to the `WordPress-Core` ruleset, to check that any class name references to WP native classes and classes from external dependencies use the case of the class as per the class declaration.
+- New `WordPress.WP.Capabilities` sniff to the `WordPress-Extra` ruleset. This sniff checks that valid capabilities are used, not roles or user levels. Props, amongst others, to [@grappler] and [@khacoder].
+    Custom capabilities can be added to the sniff via a `custom_capabilities` ruleset property.
+    The sniff also supports the `minimum_wp_version` property to allow the sniff to accurately determine how the use of deprecated capabilities should be flagged.
+- The `WordPress.WP.CapitalPDangit` sniff contains a new check to verify the correct spelling of `WordPress` in namespace names.
+- The `WordPress.WP.I18n` sniff contains a new `EmptyTextDomain` error code for an empty text string being passed as the text domain, which overrules the default value of the parameter and renders a text untranslatable.
+- The `WordPress.DB.PreparedSQLPlaceholders` sniff has been expanded with additional checks for the correct use of the `%i` placeholder, which was introduced in WP 6.2. Props [@craigfrancis].
+    The sniff now also supports the `minimum_wp_version` ruleset property to determine whether the `%i` placeholder can be used.
+- `WordPress-Core`: the following additional sniffs (or select error codes from these sniffs) have been added to the ruleset: `Generic.CodeAnalysis.AssignmentInCondition`, `Generic.CodeAnalysis.EmptyPHPStatement` (replaces the WordPressCS native sniff), `Generic.VersionControl.GitMergeConflict`, `Generic.WhiteSpace.IncrementDecrementSpacing`, `Generic.WhiteSpace.LanguageConstructSpacing`, `Generic.WhiteSpace.SpreadOperatorSpacingAfter`, `PSR2.Classes.ClassDeclaration`, `PSR2.Methods.FunctionClosingBrace`, `PSR12.Classes.ClassInstantiation`, `PSR12.Files.FileHeader` (select error codes only), `PSR12.Functions.NullableTypeDeclaration`, `PSR12.Functions.ReturnTypeDeclaration`, `PSR12.Traits.UseDeclaration`, `Squiz.Functions.MultiLineFunctionDeclaration` (replaces part of the `WordPress.WhiteSpace.ControlStructureSpacing` sniff), `Modernize.FunctionCalls.Dirname`, `NormalizedArrays.Arrays.ArrayBraceSpacing` (replaces part of the `WordPress.Arrays.ArrayDeclarationSpacing` sniff), `NormalizedArrays.Arrays.CommaAfterLast` (replaces the WordPressCS native sniff), `Universal.Classes.ModifierKeywordOrder`, `Universal.Classes.RequireAnonClassParentheses`, `Universal.Constants.LowercaseClassResolutionKeyword`, `Universal.Constants.ModifierKeywordOrder`, `Universal.Constants.UppercaseMagicConstants`, `Universal.Namespaces.DisallowCurlyBraceSyntax`, `Universal.Namespaces.DisallowDeclarationWithoutName`, `Universal.Namespaces.OneDeclarationPerFile`, `Universal.NamingConventions.NoReservedKeywordParameterNames`, `Universal.Operators.DisallowShortTernary` (replaces the WordPressCS native sniff), `Universal.Operators.DisallowStandalonePostIncrementDecrement`, `Universal.Operators.StrictComparisons` (replaces the WordPressCS native sniff), `Universal.Operators.TypeSeparatorSpacing`, `Universal.UseStatements.DisallowMixedGroupUse`, `Universal.UseStatements.KeywordSpacing`, `Universal.UseStatements.LowercaseFunctionConst`, `Universal.UseStatements.NoLeadingBackslash`, `Universal.UseStatements.NoUselessAliases`, `Universal.WhiteSpace.CommaSpacing`, `Universal.WhiteSpace.DisallowInlineTabs` (replaces the WordPressCS native sniff), `Universal.WhiteSpace.PrecisionAlignment` (replaces the WordPressCS native sniff), `Universal.WhiteSpace.AnonClassKeywordSpacing`.
+- `WordPress-Extra`: the following additional sniffs have been added to the ruleset: `Generic.CodeAnalysis.UnusedFunctionParameter`, `Universal.Arrays.DuplicateArrayKey`, `Universal.CodeAnalysis.ConstructorDestructorReturn`, `Universal.CodeAnalysis.ForeachUniqueAssignment`, `Universal.CodeAnalysis.NoEchoSprintf`, `Universal.CodeAnalysis.StaticInFinalClass`, `Universal.ControlStructures.DisallowLonelyIf`, `Universal.Files.SeparateFunctionsFromOO`.
+- `WordPress.Utils.I18nTextDomainFixer`: the `load_script_textdomain()` function to the functions the sniff looks for.
+- `WordPress.WP.AlternativeFunctions`: the following PHP native functions have been added to the sniff and will now be flagged when used: `unlink()` (in a new `unlink` group) , `rename()` (in a new `rename` group), `chgrp()`, `chmod()`, `chown()`, `is_writable()` `is_writeable()`, `mkdir()`, `rmdir()`, `touch()`, `fputs()` (in the existing `file_system_operations` group, which was previously named `file_system_read`). Props [@sandeshjangam] and [@JDGrimes].
+- The `PHPUnit_Adapter_TestCase` class to the list of "known test (case) classes".
+- The `antispambot()` function to the list of known "formatting" functions.
+- The `esc_xml()` and `wp_kses_one_attr()` functions to the list of known "escaping" functions.
+- The `wp_timezone_choice()` and `wp_readonly()` functions to the list of known "auto escaping" functions.
+- The `sanitize_url()` and `wp_kses_one_attr()` functions to the list of known "sanitizing" functions.
+- Metrics for blank lines at the start/end of a control structure body to the `WordPress.WhiteSpace.ControlStructureSpacing` sniff. These can be displayed using `--report=info` when the `blank_line_check` property has been set to `true`.
+- End-user documentation to the following new and pre-existing sniffs: `WordPress.DateTime.RestrictedFunctions`, `WordPress.NamingConventions.PrefixAllGlobals` (props [@Ipstenu]), `WordPress.PHP.StrictInArray` (props [@marconmartins]), `WordPress.PHP.YodaConditions` (props [@Ipstenu]), `WordPress.WhiteSpace.ControlStructureSpacing` (props [@ckanitz]), `WordPress.WhiteSpace.ObjectOperatorSpacing`, `WordPress.WhiteSpace.OperatorSpacing` (props [@ckanitz]), `WordPress.WP.CapitalPDangit` (props [@NielsdeBlaauw]), `WordPress.WP.Capabilities`, `WordPress.WP.ClassNameCase`, `WordPress.WP.EnqueueResourceParameters` (props [@NielsdeBlaauw]).
+    This documentation can be exposed via the [`PHP_CodeSniffer` `--generator=...` command-line argument](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage).
+    Note: all sniffs which have been added from PHPCSExtra (Universal, Modernize, NormalizedArrays sniffs) are also fully documented.
+
+#### Added (internal/dev-only)
+- New Helper classes:
+    - `ArrayWalkingFunctionsHelper`
+    - `ConstantsHelper` *
+    - `ContextHelper` *
+    - `DeprecationHelper` *
+    - `FormattingFunctionsHelper`
+    - `ListHelper` *
+    - `RulesetPropertyHelper` *
+    - `SnakeCaseHelper` *
+    - `UnslashingFunctionsHelper`
+    - `ValidationHelper`
+    - `VariableHelper` *
+    - `WPGlobalVariablesHelper`
+    - `WPHookHelper`
+- New Helper traits:
+    - `EscapingFunctionsTrait`
+    - `IsUnitTestTrait`
+    - `MinimumWPVersionTrait`
+    - `PrintingFunctionsTrait`
+    - `SanitizationHelperTrait` *
+    - `WPDBTrait`
+
+These classes and traits mostly contain pre-existing functionality moved from the `Sniff` class.
+The classes marked with an `*` are considered _internal_ and do not have any promise of future backward compatibility.
+
+More information is available in the [Upgrade Guide to WordPressCS 3.0.0 for Developers](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-Developers-of-external-standards).
+
+
+### Changed
+
+- As of this version, installation via Composer is the only supported manner of installation.
+    Installing in a different manner (git clone/PEAR/PHAR) is still possible, but no longer supported.
+- The minimum required `PHP_CodeSniffer` version to 3.7.2 (was 3.3.1).
+- Composer: the package will now identify itself as a static analysis tool.
+- The PHP `filter`, `libxml` and `XMLReader` extensions are now explicitly required.
+    It is recommended to also have the `Mbstring` and `iconv` extensions enabled for the most accurate results.
+- The release branch has been renamed from `master` to `main`.
+- The following sniffs have been moved from `WordPress-Extra` to `WordPress-Core`: the `Generic.Files.OneObjectStructurePerFile` (also changed from `warning` to `error`),
+ `Generic.PHP.BacktickOperator`, `PEAR.Files.IncludingFile`, `PSR2.Classes.PropertyDeclaration`, `PSR2.Methods.MethodDeclaration`, `Squiz.Scope.MethodScope`, `Squiz.WhiteSpace.ScopeKeywordSpacing` sniffs. Props, amongst others, to [@desrosj].
+- `WordPress-Core`: The `Generic.Arrays.DisallowShortArraySyntax` sniff has been replaced by the `Universal.Arrays.DisallowShortArraySyntax` sniff.
+    The new sniff will recognize short lists correctly and ignore them.
+- `WordPress-Core`: The `Generic.Files.EndFileNewline` sniff has been replaced by the more comprehensive `PSR2.Files.EndFileNewline` sniff.
+- A number of sniffs support setting the minimum WP version for the code being scanned.
+    This could be done in two different ways:
+	1. By setting the `minimum_supported_version` property for each sniff from a ruleset.
+	2. By passing `--runtime-set minimum_supported_wp_version #.#` on the command line.
+	The names of the property and the CLI setting have now been aligned to both use `minimum_wp_version` as the name.
+	Both ways of passing the value are still supported.
+- `WordPress.NamingConventions.PrefixAllGlobals`: the `custom_test_class_whitelist` property has been renamed to `custom_test_classes`.
+- `WordPress.NamingConventions.ValidVariableName`: the `customPropertiesWhitelist` property has been renamed to `allowed_custom_properties`.
+- `WordPress.PHP.NoSilencedErrors`: the `custom_whitelist` property has been renamed to `customAllowedFunctionsList`.
+- `WordPress.PHP.NoSilencedErrors`: the `use_default_whitelist` property has been renamed to `usePHPFunctionsList`.
+- `WordPress.WP.GlobalVariablesOverride`: the `custom_test_class_whitelist` property has been renamed to `custom_test_classes`.
+- Sniffs are now able to handle fully qualified names for custom test classes provided via a `custom_test_classes` (previously `custom_test_class_whitelist`) ruleset property.
+- The default value for `minimum_supported_wp_version`, as used by a [number of sniffs detecting usage of deprecated WP features](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#minimum-wp-version-to-check-for-usage-of-deprecated-functions-classes-and-function-parameters), has been updated to `6.0`.
+- `WordPress.NamingConventions.PrefixAllGlobals` now takes new pluggable constants into account as introduced in WordPress up to WP 6.3.
+- `WordPress.NamingConventions.ValidPostTypeSlug` now takes new reserved post types into account as introduced in WordPress up to WP 6.3.
+- `WordPress.WP.DeprecatedClasses` now detects classes deprecated in WordPress up to WP 6.3.
+- `WordPress.WP.DeprecatedFunctions` now detects functions deprecated in WordPress up to WP 6.3.
+- `WordPress.WP.DeprecatedParameters` now detects parameters deprecated in WordPress up to WP 6.3.
+- `WordPress.WP.DeprecatedParameterValues` now detects parameter values deprecated in WordPress up to WP 6.3.
+- `WordPress.Utils.I18nTextDomainFixer`: the lists of recognized plugin and theme header tags has been updated based on the current information in the plugin and theme handbooks.
+- `WordPress.WP.AlternativeFunctions`: the "group" name `file_system_read`, which can be used with the `exclude` property, has been renamed to `file_system_operations`.
+    This also means that the error codes for individual functions flagged via that group have changed from `WordPress.WP.AlternativeFunctions.file_system_read_*` to `WordPress.WP.AlternativeFunctions.file_system_operations_*`.
+- `WordPress.WP.CapitalPDangit`: the `Misspelled` error code has been split into two error codes - `MisspelledInText` and `MisspelledInComment` - to allow for more modular exclusions/selectively turning off the auto-fixer for the sniff.
+- `WordPress.WP.I18n` no longer throws both the `MissingSingularPlaceholder` and the `MismatchedPlaceholders` for the same code, as the errors have an overlap.
+- `WordPress-Core`: previously only the spacing around commas in arrays, function declarations and function calls was checked. Now, the spacing around commas will be checked in all contexts.
+- `WordPress.Arrays.ArrayKeySpacingRestrictions`: a new `SpacesBetweenBrackets` error code has been introduced for the spacing between square brackets for array assignments without key. Previously, this would throw a `NoSpacesAroundArrayKeys` error with an unclear error message.
+- `WordPress.Files.FileName` now recognizes more word separators, meaning that files using other word separators than underscores will now be flagged for not using hyphenation.
+- `WordPress.Files.FileName` now checks if a file contains a test class and if so, will bow out.
+    This change was made to prevent issues with PHPUnit 9.1+, which strongly prefers PSR4-style file names.
+    Whether something is test class or not is based on a pre-defined list of "known" test case classes which can be extended and, optionally, a list of user provided test case classes provided via setting the `custom_test_classes` property in a custom ruleset or the complete test directory can be excluded via a custom ruleset.
+- `WordPress.NamingConventions.PrefixAllGlobals` now allows for pluggable functions and classes, which should not be prefixed when "plugged".
+- `WordPress.PHP.NoSilencedErrors`: the metric, which displays in the `info` report, has been renamed from "whitelisted function call" to "silencing allowed function call".
+- `WordPress.Security.EscapeOutput` now flags the use of `get_search_query( false )` when generating output (as the `false` turns off the escaping).
+- `WordPress.Security.EscapeOutput` now also examines parameters passed for exception creation in `throw` statements and expressions for correct escaping.
+- `WordPress.Security.ValidatedSanitizedInput` now examines _all_ superglobal (except for `$GLOBALS`). Previously, the `$_SESSION` and `$_ENV` superglobals would not be flagged as needing validation/sanitization.
+- `WordPress.WP.I18n` now recognizes the new PHP 8.0+ `h` and `H` type specifiers.
+- `WordPress.WP.PostsPerPage` has improved recognition for numbers prefixed with a unary operator and non-decimal numbers.
+- `WordPress.DB.PreparedSQL` will identify more precisely the code which is problematic.
+- `WordPress.DB.PreparedSQLPlaceholders` will identify more precisely the code which is problematic.
+- `WordPress.DB.SlowDBQuery` will identify more precisely the code which is problematic.
+- `WordPress.Security.PluginMenuSlug`: the error will now be thrown more precisely on the code which triggered the error. Depending on code layout, this may mean that an error will now be thrown on a different line.
+- `WordPress.WP.DiscouragedConstants`: the error will now be thrown more precisely on the code which triggered the error. Depending on code layout, this may mean that an error will now be thrown on a different line.
+- `WordPress.WP.EnqueuedResourceParameters`: the error will now be thrown more precisely on the code which triggered the error. Depending on code layout, this may mean that an error will now be thrown on a different line.
+- `WordPress.WP.I18n`: the errors will now be thrown more precisely on the code which triggered the error. Depending on code layout, this may mean that an error will now be thrown on a different line.
+- `WordPress.WP.PostsPerPage` will identify more precisely the code which is problematic.
+- `WordPress.PHP.TypeCasts.UnsetFound` has been changed from a `warning` to an `error` as the `(unset)` cast is no longer available in PHP 8.0 and higher.
+- `WordPress.WP.EnqueuedResourceParameters.MissingVersion` has been changed from an `error` to a `warning`.
+- `WordPress.Arrays.ArrayKeySpacingRestrictions`: improved the clarity of the error messages for the `TooMuchSpaceBeforeKey` and `TooMuchSpaceAfterKey` error codes.
+- `WordPress.CodeAnalysis.EscapedNotTranslated`: improved the clarity of the error message.
+- `WordPress.PHP.IniSet`: improved the clarity of the error messages for the sniff.
+- `WordPress.PHP.PregQuoteDelimiter`: improved the clarity of the error message for the `Missing` error code.
+- `WordPress.PHP.RestrictedFunctions`: improved the clarity of the error messages for the sniff.
+- `WordPress.PHP.RestrictedPHPFunctions`: improved the error message for the `create_function_create_function` error code.
+- `WordPress.PHP.TypeCast`: improved the clarity of the error message for the `UnsetFound` error code. It will no longer advise assigning `null`.
+- `WordPress.Security.SafeRedirect`: improved the clarity of the error message. (very minor)
+- `WordPress.Security.ValidatedSanitizedInput`: improved the clarity of the error messages for the `MissingUnslash` error code.
+- `WordPress.WhiteSpace.CastStructureSpacing`: improved the clarity of the error message for the `NoSpaceBeforeOpenParenthesis` error code.
+- `WordPress.WP.I18n`: improved the clarity of the error messages for the sniff.
+- `WordPress.WP.I18n`: the error messages will now use the correct parameter name.
+- The error messages for the `WordPress.CodeAnalysis.EscapedNotTranslated`, `WordPress.NamingConventions.PrefixAllGlobals`, `WordPress.NamingConventions.ValidPostTypeSlug`, `WordPress.PHP.IniSet`, and the `WordPress.PHP.NoSilencedErrors` sniff will now display the code sample found without comments and extranuous whitespace.
+- Various updates to the README, the example ruleset and other documentation. Props, amongst others, to [@Luc45], [@slaFFik].
+- Continuous Integration checks are now run via GitHub Actions. Props [@desrosj].
+- Various other CI/QA improvements.
+- Code coverage will now be monitored via [CodeCov](https://app.codecov.io/gh/WordPress/WordPress-Coding-Standards).
+- All sniffs are now also being tested against PHP 8.0, 8.1, 8.2 and 8.3 for consistent sniff results.
+
+#### Changed (internal/dev-only)
+- All non-abstract classes in WordPressCS are now `final` with the exception of the following four classes which are known to be extended by external PHPCS standards build on top of WordPressCS: `WordPress.NamingConventions.ValidHookName`, `WordPress.Security.EscapeOutput`,`WordPress.Security.NonceVerification`, `WordPress.Security.ValidatedSanitizedInput`.
+- Most remaining utility properties and methods, previously contained in the `WordPressCS\WordPress\Sniff` class, have been moved to dedicated Helper classes and traits or, in some cases, to the sniff class using them.
+    As this change is only relevant for extenders, the full details of these moves are not included in this changelog, but can be found in the [Developers Upgrade Guide to WordPressCS 3.0.0](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-Developers-of-external-standards)
+- A few customizable `public` properties, which were used by multiple sniffs, have been moved from `*Sniff` classes to traits. Again, the full details of these moves are not included in this changelog, but can be found in the [Developers Upgrade Guide to WordPressCS 3.0.0](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-Developers-of-external-standards)
+- A number of non-public properties in sniffs have been renamed.
+    As this change is only relevant for extenders, the full details of these renames are not included in this changelog, but can be found in the [Developers Upgrade Guide to WordPressCS 3.0.0](https://github.com/WordPress/WordPress-Coding-Standards/wiki/Upgrade-Guide-to-WordPressCS-3.0.0-for-Developers-of-external-standards)
+- `AbstractFunctionRestrictionsSniff`: The `whitelist` key in the `$groups` array property has been renamed to `allow`.
+- The `WordPress.NamingConventions.ValidFunctionName` sniff no longer extends the similar PHPCS native `PEAR` sniff.
+
+
+### Removed
+
+- Support for the deprecated, old-style WordPressCS native ignore annotations. Use the PHPCS native selective ignore annotations instead.
+- The following WordPressCS native sniffs have been removed:
+    - The `WordPress.Arrays.CommaAfterArrayItem` sniff (replaced by the `NormalizedArrays.Arrays.CommaAfterLast` and the `Universal.WhiteSpace.CommaSpacing` sniffs).
+    - The `WordPress.Classes.ClassInstantiation` sniff (replaced by the `PSR12.Classes.ClassInstantiation`, `Universal.Classes.RequireAnonClassParentheses` and `Universal.WhiteSpace.AnonClassKeywordSpacing` sniffs).
+    - The `WordPress.CodeAnalysis.AssignmentInCondition` sniff (replaced by the `Generic.CodeAnalysis.AssignmentInCondition` and the `WordPress.CodeAnalysis.AssignmentInTernaryCondition` sniffs).
+    - The `WordPress.CodeAnalysis.EmptyStatement` sniff (replaced by the `Generic.CodeAnalysis.EmptyPHPStatement` sniff).
+    - The `WordPress.PHP.DisallowShortTernary` sniff (replaced by the `Universal.Operators.DisallowShortTernary` sniff).
+    - The `WordPress.PHP.StrictComparisons` sniff (replaced by the `Universal.Operators.StrictComparisons` sniff).
+    - The `WordPress.WhiteSpace.DisallowInlineTabs` sniff (replaced by the `Universal.WhiteSpace.DisallowInlineTabs` sniff).
+    - The `WordPress.WhiteSpace.PrecisionAlignment` sniff (replaced by the `Universal.WhiteSpace.PrecisionAlignment` sniff).
+    - The `WordPress.WP.TimezoneChange` sniff (replaced by the `WordPress.DateTime.RestrictedFunctions` sniff). This sniff was previously already deprecated.
+- `WordPress-Extra`: The `Squiz.WhiteSpace.LanguageConstructSpacing` sniff (replaced by the added, more comprehensive `Generic.WhiteSpace.LanguageConstructSpacing` sniff in the `WordPress-Core` ruleset).
+- `WordPress.Arrays.ArrayDeclarationSpacing`: array brace spacing checks (replaced by the `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff).
+- `WordPress.WhiteSpace.ControlStructureSpacing`: checks for the spacing for function declarations (replaced by the `Squiz.Functions.MultiLineFunctionDeclaration` sniff).
+    Includes removal of the `spaces_before_closure_open_paren` property for this sniff.
+- `WordPress.WP.I18n`: the `check_translator_comments` property.
+    Exclude the `WordPress.WP.I18n.MissingTranslatorsComment` and the `WordPress.WP.I18n.TranslatorsCommentWrongStyle` error codes instead.
+- WordPressCS will no longer check for assigning the return value of an object instantiation by reference.
+    This is a PHP parse error since PHP 7.0. Use the `PHPCompatibilityWP` standard to check for PHP cross-version compatibility issues.
+- The check for object instantiations will no longer check JavaScript files.
+- The `WordPress.Arrays.ArrayKeySpacingRestrictions.MissingBracketCloser` error code as sniffs should not report on parse errors.
+- The `WordPress.CodeAnalysis.AssignmentIn[Ternary]Condition.NonVariableAssignmentFound` error code as sniffs should not report on parse errors.
+- The `Block_Supported_Styles_Test` class will no longer incorrectly be recognized as an extendable test case class.
+
+#### Removed (internal/dev-only)
+- `AbstractArrayAssignmentRestrictionsSniff`: support for the optional `'callback'` key in the array returned by `getGroups()`.
+- `WordPressCS\WordPress\PHPCSHelper` class (use the `PHPCSUtils\BackCompat\Helper` class instead).
+- `WordPressCS\WordPress\Sniff::addMessage()` method (use the `PHPCSUtils\Utils\MessageHelper::addMessage()` method instead).
+- `WordPressCS\WordPress\Sniff::addFixableMessage()` method (use the `PHPCSUtils\Utils\MessageHelper::addFixableMessage()` method instead).
+- `WordPressCS\WordPress\Sniff::determine_namespace()` method (use the `PHPCSUtils\Utils\Namespaces::determineNamespace()` method instead).
+- `WordPressCS\WordPress\Sniff::does_function_call_have_parameters()` method (use the `PHPCSUtils\Utils\PassedParameters::hasParameters()` method instead).
+- `WordPressCS\WordPress\Sniff::find_array_open_close()` method (use the `PHPCSUtils\Utils\Arrays::getOpenClose()` method instead).
+- `WordPressCS\WordPress\Sniff::find_list_open_close()` method (use the `PHPCSUtils\Utils\Lists::getOpenClose()` method instead).
+- `WordPressCS\WordPress\Sniff::get_declared_namespace_name()` method (use the `PHPCSUtils\Utils\Namespaces::getDeclaredName()` method instead).
+- `WordPressCS\WordPress\Sniff::get_function_call_parameter_count()` method (use the `PHPCSUtils\Utils\PassedParameters::getParameterCount()` method instead).
+- `WordPressCS\WordPress\Sniff::get_function_call_parameters()` method (use the `PHPCSUtils\Utils\PassedParameters::getParameters()` method instead).
+- `WordPressCS\WordPress\Sniff::get_function_call_parameter()` method (use the `PHPCSUtils\Utils\PassedParameters::getParameter()` method instead).
+- `WordPressCS\WordPress\Sniff::get_interpolated_variables()` method (use the `PHPCSUtils\Utils\TextStrings::getEmbeds()` method instead).
+- `WordPressCS\WordPress\Sniff::get_last_ptr_on_line()` method (no replacement available at this time).
+- `WordPressCS\WordPress\Sniff::get_use_type()` method (use the `PHPCSUtils\Utils\UseStatements::getType()` method instead).
+- `WordPressCS\WordPress\Sniff::has_whitelist_comment()` method (no replacement).
+- `WordPressCS\WordPress\Sniff::$hookFunctions` property (no replacement available at this time).
+- `WordPressCS\WordPress\Sniff::init()` method (no replacement).
+- `WordPressCS\WordPress\Sniff::is_class_constant()` method (use the `PHPCSUtils\Utils\Scopes::isOOConstant()` method instead).
+- `WordPressCS\WordPress\Sniff::is_class_property()` method (use the `PHPCSUtils\Utils\Scopes::isOOProperty()` method instead).
+- `WordPressCS\WordPress\Sniff::is_foreach_as()` method (use the `PHPCSUtils\Utils\Context::inForeachCondition()` method instead).
+- `WordPressCS\WordPress\Sniff::is_short_list()` method (depending on your needs, use the `PHPCSUtils\Utils\Lists::isShortList()` or the `PHPCSUtils\Utils\Arrays::isShortArray()` method instead).
+- `WordPressCS\WordPress\Sniff::is_token_in_test_method()` method (no replacement available at this time).
+- `WordPressCS\WordPress\Sniff::REGEX_COMPLEX_VARS` constant (use the PHPCSUtils `PHPCSUtils\Utils\TextStrings::stripEmbeds()` and `PHPCSUtils\Utils\TextStrings::getEmbeds()` methods instead).
+- `WordPressCS\WordPress\Sniff::string_to_errorcode()` method (use the `PHPCSUtils\Utils\MessageHelper::stringToErrorcode()` method instead).
+- `WordPressCS\WordPress\Sniff::strip_interpolated_variables()` method (use the `PHPCSUtils\Utils\TextStrings::stripEmbeds()` method instead).
+- `WordPressCS\WordPress\Sniff::strip_quotes()` method (use the `PHPCSUtils\Utils\TextStrings::stripQuotes()` method instead).
+- `WordPressCS\WordPress\Sniff::valid_direct_scope()` method (use the `PHPCSUtils\Utils\Scopes::validDirectScope()` method instead).
+- Unused dev-only files in the (now removed) `bin` directory.
+
+
+### Fixed
+
+- All sniffs which, in one way or another, check whether code represents a short list or a short array will now do so more accurately.
+    This fixes various false positives and false negatives.
+- Sniffs supporting the `minimum_wp_version` property (previously `minimum_supported_version`) will no longer throw a "passing null to non-nullable" deprecation notice on PHP 8.1+.
+- `WordPress.WhiteSpace.ControlStructureSpacing` no longer throws a `TypeError` on PHP 8.0+.
+- `WordPress.NamingConventions.PrefixAllGlobals`no longer throws a "passing null to non-nullable" deprecation notice on PHP 8.1+.
+- `WordPress.WP.I18n` no longer throws a "passing null to non-nullable" deprecation notice on PHP 8.1+.
+- `VariableHelper::is_comparison()` (previously `Sniff::is_comparison()`): fixed risk of undefined array key notice when scanning code containing parse errors.
+- `AbstractArrayAssignmentRestrictionsSniff` could previously get confused when it encountered comments in unexpected places.
+    This fix has a positive impact on all sniffs which are based on this abstract (2 sniffs).
+- `AbstractArrayAssignmentRestrictionsSniff` no longer examines numeric string keys as PHP treats those as integer keys, which were never intended as the target of this abstract.
+    This fix has a positive impact on all sniffs which are based on this abstract (2 sniffs).
+- `AbstractArrayAssignmentRestrictionsSniff` in case of duplicate entries, the sniff will now only examine the last value, as that's the value PHP will see.
+    This fix has a positive impact on all sniffs which are based on this abstract (2 sniffs).
+- `AbstractArrayAssignmentRestrictionsSniff` now determines the assigned value with higher accuracy.
+    This fix has a positive impact on all sniffs which are based on this abstract (2 sniffs).
+- `AbstractClassRestrictionsSniff` now treats the `namespace` keyword when used as an operator case-insensitively.
+    This fix has a positive impact on all sniffs which are based on this abstract (3 sniffs).
+- `AbstractClassRestrictionsSniff` now treats the hierarchy keywords (`self`, `parent`, `static`) case-insensitively.
+    This fix has a positive impact on all sniffs which are based on this abstract (3 sniffs).
+- `AbstractClassRestrictionsSniff` now limits itself correctly when trying to find a class name before a `::`.
+    This fix has a positive impact on all sniffs which are based on this abstract (3 sniffs).
+- `AbstractClassRestrictionsSniff`: false negatives on class instantiation statements ending on a PHP close tag.
+    This fix has a positive impact on all sniffs which are based on this abstract (3 sniffs).
+- `AbstractClassRestrictionsSniff`: false negatives on class instantiation statements combined with method chaining.
+    This fix has a positive impact on all sniffs which are based on this abstract (3 sniffs).
+- `AbstractFunctionRestrictionsSniff`: false positives on function declarations when the function returns by reference.
+    This fix has a positive impact on all sniffs which are based on this abstract (nearly half of the WordPressCS sniffs).
+- `AbstractFunctionRestrictionsSniff`: false positives on instantiation of a class with the same name as a targetted function.
+    This fix has a positive impact on all sniffs which are based on this abstract (nearly half of the WordPressCS sniffs).
+- `AbstractFunctionRestrictionsSniff` now respects that function names in PHP are case-insensitive in more places.
+    This fix has a positive impact on all sniffs which are based on this abstract (nearly half of the WordPressCS sniffs).
+- Various utility methods in Helper classes/traits have received fixes to correctly treat function and class names as case-insensitive.
+    These fixes have a positive impact on all sniffs using these methods.
+- Version comparisons done by sniffs supporting the `minimum_wp_version` property (previously `minimum_supported_version`) will now be more precise.
+- `WordPress.Arrays.ArrayIndentation` now ignores indentation issues for array items which are not the first thing on a line. This fixes a potential fixer conflict.
+- `WordPress.Arrays.ArrayKeySpacingRestrictions`: signed positive integer keys will now be treated the same as signed negative integer keys.
+- `WordPress.Arrays.ArrayKeySpacingRestrictions`: keys consisting of calculations will now be recognized more accurately.
+- `WordPress.Arrays.ArrayKeySpacingRestrictions.NoSpacesAroundArrayKeys`: now has better protection in case of a fixer conflict.
+- `WordPress.Classes.ClassInstantiation` could create parse errors when fixing a class instantiation using variable variables. This has been fixed by replacing the sniff with the `PSR12.Classes.ClassInstantiation` sniff (and some others).
+- `WordPress.DB.DirectDatabaseQuery` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.DB.DirectDatabaseQuery` now respects that function (method) names in PHP are case-insensitive.
+- `WordPress.DB.DirectDatabaseQuery` now only looks at the current statement to find a method call to the `$wpdb` object.
+- `WordPress.DB.DirectDatabaseQuery` no longer warns about `TRUNCATE` queries as those cannot be cached and need a direct database query.
+- `WordPress.DB.PreparedSQL` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.DB.PreparedSQL` now respects that function names in PHP are case-insensitive.
+- `WordPress.DB.PreparedSQL` improved recognition of interpolated variables and expressions in the `$text` argument. This fixes both some false negatives as well as some false positives.
+- `WordPress.DB.PreparedSQL` stricter recognition of the `$wpdb` variable in double quoted query strings.
+- `WordPress.DB.PreparedSQL` false positive for floating point numbers concatenated into an SQL query.
+- `WordPress.DB.PreparedSQLPlaceholders` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.DB.PreparedSQLPlaceholders` now respects that function names in PHP are case-insensitive.
+- `WordPress.DB.PreparedSQLPlaceholders` stricter recognition of the `$wpdb` variable in double quotes query strings.
+- `WordPress.DB.PreparedSQLPlaceholders` false positive when a fully qualified function call is encountered in an `implode( ', ', array_fill(...))` pattern.
+- `WordPress.Files.FileName` no longer presumes a three character file extension.
+- `WordPress.NamingConventions.PrefixAllGlobals` could previously get confused when it encountered comments in unexpected places in function calls which were being examined.
+- `WordPress.NamingConventions.PrefixAllGlobals` now respects that function names in PHP are case-insensitive when checking whether a function declaration is polyfilling a PHP native function.
+- `WordPress.NamingConventions.PrefixAllGlobals` improved false positive prevention for variable assignments via keyed lists.
+- `WordPress.NamingConventions.PrefixAllGlobals` now only looks at the current statement when determining which variables were imported via a `global` statement. This prevents both false positives as well as false negatives.
+- `WordPress.NamingConventions.PrefixAllGlobals` no longer gets confused over `global` statements in nested clsure/function declarations.
+- `WordPress.NamingConventions.ValidFunctionName` now also checks the names of (global) functions when the declaration is nested within an OO method.
+- `WordPress.NamingConventions.ValidFunctionName` no longer throws false positives for triple underscore methods.
+- `WordPress.NamingConventions.ValidFunctionName` the suggested replacement names in the error message no longer remove underscores from a name in case of leading or trailing underscores, or multiple underscores in the middle of a name.
+- `WordPress.NamingConventions.ValidFunctionName` the determination whether a name is in `snake_case` is now more accurate and has improved handling of non-ascii characters.
+- `WordPress.NamingConventions.ValidFunctionName` now correctly recognizes a PHP4-style constructor when the class and the constructor method name contains non-ascii characters.
+- `WordPress.NamingConventions.ValidHookName` no longer throws false positives when the hook name is generated via a function call and that function is passed string literals as parameters.
+- `WordPress.NamingConventions.ValidHookName` now ignores parameters in a variable function call (like a call to a closure).
+- `WordPress.NamingConventions.ValidPostTypeSlug` no longer throws false positives for interpolated text strings with complex embedded variables/expressions.
+- `WordPress.NamingConventions.ValidVariableName` the suggested replacement names in the error message will no longer remove underscores from a name in case of leading or trailing underscores, or multiple underscores in the middle of a name.
+- `WordPress.NamingConventions.ValidVariableName` the determination whether a name is in `snake_case` is now more accurate and has improved handling of non-ascii characters.
+- `WordPress.NamingConventions.ValidVariableName` now examines all variables and variables in expressions in a text string containing interpolation.
+- `WordPress.NamingConventions.ValidVariableName` now has improved recognition of variables in complex embedded variables/expressions in interpolated text strings.
+- `WordPress.PHP.IniSet` no longer gets confused over comments in the code when determining whether the ini value is an allowed one.
+- `WordPress.PHP.NoSilencedErrors` no longer throws an error when error silencing is encountered for function calls to the PHP native `libxml_disable_entity_loader()` and `imagecreatefromwebp()` methods.
+- `WordPress.PHP.StrictInArray` no longer gets confused over comments in the code when determining whether the `$strict` parameter is used.
+- `WordPress.Security.EscapeOutput` no longer throws a false positive on function calls where the parameters need escaping, when no parameters are being passed.
+- `WordPress.Security.EscapeOutput` no longer throws a false positive when a fully qualified function call to the `\basename()` function is encountered within a call to `_deprecated_file()`.
+- `WordPress.Security.EscapeOutput` could previously get confused when it encountered comments in the `$file` parameter for `_deprecated_file()`.
+- `WordPress.Security.EscapeOutput` now ignores significantly more operators which should yield more accurate results.
+- `WordPress.Security.EscapeOutput` now respects that function names in PHP are case-insensitive when checking whether a printing function is being used.
+- `WordPress.Security.EscapeOutput` no longer throws an `Internal.Exception` when it encounters a constant or property mirroring the name of one of the printing functions being targetted, nor will it throw false positives for those.
+- `WordPress.Security.EscapeOutput` no longer incorrectly handles method calls or calls to namespaced functions mirroring the name of one of the printing functions being targetted.
+- `WordPress.Security.EscapeOutput` now ignores `exit`/`die` statements without a status being passed, preventing false positives on code after the statement.
+- `WordPress.Security.EscapeOutput` now has improved recognition that `print` can also be used as an expression, not only as a statement.
+- `WordPress.Security.EscapeOutput` now has much, much, much more accurate handling of code involving ternary expressions and should now correctly ignore the ternary condition in all long ternaries being examined.
+- `WordPress.Security.EscapeOutput` no longer disregards the ternary condition in a short ternary.
+- `WordPress.Security.EscapeOutput` no longer skips over a constant or property mirroring the name of one of the (auto-)escaping/formatting functions being targeted.
+- `WordPress.Security.EscapeOutput` no longer throws false positives for `*::class`, which will always evaluate to a plain string.
+- `WordPress.Security.EscapeOutput` no longer throws false positives on output generating keywords encountered in an inline expression.
+- `WordPress.Security.EscapeOutput` no longer throws false positives on parameters passed to `_e()` or `_ex()`, which won't be used in the output.
+- `WordPress.Security.EscapeOutput` no longer throws false positives on heredocs not using interpolation.
+- `WordPress.Security.NonceVerification` now respects that function names in PHP are case-insensitive when checking whether an array comparison function is being used.
+- `WordPress.Security.NonceVerification` now also checks for nonce verification when the `$_FILES` superglobal is being used.
+- `WordPress.Security.NonceVerification` now ignores properties named after superglobals.
+- `WordPress.Security.NonceVerification` now ignores list assignments to superglobals.
+- `WordPress.Security.NonceVerification` now ignores superglobals being unset.
+- `WordPress.Security.ValidatedSanitizedInput` now respects that function names in PHP are case-insensitive when checking whether an array comparison function is being used.
+- `WordPress.Security.ValidatedSanitizedInput` now respects that function names in PHP are case-insensitive when checking whether a variable is being validated using `[array_]key_exists()`.
+- `WordPress.Security.ValidatedSanitizedInput` improved recognition of interpolated variables and expression in the text strings. This fixes some false negatives.
+- `WordPress.Security.ValidatedSanitizedInput` no longer incorrectly regards an `unset()` as variable validation.
+- `WordPress.Security.ValidatedSanitizedInput` no longer incorrectly regards validation in a nested scope as validation which applies to the superglobal being examined.
+- `WordPress.WP.AlternativeFunctions` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.WP.AlternativeFunctions` now correctly takes the `minimum_wp_version` into account when determining whether a call to `parse_url()` could switch over to using `wp_parse_url()`.
+- `WordPress.WP.CapitalPDangit` now skips (keyed) list assignments to prevent false positives.
+- `WordPress.WP.CapitalPDangit` now always skips all array keys, not just plain text array keys.
+- `WordPress.WP.CronInterval` no longer throws a `ChangeDetected` warning for interval calculations wrapped in parentheses, but for which the value for the interval is otherwise known.
+- `WordPress.WP.CronInterval` no longer throws a `ChangeDetected` warning for interval calculations using fully qualified WP native time constants, but for which the value for the interval is otherwise known.
+- `WordPress.WP.DeprecatedParameters` no longer throws a false positive for function calls to `comments_number()` using the fourth parameter (which was deprecated, but has been repurposed since WP 5.4).
+- `WordPress.WP.DeprecatedParameters` now looks for the correct parameter in calls to the `unregister_setting()` function.
+- `WordPress.WP.DeprecatedParameters` now lists the correct WP version for the deprecation of the third parameter in function calls to `get_user_option()`.
+- `WordPress.WP.DiscouragedConstants` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.WP.EnqueuedResources` now recognizes enqueuing in a multi-line text string correctly.
+- `WordPress.WP.EnqueuedResourceParameters` could previously get confused when it encountered comments in unexpected places.
+- `WordPress.WP.GlobalVariablesOverride` improved false positive prevention for variable assignments via keyed lists.
+- `WordPress.WP.GlobalVariablesOverride` now only looks at the current statement when determining which variables were imported via a `global` statement. This prevents both false positives as well as false negatives.
+- `WordPress.WP.I18n` improved recognition of interpolated variables and expression in the `$text` argument. This fixes some false negatives.
+- `WordPress.WP.I18n` no longer potentially creates parse errors when auto-fixing an `UnorderedPlaceholders*` error involving a multi-line text string.
+- `WordPress.WP.I18n` no longer throws false positives for compound parameters starting with a text string, which were previously checked as if the parameter only consisted of a text string.
+- `WordPress.WP.PostsPerPage` now determines the end of statement with more precision and will no longer throw a false positive for function calls on PHP 8.0+.
+
+
 ## [2.3.0] - 2020-05-14
 
 ### Added
@@ -501,7 +875,7 @@ If you are a maintainer of an external standard based on WPCS and any of your cu
 - New utility method `Sniff::is_use_of_global_constant()`.
 - A rationale to the package suggestion made via `composer.json`.
 - CI: Validation of the `composer.json` file on each build.
-- A wiki page with instructions on how to [set up WPCS to run with Eclipse on XAMPP](https://github.com/WordPress/WordPress-Coding-Standards/wiki/How-to-use-WPCS-with-Eclipse-and-XAMPP).
+- A wiki page with instructions on how to [set up WordPressCS to run with Eclipse on XAMPP](https://github.com/WordPress/WordPress-Coding-Standards/wiki/How-to-use-WordPressCS-with-Eclipse-and-XAMPP).
 - Readme: A link to an external resource with more examples for setting up PHPCS for CI.
 - Readme: A badge-based quick overview of the project.
 
@@ -1182,6 +1556,7 @@ Initial tagged release.
 [Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
 
 [Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/main...HEAD
+[3.0.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.3.0...3.0.0
 [2.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.1.1...2.2.0
@@ -1209,3 +1584,16 @@ Initial tagged release.
 [0.4.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/0.3.0...0.4.0
 [0.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2013-10-06...0.3.0
 [2013-10-06]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2013-06-11...2013-10-06
+
+[@ckanitz]:       https://github.com/ckanitz
+[@craigfrancis]:  https://github.com/craigfrancis
+[@desrosj]:       https://github.com/desrosj
+[@grappler]:      https://github.com/grappler
+[@Ipstenu]:       https://github.com/Ipstenu
+[@JDGrimes]:      https://github.com/JDGrimes
+[@khacoder]:      https://github.com/khacoder
+[@Luc45]:         https://github.com/Luc45
+[@marconmartins]: https://github.com/marconmartins
+[@NielsdeBlaauw]: https://github.com/NielsdeBlaauw
+[@slaFFik]:       https://github.com/slaFFik
+[@sandeshjangam]: https://github.com/sandeshjangam

From 387784c8a0ae66887e31b074b775d43525c76ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Urba=C5=84ski?= <hi@dawidurbanski.com>
Date: Sun, 3 Sep 2023 10:43:53 +0200
Subject: [PATCH 808/822] Docs: Use WordPress.Files.FileName rule instead of
 WordPress.Files.Filename in the sample phpcs ruleset

---
 phpcs.xml.dist.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpcs.xml.dist.sample b/phpcs.xml.dist.sample
index c20d803f77..b1ddd44803 100644
--- a/phpcs.xml.dist.sample
+++ b/phpcs.xml.dist.sample
@@ -146,7 +146,7 @@
 	<rule ref="WordPress.WP.GlobalVariablesOverride">
 		<exclude-pattern>/path/to/Tests/*Test\.php</exclude-pattern>
 	</rule>
-	<rule ref="WordPress.Files.Filename">
+	<rule ref="WordPress.Files.FileName">
 		<exclude-pattern>/path/to/Tests/*Test\.php</exclude-pattern>
 	</rule>
 

From d7d4de3d96977471611ca108bf0da736d5b32d6c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 3 Sep 2023 15:49:51 +0200
Subject: [PATCH 809/822] GH Actions: add task to test example ruleset

... to prevent typos like reported in 2375 from entering it.
---
 .github/workflows/basic-qa.yml              | 6 ++++++
 Tests/RulesetCheck/example-ruleset-test.inc | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 Tests/RulesetCheck/example-ruleset-test.inc

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 859cc0566d..94432f31b5 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -141,6 +141,12 @@ jobs:
       - name: Test the WordPress ruleset
         run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/class-ruleset-test.inc --standard=WordPress
 
+      - name: Rename the example ruleset to one which can be used for a ruleset
+        run:  cp phpcs.xml.dist.sample sample.xml
+
+      - name: Test the example ruleset
+        run: $(pwd)/vendor/bin/phpcs -ps ./Tests/RulesetCheck/example-ruleset-test.inc --standard=./sample.xml
+
       # Test for fixer conflicts by running the auto-fixers of the complete WPCS over the test case files.
       # This is not an exhaustive test, but should give an early indication for typical fixer conflicts.
       # If only fixable errors are found, the exit code will be 1, which can be interpreted as success.
diff --git a/Tests/RulesetCheck/example-ruleset-test.inc b/Tests/RulesetCheck/example-ruleset-test.inc
new file mode 100644
index 0000000000..de3055cb61
--- /dev/null
+++ b/Tests/RulesetCheck/example-ruleset-test.inc
@@ -0,0 +1,8 @@
+<?php
+/**
+ * File which should not yield any errors when using the example ruleset.
+ *
+ * @package My\Prefix\Package
+ */
+
+$my_prefix_var = 'hello';

From 20c8503f5f52e777dc87c893f32123a4d4733630 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <brad.jorsch@automattic.com>
Date: Sun, 3 Sep 2023 11:02:45 -0400
Subject: [PATCH 810/822] Security/EscapeOutputSniff: More modular error codes

This splits certain cases out of `OutputNotEscaped` to allow for
ignoring certain cases that are looking at error strings at time of
generation (where they may eventually be used in both HTML and non-HTML
contexts) rather than at time of output.

* `ExceptionNotEscaped` for unescaped strings in throws (cf. #2374).
* `ErrorNotEscaped` for unescaped strings in `trigger_error` (cf. #1864).
---
 .../Sniffs/Security/EscapeOutputSniff.php     | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index e356c46ff5..a3a0bd59de 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -263,7 +263,7 @@ public function process_token( $stackPtr ) {
 
 				// Examine each parameter individually.
 				foreach ( $params as $param ) {
-					$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+					$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ), 'ExceptionNotEscaped' );
 				}
 
 				return $end;
@@ -344,7 +344,7 @@ public function process_token( $stackPtr ) {
 				break;
 		}
 
-		return $this->check_code_is_escaped( $start, $end );
+		return $this->check_code_is_escaped( $start, $end, 'OutputNotEscaped' );
 	}
 
 	/**
@@ -395,7 +395,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					continue;
 				}
 
-				$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+				$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ), 'OutputNotEscaped' );
 			}
 
 			return $end;
@@ -414,7 +414,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				return $end;
 			}
 
-			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ) );
+			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ), 'ErrorNotEscaped' );
 		}
 
 		/*
@@ -435,7 +435,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		// Examine each parameter individually.
 		foreach ( $params as $param ) {
-			$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
+			$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ), 'OutputNotEscaped' );
 		}
 
 		return $end;
@@ -446,12 +446,13 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @since 3.0.0 Split off from the process_token() method.
 	 *
-	 * @param int $start The position to start checking from.
-	 * @param int $end   The position to stop the check at.
+	 * @param int    $start The position to start checking from.
+	 * @param int    $end   The position to stop the check at.
+	 * @param string $code  Code to use for the PHPCS error.
 	 *
 	 * @return int Integer stack pointer to skip forward.
 	 */
-	protected function check_code_is_escaped( $start, $end ) {
+	protected function check_code_is_escaped( $start, $end, $code ) {
 		/*
 		 * Check for a ternary operator.
 		 * We only need to do this here if this statement is lacking parenthesis.
@@ -532,7 +533,7 @@ protected function check_code_is_escaped( $start, $end ) {
 
 			// Handle PHP 8.0+ match expressions.
 			if ( \T_MATCH === $this->tokens[ $i ]['code'] ) {
-				$match_valid = $this->walk_match_expression( $i );
+				$match_valid = $this->walk_match_expression( $i, $code );
 				if ( false === $match_valid ) {
 					// Live coding or parse error. Shouldn't be possible as PHP[CS] will tokenize the keyword as `T_STRING` in that case.
 					break; // @codeCoverageIgnore
@@ -553,7 +554,7 @@ protected function check_code_is_escaped( $start, $end ) {
 				$array_items = PassedParameters::getParameters( $this->phpcsFile, $i, 0, true );
 				if ( ! empty( $array_items ) ) {
 					foreach ( $array_items as $array_item ) {
-						$this->check_code_is_escaped( $array_item['start'], ( $array_item['end'] + 1 ) );
+						$this->check_code_is_escaped( $array_item['start'], ( $array_item['end'] + 1 ), $code );
 					}
 				}
 
@@ -699,7 +700,7 @@ protected function check_code_is_escaped( $start, $end ) {
 						$formatting_params = PassedParameters::getParameters( $this->phpcsFile, $i );
 						if ( ! empty( $formatting_params ) ) {
 							foreach ( $formatting_params as $format_param ) {
-								$this->check_code_is_escaped( $format_param['start'], ( $format_param['end'] + 1 ) );
+								$this->check_code_is_escaped( $format_param['start'], ( $format_param['end'] + 1 ), $code );
 							}
 						}
 
@@ -754,7 +755,7 @@ protected function check_code_is_escaped( $start, $end ) {
 			$this->phpcsFile->addError(
 				"All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks), found '%s'.",
 				$ptr,
-				'OutputNotEscaped',
+				$code,
 				array( $content )
 			);
 		}
@@ -825,11 +826,12 @@ private function find_long_ternary( $start, $end ) {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param int $stackPtr Pointer to a T_MATCH token.
+	 * @param int    $stackPtr Pointer to a T_MATCH token.
+	 * @param string $code     Code to use for the PHPCS error.
 	 *
 	 * @return int|false Stack pointer to skip to or FALSE if the match expression contained a parse error.
 	 */
-	private function walk_match_expression( $stackPtr ) {
+	private function walk_match_expression( $stackPtr, $code ) {
 		if ( ! isset( $this->tokens[ $stackPtr ]['scope_opener'], $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
 			// Parse error/live coding. Shouldn't be possible as PHP[CS] will tokenize the keyword as `T_STRING` in that case.
 			return false; // @codeCoverageIgnore
@@ -889,7 +891,7 @@ private function walk_match_expression( $stackPtr ) {
 			}
 
 			// Now check that the value returned by this match "leaf" is correctly escaped.
-			$this->check_code_is_escaped( $item_start, $item_end );
+			$this->check_code_is_escaped( $item_start, $item_end, $code );
 
 			// Independently of whether or not the check was succesfull or ran into (parse error) problems,
 			// always skip to the identified end of the item.

From 9385487abfc09853c9dcf298f3efe99a99726e79 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <anomiex@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:08:32 -0400
Subject: [PATCH 811/822] Keep the old code for `trigger_error`

Per https://github.com/WordPress/WordPress-Coding-Standards/issues/2374#issuecomment-1704338167
---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index a3a0bd59de..37c38f0a8f 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -414,7 +414,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				return $end;
 			}
 
-			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ), 'ErrorNotEscaped' );
+			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ), 'OutputNotEscaped' );
 		}
 
 		/*

From f5590ce7b2d43fa73a7cfff22f481cace830c204 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <brad.jorsch@automattic.com>
Date: Tue, 5 Sep 2023 09:40:11 -0400
Subject: [PATCH 812/822] Default `$code` per request

---
 WordPress/Sniffs/Security/EscapeOutputSniff.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Sniffs/Security/EscapeOutputSniff.php b/WordPress/Sniffs/Security/EscapeOutputSniff.php
index 37c38f0a8f..65ee5af3d2 100644
--- a/WordPress/Sniffs/Security/EscapeOutputSniff.php
+++ b/WordPress/Sniffs/Security/EscapeOutputSniff.php
@@ -344,7 +344,7 @@ public function process_token( $stackPtr ) {
 				break;
 		}
 
-		return $this->check_code_is_escaped( $start, $end, 'OutputNotEscaped' );
+		return $this->check_code_is_escaped( $start, $end );
 	}
 
 	/**
@@ -395,7 +395,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 					continue;
 				}
 
-				$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ), 'OutputNotEscaped' );
+				$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
 			}
 
 			return $end;
@@ -414,7 +414,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				return $end;
 			}
 
-			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ), 'OutputNotEscaped' );
+			return $this->check_code_is_escaped( $message_param['start'], ( $message_param['end'] + 1 ) );
 		}
 
 		/*
@@ -435,7 +435,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 
 		// Examine each parameter individually.
 		foreach ( $params as $param ) {
-			$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ), 'OutputNotEscaped' );
+			$this->check_code_is_escaped( $param['start'], ( $param['end'] + 1 ) );
 		}
 
 		return $end;
@@ -452,7 +452,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 	 *
 	 * @return int Integer stack pointer to skip forward.
 	 */
-	protected function check_code_is_escaped( $start, $end, $code ) {
+	protected function check_code_is_escaped( $start, $end, $code = 'OutputNotEscaped' ) {
 		/*
 		 * Check for a ternary operator.
 		 * We only need to do this here if this statement is lacking parenthesis.

From fe4fa457552d6618135726506d3877ce330f7d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Mon, 28 Aug 2023 14:32:20 +0200
Subject: [PATCH 813/822] Update readme of the project

Add the funding link and section in the readme.
Add the link to the v3 release make post in the readme.
Add the FUNDING.yml file so that we can add the funding button in the repo.

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .github/FUNDING.yml |  1 +
 README.md           | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..f2427b9ed5
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ["https://opencollective.com/thewpcc/contribute/wp-php-63406", WP PHP]
diff --git a/README.md b/README.md
index 459adb0414..147eb5a18f 100644
--- a/README.md
+++ b/README.md
@@ -39,13 +39,17 @@
 * [Fixing errors or ignoring them](#fixing-errors-or-ignoring-them)
     + [Tools shipped with WordPressCS](#tools-shipped-with-wordpresscs)
 * [Contributing](#contributing)
+* [Funding](#funding)
 * [License](#license)
 
+---
 
 ## Introduction
 
 This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) rules (sniffs) to validate code developed for WordPress. It ensures code quality and adherence to coding conventions, especially the official [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/).
 
+This project needs funding. If you want to donate read [here](#funding) about how you can help.
+
 ## Minimum Requirements
 
 The WordPress Coding Standards package requires:
@@ -62,7 +66,7 @@ For the best results, it is recommended to also ensure the following additional
 
 ## Installation
 
-As of WordPressCS 3.0.0, installation via Composer using the below instructions is the only supported type of installation.
+As of [WordPressCS 3.0.0](https://make.wordpress.org/core/2023/08/21/wordpresscs-3-0-0-is-now-available/), installation via Composer using the below instructions is the only supported type of installation.
 
 [Composer](https://getcomposer.org/) will automatically install the project dependencies and register the rulesets from WordPressCS and other external standards with PHP_CodeSniffer using the [Composer PHPCS plugin](https://github.com/PHPCSStandards/composer-installer).
 
@@ -248,6 +252,10 @@ At this moment, WordPressCS offer the following tools:
 
 See [CONTRIBUTING](.github/CONTRIBUTING.md), including information about [unit testing](.github/CONTRIBUTING.md#unit-testing) the standard.
 
+## Funding
+
+If you want to sponsor the work on WordPressCS, you can do so by donating to the [WP PHP Open Collective](https://opencollective.com//thewpcc/contribute/wp-php-63406).
+
 ## License
 
 See [LICENSE](LICENSE) (MIT).

From 45cff8da7e06b25b65e4986669b150e896fda7e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sun, 10 Sep 2023 11:23:25 +0200
Subject: [PATCH 814/822] Update README.md

Co-authored-by: Gary Jones <github@garyjones.io>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 147eb5a18f..0175164c96 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@
 
 This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) rules (sniffs) to validate code developed for WordPress. It ensures code quality and adherence to coding conventions, especially the official [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/).
 
-This project needs funding. If you want to donate read [here](#funding) about how you can help.
+This project needs funding. [Find out how you can help](#funding).
 
 ## Minimum Requirements
 

From d3c67d8763f231900aece6a9ee1cc86c5d1d4f21 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 11 Sep 2023 00:13:39 +0200
Subject: [PATCH 815/822] Funding: fix format

This should either be an array of links or a singular link. The `WP PHP` was regarded as an invalid link (not as a link description).

Ref: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index f2427b9ed5..1c6df73886 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ["https://opencollective.com/thewpcc/contribute/wp-php-63406", WP PHP]
+custom: "https://opencollective.com/thewpcc/contribute/wp-php-63406"

From 401e4ece82a102a2eb683325f58ef26dde505e88 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 11 Sep 2023 16:39:31 +0200
Subject: [PATCH 816/822] Release checklist: add link to monthly dev blog

Apparently we have to pro-actively inform the team as they don't appear to watch Make.

Ref: https://developer.wordpress.org/news/2023/09/whats-new-for-developers-september-2023/#comment-1611
---
 .github/release-checklist.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/release-checklist.md b/.github/release-checklist.md
index 3c39e21ed0..df5f91ed48 100644
--- a/.github/release-checklist.md
+++ b/.github/release-checklist.md
@@ -62,9 +62,10 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
 - [ ] Tweet, toot, etc about the release.
 - [ ] Post about it in Slack.
 - [ ] Submit for ["Month in WordPress"][month-in-wp].
-
+- [ ] Submit for the ["Monthy Dev Roundup"][dev-roundup].
 
 [phpcs-releases]:      https://github.com/squizlabs/PHP_CodeSniffer/releases
 [phpcsutils-releases]: https://github.com/PHPCSStandards/PHPCSUtils/releases
 [phpcsextra-releases]: https://github.com/PHPCSStandards/PHPCSExtra/releases
 [month-in-wp]:         https://make.wordpress.org/community/month-in-wordpress-submissions/
+[dev-roundup]:         https://github.com/WordPress/developer-blog-content/issues?q=is%3Aissue+label%3A%22Monthly+Roundup%22

From dd9b56758c9547e5f000e7d517c31616b678407f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:10:44 +0200
Subject: [PATCH 817/822] 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).
* Submit a maximum of 5 pull requests at a time.
    If additional pull requests are needed, these will subsequently be submitted the next time Dependabot runs after one or more of the open pull requests have been merged.
* 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 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..97c58b7822
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# 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"
+    open-pull-requests-limit: 5
+    commit-message:
+      prefix: "GH Actions:"
+    labels:
+      - "Type: Chores/Cleanup"

From 9f57f6bddf355a69694b8705693893bab7c41fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:34:25 +0200
Subject: [PATCH 818/822] Add changelog for v3.0.1

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
Co-authored-by: Gary Jones <github@garyjones.io>
---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e0cb8c58..2e9ca7edb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,23 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 _No documentation available about unreleased changes as of yet._
 
+## [3.0.1] - 2023-09-13
+
+### Added
+
+- In WordPressCS 3.0.0, the functionality of the `WordPress.Security.EscapeOutput` sniff was updated to report unescaped message parameters passed to exceptions created in `throw` statements. This specific violation now has a separate error code: `ExceptionNotEscaped`. This will allow users to ignore or exclude that specific error code. Props [@anomiex].
+    The error code(s) for other escaping issues flagged by the sniff remain unchanged.
+
+### Changed
+
+- Updated the CI workflow to test the example ruleset for issues.
+- Funding files and updates in the Readme about funding the project.
+
+### Fixed
+
+- Fixed a sniff name in the `phpcs.xml.dist.sample` file (case-sensitive sniff name). Props [@dawidurbanski].
+
+
 ## [3.0.0] - 2023-08-21
 
 ### Important information about this release:
@@ -1556,6 +1573,7 @@ Initial tagged release.
 [Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
 
 [Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/main...HEAD
+[3.0.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.3.0...3.0.0
 [2.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.0...2.2.1
@@ -1585,8 +1603,10 @@ Initial tagged release.
 [0.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2013-10-06...0.3.0
 [2013-10-06]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2013-06-11...2013-10-06
 
+[@anomiex]:       https://github.com/anomiex
 [@ckanitz]:       https://github.com/ckanitz
 [@craigfrancis]:  https://github.com/craigfrancis
+[@dawidurbanski]: https://github.com/dawidurbanski
 [@desrosj]:       https://github.com/desrosj
 [@grappler]:      https://github.com/grappler
 [@Ipstenu]:       https://github.com/Ipstenu

From 991cf2169d294d96b6105c2ac43535d3c9803803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:18:09 +0200
Subject: [PATCH 819/822] Fix the release date in the changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e9ca7edb4..7bfac3e701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 _No documentation available about unreleased changes as of yet._
 
-## [3.0.1] - 2023-09-13
+## [3.0.1] - 2023-09-14
 
 ### Added
 

From 82d5c916b13a6631c653987fd63b0d7db14b73e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:57:36 +0000
Subject: [PATCH 820/822] 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/basic-qa.yml   | 6 +++---
 .github/workflows/quicktest.yml  | 2 +-
 .github/workflows/unit-tests.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/basic-qa.yml b/.github/workflows/basic-qa.yml
index 94432f31b5..97943efa21 100644
--- a/.github/workflows/basic-qa.yml
+++ b/.github/workflows/basic-qa.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -104,7 +104,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -174,7 +174,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 52f0d3bb8d..182c24c1de 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # On stable PHPCS versions, 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.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 384bfa226e..ab5f8f5b50 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # On stable PHPCS versions, 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 25033a65262dc8874017d63eea46528260c8802d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Mon, 18 Sep 2023 11:24:36 +0200
Subject: [PATCH 821/822] Add defensive coding to posts per page sniff and add
 tests

The posts per page sniff should bail out early if empty string is passed as a value.

The tests were added for both posts per page sniff and slow db query sniff,
to check if empty string is passed as a value.
In the case of SlowDBQuery the sniff should flag cases where there is and isn't a value passed,
as that sniff will always flag whenever meta_key and meta_value are used in a query.
---
 WordPress/Sniffs/WP/PostsPerPageSniff.php   |  4 ++++
 WordPress/Tests/DB/SlowDBQueryUnitTest.inc  |  4 ++++
 WordPress/Tests/DB/SlowDBQueryUnitTest.php  |  3 +++
 WordPress/Tests/WP/PostsPerPageUnitTest.inc | 14 ++++++++++++++
 4 files changed, 25 insertions(+)

diff --git a/WordPress/Sniffs/WP/PostsPerPageSniff.php b/WordPress/Sniffs/WP/PostsPerPageSniff.php
index a3f8ce45a7..e2575cbd43 100644
--- a/WordPress/Sniffs/WP/PostsPerPageSniff.php
+++ b/WordPress/Sniffs/WP/PostsPerPageSniff.php
@@ -67,6 +67,10 @@ public function getGroups() {
 	public function callback( $key, $val, $line, $group ) {
 		$stripped_val = TextStrings::stripQuotes( $val );
 
+		if ( '' === $stripped_val ) {
+			return false;
+		}
+
 		if ( $val !== $stripped_val ) {
 			// The value was a text string. For text strings, we only accept purely numeric values.
 			if ( preg_match( '`^[0-9]+$`', $stripped_val ) !== 1 ) {
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.inc b/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
index fea1379591..883673d22e 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.inc
@@ -21,3 +21,7 @@ $query = 'foo=bar&meta_key=foo&meta_value=bar';
 if ( ! isset( $widget['params'][0] ) ) {
 	$widget['params'][0] = array();
 }
+
+$query = 'foo=bar&meta_key=&meta_value=bar';
+$query = 'foo=bar&meta_key=foo&meta_value=';
+$query = 'foo=bar&meta_key=&meta_value=';
diff --git a/WordPress/Tests/DB/SlowDBQueryUnitTest.php b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
index e0832726ae..46ba3204d1 100644
--- a/WordPress/Tests/DB/SlowDBQueryUnitTest.php
+++ b/WordPress/Tests/DB/SlowDBQueryUnitTest.php
@@ -44,6 +44,9 @@ public function getWarningList() {
 			15 => 1,
 			16 => 1,
 			19 => 2,
+			25 => 2,
+			26 => 2,
+			27 => 2,
 		);
 	}
 }
diff --git a/WordPress/Tests/WP/PostsPerPageUnitTest.inc b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
index 7474ba6c3c..bb216bdfbd 100644
--- a/WordPress/Tests/WP/PostsPerPageUnitTest.inc
+++ b/WordPress/Tests/WP/PostsPerPageUnitTest.inc
@@ -124,3 +124,17 @@ $args = array(
 	'posts_per_page' => 75.0, // OK (75).
 	'posts_per_page' => 150.000, // Bad (150).
 );
+
+$query = 'posts_per_page=' . (int) $_POST['limit']; // OK.
+
+$args = array(
+	'posts_per_page' => '', // OK.
+);
+
+_query_posts( 'nopaging=true&posts_per_page=' ); // OK.
+
+$query_args['posts_per_page'] = ''; // OK.
+
+$query_args[
+	'posts_per_page'
+] = ''; // OK.

From 1d95bdaabe3a31e024253cba29c2056c3e03fc78 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 21 Sep 2023 00:37:18 +0200
Subject: [PATCH 822/822] README: minor tweak

Just noticed this didn't display as intended.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0175164c96..aeb68cd909 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ The WordPress Coding Standards package requires:
 * [Composer](https://getcomposer.org/)
 
 For the best results, it is recommended to also ensure the following additional PHP extensions are enabled:
-    - [iconv](https://www.php.net/book.iconv)
-    - [Multibyte String](https://www.php.net/book.mbstring)
+- [iconv](https://www.php.net/book.iconv)
+- [Multibyte String](https://www.php.net/book.mbstring)
 
 ## Installation