fix: Prevent crash with static call on instances of intersection (#1662)

larastan · Jul 16, 2023 · a95b5e3 · a95b5e3
1 parent 5c3b71c
commit a95b5e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/ReturnTypes/ModelDynamicStaticMethodReturnTypeExtension.php b/src/ReturnTypes/ModelDynamicStaticMethodReturnTypeExtension.php
@@ -16,6 +16,7 @@
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\MissingMethodFromReflectionException;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
@@ -102,11 +103,15 @@ public function getTypeFromStaticMethodCall(
                 $types = [];
 
                 foreach ($classNames as $className) {
-                    if ($this->reflectionProvider->hasClass($className)) {
+                    if (! $this->reflectionProvider->hasClass($className)) {
+                        continue;
+                    }
+                    try {
                         $types[] = new GenericObjectType(
                             $this->builderHelper->determineBuilderName($className),
                             [new ObjectType($className)]
                         );
+                    } catch (MissingMethodFromReflectionException) {
                     }
                 }
 

diff --git a/tests/Type/data/eloquent-builder.php b/tests/Type/data/eloquent-builder.php
@@ -223,6 +223,7 @@ function doFoo(User $user, Post $post, $userAndAuth): void
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', $userAndAuth->newQueryWithoutScopes());
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', $userAndAuth->newQueryWithoutScope('foo'));
     assertType('Illuminate\Database\Eloquent\Builder<App\User>', $userAndAuth->newQueryForRestoration([1]));
+    assertType('Illuminate\Database\Eloquent\Builder<App\User>', $userAndAuth::query());
 
     assertType('Illuminate\Support\LazyCollection<int, App\User>', User::query()->lazy());
     assertType('Illuminate\Support\LazyCollection<int, App\User>', User::query()->lazyById());