From 9af66e88813da12b27ba4818f42e85c7c56a9ecc Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 15 Oct 2021 16:22:11 -0400
Subject: [PATCH 01/29] PHPCompatibility: development branch (PHP 8 support)

---
 .gitmodules          | 3 +++
 PHPCSUtils           | 1 +
 PHPCompatibility     | 2 +-
 delta.xml            | 2 +-
 phpcompatibility.sh  | 1 +
 phpcompatibility.xml | 2 +-
 wp.xml               | 2 +-
 7 files changed, 9 insertions(+), 4 deletions(-)
 create mode 160000 PHPCSUtils
 create mode 100755 phpcompatibility.sh

diff --git a/.gitmodules b/.gitmodules
index 111fce6..c9b718f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "moodle-local_codechecker"]
 	path = moodle-local_codechecker
 	url = https://github.com/moodlehq/moodle-local_codechecker.git
+[submodule "PHPCSUtils"]
+	path = PHPCSUtils
+	url = https://github.com/PHPCSStandards/PHPCSUtils.git
diff --git a/PHPCSUtils b/PHPCSUtils
new file mode 160000
index 0000000..5908002
--- /dev/null
+++ b/PHPCSUtils
@@ -0,0 +1 @@
+Subproject commit 5908002baaf857f23c2afcc35c4408d4ad4965da
diff --git a/PHPCompatibility b/PHPCompatibility
index 9fb3244..8c49d1c 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 9fb324479acf6f39452e0655d2429cc0d3914243
+Subproject commit 8c49d1cb405b6e2fd8e627641cd48b00764960e1
diff --git a/delta.xml b/delta.xml
index 077874a..32a61a5 100644
--- a/delta.xml
+++ b/delta.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility" />
+	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
diff --git a/phpcompatibility.sh b/phpcompatibility.sh
new file mode 100755
index 0000000..6edc868
--- /dev/null
+++ b/phpcompatibility.sh
@@ -0,0 +1 @@
+/misc/temp/phpcs/PHP_CodeSniffer/bin/phpcs -p --colors --standard=/misc/temp/phpcs/phpcompatibility.xml --basepath=. .
diff --git a/phpcompatibility.xml b/phpcompatibility.xml
index 42e8287..e014595 100644
--- a/phpcompatibility.xml
+++ b/phpcompatibility.xml
@@ -8,7 +8,7 @@
 	<!-- Check up to 8 files simultanously. -->
 	<arg name="parallel" value="8"/>
 
-	<config name="installed_paths" value="/misc/temp/phpcs/PHPCompatibility" />
+	<config name="installed_paths" value="/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
diff --git a/wp.xml b/wp.xml
index bd81a9a..9320c10 100644
--- a/wp.xml
+++ b/wp.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility" />
+	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>

From 3d5fdce0313070c2cf11fc2735779331dff8218d Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Thu, 26 May 2022 09:53:20 -0400
Subject: [PATCH 02/29] PHPCompatibility: development branch (PHP 8.0/8.1
 support)

---
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index 5908002..9ecd297 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 5908002baaf857f23c2afcc35c4408d4ad4965da
+Subproject commit 9ecd2974d5c34f267e2828c0c3b16c3bd0ebaf45
diff --git a/PHPCompatibility b/PHPCompatibility
index 8c49d1c..c23e20c 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 8c49d1cb405b6e2fd8e627641cd48b00764960e1
+Subproject commit c23e20c0aaa5c527fd7b3fbef38c50c458bb47f1

From 9640e7e6cfbad687e97ad2d39f63ab20e8074692 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 29 Jul 2022 15:04:29 -0400
Subject: [PATCH 03/29] bump versions: PHPCS 3.7.1; PHPCSUtils develop; PHP 7.2

---
 PHPCSUtils      | 2 +-
 PHP_CodeSniffer | 2 +-
 delta.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index 9ecd297..b65fbd4 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 9ecd2974d5c34f267e2828c0c3b16c3bd0ebaf45
+Subproject commit b65fbd47c38202a667ea3930a4a51c5c8b9ca434
diff --git a/PHP_CodeSniffer b/PHP_CodeSniffer
index 5e4e715..1359e17 160000
--- a/PHP_CodeSniffer
+++ b/PHP_CodeSniffer
@@ -1 +1 @@
-Subproject commit 5e4e71592f69da17871dba6e80dd51bce74a351a
+Subproject commit 1359e176e9307e906dc3d890bcc9603ff6d90619
diff --git a/delta.xml b/delta.xml
index 32a61a5..43e0d81 100644
--- a/delta.xml
+++ b/delta.xml
@@ -81,7 +81,7 @@
 	<rule ref="WordPress-Docs"/>
 
 	<!-- Check for PHP cross-version compatibility. -->
-	<config name="testVersion" value="7.1-99.0"/>
+	<config name="testVersion" value="7.2-99.0"/>
 	<rule ref="PHPCompatibility">
 		<!-- Incorrect error. -->
 		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/>

From 93b0481d6403a0d97709be5f23b103528b99b600 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 29 Jul 2022 15:13:28 -0400
Subject: [PATCH 04/29] moodle: use moodle-cs repo (v3.2.4) instead of
 local_codechecker

---
 .gitmodules              | 6 +++---
 moodle-cs                | 1 +
 moodle-local_codechecker | 1 -
 moodle.xml               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 160000 moodle-cs
 delete mode 160000 moodle-local_codechecker

diff --git a/.gitmodules b/.gitmodules
index c9b718f..e4c2a51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,9 @@
 [submodule "PHP_CodeSniffer"]
 	path = PHP_CodeSniffer
 	url = https://github.com/squizlabs/PHP_CodeSniffer.git
-[submodule "moodle-local_codechecker"]
-	path = moodle-local_codechecker
-	url = https://github.com/moodlehq/moodle-local_codechecker.git
 [submodule "PHPCSUtils"]
 	path = PHPCSUtils
 	url = https://github.com/PHPCSStandards/PHPCSUtils.git
