Merge pull request #382 from brambaud/issue/381

Entity query count and accessCheck order should not matter

Author: mglaman

src/Type/EntityQuery/EntityQueryCountType.php

@@ -2,8 +2,6 @@
 
 namespace mglaman\PHPStanDrupal\Type\EntityQuery;
 
-use PHPStan\Type\ObjectType;
-
 /**
  * Type used to represent an entity query instance as count query.
  */

src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php

@@ -39,15 +39,21 @@ public function getTypeFromMethodCall(
         $varType = $scope->getType($methodCall->var);
         $methodName = $methodReflection->getName();
 
+        if (!$varType instanceof ObjectType) {
+            return $defaultReturnType;
+        }
+
         if ($methodName === 'count') {
-            if ($varType instanceof ObjectType) {
-                return new EntityQueryCountType(
-                    $varType->getClassName(),
-                    $varType->getSubtractedType(),
-                    $varType->getClassReflection()
-                );
+            $returnType = new EntityQueryCountType(
+                $varType->getClassName(),
+                $varType->getSubtractedType(),
+                $varType->getClassReflection()
+            );
+            if ($varType instanceof EntityQueryType && $varType->hasAccessCheck()) {
+                return $returnType->withAccessCheck();
             }
-            return $defaultReturnType;
+
+            return $returnType;
         }
 
         if ($methodName === 'execute') {

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();
+    }
 }