Entity query count and accessCheck order should not matter

Fixes #381

Author: brambaud

src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php

@@ -40,6 +40,20 @@ public function getTypeFromMethodCall(
         $methodName = $methodReflection->getName();
 
         if ($methodName === 'count') {
+            if ($varType instanceof EntityQueryType) {
+                $returnType = new EntityQueryCountType(
+                    $varType->getClassName(),
+                    $varType->getSubtractedType(),
+                    $varType->getClassReflection()
+                );
+
+                if ($varType->hasAccessCheck()) {
+                    return $returnType->withAccessCheck();
+                }
+
+                return $returnType;
+            }
+
             if ($varType instanceof ObjectType) {
                 return new EntityQueryCountType(
                     $varType->getClassName(),

tests/fixtures/drupal/modules/phpstan_fixtures/src/EntityQueryWithAccessRule.php

@@ -22,4 +22,28 @@ public function bar(): void
             ->condition('field_test', 'foo', '=')
             ->execute();
     }
+
+    public function count(): void
+    {
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getQuery()
+            ->accessCheck(false)
+            ->count()
+            ->execute();
+    }
+
+    public function bug381CountOrderShouldNotMatter(): void
+    {
+        $query = \Drupal::entityTypeManager()->getStorage('node')
+            ->getQuery()
+            ->accessCheck(FALSE)
+            ->count();
+        $count = (int) $query->execute();
+
+        $query = \Drupal::entityTypeManager()->getStorage('node')
+            ->getQuery()
+            ->count()
+            ->accessCheck(FALSE);
+        $count = (int) $query->execute();
+    }
 }