+[submodule "moodle-cs"]
+	path = moodle-cs
+	url = https://github.com/moodlehq/moodle-cs.git
diff --git a/moodle-cs b/moodle-cs
new file mode 160000
index 0000000..ff404ea
--- /dev/null
+++ b/moodle-cs
@@ -0,0 +1 @@
+Subproject commit ff404eafbeebf5413e9bad11fba2acfa09734738
diff --git a/moodle-local_codechecker b/moodle-local_codechecker
deleted file mode 160000
index 6811056..0000000
--- a/moodle-local_codechecker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6811056f8ff3f6f55308890fbe5f7221311d5745
diff --git a/moodle.xml b/moodle.xml
index 864490d..51fc0a4 100644
--- a/moodle.xml
+++ b/moodle.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/moodle-local_codechecker" />
+	<config name="installed_paths" value="/misc/temp/phpcs/moodle-cs,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>

From 9d12f2a7a82a3507dd854bde7701ce4fe1422b98 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 16 Sep 2022 15:25:48 -0400
Subject: [PATCH 05/29] DELTA: Ignore WordPress-specific rules for ini_set()

---
 delta.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/delta.xml b/delta.xml
index 43e0d81..e1afeb2 100644
--- a/delta.xml
+++ b/delta.xml
@@ -68,6 +68,7 @@
 		<exclude name="WordPress.DB.RestrictedFunctions"/>
 
 		<!-- WP Specific: Requires use of WP functions. -->
+		<exclude name="WordPress.PHP.IniSet"/>
 		<exclude name="WordPress.Security.EscapeOutput"/>
 		<exclude name="WordPress.Security.NonceVerification"/>
 		<exclude name="WordPress.WP.AlternativeFunctions"/>

From 1abc8db88c39afb76e058c2426df82e51ec27764 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 2 Dec 2022 13:07:22 -0500
Subject: [PATCH 06/29] moodle-cs: v3.2.5

---
 moodle-cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moodle-cs b/moodle-cs
index ff404ea..805a077 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit ff404eafbeebf5413e9bad11fba2acfa09734738
+Subproject commit 805a077056117f3e5f26735d5951b7780550070d

From 64a562c809ad8744fbb7e6d98c39c6a7dd100bd2 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 2 Dec 2022 13:08:49 -0500
Subject: [PATCH 07/29] PHPCompatibility: develop branch 2022-11-22;
 PHPCSUtils: 1.0.0-alpha4

---
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index b65fbd4..37c6da9 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit b65fbd47c38202a667ea3930a4a51c5c8b9ca434
+Subproject commit 37c6da9a0aede973974ae02ef1af2dd641355e86
diff --git a/PHPCompatibility b/PHPCompatibility
index c23e20c..770abd7 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit c23e20c0aaa5c527fd7b3fbef38c50c458bb47f1
+Subproject commit 770abd79ec9ead201757c55af101387a922bb535

From e7ad191037a079f19d4003b7e474eefc61f0fa6d Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 2 Dec 2022 13:20:05 -0500
Subject: [PATCH 08/29] cleanup: fix phpcs errors in the runner

---
 run_phpcs.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/run_phpcs.php b/run_phpcs.php
index a383ff7..fb6045e 100644
--- a/run_phpcs.php
+++ b/run_phpcs.php
@@ -12,12 +12,8 @@
 		if (is_readable($path)) {
 			echo $filename . PHP_EOL;
 			passthru("phpcs -p --colors --standard=$phpcs_dir/phpcompatibility.xml --report=json --report-file=$phpcs_dir/output/$filename.json --basepath=$path $path");
-		}
-		else {
+		} else {
 			echo 'ERROR: Folder not readable - ' . $path . PHP_EOL;
 		}
 	}
-	else {
-		//echo 'ERROR: Folder does not exist - ' . $path . PHP_EOL;
-	}
 }

From 4b045a462f64afe6125c6f0feaec15cc99c97ac5 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Wed, 18 Jan 2023 16:28:37 -0500
Subject: [PATCH 09/29] PHPCompatibility: develop branch 2023-01-08;
 PHPCSUtils: 1.0.1; moodle-cs: v3.3.0

---
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 moodle-cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index 37c6da9..4fd2e30 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 37c6da9a0aede973974ae02ef1af2dd641355e86
+Subproject commit 4fd2e30c7465112ca2e3646037bfb9e6f0f4d4f3
diff --git a/PHPCompatibility b/PHPCompatibility
index 770abd7..2fb8233 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 770abd79ec9ead201757c55af101387a922bb535
+Subproject commit 2fb82334bbefe513e2522ea585cd5ba32bb4d763
diff --git a/moodle-cs b/moodle-cs
index 805a077..3679d90 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 805a077056117f3e5f26735d5951b7780550070d
+Subproject commit 3679d90dea0bdf8f0a583a53d8983a1e8269b828

From 6bbf6d818a02b5b7c6361d7de38cae199723abc2 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 24 Feb 2023 15:49:09 -0500
Subject: [PATCH 10/29] PHPCSExtra: v1.0.2

---
 .gitmodules | 3 +++
 PHPCSExtra  | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 PHPCSExtra

diff --git a/.gitmodules b/.gitmodules
index e4c2a51..a9f5ba8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "moodle-cs"]
 	path = moodle-cs
 	url = https://github.com/moodlehq/moodle-cs.git
+[submodule "PHPCSExtra"]
+	path = PHPCSExtra
+	url = https://github.com/PHPCSStandards/PHPCSExtra.git
diff --git a/PHPCSExtra b/PHPCSExtra
new file mode 160000
index 0000000..a077c4a
--- /dev/null
+++ b/PHPCSExtra
@@ -0,0 +1 @@
+Subproject commit a077c4ad65b906768ed2f820701958b57f605be0

From 8c66c679d3e7c0876059b9a69ba090f6e719eb39 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 24 Feb 2023 15:49:48 -0500
Subject: [PATCH 11/29] delta: Ignore package tag rule

---
 delta.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/delta.xml b/delta.xml
