From 742c11a4f2cb1f4d76550be1e1957ed62efdb18b Mon Sep 17 00:00:00 2001
From: dpi <pro@danielph.in>
Date: Tue, 4 Jun 2024 18:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bugs=20introduced=20by=20`?=
 =?UTF-8?q?drupal/coder`=208.3.24=20(#82)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PreviousNextDrupal/ruleset.xml | 12 ++++++++++++
 composer.json                  |  2 +-
 phpstan.neon                   |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/PreviousNextDrupal/ruleset.xml b/PreviousNextDrupal/ruleset.xml
index 008f68e..3737c25 100644
--- a/PreviousNextDrupal/ruleset.xml
+++ b/PreviousNextDrupal/ruleset.xml
@@ -62,6 +62,14 @@
     <!-- Drupal -->
     <rule ref="Drupal" />
 
+    <!-- Undo the DeclareStrictTypesMissing ignore introduced by
+         https://www.drupal.org/project/coder/issues/3407995
+         This must be placed after the above ref="Drupal"
+         -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
+        <severity>5</severity>
+    </rule>
+
     <!-- Drupal.Arrays -->
     <rule ref="Drupal.Arrays.Array.LongLineDeclaration"><severity>0</severity></rule>
 
@@ -77,4 +85,8 @@
     <rule ref="Drupal.Commenting.TodoComment.TodoFormat"><severity>0</severity></rule>
     <!-- Do not require @var for properties since PHP has property typing -->
     <rule ref="Drupal.Commenting.VariableComment.Missing"><severity>0</severity></rule>
+
+    <!-- Drupal.Functions -->
+    <!-- This duplicates SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration -->
+    <rule ref="Drupal.Functions.MultiLineFunctionDeclaration.MissingTrailingComma"><severity>0</severity></rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index a69b778..60f20c4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
-        "drupal/coder": "^8.3.21",
+        "drupal/coder": "^8.3.24",
         "slevomat/coding-standard": "^8.13.2",
         "squizlabs/php_codesniffer": "^3.7.1"
     },
diff --git a/phpstan.neon b/phpstan.neon
index dc3e8be..3ba1fd3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,4 +7,6 @@ parameters:
 		- %currentWorkingDirectory%/vendor/squizlabs/php_codesniffer/autoload.php
 	excludePaths:
 		- %currentWorkingDirectory%/tests/*/fixtures/*
-	checkGenericClassInNonGenericObjectType: false
+	ignoreErrors:
+		-
+			identifier: missingType.generics