[TypedCollections] Skip with string key already on CompleteReturnDocblockFromToManyRector (#480)

* [TypedCollections] Skip with string key already on CompleteReturnDocblockFromToManyRector

* [rector] Rector fixes

---------

Co-authored-by: GitHub Action <actions@github.com>

Author: samsonasik

rules-tests/TypedCollections/Rector/Class_/CompleteReturnDocblockFromToManyRector/Fixture/OneToMany/skip_with_string_key.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\Class_\CompleteReturnDocblockFromToManyRector\Fixture\OneToMany;
+
+ use Doctrine\ORM\Mapping as ORM;
+
+ /**
+  * @ORM\Entity
+  */
+ final class Trainer
+ {
+     /**
+      * @ORM\OneToMany(targetEntity=Training::class, indexBy=someField)
+      * @var \Doctrine\Common\Collections\Collection<string, Training>
+      */
+     private $trainings;
+
+     /**
+      * @return \Doctrine\Common\Collections\Collection<string, Training>
+      */
+     public function getTrainings()
+     {
+         return $this->trainings;
+     }
+ }

rules/TypedCollections/DocBlockProcessor/UnionCollectionTagValueNodeNarrower.php

@@ -220,7 +220,8 @@ private function isCollectionIdentifierTypeNode(TypeNode $typeNode): bool
 
         return in_array(
             $typeNode->name,
-            [DoctrineClass::COLLECTION, DoctrineClass::ARRAY_COLLECTION, 'Collection', 'ArrayCollection']
+            [DoctrineClass::COLLECTION, DoctrineClass::ARRAY_COLLECTION, 'Collection', 'ArrayCollection'],
+            true
         );
     }
 }

rules/TypedCollections/Rector/Class_/CompleteReturnDocblockFromToManyRector.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
+use PHPStan\Type\Generic\GenericObjectType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Doctrine\NodeAnalyzer\MethodUniqueReturnedPropertyResolver;
@@ -134,6 +135,12 @@ public function refactor(Node $node): ?Node
                 $this->collectionTypeResolver->hasIndexBy($property),
                 $property
             );
+
+            $returnType = $phpDocInfo->getReturnType();
+            if ($returnType instanceof GenericObjectType) {
+                continue;
+            }
+
             $this->phpDocTypeChanger->changeReturnType($classMethod, $phpDocInfo, $newVarType);
             $hasChanged = true;
         }