index e1afeb2..ba113cf 100644
--- a/delta.xml
+++ b/delta.xml
@@ -36,6 +36,7 @@
 
 		<!-- File-level comments are not required. -->
 		<exclude name="Squiz.Commenting.FileComment.Missing"/>
+		<exclude name="Squiz.Commenting.FileComment.MissingPackageTag"/>
 
 		<!-- Comment alignment spacing. -->
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>

From f036cc91f3a267872acee90c0573940a214b5131 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 24 Feb 2023 15:50:11 -0500
Subject: [PATCH 12/29] moodle-cs: v3.3.2

---
 moodle-cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moodle-cs b/moodle-cs
index 3679d90..f1f5538 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 3679d90dea0bdf8f0a583a53d8983a1e8269b828
+Subproject commit f1f5538278f815cdeddc7f2ea95686e1a727e4e1

From 8d3be1be4fb3482ea973955e494b44d8afadadcf Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 24 Feb 2023 15:52:21 -0500
Subject: [PATCH 13/29] PHP_CodeSniffer: 3.7.2

---
 PHP_CodeSniffer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHP_CodeSniffer b/PHP_CodeSniffer
index 1359e17..ed8e00d 160000
--- a/PHP_CodeSniffer
+++ b/PHP_CodeSniffer
@@ -1 +1 @@
-Subproject commit 1359e176e9307e906dc3d890bcc9603ff6d90619
+Subproject commit ed8e00df0a83aa96acf703f8c2979ff33341f879

From e464378ae8bb17e5b07e8430451fa8ee99febaf3 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 9 May 2023 17:31:03 -0400
Subject: [PATCH 14/29] rulesets: use full WordPress for wp ruleset; exclude
 unhelpful rules from delta ruleset

---
 delta.xml |  8 +++++++-
 wp.xml    | 11 ++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/delta.xml b/delta.xml
index ba113cf..8e5831b 100644
--- a/delta.xml
+++ b/delta.xml
@@ -85,8 +85,11 @@
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="7.2-99.0"/>
 	<rule ref="PHPCompatibility">
-		<!-- Incorrect error. -->
+		<!-- PHP 4.3 - Incorrect error. -->
 		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/>
+
+		<!-- PHP 8.1 - We don't care that the default flags for htmlspecialchars() has changed. Both defaults are acceptable. -->
+		<exclude name="PHPCompatibility.ParameterValues.NewHTMLEntitiesFlagsDefault.NotSet"/>
 	</rule>
 
 	<!-- No spaces around function call signature. No WordPress spaces. -->
@@ -107,6 +110,9 @@
 	<rule ref="Generic.CodeAnalysis">
 		<!-- Add back? No assignments in while conditions. -->
 		<exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
+
+		<!-- Handled in a better way by Squiz.Commenting.EmptyCatchComment.Missing -->
+		<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCatch"/>
 	</rule>
 	<rule ref="Generic.Commenting"/>
 	<rule ref="Generic.Metrics"/>
diff --git a/wp.xml b/wp.xml
index 9320c10..67b6496 100644
--- a/wp.xml
+++ b/wp.xml
@@ -20,11 +20,8 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
-	<!-- Include the WordPress-Extra standard. -->
-	<rule ref="WordPress-Extra"/>
-
-	<!-- Let's also check that everything is properly documented. -->
-	<rule ref="WordPress-Docs"/>
+	<!-- Include the WordPress standard. -->
+	<rule ref="WordPress"/>
 
 	<!-- This rule is not part of the standard, but is used by WPCS natively. -->
 	<rule ref="PSR2.Methods.FunctionClosingBrace"/>
@@ -64,10 +61,6 @@
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
 	</rule>
-	<rule ref="Squiz.Commenting.InlineComment">
-		<!-- Add back? Requires either a period, question mark or exclamation point, but that's too restrictive (e.g. URLs). -->
-		<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
-	</rule>
 	<rule ref="Squiz.Commenting.VariableComment"/>
 
 	<!-- Override statement alignment to have a single space. -->

From 57142d57312d7137847b9c1ff7cddf8630465c3d Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 16 May 2023 14:44:27 -0400
Subject: [PATCH 15/29] WordPress: develop branch 2023-05-01; add PHPCSExtra to
 paths;

---
 WordPress-Coding-Standards | 2 +-
 delta.xml                  | 3 +--
 moodle.xml                 | 2 +-
 phpcompatibility.xml       | 2 +-
 wp.xml                     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/WordPress-Coding-Standards b/WordPress-Coding-Standards
index 7da1894..fca9d9e 160000
--- a/WordPress-Coding-Standards
+++ b/WordPress-Coding-Standards
@@ -1 +1 @@
-Subproject commit 7da1894633f168fe244afc6de00d141f27517b62
+Subproject commit fca9d9ef2dcd042658ccb9df16552f5048e7bb04
diff --git a/delta.xml b/delta.xml
index 8e5831b..1446147 100644
--- a/delta.xml
+++ b/delta.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
+	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils,/misc/temp/phpcs/PHPCSExtra" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
@@ -75,7 +75,6 @@
 		<exclude name="WordPress.WP.AlternativeFunctions"/>
 		<exclude name="WordPress.WP.DeprecatedFunctions"/>
 		<exclude name="WordPress.WP.EnqueuedResources"/>
-		<exclude name="WordPress.WP.TimezoneChange"/>
 		<exclude name="WordPress.WP.GlobalVariablesOverride"/>
 	</rule>
 
diff --git a/moodle.xml b/moodle.xml
index 51fc0a4..3c047a2 100644
--- a/moodle.xml
+++ b/moodle.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/moodle-cs,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
+	<config name="installed_paths" value="/misc/temp/phpcs/moodle-cs,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils,/misc/temp/phpcs/PHPCSExtra" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
diff --git a/phpcompatibility.xml b/phpcompatibility.xml
index e014595..f7ee32d 100644
--- a/phpcompatibility.xml
+++ b/phpcompatibility.xml
@@ -8,7 +8,7 @@
 	<!-- Check up to 8 files simultanously. -->
 	<arg name="parallel" value="8"/>
 
