add odm support to AddReturnDocBlockToCollectionPropertyGetterByToMan…

…yAnnotationRector
rectorphp · Jul 25, 2024 · d6d0f4f · d6d0f4f
1 parent df90845
commit d6d0f4f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 35 deletions.
diff --git a/...ReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector/Fixture/Odm/orm_many.php b/...ReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector/Fixture/Odm/orm_many.php
diff --git a/...rnDocBlockToCollectionPropertyGetterByToManyAnnotationRector/Fixture/Odm/orm_many.php.inc b/...rnDocBlockToCollectionPropertyGetterByToManyAnnotationRector/Fixture/Odm/orm_many.php.inc
@@ -12,7 +12,7 @@ use Rector\Doctrine\Tests\CodeQuality\Rector\Class_\AddReturnDocBlockToCollectio
 final class OdmMany
 {
     /**
-     * @\Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany()
+     * @\Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany(targetDocument="\Rector\Doctrine\Tests\CodeQuality\Rector\Class_\AddReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector\Source\Training")
      */
     private $items = [];
 
@@ -38,10 +38,17 @@ use Rector\Doctrine\Tests\CodeQuality\Rector\Class_\AddReturnDocBlockToCollectio
 final class OdmMany
 {
     /**
-     * @\Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany()
+     * @\Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany(targetDocument="\Rector\Doctrine\Tests\CodeQuality\Rector\Class_\AddReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector\Source\Training")
      */
     private $items = [];
+
+    /**
+     * @return \Doctrine\Common\Collections\Collection<int, \\Rector\Doctrine\Tests\CodeQuality\Rector\Class_\AddReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector\Source\Training>
+     */
+    public function getItems()
+    {
+        return $this->items;
+    }
 }
 
 ?>
-
diff --git a/rules/CodeQuality/Enum/ToManyMappings.php b/rules/CodeQuality/Enum/ToManyMappings.php
@@ -10,7 +10,7 @@
 class ToManyMappings
 {
     /**
-     * @var class-string[]
+     * @var string[]
      */
     final public const TO_MANY_CLASSES = [
         MappingClass::ONE_TO_MANY,

diff --git a/src/TypeAnalyzer/CollectionTypeResolver.php b/src/TypeAnalyzer/CollectionTypeResolver.php
@@ -15,7 +15,6 @@
 use Rector\BetterPhpDocParser\PhpDoc\StringNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Doctrine\CodeQuality\Enum\ToManyMappings;
-use Rector\Doctrine\Enum\OdmMappingClass;
 use Rector\Doctrine\PhpDoc\ShortClassExpander;
 use Rector\StaticTypeMapper\Naming\NameScopeFactory;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@@ -59,15 +58,15 @@ public function resolveFromToManyProperties(Property $property): ?FullyQualified
         }
 
         $targetEntityArrayItemNode = $doctrineAnnotationTagValueNode->getValue('targetEntity');
+        // in case of odm
+        $targetDocumentArrayItemNode = $doctrineAnnotationTagValueNode->getValue('targetDocument');
 
-        dump($targetEntityArrayItemNode);
-        die;
-
-        if (! $targetEntityArrayItemNode instanceof ArrayItemNode) {
+        $targetArrayItemNode = $targetEntityArrayItemNode ?: $targetDocumentArrayItemNode;
+        if (! $targetArrayItemNode instanceof ArrayItemNode) {
             return null;
         }
 
-        $targetEntityClass = $targetEntityArrayItemNode->value;
+        $targetEntityClass = $targetArrayItemNode->value;
 
         if ($targetEntityClass instanceof StringNode) {
             $targetEntityClass = $targetEntityClass->value;