Merge pull request #12 from calebdw/static_models

fix: properly handle static called on type for query
calebdw · Sep 14, 2024 · bbb36bc · bbb36bc
2 parents c5aee7b + 3c15b82
commit bbb36bc
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/src/ReturnTypes/ModelDynamicStaticMethodReturnTypeExtension.php b/src/ReturnTypes/ModelDynamicStaticMethodReturnTypeExtension.php
@@ -22,6 +22,8 @@
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\StaticType;
+use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
@@ -84,9 +86,15 @@ public function getTypeFromStaticMethodCall(
 
         if (count(array_intersect([EloquentBuilder::class], $returnType->getReferencedClasses())) > 0) {
             if ($methodCall->class instanceof Name) {
+                $type = $scope->resolveTypeByName($methodCall->class);
+
+                if ($type instanceof ThisType) {
+                    $type = new StaticType($type->getClassReflection());
+                }
+
                 $returnType = new GenericObjectType(
-                    $this->builderHelper->determineBuilderName($scope->resolveName($methodCall->class)),
-                    [new ObjectType($scope->resolveName($methodCall->class))],
+                    $this->builderHelper->determineBuilderName($type->getClassName()),
+                    [$type],
                 );
             } elseif ($methodCall->class instanceof Expr) {
                 $type = $scope->getType($methodCall->class);

diff --git a/tests/Integration/IntegrationTest.php b/tests/Integration/IntegrationTest.php
@@ -22,6 +22,7 @@ public static function dataIntegrationTests(): iterable
         self::getContainer();
 
         yield [__DIR__ . '/data/test-case-extension.php'];
+        yield [__DIR__ . '/data/model-builder.php'];
         yield [__DIR__ . '/data/model-properties.php'];
         yield [__DIR__ . '/data/blade-view.php'];
         yield [__DIR__ . '/data/helpers.php'];

diff --git a/tests/Integration/data/model-builder.php b/tests/Integration/data/model-builder.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace ModelBuilder;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+class User extends Model
+{
+    /** @return Builder<static> */
+    public static function testQueryStatic(): Builder
+    {
+        return static::query();
+    }
+
+    public static function testCreateStatic(): static
+    {
+        return static::query()->create();
+    }
+
+    public static function testCreateSelf(): static
+    {
+        return self::query()->create();
+    }
+}
diff --git a/tests/Type/data/eloquent-builder.php b/tests/Type/data/eloquent-builder.php
@@ -353,7 +353,7 @@ class TestModel extends Model
     public function test(): void
     {
         assertType('Illuminate\Database\Eloquent\Collection<int, EloquentBuilder\TestModel>', $this->where('email', 1)->get());
-        assertType('Illuminate\Database\Eloquent\Builder<EloquentBuilder\TestModel>', static::query()->where('email', 'bar'));
+        assertType('Illuminate\Database\Eloquent\Builder<static(EloquentBuilder\TestModel)>', static::query()->where('email', 'bar'));
         assertType('Illuminate\Database\Eloquent\Builder<EloquentBuilder\TestModel>', $this->where('email', 'bar'));
     }
 }

diff --git a/tests/Type/data/model.php b/tests/Type/data/model.php
@@ -24,6 +24,15 @@ public function __construct(private User $user)
 class Bar extends Model
 {
     use HasBar;
+
+    public function test(): void
+    {
+        assertType('Illuminate\Database\Eloquent\Builder<static(Model\Bar)>', self::query());
+        assertType('Illuminate\Database\Eloquent\Builder<static(Model\Bar)>', static::query());
+
+        assertType('static(Model\Bar)|null', self::query()->first());
+        assertType('static(Model\Bar)|null', static::query()->first());
+    }
 }
 
 trait HasBar