-	<config name="installed_paths" value="/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
+	<config name="installed_paths" value="/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils,/misc/temp/phpcs/PHPCSExtra" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
diff --git a/wp.xml b/wp.xml
index 67b6496..a8c25ad 100644
--- a/wp.xml
+++ b/wp.xml
@@ -9,7 +9,7 @@
 	<arg name="parallel" value="8"/>
 
 	<!-- Load additional standards. -->
-	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils" />
+	<config name="installed_paths" value="/misc/temp/phpcs/WordPress-Coding-Standards,/misc/temp/phpcs/PHPCompatibility,/misc/temp/phpcs/PHPCSUtils,/misc/temp/phpcs/PHPCSExtra" />
 
 	<!-- Exclude the Composer Vendor directory. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>

From 87cb445cda85b287ad5e57d2579dad276e8e56cb Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 16 May 2023 14:45:18 -0400
Subject: [PATCH 16/29] moodle: Include non-conflicting rules from the PSR1 and
 PSR12 standards.

---
 moodle.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/moodle.xml b/moodle.xml
index 3c047a2..b9fe4a3 100644
--- a/moodle.xml
+++ b/moodle.xml
@@ -20,6 +20,29 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
+	<!-- Include the PSR1 standard. -->
+	<rule ref="PSR1">
+		<!-- Moodle has its own rules for these. -->
+		<exclude name="PSR1.Classes.ClassDeclaration"/>
+		<exclude name="PSR1.Methods.CamelCapsMethodName"/>
+
+		<!-- Legacy Moodle code has lots of side effects. -->
+		<exclude name="PSR1.Files.SideEffects"/>
+	</rule>
+
+	<!-- Include the PSR12 standard. -->
+	<rule ref="PSR12">
+		<!-- Moodle has its own rules for these. -->
+		<exclude name="Generic.Files.LineLength"/>
+		<exclude name="PSR12.ControlStructures.ControlStructureSpacing"/>
+		<exclude name="PSR12.Files.FileHeader"/>
+		<exclude name="PSR2.Classes.ClassDeclaration"/>
+		<exclude name="PSR2.ControlStructures.ElseIfDeclaration"/>
+		<exclude name="PSR2.Methods.FunctionCallSignature"/>
+		<exclude name="Squiz.Classes.ValidClassName"/>
+		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration"/>
+	</rule>
+
 	<!-- Include the moodle standard. -->
 	<rule ref="moodle">
 		<!--

From f27f18164d42e9182acd9aa270a34fd38df0fea4 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 16 May 2023 15:41:24 -0400
Subject: [PATCH 17/29] rulesets: Ignore PHPCompatibility htmlspecialchars()
 flags sniff (we WANT to inherit the defaults)

---
 phpcompatibility.xml | 6 +++++-
 wp.xml               | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/phpcompatibility.xml b/phpcompatibility.xml
index f7ee32d..b7dc897 100644
--- a/phpcompatibility.xml
+++ b/phpcompatibility.xml
@@ -22,6 +22,10 @@
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="7.1-99.0"/>
 	<rule ref="PHPCompatibility">
-		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/> <!-- Incorrect error -->
+		<!-- PHP 4.3 - Incorrect error. -->
+		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/>
+
+		<!-- PHP 8.1 - We don't care that the default flags for htmlspecialchars() has changed. Both defaults are acceptable. -->
+		<exclude name="PHPCompatibility.ParameterValues.NewHTMLEntitiesFlagsDefault.NotSet"/>
 	</rule>
 </ruleset>
diff --git a/wp.xml b/wp.xml
index a8c25ad..dc50a15 100644
--- a/wp.xml
+++ b/wp.xml
@@ -29,11 +29,14 @@
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="5.6-99.0"/>
 	<rule ref="PHPCompatibility">
-		<!-- Incorrect error. -->
+		<!-- PHP 4.3 - Incorrect error. -->
 		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/>
 
 		<!-- Only applies to PHP 5.6.16 and older. -->
 		<exclude name="PHPCompatibility.PHP.NewConstants.mysqli_client_ssl_dont_verify_server_certFound"/>
+
+		<!-- PHP 8.1 - We don't care that the default flags for htmlspecialchars() has changed. Both defaults are acceptable. -->
+		<exclude name="PHPCompatibility.ParameterValues.NewHTMLEntitiesFlagsDefault.NotSet"/>
 	</rule>
 
 	<!-- Code quality. -->

From 4865bcba2278a1e4e840fe922d073d924063289b Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 16 May 2023 16:09:21 -0400
Subject: [PATCH 18/29] PHPCompatibility: develop branch 2023-05-14;
 PHPCSUtils: 1.0.5; PHPCSExtra: 1.0.3

---
 PHPCSExtra       | 2 +-
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PHPCSExtra b/PHPCSExtra
index a077c4a..7029c05 160000
--- a/PHPCSExtra
+++ b/PHPCSExtra
@@ -1 +1 @@
-Subproject commit a077c4ad65b906768ed2f820701958b57f605be0
+Subproject commit 7029c051cd310e2e17c6caea3429bfbe290c41ae
diff --git a/PHPCSUtils b/PHPCSUtils
index 4fd2e30..0cfef51 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 4fd2e30c7465112ca2e3646037bfb9e6f0f4d4f3
+Subproject commit 0cfef5193e68e8ff179333d8ae937db62939b656
diff --git a/PHPCompatibility b/PHPCompatibility
index 2fb8233..ad8408f 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 2fb82334bbefe513e2522ea585cd5ba32bb4d763
+Subproject commit ad8408fd14a6580ad05c6b9bf769e12964561256

From 0a363717bcd5c88be3916b9e53a5da2376366cab Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 23 May 2023 17:09:17 -0400
Subject: [PATCH 19/29] ruleset: delta - more complete rules; phpcompatibility
 - also check syntax

---
 delta.xml            | 49 +++++++++++++++++++++++++++++++++++++++-----
 phpcompatibility.xml |  3 +++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/delta.xml b/delta.xml
