Merge pull request #345 from lptn/fix-typo

Support template syntax for Model::query() calls

src/Handlers/Eloquent/ModelMethodHandler.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\Class_;
-use Psalm\FileManipulation;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Internal\MethodIdentifier;
 use Psalm\LaravelPlugin\Util\ProxyMethodReturnTypeProvider;
@@ -20,6 +19,7 @@
 use Psalm\Type;
 use Psalm\Type\Union;
 
+use function is_string;
 use function strtolower;
 
 final class ModelMethodHandler implements MethodReturnTypeProviderInterface, AfterClassLikeVisitInterface
@@ -39,12 +39,28 @@ public static function getMethodReturnType(MethodReturnTypeProviderEvent $event)
             return null;
         }
 
+        $called_fq_classlike_name = $event->getCalledFqClasslikeName();
+
+        if (! is_string($called_fq_classlike_name)) {
+            return null;
+        }
+
+        // Model::query()
+        if ($event->getMethodNameLowercase() === 'query') {
+            return new Union([
+                new Type\Atomic\TGenericObject(Builder::class, [
+                    new Union([
+                        new Type\Atomic\TNamedObject($called_fq_classlike_name),
+                    ]),
+                ])
+            ]);
+        }
+
         // proxy to builder object
         if ($event->getMethodNameLowercase() === '__callstatic') {
-            $called_fq_classlike_name = $event->getCalledFqClasslikeName();
             $called_method_name_lowercase = $event->getCalledMethodNameLowercase();
 
-            if (!$called_fq_classlike_name || !$called_method_name_lowercase) {
+            if (!$called_method_name_lowercase) {
                 return null;
             }
             $methodId = new MethodIdentifier($called_fq_classlike_name, $called_method_name_lowercase);