Let's test all permutations

Author: Boegie

tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php

@@ -99,8 +99,23 @@ public function cases(): \Generator
 
         yield 'bug-494.php' => [
             [__DIR__.'/data/bug-494.php'],
-            []
+            [
+                [
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
+                    43,
+                    'See https://www.drupal.org/node/3201242',
+                ],
+                [
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
+                    103,
+                    'See https://www.drupal.org/node/3201242',
+                ],
+                [
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
+                    108,
+                    'See https://www.drupal.org/node/3201242',
+                ],
+            ]
         ];
-
     }
 }

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

@@ -19,6 +19,32 @@ public function bug494(string $entity_type): void
             ->accessCheck(FALSE)
             ->execute();
 
+        \Drupal::entityQuery($entity_type)
+            ->accessCheck(TRUE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(TRUE)
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->accessCheck()
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck()
+            ->execute();
+
+        // Failing test due to missing accessCheck.
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        // Same tests but now with count() chained as well.
         \Drupal::entityQuery($entity_type)
             ->accessCheck(FALSE)
             ->condition('field_test', 'foo', '=')
@@ -36,5 +62,52 @@ public function bug494(string $entity_type): void
             ->count()
             ->accessCheck(FALSE)
             ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->accessCheck(TRUE)
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(TRUE)
+            ->count()
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->accessCheck(TRUE)
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->accessCheck()
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck()
+            ->count()
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->accessCheck()
+            ->execute();
+
+        // Failing tests due to missing accessCheck.
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->count()
+            ->condition('field_test', 'foo', '=')
+            ->execute();
     }
 }