Merge pull request #498 from Boegie/474

Fixes #474

Author: mglaman

src/Type/EntityStorage/GetQueryReturnTypeExtension.php

@@ -25,7 +25,10 @@ public function getClass(): string
 
     public function isMethodSupported(MethodReflection $methodReflection): bool
     {
-        return $methodReflection->getName() === 'getQuery';
+        return in_array($methodReflection->getName(), [
+            'getQuery',
+            'getAggregateQuery',
+        ], true);
     }
 
     public function getTypeFromMethodCall(

tests/src/Rules/EntityParameterTypehintRuleTest.php

@@ -11,9 +11,16 @@ final class EntityParameterTypehintRuleTest extends DrupalRuleTestCase
 {
     protected function getRule(): Rule
     {
-        $broker = $this->createReflectionProvider();
         // @phpstan-ignore-next-line
-        return new MissingFunctionParameterTypehintRule(new MissingTypehintCheck($broker, true, true, true, true, []));
+        return new MissingFunctionParameterTypehintRule(
+            // @phpstan-ignore-next-line
+            new MissingTypehintCheck(
+                true,
+                true,
+                true,
+                true,
+                []
+            ));
     }
 
     public function testRule(): void

tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php

@@ -86,7 +86,21 @@ public function cases(): \Generator
             [__DIR__ . '/data/bug-437.php'],
             []
         ];*/
-
+        yield 'bug-474.php' => [
+            [__DIR__ . '/data/bug-474.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.',
+                    49,
+                    '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.',
+                    98,
+                    'See https://www.drupal.org/node/3201242',
+                ],
+            ]
+        ];
         yield 'bug-475.php' => [
             [__DIR__.'/data/bug-475.php'],
             []

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

@@ -0,0 +1,104 @@
+<?php
+
+namespace Bug474;
+
+class TestClass {
+
+    /**
+     * Tests entity queries using getAggregateQuery with access check.
+     */
+    function bug474(): void
+    {
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->accessCheck(FALSE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->accessCheck(FALSE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(TRUE)
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->accessCheck(TRUE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck()
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->accessCheck()
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        // Failing test due to missing accessCheck.
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        // Same tests but now with count() chained as well.
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->accessCheck(FALSE)
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->count()
+            ->accessCheck(FALSE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(TRUE)
+            ->count()
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->count()
+            ->accessCheck(TRUE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck()
+            ->count()
+            ->execute();
+
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->count()
+            ->accessCheck()
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        // Failing test due to missing accessCheck.
+        \Drupal::entityTypeManager()->getStorage('node')
+            ->getAggregateQuery()
+            ->condition('field_test', 'foo', '=')
+            ->count()
+            ->execute();
+    }
+}