From b6e8853ae29347c6d569d5770bdb8e7025fed666 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 13 Sep 2025 14:56:56 +0200
Subject: [PATCH 1/2] PHPCS: remove redundant exclusion

The test bootstrap file no longer creates aliases for the old PHPUnit class names, so this exclusion is no longer needed.
---
 phpcs.xml.dist | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index be0349890a..fc5597bbf4 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -157,11 +157,6 @@
     <!-- Do not allow ambiguous conditions. -->
     <rule ref="Generic.CodeAnalysis.RequireExplicitBooleanOperatorPrecedence"/>
 
-    <!-- The testing bootstrap file uses string concats to stop IDEs seeing the class aliases -->
-    <rule ref="Generic.Strings.UnnecessaryStringConcat">
-        <exclude-pattern>tests/bootstrap\.php</exclude-pattern>
-    </rule>
-
     <!-- This test file specifically *needs* Windows line endings for testing purposes. -->
     <rule ref="Generic.Files.LineEndings.InvalidEOLChar">
         <exclude-pattern>tests/Core/Tokenizers/PHP/*WinTest\.php</exclude-pattern>

From dc5bcedae0c14cf546e9f6368b8c9b2d43a3b956 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 13 Sep 2025 14:51:47 +0200
Subject: [PATCH 2/2] PHPCS: add some extra function comment rules

---
 phpcs.xml.dist | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index fc5597bbf4..8f73c7b5f0 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -182,4 +182,17 @@
         <!-- Prevent conflict with function spacing sniff. -->
         <exclude-pattern>/requirements\.php</exclude-pattern>
     </rule>
+
+    <!-- Use select error codes from the Squiz FunctionComment sniff, which shouldn't conflict with the PEAR sniff. -->
+    <rule ref="Squiz.Commenting.FunctionComment.InvalidReturnVoid"/>
+    <rule ref="Squiz.Commenting.FunctionComment.InvalidNoReturn"/>
+    <rule ref="Squiz.Commenting.FunctionComment.InvalidReturnNotVoid"/>
+    <rule ref="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
+    <rule ref="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
+    <rule ref="Squiz.Commenting.FunctionComment.InvalidReturnVoid"/>
+    <rule ref="Squiz.Commenting.FunctionComment.IncorrectTypeHint"/>
+    <rule ref="Squiz.Commenting.FunctionComment.InvalidTypeHint"/>
+    <rule ref="Squiz.Commenting.FunctionComment.ParamNameUnexpectedAmpersandPrefix"/>
+    <rule ref="Squiz.Commenting.FunctionComment.ParamCommentNotCapital"/>
+
 </ruleset>