index 1446147..06d6b0e 100644
--- a/delta.xml
+++ b/delta.xml
@@ -20,8 +20,31 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
-	<!-- Include the WordPress-Extra standard. -->
-	<rule ref="WordPress-Extra">
+	<!-- Include the PSR1 standard. -->
+	<rule ref="PSR1">
+		<!-- WordPress has its own rules for these. -->
+		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
+		<exclude name="PSR1.Classes.ClassDeclaration"/>
+		<exclude name="PSR1.Methods.CamelCapsMethodName"/>
+
+		<!-- Legacy code has lots of side effects. -->
+		<exclude name="PSR1.Files.SideEffects"/>
+	</rule>
+
+	<!-- Include the PSR12 standard. -->
+	<rule ref="PSR12">
+		<!-- WordPress has its own rules for these. -->
+		<exclude name="Generic.Files.LineLength"/>
+		<exclude name="PSR12.ControlStructures.ControlStructureSpacing"/>
+		<exclude name="PSR12.Files.FileHeader"/>
+		<exclude name="PSR2.Classes.ClassDeclaration"/>
+		<exclude name="PSR2.Methods.FunctionCallSignature"/>
+		<exclude name="Squiz.Classes.ValidClassName"/>
+		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration"/>
+	</rule>
+
+	<!-- Include the WordPress standard. -->
+	<rule ref="WordPress">
 		<!--
 		We can run `phpcs` with the '-s' flag, which allows us to see the names
 		of the sniffs reporting errors. Once we know the sniff names, we can opt
@@ -45,6 +68,9 @@
 		<!-- Add back? Double quotes only when necessary. -->
 		<exclude name="Squiz.Strings.DoubleQuoteUsage"/>
 
+		<!-- Allow increment/decrement after variable. -->
+		<exclude name="Universal.Operators.DisallowStandalonePostIncrementDecrement"/>
+
 		<!-- Add back? Hyphenated filenames. -->
 		<exclude name="WordPress.Files.FileName"/>
 
@@ -72,14 +98,15 @@
 		<exclude name="WordPress.PHP.IniSet"/>
 		<exclude name="WordPress.Security.EscapeOutput"/>
 		<exclude name="WordPress.Security.NonceVerification"/>
+		<exclude name="WordPress.Security.ValidatedSanitizedInput"/>
 		<exclude name="WordPress.WP.AlternativeFunctions"/>
 		<exclude name="WordPress.WP.DeprecatedFunctions"/>
 		<exclude name="WordPress.WP.EnqueuedResources"/>
 		<exclude name="WordPress.WP.GlobalVariablesOverride"/>
-	</rule>
 
-	<!-- Let's also check that everything is properly documented. -->
-	<rule ref="WordPress-Docs"/>
+		<!-- WP Specific: Always capitalizes WordPress, even in code... -->
+		<exclude name="WordPress.WP.CapitalPDangit"/>
+	</rule>
 
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="7.2-99.0"/>
@@ -155,9 +182,21 @@
 		</properties>
 	</rule>
 
+	<!-- Switch breaks are followed by newline or the switch end. -->
+	<rule ref="Squiz.ControlStructures.SwitchDeclaration">
+		<exclude name="Squiz.ControlStructures.SwitchDeclaration.BreakIndent" />
+	</rule>
+
 	<!-- Scope closing brace on own line. -->
 	<rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
 
+	<!-- Enforce arrays with commas and appropriate spaces. -->
+	<rule ref="NormalizedArrays.Arrays.ArrayBraceSpacing"/>
+	<rule ref="NormalizedArrays.Arrays.CommaAfterLast"/>
+
+	<!-- Disallow PHP's alternative control structure syntax. -->
+	<rule ref="Universal.ControlStructures.DisallowAlternativeSyntax"/>
+
 	<!-- Forbidden functions. -->
 	<rule ref="Generic.PHP.ForbiddenFunctions">
 		<properties>
diff --git a/phpcompatibility.xml b/phpcompatibility.xml
index b7dc897..9494a6f 100644
--- a/phpcompatibility.xml
+++ b/phpcompatibility.xml
@@ -19,6 +19,9 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
+	<!-- Check PHP syntax. -->
+	<rule ref="Generic.PHP.Syntax"/>
+
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="7.1-99.0"/>
 	<rule ref="PHPCompatibility">

From a995b262b25c1ad6652653b87ca9fe689277db2e Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 19 Sep 2023 15:15:12 -0400
Subject: [PATCH 20/29] PHPCSExtra: 1.1.1; PHPCSUtils: 1.0.8; PHPCompatibility:
 develop branch 2023-09-13; WordPress-Coding-Standards: 3.0.1; moodle-cs:
 v3.3.6

---
 PHPCSExtra                 | 2 +-
 PHPCSUtils                 | 2 +-
 PHPCompatibility           | 2 +-
 WordPress-Coding-Standards | 2 +-
 moodle-cs                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPCSExtra b/PHPCSExtra
index 7029c05..98bcdba 160000
--- a/PHPCSExtra
+++ b/PHPCSExtra
@@ -1 +1 @@
-Subproject commit 7029c051cd310e2e17c6caea3429bfbe290c41ae
+Subproject commit 98bcdbacbda14b1db85f710b1853125726795bbc
diff --git a/PHPCSUtils b/PHPCSUtils
index 0cfef51..69465ca 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 0cfef5193e68e8ff179333d8ae937db62939b656
+Subproject commit 69465cab9d12454e5e7767b9041af0cd8cd13be7
diff --git a/PHPCompatibility b/PHPCompatibility
index ad8408f..302dffe 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit ad8408fd14a6580ad05c6b9bf769e12964561256
+Subproject commit 302dffedd8f1acfc0ed5c7ee096ea2237553ae1a
diff --git a/WordPress-Coding-Standards b/WordPress-Coding-Standards
index fca9d9e..b4caf96 160000
--- a/WordPress-Coding-Standards
+++ b/WordPress-Coding-Standards
@@ -1 +1 @@
-Subproject commit fca9d9ef2dcd042658ccb9df16552f5048e7bb04
+Subproject commit b4caf9689f1a0e4a4c632679a44e638c1c67aff1
diff --git a/moodle-cs b/moodle-cs
index f1f5538..9292e56 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit f1f5538278f815cdeddc7f2ea95686e1a727e4e1
+Subproject commit 9292e56a1d1f1f33dc2ef68780023c110bdfd6c2

