Fix method.alreadyNarrowedType from all QueryInterface::accessCheck()s (#825)

src/Type/EntityQuery/AccessCheckTypeSpecifyingExtension.php

@@ -54,6 +54,6 @@ public function specifyTypes(
             $returnType->withAccessCheck(),
             TypeSpecifierContext::createTruthy(),
             $scope
-        );
+        )->setAlwaysOverwriteTypes();
     }
 }

tests/src/Rules/Bug825Test.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace mglaman\PHPStanDrupal\Tests\Rules;
+
+use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
+use PHPStan\Rules\Comparison\ImpossibleCheckTypeMethodCallRule;
+use PHPStan\Rules\Rule;
+
+final class Bug825Test extends DrupalRuleTestCase
+{
+    protected function getRule(): Rule
+    {
+        /** @phpstan-ignore phpstanApi.constructor, phpstanApi.classConstant */
+        return self::getContainer()->getByType(ImpossibleCheckTypeMethodCallRule::class);
+    }
+
+    public function test(): void
+    {
+        $this->analyse(
+            [__DIR__ . '/data/bug-825.php'],
+            []
+        );
+    }
+}

tests/src/Rules/data/bug-825.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Bug825;
+
+// Fluent: accessCheck() immediately after entityQuery().
+function accessCheckImmediatelyAfterEntityQuery(): void {
+    \Drupal::entityQuery('node')
+        ->accessCheck()
+        ->execute();
+}
+
+// Fluent: accessCheck() immediately after entityQuery(), then condition.
+function accessCheckBeforeCondition(): void {
+    \Drupal::entityQuery('node')
+        ->accessCheck()
+        ->condition('type', 'article')
+        ->execute();
+}
+
+// Fluent: condition before accessCheck().
+function conditionBeforeAccessCheck(): void {
+    \Drupal::entityQuery('node')
+        ->condition('type', 'article')
+        ->accessCheck()
+        ->execute();
+}
+
+// Non-fluent: separate statements.
+function separateStatements(): void {
+    $query = \Drupal::entityQuery('node');
+    $query->condition('type', 'article');
+    $query->accessCheck();
+    $query->execute();
+}