AddGenericReturnTypeToRelationsRector fix for chained relation call

driftingly · Dec 17, 2024 · 4061832 · 4061832
1 parent 44674a8
commit 4061832
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php b/src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php
@@ -265,6 +265,12 @@ private function getRelationMethodCall(ClassMethod $classMethod): ?MethodCall
             return null;
         }
 
+        // Find deepest MethodCall, which is the first in code, to allow chaining:
+        // $this->hasMany(..)->orderBy(..)->with(..)
+        while ($methodCall->var instanceof MethodCall) {
+            $methodCall = $methodCall->var;
+        }
+
         // Called method should be one of the Laravel's relation methods
         if (! $this->doesMethodHasName($methodCall, self::RELATION_METHODS)) {
             return null;