From 48eee8f222093a96eeabae78a81208e4a5a3d3b6 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 19 Sep 2023 15:16:59 -0400
Subject: [PATCH 21/29] rulesets: check PHP syntax; use moodle-extra

---
 delta.xml            |  1 +
 moodle.xml           | 34 ++++++++++------------------------
 phpcompatibility.xml |  2 +-
 wp.xml               |  1 +
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/delta.xml b/delta.xml
index 06d6b0e..7633ff4 100644
--- a/delta.xml
+++ b/delta.xml
@@ -142,6 +142,7 @@
 	</rule>
 	<rule ref="Generic.Commenting"/>
 	<rule ref="Generic.Metrics"/>
+	<rule ref="Generic.PHP.Syntax"/>
 	<rule ref="Generic.Strings.UnnecessaryStringConcat">
 		<properties>
 			<property name="allowMultiline" value="true" />
diff --git a/moodle.xml b/moodle.xml
index b9fe4a3..4c92c93 100644
--- a/moodle.xml
+++ b/moodle.xml
@@ -20,38 +20,24 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
-	<!-- Include the PSR1 standard. -->
-	<rule ref="PSR1">
-		<!-- Moodle has its own rules for these. -->
-		<exclude name="PSR1.Classes.ClassDeclaration"/>
-		<exclude name="PSR1.Methods.CamelCapsMethodName"/>
-
-		<!-- Legacy Moodle code has lots of side effects. -->
-		<exclude name="PSR1.Files.SideEffects"/>
-	</rule>
-
-	<!-- Include the PSR12 standard. -->
-	<rule ref="PSR12">
-		<!-- Moodle has its own rules for these. -->
-		<exclude name="Generic.Files.LineLength"/>
-		<exclude name="PSR12.ControlStructures.ControlStructureSpacing"/>
-		<exclude name="PSR12.Files.FileHeader"/>
-		<exclude name="PSR2.Classes.ClassDeclaration"/>
-		<exclude name="PSR2.ControlStructures.ElseIfDeclaration"/>
-		<exclude name="PSR2.Methods.FunctionCallSignature"/>
-		<exclude name="Squiz.Classes.ValidClassName"/>
-		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration"/>
-	</rule>
-
 	<!-- Include the moodle standard. -->
-	<rule ref="moodle">
+	<rule ref="moodle-extra">
 		<!--
 		We can run `phpcs` with the '-s' flag, which allows us to see the names
 		of the sniffs reporting errors. Once we know the sniff names, we can opt
 		to exclude sniffs which don't suit our project.
 		-->
+
+		<!-- Moodle requires that specific, global namespace classes exist. -->
+		<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
 	</rule>
 
+	<!-- Check PHP syntax. -->
+	<rule ref="Generic.PHP.Syntax"/>
+
+	<!-- We require PHP >= 7.1 which allows constant visibility -->
+	<rule ref="PSR12.Properties.ConstantVisibility"/>
+
 	<!-- Check for PHP cross-version compatibility. -->
 	<config name="testVersion" value="7.1-99.0"/>
 </ruleset>
diff --git a/phpcompatibility.xml b/phpcompatibility.xml
index 9494a6f..eabf691 100644
--- a/phpcompatibility.xml
+++ b/phpcompatibility.xml
@@ -23,7 +23,7 @@
 	<rule ref="Generic.PHP.Syntax"/>
 
 	<!-- Check for PHP cross-version compatibility. -->
-	<config name="testVersion" value="7.1-99.0"/>
+	<config name="testVersion" value="7.0-99.0"/>
 	<rule ref="PHPCompatibility">
 		<!-- PHP 4.3 - Incorrect error. -->
 		<exclude name="PHPCompatibility.PHP.NewFunctionParameters.php_uname_modeFound"/>
diff --git a/wp.xml b/wp.xml
index dc50a15..56fb956 100644
--- a/wp.xml
+++ b/wp.xml
@@ -43,6 +43,7 @@
 	<rule ref="Generic.CodeAnalysis"/>
 	<rule ref="Generic.Commenting"/>
 	<rule ref="Generic.Metrics"/>
+	<rule ref="Generic.PHP.Syntax"/>
 	<rule ref="Generic.Strings.UnnecessaryStringConcat">
 		<properties>
 			<property name="allowMultiline" value="true" />

From ef0351f626b78f10e16020c1d2bacdea26080a2c Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 19 Sep 2023 15:55:29 -0400
Subject: [PATCH 22/29] delta: remove more WordPress spaces

---
 delta.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/delta.xml b/delta.xml
index 7633ff4..b7c7408 100644
--- a/delta.xml
+++ b/delta.xml
@@ -84,6 +84,7 @@
 		<exclude name="WordPress.Arrays.ArrayDeclarationSpacing"/>
 		<exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions"/>
 		<exclude name="Generic.WhiteSpace.ArbitraryParenthesesSpacing"/>
+		<exclude name="WordPress.WhiteSpace.CastStructureSpacing"/>
 		<exclude name="WordPress.WhiteSpace.ControlStructureSpacing"/>
 		<exclude name="WordPress.WhiteSpace.OperatorSpacing"/>
 
@@ -192,7 +193,11 @@
 	<rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
 
 	<!-- Enforce arrays with commas and appropriate spaces. -->
-	<rule ref="NormalizedArrays.Arrays.ArrayBraceSpacing"/>
+	<rule ref="NormalizedArrays.Arrays.ArrayBraceSpacing">
+		<properties>
+			<property name="spacesSingleLine" value="0"/>
+		</properties>
+	</rule>
 	<rule ref="NormalizedArrays.Arrays.CommaAfterLast"/>
 
 	<!-- Disallow PHP's alternative control structure syntax. -->

