Merge pull request #512 from mglaman/508

Author: mglaman

src/Type/EntityQuery/AccessCheckTypeSpecifyingExtension.php

@@ -43,8 +43,13 @@ public function specifyTypes(
         $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
         $expr = $node->var;
         if (!$returnType instanceof EntityQueryType) {
-            return $this->typeSpecifier->create($expr, $returnType, TypeSpecifierContext::createTruthy());
+            return new SpecifiedTypes([]);
         }
-        return $this->typeSpecifier->create($expr, $returnType->withAccessCheck(), TypeSpecifierContext::createTruthy());
+        return $this->typeSpecifier->create(
+            $expr,
+            $returnType->withAccessCheck(),
+            TypeSpecifierContext::createTruthy(),
+            true
+        );
     }
 }

tests/src/Rules/AccessCheckImpossibleTypeCallRuleTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace mglaman\PHPStanDrupal\Tests\Rules;
+
+use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
+use PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper;
+use PHPStan\Rules\Comparison\ImpossibleCheckTypeMethodCallRule;
+use PHPStan\Rules\Rule;
+
+final class AccessCheckImpossibleTypeCallRuleTest extends DrupalRuleTestCase
+{
+
+    protected function getRule(): Rule
+    {
+        // @phpstan-ignore-next-line
+        return new ImpossibleCheckTypeMethodCallRule(
+        // @phpstan-ignore-next-line
+            new ImpossibleCheckTypeHelper(
+                $this->createReflectionProvider(),
+                $this->getTypeSpecifier(),
+                [],
+                false,
+                true,
+            ),
+            true,
+            false,
+        );
+    }
+
+    public function testRule(): void
+    {
+        $this->analyse(
+            [__DIR__ . '/data/bug-496.php'],
+            []
+        );
+    }
+}