From f35e0621aa9f200a3ca05a0a1cc030560634f315 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Sun, 12 Jul 2026 12:37:35 +0200
Subject: [PATCH 1/3] [StaticTypeMapper] Map literal-string docblock type to
 AccessoryLiteralStringType

---
 .../Fixture/skip_literal_string_narrowing.php.inc  | 14 ++++++++++++++
 .../Mapper/ScalarStringToTypeMapper.php            |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_literal_string_narrowing.php.inc

diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_literal_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_literal_string_narrowing.php.inc
new file mode 100644
index 00000000000..8b6fdb241ac
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_literal_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipLiteralStringNarrowing
+{
+    /**
+     * @return literal-string
+     */
+    public function getTableAlias(): string
+    {
+        return 'n';
+    }
+}
diff --git a/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php b/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
index 36d0e79d0e8..1ac143f76b9 100644
--- a/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
+++ b/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
@@ -6,6 +6,7 @@
 
 use Nette\Utils\Strings;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryLiteralStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
@@ -35,6 +36,7 @@ final class ScalarStringToTypeMapper
     private const array SCALAR_NAME_BY_TYPE = [
         StringType::class => ['string'],
         AccessoryNonEmptyStringType::class => ['non-empty-string'],
+        AccessoryLiteralStringType::class => ['literal-string'],
         NonEmptyArrayType::class => ['non-empty-array'],
         ClassStringType::class => ['class-string'],
         FloatType::class => ['float', 'real', 'double'],

From 20e9a16e050212714da3dcedd5f30a2767cadb62 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Sun, 12 Jul 2026 12:38:20 +0200
Subject: [PATCH 2/3] add non-empty-string regression fixture

---
 .../skip_non_empty_string_narrowing.php.inc        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_empty_string_narrowing.php.inc

diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_empty_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_empty_string_narrowing.php.inc
new file mode 100644
index 00000000000..78f81f6c735
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_empty_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipNonEmptyStringNarrowing
+{
+    /**
+     * @return non-empty-string
+     */
+    public function getName(): string
+    {
+        return 'name';
+    }
+}

From 93f189ea140e8797bf7f35e276943d8bd6b5dfb2 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Sun, 12 Jul 2026 12:41:52 +0200
Subject: [PATCH 3/3] map more phpstan-special types:
 numeric/non-falsy/lowercase/uppercase-string, non-negative/non-positive-int,
 array-key

---
 .../skip_lowercase_string_narrowing.php.inc   | 14 +++++++++++++
 .../skip_non_falsy_string_narrowing.php.inc   | 14 +++++++++++++
 .../skip_non_negative_int_narrowing.php.inc   | 14 +++++++++++++
 .../skip_non_positive_int_narrowing.php.inc   | 14 +++++++++++++
 .../skip_numeric_string_narrowing.php.inc     | 14 +++++++++++++
 .../skip_uppercase_string_narrowing.php.inc   | 14 +++++++++++++
 .../Mapper/ScalarStringToTypeMapper.php       | 21 +++++++++++++++++++
 7 files changed, 105 insertions(+)
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_lowercase_string_narrowing.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_falsy_string_narrowing.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_negative_int_narrowing.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_positive_int_narrowing.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_numeric_string_narrowing.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_uppercase_string_narrowing.php.inc

diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_lowercase_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_lowercase_string_narrowing.php.inc
new file mode 100644
index 00000000000..c7a75ca989f
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_lowercase_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipLowercaseStringNarrowing
+{
+    /**
+     * @return lowercase-string
+     */
+    public function run(): string
+    {
+        return 'x';
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_falsy_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_falsy_string_narrowing.php.inc
new file mode 100644
index 00000000000..3abb4f51d5f
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_falsy_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipNonFalsyStringNarrowing
+{
+    /**
+     * @return non-falsy-string
+     */
+    public function run(): string
+    {
+        return 'x';
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_negative_int_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_negative_int_narrowing.php.inc
new file mode 100644
index 00000000000..bfbec9c2261
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_negative_int_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipNonNegativeIntNarrowing
+{
+    /**
+     * @return non-negative-int
+     */
+    public function run(): int
+    {
+        return 0;
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_positive_int_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_positive_int_narrowing.php.inc
new file mode 100644
index 00000000000..c2b48626c39
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_non_positive_int_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipNonPositiveIntNarrowing
+{
+    /**
+     * @return non-positive-int
+     */
+    public function run(): int
+    {
+        return 0;
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_numeric_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_numeric_string_narrowing.php.inc
new file mode 100644
index 00000000000..f575bb056c5
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_numeric_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipNumericStringNarrowing
+{
+    /**
+     * @return numeric-string
+     */
+    public function run(): string
+    {
+        return '1';
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_uppercase_string_narrowing.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_uppercase_string_narrowing.php.inc
new file mode 100644
index 00000000000..6d606ffaab4
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveReturnTagIncompatibleWithNativeTypeRector/Fixture/skip_uppercase_string_narrowing.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector\Fixture;
+
+final class SkipUppercaseStringNarrowing
+{
+    /**
+     * @return uppercase-string
+     */
+    public function run(): string
+    {
+        return 'X';
+    }
+}
diff --git a/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php b/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
index 1ac143f76b9..2cd22974a20 100644
--- a/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
+++ b/src/StaticTypeMapper/Mapper/ScalarStringToTypeMapper.php
@@ -7,7 +7,11 @@
 use Nette\Utils\Strings;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\Accessory\AccessoryLiteralStringType;
+use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
+use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
+use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
@@ -26,6 +30,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\UnionType;
 use PHPStan\Type\VoidType;
 
 final class ScalarStringToTypeMapper
@@ -37,6 +42,10 @@ final class ScalarStringToTypeMapper
         StringType::class => ['string'],
         AccessoryNonEmptyStringType::class => ['non-empty-string'],
         AccessoryLiteralStringType::class => ['literal-string'],
+        AccessoryNumericStringType::class => ['numeric-string'],
+        AccessoryNonFalsyStringType::class => ['non-falsy-string', 'truthy-string'],
+        AccessoryLowercaseStringType::class => ['lowercase-string'],
+        AccessoryUppercaseStringType::class => ['uppercase-string'],
         NonEmptyArrayType::class => ['non-empty-array'],
         ClassStringType::class => ['class-string'],
         FloatType::class => ['float', 'real', 'double'],
@@ -70,6 +79,18 @@ public function mapScalarStringToType(string $scalarName): Type
             return IntegerRangeType::createAllSmallerThan(0);
         }
 
+        if ($loweredScalarName === 'non-negative-int') {
+            return IntegerRangeType::fromInterval(0, null);
+        }
+
+        if ($loweredScalarName === 'non-positive-int') {
+            return IntegerRangeType::fromInterval(null, 0);
+        }
+
+        if ($loweredScalarName === 'array-key') {
+            return new UnionType([new IntegerType(), new StringType()]);
+        }
+
         foreach (self::SCALAR_NAME_BY_TYPE as $objectType => $scalarNames) {
             if (! in_array($loweredScalarName, $scalarNames, true)) {
                 continue;