GetQueryReturnTypeExtension default return must be EntityQueryType

Author: mglaman

src/Type/EntityStorage/GetQueryReturnTypeExtension.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use mglaman\PHPStanDrupal\Type\EntityQuery\ConfigEntityQueryType;
 use mglaman\PHPStanDrupal\Type\EntityQuery\ContentEntityQueryType;
+use mglaman\PHPStanDrupal\Type\EntityQuery\EntityQueryType;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
@@ -56,6 +57,10 @@ public function getTypeFromMethodCall(
                 $returnType->getClassReflection()
             );
         }
-        return $returnType;
+        return new EntityQueryType(
+            $returnType->getClassName(),
+            $returnType->getSubtractedType(),
+            $returnType->getClassReflection()
+        );
     }
 }

tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php

@@ -45,11 +45,11 @@ public function cases(): \Generator
             ],
         ];
 
-        yield [
+        yield 'bug-438.php' => [
             [__DIR__ . '/data/bug-438.php'],
             []
         ];
-        yield [
+        yield 'bug-396a.php' => [
             [__DIR__.'/data/bug-396a.php'],
             [
                 [
@@ -59,11 +59,11 @@ public function cases(): \Generator
                 ]
             ]
         ];
-        yield [
+        yield 'bug-396b.php' => [
             [__DIR__ . '/data/bug-396b.php'],
             []
         ];
-        yield [
+        yield 'bug-396c.php' => [
             [__DIR__ . '/data/bug-396c.php'],
             []
         ];