Merge pull request #15 from calebdw/relation_class_forwarding

fix: relation class forwarding
calebdw · Sep 14, 2024 · 07b0e17 · 07b0e17
2 parents 9844f3e + f0b347b
commit 07b0e17
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/src/Methods/EloquentBuilderForwardsCallsExtension.php b/src/Methods/EloquentBuilderForwardsCallsExtension.php
@@ -68,7 +68,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
      */
     private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
     {
-        if ($classReflection->getName() !== EloquentBuilder::class && ! $classReflection->isSubclassOf(EloquentBuilder::class)) {
+        if (! $classReflection->is(EloquentBuilder::class)) {
             return null;
         }
 

diff --git a/src/Methods/MacroMethodsClassReflectionExtension.php b/src/Methods/MacroMethodsClassReflectionExtension.php
@@ -71,9 +71,8 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
             }
         } elseif (
             $this->hasIndirectTraitUse($classReflection, Macroable::class) ||
-            $classReflection->getName() === Builder::class ||
-            $classReflection->isSubclassOf(Builder::class) ||
-            $classReflection->getName() === QueryBuilder::class
+            $classReflection->is(Builder::class) ||
+            $classReflection->is(QueryBuilder::class)
         ) {
             $classNames         = [$classReflection->getName()];
             $macroTraitProperty = 'macros';

diff --git a/src/Methods/ModelForwardsCallsExtension.php b/src/Methods/ModelForwardsCallsExtension.php
@@ -76,7 +76,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
      */
     private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
     {
-        if ($classReflection->getName() !== Model::class && ! $classReflection->isSubclassOf(Model::class)) {
+        if (! $classReflection->is(Model::class)) {
             return null;
         }
 

diff --git a/src/Methods/RelationForwardsCallsExtension.php b/src/Methods/RelationForwardsCallsExtension.php
@@ -62,7 +62,7 @@ public function getMethod(
      */
     private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
     {
-        if (! $classReflection->isSubclassOf(Relation::class)) {
+        if (! $classReflection->is(Relation::class)) {
             return null;
         }
 

diff --git a/src/Support/CollectionHelper.php b/src/Support/CollectionHelper.php
@@ -140,7 +140,7 @@ private function getTypeFromEloquentCollection(ClassReflection $classReflection)
 
         $innerValueType = $classReflection->getActiveTemplateTypeMap()->getType('TModel');
 
-        if ($classReflection->getName() === EloquentCollection::class || $classReflection->isSubclassOf(EloquentCollection::class)) {
+        if ($classReflection->is(EloquentCollection::class)) {
             $keyType = new IntegerType();
         }
 

diff --git a/tests/Type/data/model.php b/tests/Type/data/model.php
@@ -9,6 +9,7 @@
 use App\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Http\FormRequest;
 
 use function PHPStan\Testing\assertType;
@@ -129,6 +130,9 @@ function test(
     assertType('App\User|null', User::firstWhere(['email' => '[email protected]']));
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with('accounts'));
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with('accounts')->with('group'));
+    assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with(['accounts' => function (Relation $relation) {
+        assertType('Illuminate\Database\Eloquent\Relations\Relation<Illuminate\Database\Eloquent\Model>', $relation->orderBy('id'));
+    }]));
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::lockForUpdate());
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::sharedLock());
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::query());