From 593983325a29d8bbfca83b57b98f64a72011f42d Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sat, 19 Sep 2026 09:48:32 +0200
Subject: [PATCH 1/2] Fix PHPParser ArgPlaceholder compat

---
 src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php | 4 ++--
 src/Rules/PHPUnit/AssertSameNullExpectedRule.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php b/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
index f185bdf7..e0bcfd62 100644
--- a/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
+++ b/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
@@ -77,8 +77,8 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param array<Node\Arg|Node\VariadicPlaceholder> $args
-	 * @return list<Node\Arg|Node\VariadicPlaceholder>
+	 * @param array<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder> $args
+	 * @return list<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder>
 	 */
 	private static function rewriteArgs(array $args): array
 	{
diff --git a/src/Rules/PHPUnit/AssertSameNullExpectedRule.php b/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
index f6032efb..fc637aba 100644
--- a/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
+++ b/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
@@ -63,8 +63,8 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param array<Node\Arg|Node\VariadicPlaceholder> $args
-	 * @return list<Node\Arg|Node\VariadicPlaceholder>
+	 * @param array<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder> $args
+	 * @return list<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder>
 	 */
 	private static function rewriteArgs(array $args): array
 	{

From c5f13c53f3d71a97157e8748f33b57cc75689005 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sat, 19 Sep 2026 09:55:37 +0200
Subject: [PATCH 2/2] simplify fix

---
 src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php | 6 ++++--
 src/Rules/PHPUnit/AssertSameNullExpectedRule.php    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php b/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
index e0bcfd62..89078793 100644
--- a/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
+++ b/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -77,8 +78,9 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param array<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder> $args
-	 * @return list<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder>
+	 * @template T of NodeAbstract
+	 * @param array<T> $args
+	 * @return list<T>
 	 */
 	private static function rewriteArgs(array $args): array
 	{
diff --git a/src/Rules/PHPUnit/AssertSameNullExpectedRule.php b/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
index fc637aba..2d5fda41 100644
--- a/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
+++ b/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -63,8 +64,9 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param array<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder> $args
-	 * @return list<Node\Arg|Node\VariadicPlaceholder|Node\ArgPlaceholder>
+	 * @template T of NodeAbstract
+	 * @param array<T> $args
+	 * @return list<T>
 	 */
 	private static function rewriteArgs(array $args): array
 	{