From 9ae8c78c5edada63aa404593ef911c70399cd9b2 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Mon, 29 Apr 2024 12:33:53 +0100
Subject: [PATCH 1/2] Composer: Update dev-dependencies

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

diff --git a/composer.json b/composer.json
index db73a114..57a05b22 100644
--- a/composer.json
+++ b/composer.json
@@ -26,16 +26,14 @@
 		"php": ">=7.4"
 	},
 	"require-dev": {
-		"automattic/vipwpcs": "^2.2",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
+		"automattic/vipwpcs": "^3",
 		"dms/phpunit-arraysubset-asserts": "^0.5.0",
 		"php-parallel-lint/php-parallel-lint": "^1.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.1",
 		"phpunit/phpunit": "^9",
-		"squizlabs/php_codesniffer": "^3.5",
 		"wp-cli/extension-command": "^2.0",
-		"wp-cli/wp-cli-tests": "^3",
-		"wp-coding-standards/wpcs": "^2.3.0",
+		"wp-cli/wp-cli-tests": "^v4",
+		"wp-coding-standards/wpcs": "^3.1",
 		"yoast/wp-test-utils": "^1.2"
 	},
 	"autoload": {

From 23a10e36b76fbb2097dcd100befbf922e3d2049e Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Mon, 29 Apr 2024 12:45:29 +0100
Subject: [PATCH 2/2] PHPCS: Consolidate config into config file

The PHPCS in the composer.json was duplicating but obscuring some aspects of what was in the `phpcs.xml.dist` file. This change consolidates the Composer commands and the config file.
---
 .phpcs.xml.dist | 30 ++++++++++++++++++++----------
 composer.json   |  4 ++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index af71a3db..4759537c 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -2,12 +2,18 @@
 <ruleset name="WordPress Coding Standards for Plugins">
 	<description>Generally-applicable sniffs for WordPress plugins</description>
 
-	<rule ref="WordPress-Extra" />
-	<rule ref="WordPress-Docs" />
 	<rule ref="WordPress-VIP-Go" />
-	<rule ref="WordPress">
-		<exclude name="Generic.Arrays.DisallowShortArraySyntax.Found" />
-	</rule>
+
+	<!-- Rules: WordPress Coding Standards - see
+		https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards -->
+<!--	<rule ref="WordPress-Extra">--> <!-- Includes WordPress-Core -->
+<!--		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found" />-->
+<!--	</rule>-->
+	<!--<rule ref="WordPress-Docs"/>-->
+	<!-- For help in understanding this minimum_supported_wp_version:
+		https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#setting-minimum-supported-wp-version-for-all-sniffs-in-one-go-wpcs-0140 -->
+	<config name="minimum_supported_wp_version" value="5.9"/>
+
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" type="array">
@@ -17,12 +23,15 @@
 	</rule>
 
 	<rule ref="PHPCompatibilityWP"/>
-	<config name="testVersion" value="7.2-"/>
-
-	<arg name="extensions" value="php"/>
+	<config name="testVersion" value="7.4-"/>
 
-	<!-- Show sniff codes in all reports -->
-	<arg value="s"/>
+	<!-- How to scan -->
+	<arg value="sp"/> <!-- Show sniff and progress -->
+	<arg value="n"/> <!-- No warnings -->
+	<arg name="colors"/> <!-- Show results with colors. Disable if working on Windows -->
+	<arg name="basepath" value="."/> <!-- Strip the file paths down to the relevant bit -->
+	<arg name="parallel" value="8"/> <!-- Enables parallel processing when available for faster results -->
+	<arg name="extensions" value="php"/> <!-- Limit to PHP files -->
 
 	<!-- Allow invoking just `phpcs` on command line without assuming STDIN for file input. -->
 	<file>.</file>
@@ -30,5 +39,6 @@
 	<exclude-pattern>*/dev-lib/*</exclude-pattern>
 	<exclude-pattern>*/node_modules/*</exclude-pattern>
 	<exclude-pattern>*/vendor/*</exclude-pattern>
+	<exclude-pattern>*/tests/*</exclude-pattern>
 	<exclude-pattern>*/dist/*</exclude-pattern>
 </ruleset>
diff --git a/composer.json b/composer.json
index 57a05b22..b1ad7c22 100644
--- a/composer.json
+++ b/composer.json
@@ -56,10 +56,10 @@
 			"@php ./vendor/bin/phpunit --exclude=ms-excluded"
 		],
 		"cs": [
-			"@php ./vendor/bin/phpcs -p -s -v -n . --standard=\"WordPress-VIP-Go\" --extensions=php --ignore=\"/vendor/*,/node_modules/*,/tests/*\""
+			"@php ./vendor/bin/phpcs"
 		],
 		"cbf": [
-			"@php ./vendor/bin/phpcbf -p -s -v -n . --standard=\"WordPress-VIP-Go\" --extensions=php --ignore=\"/vendor/*,/node_modules/*,/tests/*\""
+			"@php ./vendor/bin/phpcbf"
 		],
 		"lint": [
 			"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git"