From 402fdc7428b1c18ef7a47e20ea349bc197a20bc4 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 19 Sep 2023 16:10:51 -0400
Subject: [PATCH 23/29] delta: exclude more WordPress-specific rules

---
 delta.xml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/delta.xml b/delta.xml
index b7c7408..2f571de 100644
--- a/delta.xml
+++ b/delta.xml
@@ -78,35 +78,26 @@
 		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
 
 		<!-- Add back? date() vs gmdate(). -->
-		<exclude name="WordPress.DateTime.RestrictedFunctions"/>
+		<exclude name="WordPress.DateTime"/>
 
 		<!-- No WordPress spaces. -->
+		<exclude name="Generic.WhiteSpace.ArbitraryParenthesesSpacing"/>
 		<exclude name="WordPress.Arrays.ArrayDeclarationSpacing"/>
 		<exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions"/>
-		<exclude name="Generic.WhiteSpace.ArbitraryParenthesesSpacing"/>
-		<exclude name="WordPress.WhiteSpace.CastStructureSpacing"/>
-		<exclude name="WordPress.WhiteSpace.ControlStructureSpacing"/>
-		<exclude name="WordPress.WhiteSpace.OperatorSpacing"/>
+		<exclude name="WordPress.WhiteSpace"/>
 
 		<!-- Yoda is illogical and handled by WordPress.CodeAnalysis.AssignmentInCondition. -->
 		<exclude name="WordPress.PHP.YodaConditions"/>
 
 		<!-- WP Specific: Requires use of $wpdb. -->
-		<exclude name="WordPress.DB.RestrictedClasses"/>
-		<exclude name="WordPress.DB.RestrictedFunctions"/>
+		<exclude name="WordPress.DB"/>
 
 		<!-- WP Specific: Requires use of WP functions. -->
 		<exclude name="WordPress.PHP.IniSet"/>
-		<exclude name="WordPress.Security.EscapeOutput"/>
-		<exclude name="WordPress.Security.NonceVerification"/>
-		<exclude name="WordPress.Security.ValidatedSanitizedInput"/>
-		<exclude name="WordPress.WP.AlternativeFunctions"/>
-		<exclude name="WordPress.WP.DeprecatedFunctions"/>
-		<exclude name="WordPress.WP.EnqueuedResources"/>
-		<exclude name="WordPress.WP.GlobalVariablesOverride"/>
-
-		<!-- WP Specific: Always capitalizes WordPress, even in code... -->
-		<exclude name="WordPress.WP.CapitalPDangit"/>
+		<exclude name="WordPress.Security"/>
+
+		<!-- WP Specific: General WordPress -->
+		<exclude name="WordPress.WP"/>
 	</rule>
 
 	<!-- Check for PHP cross-version compatibility. -->

From 472d84f7c91a1d3489f0d94ace2c632e0b1b6140 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Thu, 28 Sep 2023 01:13:31 -0400
Subject: [PATCH 24/29] moodle-cs: v3.3.9; remove namescape fix that was merged
 upstream

---
 moodle-cs  | 2 +-
 moodle.xml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/moodle-cs b/moodle-cs
index 9292e56..5503396 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 9292e56a1d1f1f33dc2ef68780023c110bdfd6c2
+Subproject commit 5503396df563cbe3244b67625246664ba5b663f1
diff --git a/moodle.xml b/moodle.xml
index 4c92c93..06aa001 100644
--- a/moodle.xml
+++ b/moodle.xml
@@ -27,9 +27,6 @@
 		of the sniffs reporting errors. Once we know the sniff names, we can opt
 		to exclude sniffs which don't suit our project.
 		-->
-
-		<!-- Moodle requires that specific, global namespace classes exist. -->
-		<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
 	</rule>
 
 	<!-- Check PHP syntax. -->

From 0195acb98c34ea513ecac63959778c0b30a342a4 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Thu, 30 Nov 2023 17:44:50 -0500
Subject: [PATCH 25/29] moodle-cs: v3.3.11; PHPCSExtra 1.1.2

---
 PHPCSExtra | 2 +-
 moodle-cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCSExtra b/PHPCSExtra
index 98bcdba..746c319 160000
--- a/PHPCSExtra
+++ b/PHPCSExtra
@@ -1 +1 @@
-Subproject commit 98bcdbacbda14b1db85f710b1853125726795bbc
+Subproject commit 746c3190ba8eb2f212087c947ba75f4f5b9a58d5
diff --git a/moodle-cs b/moodle-cs
index 5503396..a415a54 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 5503396df563cbe3244b67625246664ba5b663f1
+Subproject commit a415a541c7b9b56698db8bf0335ce767d02c05bb

From a211a3c50ef114b41a71fcabea5fd52eacb0c29f Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Thu, 14 Mar 2024 16:30:26 -0400
Subject: [PATCH 26/29] standards: PHPCSExtra 1.2.1; PHPCSUtils 1.0.9;
 PHPCompatibility 2024-03-04; PHP_CodeSniffer 3.9.0

---
 .gitmodules      | 2 +-
 PHPCSExtra       | 2 +-
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 PHP_CodeSniffer  | 2 +-
 moodle-cs        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a9f5ba8..09755b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git
 [submodule "PHP_CodeSniffer"]
 	path = PHP_CodeSniffer
-	url = https://github.com/squizlabs/PHP_CodeSniffer.git
+	url = https://github.com/PHPCSStandards/PHP_CodeSniffer.git
 [submodule "PHPCSUtils"]
 	path = PHPCSUtils
 	url = https://github.com/PHPCSStandards/PHPCSUtils.git
