From 9e54f349fea49690e7daa75f507598b041845a2d Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Sat, 6 Sep 2025 13:19:49 +0200
Subject: [PATCH 1/2] More rules inspired by phpstan-src

---
 phpcs.xml | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index 62a2e0c..fd25955 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -16,6 +16,7 @@
 		<exclude name="Squiz.Commenting.FunctionComment"/>
 		<exclude name="Squiz.PHP.Heredoc.NotAllowed"/>
 		<exclude name="Squiz.WhiteSpace.FunctionSpacing.Before"/>
+		<exclude name="SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
 		<properties>
@@ -51,6 +52,8 @@
 	</rule>
 	<rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure.UnusedInheritedVariable"/>
 	<rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly.ReferencedGeneralException"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
 	<rule ref="SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit">
@@ -67,6 +70,17 @@
 
 		</properties>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Classes.ClassMemberSpacing">
+		<properties>
+			<property name="linesCountBetweenMembers" value="1"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Classes.MethodSpacing">
+		<properties>
+			<property name="minLinesCount" value="1"/>
+			<property name="maxLinesCount" value="1"/>
+		</properties>
+	</rule>
 	<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
 	<rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
 	<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
@@ -76,8 +90,12 @@
 	<rule ref="SlevomatCodingStandard.Classes.TraitUseSpacing"/>
 	<rule ref="SlevomatCodingStandard.Variables.UnusedVariable"/>
 	<rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
-	<!-- Disallow trailing comma in function calls, since this breaks on PHP < 7.3 -->
-	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
+		<properties>
+			<property name="onlySingleLine" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
 	<!-- Disallow trailing comma in closure use and function declarations, since this breaks on PHP < 8.0 -->
 	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse" />
 	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration" />
@@ -119,11 +137,7 @@
 			<property name="enable" value="true"/>
 		</properties>
 	</rule>
-	<rule ref="SlevomatCodingStandard.Functions.RequireArrowFunction">
-		<properties>
-			<property name="enable" value="true"/>
-		</properties>
-	</rule>
+	<rule ref="SlevomatCodingStandard.Functions.RequireArrowFunction"/>
 	<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration"/>
 	<exclude-pattern>tests/*/data</exclude-pattern>
 	<exclude-pattern>tests/*/data-attributes</exclude-pattern>

From 40541f6bcc86e5a0659c58ad3860c93509d7e71a Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Sat, 6 Sep 2025 13:30:55 +0200
Subject: [PATCH 2/2] Test phpstan-src

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 564b1d1..f817094 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,7 @@ jobs:
           - "phpstan-deprecation-rules"
           - "phpstan-dibi"
           - "phpstan-strict-rules"
+          - "phpstan-src"
 
     steps:
       - name: "Checkout extension"