[NodeAnalyzer] Ensure mix annotation and attribute lookup finder on A…

…ttrinationFinder::findManyBy* (#367)
rectorphp · Feb 16, 2025 · 33f8d9b · 33f8d9b
1 parent 10aecf9
commit 33f8d9b
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/NodeAnalyzer/AttrinationFinder.php b/src/NodeAnalyzer/AttrinationFinder.php
@@ -53,14 +53,12 @@ public function hasByOne(Property|Class_|ClassMethod|Param $node, string $name):
     public function findManyBy(Property|Class_|ClassMethod|Param $node, string $name): array
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
+        $doctrineAnnotationTagValueNodes = [];
         if ($phpDocInfo instanceof PhpDocInfo) {
             $doctrineAnnotationTagValueNodes = $phpDocInfo->findByAnnotationClass($name);
-            if ($doctrineAnnotationTagValueNodes !== []) {
-                return $doctrineAnnotationTagValueNodes;
-            }
         }
 
-        return $this->attributeFinder->findManyByClass($node, $name);
+        return array_merge($doctrineAnnotationTagValueNodes, $this->attributeFinder->findManyByClass($node, $name));
     }
 
     /**
@@ -70,19 +68,20 @@ public function findManyBy(Property|Class_|ClassMethod|Param $node, string $name
     public function findManyByMany(Property|Class_|ClassMethod|Param $node, array $names): array
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
-        if ($phpDocInfo instanceof PhpDocInfo) {
-            $doctrineAnnotationTagValueNodes = [];
+        $doctrineAnnotationTagValueNodes = [];
 
+        if ($phpDocInfo instanceof PhpDocInfo) {
             foreach ($names as $name) {
                 foreach ($phpDocInfo->findByAnnotationClass($name) as $annotationTagValueNode) {
                     $doctrineAnnotationTagValueNodes[] = $annotationTagValueNode;
                 }
             }
-
-            return $doctrineAnnotationTagValueNodes;
         }
 
-        return $this->attributeFinder->findManyByClasses($node, $names);
+        return array_merge(
+            $doctrineAnnotationTagValueNodes,
+            $this->attributeFinder->findManyByClasses($node, $names)
+        );
     }
 
     /**