Copy subtype phpdoc on ClassPropertyAssignToConstructorPromotionRecto…

…r (#8438) (#5603)

* Copy subtype phpdoc on ClassPropertyAssignToConstructorPromotionRector (#8438)

* Apply suggestions from code review

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

---------

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/copy_integer_range_type_doc.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+class CopyIntegerRangeType
+{
+    /** @var positive-int */
+    public int $count;
+
+    public function __construct(int $count)
+    {
+        $this->count = $count;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+class CopyIntegerRangeType
+{
+    public function __construct(
+        /** @var positive-int */
+        public int $count
+    )
+    {
+    }
+}
+
+?>

rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php

@@ -15,6 +15,7 @@
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\DeadCode\PhpDoc\DeadVarTagValueNodeAnalyzer;
+use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
 use Rector\PHPStanStaticTypeMapper\DoctrineTypeAnalyzer;
 
 final readonly class VarTagRemover
@@ -25,6 +26,7 @@ public function __construct(
         private DeadVarTagValueNodeAnalyzer $deadVarTagValueNodeAnalyzer,
         private PhpDocTypeChanger $phpDocTypeChanger,
         private DocBlockUpdater $docBlockUpdater,
+        private TypeComparator $typeComparator,
     ) {
     }
 
@@ -78,7 +80,18 @@ public function removeVarPhpTagValueNodeIfNotComment(Expression | Property | Par
             return;
         }
 
+        // keep subtypes like positive-int
+        if ($this->shouldKeepSubtypes($type, $phpDocInfo->getVarType())) {
+            return;
+        }
+
         $phpDocInfo->removeByType(VarTagValueNode::class);
         $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
     }
+
+    private function shouldKeepSubtypes(Type $type, Type $varType): bool
+    {
+        return ! $this->typeComparator->areTypesEqual($type, $varType)
+            && $this->typeComparator->isSubtype($varType, $type);
+    }
 }