fix: use class name to construct new ObjectType

larastan · Jul 1, 2022 · ab0cca9 · ab0cca9
1 parent fbb8313
commit ab0cca9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/ReturnTypes/NewModelQueryDynamicMethodReturnTypeExtension.php b/src/ReturnTypes/NewModelQueryDynamicMethodReturnTypeExtension.php
@@ -11,6 +11,7 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
 
@@ -46,6 +47,6 @@ public function getTypeFromMethodCall(
 
         $builderName = $this->builderHelper->determineBuilderName($calledOnType->getClassName());
 
-        return new GenericObjectType($builderName, [$calledOnType]);
+        return new GenericObjectType($builderName, [new ObjectType($calledOnType->getClassName())]);
     }
 }
diff --git a/tests/Type/data/eloquent-builder.php b/tests/Type/data/eloquent-builder.php
@@ -8,6 +8,7 @@
 use App\PostBuilder;
 use App\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use function PHPStan\Testing\assertType;
 
 User::query()->has('accounts', '=', 1, 'and', function (Builder $query) {
@@ -160,3 +161,19 @@ function doFoo(User $user, Post $post): void
     assertType('App\PostBuilder<App\Post>', $post->newQueryWithoutScope('foo'));
     assertType('App\PostBuilder<App\Post>', $post->newQueryForRestoration([1]));
 };
+
+class Foo extends Model
+{
+    /** @phpstan-use FooTrait<Foo> */
+    use FooTrait;
+}
+
+/** @template TModelClass of Model */
+trait FooTrait
+{
+    /** @return Builder<TModelClass> */
+    public function doFoo(): Builder
+    {
+        return $this->newQuery();
+    }
+}