add failing fixture

rules-tests/TypedCollections/Rector/ClassMethod/RemoveNullFromNullableCollectionTypeRector/Fixture/property_with_other_doc.php.inc

@@ -0,0 +1,51 @@
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\ClassMethod\RemoveNullFromNullableCollectionTypeRector\Fixture;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
+use Symfony\Component\Validator\Constraints as Assert;
+
+final class PropertyWithOtherDoc
+{
+    /**
+     * @MongoDB\EmbedMany()
+     * @var Collection<int, string>|null
+     * @Assert\Valid()
+     */
+    private Collection $collection;
+
+    public function __construct()
+    {
+        $this->collection = new ArrayCollection([]);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\ClassMethod\RemoveNullFromNullableCollectionTypeRector\Fixture;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
+use Symfony\Component\Validator\Constraints as Assert;
+
+final class PropertyWithOtherDoc
+{
+    /**
+     * @MongoDB\EmbedMany()
+     * @var \Doctrine\Common\Collections\Collection<int, string>
+     * @Assert\Valid()
+     */
+    private Collection $collection;
+
+    public function __construct()
+    {
+        $this->collection = new ArrayCollection([]);
+    }
+}
+
+?>

rules-tests/TypedCollections/Rector/ClassMethod/RemoveNullFromNullableCollectionTypeRector/Fixture/remove_from_property_docblock.php.inc

@@ -30,7 +30,7 @@ use Doctrine\Common\Collections\Collection;
 final class RemoveFromPropertyDocblock
 {
     /**
-     * @var Collection<int, string>
+     * @var \Doctrine\Common\Collections\Collection<int, string>
      */
     private Collection $collection;
 

rules-tests/TypedCollections/Rector/ClassMethod/RemoveNullFromNullableCollectionTypeRector/Fixture/remove_union_from_property_docblock.php.inc

@@ -30,7 +30,7 @@ use Doctrine\Common\Collections\Collection;
 final class RemoveUnionFromPropertyDocblock
 {
     /**
-     * @var Collection<int, string>
+     * @var \Doctrine\Common\Collections\Collection<int, string>
      */
     private Collection $collection;
 

rules/TypedCollections/Rector/ClassMethod/RemoveNullFromNullableCollectionTypeRector.php

@@ -15,10 +15,11 @@
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Comments\NodeDocBlock\DocBlockUpdater;
+use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -30,7 +31,8 @@ final class RemoveNullFromNullableCollectionTypeRector extends AbstractRector
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly PhpDocTypeChanger $phpDocTypeChanger,
+        private readonly StaticTypeMapper $staticTypeMapper
     ) {
     }
 
@@ -96,6 +98,7 @@ private function refactorClassMethod(ClassMethod $classMethod): null|ClassMethod
             return null;
         }
 
+        // nullable might be on purpose, e.g. via data provider
         if ($this->testsNodeAnalyzer->isInTestClass($classMethod)) {
             return null;
         }
@@ -155,10 +158,13 @@ private function refactorProperty(Property $property): ?Property
                 // only one type left, lets use it directly
                 if (count($unionTypeNode->types) === 1) {
                     $onlyType = array_pop($unionTypeNode->types);
-                    $varTagValueNode->type = $onlyType;
+                    $finalType = $onlyType;
+                } else {
+                    $finalType = $unionTypeNode;
                 }
 
-                $this->updateVarTagValueNode($phpDocInfo, $varTagValueNode, $property);
+                $finalType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($finalType, $property);
+                $this->phpDocTypeChanger->changeVarType($property, $phpDocInfo, $finalType);
 
                 return $property;
             }
@@ -170,8 +176,12 @@ private function refactorProperty(Property $property): ?Property
         }
 
         // unwrap nullable type
-        $varTagValueNode->type = $varTagValueNode->type->type;
-        $this->updateVarTagValueNode($phpDocInfo, $varTagValueNode, $property);
+        $finalType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType(
+            $varTagValueNode->type->type,
+            $property
+        );
+
+        $this->phpDocTypeChanger->changeVarType($property, $phpDocInfo, $finalType);
 
         return $property;
     }
@@ -184,16 +194,4 @@ private function hasNativeCollectionType(Property $property): bool
 
         return $this->isName($property->type, DoctrineClass::COLLECTION);
     }
-
-    private function updateVarTagValueNode(
-        PhpDocInfo $phpDocInfo,
-        VarTagValueNode $varTagValueNode,
-        Property $property
-    ): void {
-
-        $phpDocInfo->removeByType(VarTagValueNode::class);
-        $phpDocInfo->addTagValueNode($varTagValueNode);
-
-        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($property);
-    }
 }