diff --git a/PHPCSExtra b/PHPCSExtra
index 746c319..11d387c 160000
--- a/PHPCSExtra
+++ b/PHPCSExtra
@@ -1 +1 @@
-Subproject commit 746c3190ba8eb2f212087c947ba75f4f5b9a58d5
+Subproject commit 11d387c6642b6e4acaf0bd9bf5203b8cca1ec489
diff --git a/PHPCSUtils b/PHPCSUtils
index 69465ca..908247b 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 69465cab9d12454e5e7767b9041af0cd8cd13be7
+Subproject commit 908247bc65010c7b7541a9551e002db12e9dae70
diff --git a/PHPCompatibility b/PHPCompatibility
index 302dffe..177933b 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 302dffedd8f1acfc0ed5c7ee096ea2237553ae1a
+Subproject commit 177933bc1e482723bb44dd84b2c5735da01fc054
diff --git a/PHP_CodeSniffer b/PHP_CodeSniffer
index ed8e00d..d63cee4 160000
--- a/PHP_CodeSniffer
+++ b/PHP_CodeSniffer
@@ -1 +1 @@
-Subproject commit ed8e00df0a83aa96acf703f8c2979ff33341f879
+Subproject commit d63cee4890a8afaf86a22e51ad4d97c91dd4579b
diff --git a/moodle-cs b/moodle-cs
index a415a54..3966e9f 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit a415a541c7b9b56698db8bf0335ce767d02c05bb
+Subproject commit 3966e9f1e1acdf0f11e2c8c49e5c718f9a8ff54a

From a32c53b30163ab23da8b7fc08bafcdd859537ee6 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Tue, 9 Apr 2024 09:59:08 -0400
Subject: [PATCH 27/29] standards: PHPCSUtils 1.0.10; PHPCompatibility
 2024-04-08; PHP_CodeSniffer 3.9.1; WordPress-Coding-Standards 3.1.0;
 moodle-cs v3.4.6

---
 PHPCSUtils                 | 2 +-
 PHPCompatibility           | 2 +-
 PHP_CodeSniffer            | 2 +-
 WordPress-Coding-Standards | 2 +-
 moodle-cs                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index 908247b..f627b49 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit 908247bc65010c7b7541a9551e002db12e9dae70
+Subproject commit f627b49f14be0f9f1283a1d4ed3df60a666a0a50
diff --git a/PHPCompatibility b/PHPCompatibility
index 177933b..a988e5b 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit 177933bc1e482723bb44dd84b2c5735da01fc054
+Subproject commit a988e5b959ef71b59038af725ce44516c4b587db
diff --git a/PHP_CodeSniffer b/PHP_CodeSniffer
index d63cee4..267a440 160000
--- a/PHP_CodeSniffer
+++ b/PHP_CodeSniffer
@@ -1 +1 @@
-Subproject commit d63cee4890a8afaf86a22e51ad4d97c91dd4579b
+Subproject commit 267a4405fff1d9c847134db3a3c92f1ab7f77909
diff --git a/WordPress-Coding-Standards b/WordPress-Coding-Standards
index b4caf96..9333efc 160000
--- a/WordPress-Coding-Standards
+++ b/WordPress-Coding-Standards
@@ -1 +1 @@
-Subproject commit b4caf9689f1a0e4a4c632679a44e638c1c67aff1
+Subproject commit 9333efcbff231f10dfd9c56bb7b65818b4733ca7
diff --git a/moodle-cs b/moodle-cs
index 3966e9f..02a279e 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 3966e9f1e1acdf0f11e2c8c49e5c718f9a8ff54a
+Subproject commit 02a279ecbd9431172e8eeee5385d4f6ec57c957b

From 845ea2922389aae5e2f665259624cdcb00bc0372 Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Thu, 29 Aug 2024 15:30:41 -0400
Subject: [PATCH 28/29] standards: PHPCSUtils 1.0.12; PHPCompatibility
 2024-08-11; PHP_CodeSniffer 3.10.2; moodle-cs v3.4.10

---
 PHPCSUtils       | 2 +-
 PHPCompatibility | 2 +-
 PHP_CodeSniffer  | 2 +-
 moodle-cs        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PHPCSUtils b/PHPCSUtils
index f627b49..87b233b 160000
--- a/PHPCSUtils
+++ b/PHPCSUtils
@@ -1 +1 @@
-Subproject commit f627b49f14be0f9f1283a1d4ed3df60a666a0a50
+Subproject commit 87b233b00daf83fb70f40c9a28692be017ea7c6c
diff --git a/PHPCompatibility b/PHPCompatibility
index a988e5b..2b7b6e8 160000
--- a/PHPCompatibility
+++ b/PHPCompatibility
@@ -1 +1 @@
-Subproject commit a988e5b959ef71b59038af725ce44516c4b587db
+Subproject commit 2b7b6e8f5d0ccae3bd41c25bcf1298884a5e1f62
diff --git a/PHP_CodeSniffer b/PHP_CodeSniffer
index 267a440..86e5f5d 160000
--- a/PHP_CodeSniffer
+++ b/PHP_CodeSniffer
@@ -1 +1 @@
-Subproject commit 267a4405fff1d9c847134db3a3c92f1ab7f77909
+Subproject commit 86e5f5dd9a840c46810ebe5ff1885581c42a3017
diff --git a/moodle-cs b/moodle-cs
index 02a279e..89ff0ac 160000
--- a/moodle-cs
+++ b/moodle-cs
@@ -1 +1 @@
-Subproject commit 02a279ecbd9431172e8eeee5385d4f6ec57c957b
+Subproject commit 89ff0acd727f8611cbafe5aea524614090b24ad9

From 1a4e4d0c0e7442ea0f6f54eb332a96654a52e7eb Mon Sep 17 00:00:00 2001
From: Jonathan Champ <jrchamp@ncsu.edu>
Date: Fri, 11 Oct 2024 13:52:52 -0400
Subject: [PATCH 29/29] wordpress: check all files, not just PHP

---
 wp.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wp.xml b/wp.xml
index 56fb956..162cfb7 100644
--- a/wp.xml
+++ b/wp.xml
@@ -2,9 +2,6 @@
 <ruleset name="DELTA-WordPress-Development">
 	<description>A custom set of rules based on WordPress project</description>
 
-	<!-- Only scan PHP files. -->
-	<arg name="extensions" value="php"/>
-
 	<!-- Check up to 8 files simultanously. -->
 	<arg name="parallel" value="8"/>