From 4512a6282d6487249bce08e83b34186c0244d48b Mon Sep 17 00:00:00 2001
From: Maarten Paauw <github@paauw.dev>
Date: Mon, 6 Jul 2026 15:57:59 +0200
Subject: [PATCH 1/2] test: add broken test file for static union type

---
 .../skip_generic_union_return_self.php.inc      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector/Fixture/skip_generic_union_return_self.php.inc

diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector/Fixture/skip_generic_union_return_self.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector/Fixture/skip_generic_union_return_self.php.inc
new file mode 100644
index 00000000000..4fe32cf9b2b
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector/Fixture/skip_generic_union_return_self.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDuplicatedReturnSelfDocblockRector\Fixture;
+
+/**
+ * @template TFirst of scalar
+ */
+abstract readonly class SkipGenericUnionReturnSelf
+{
+    /**
+     * @return static<string|int>
+     */
+    public function get(): self
+    {
+        return $this;
+    }
+}

From fd5008bc7a69b0dd24479ff5bdbe5bd130cee01b Mon Sep 17 00:00:00 2001
From: Maarten Paauw <github@paauw.dev>
Date: Mon, 6 Jul 2026 16:23:20 +0200
Subject: [PATCH 2/2] fix: enhance type handling for static generics

---
 .../ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php
index 62b4f8bb763..11cf7645087 100644
--- a/rules/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php
+++ b/rules/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php
@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Generic\GenericStaticType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@@ -128,7 +129,7 @@ private function isCurrentObjectReturnDocType(
         $docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($typeNode, $classMethod);
 
         // generic narrowing, e.g. @return self<TValue, never> is not a plain duplicate of the native self type
-        if ($docType instanceof GenericObjectType) {
+        if ($docType instanceof GenericObjectType || $docType instanceof GenericStaticType) {
             return false;
         }