EntityQueryDynamicReturnTypeExtension ignore count if unknown type (#546)

Co-authored-by: Matt Glaman <[email protected]>

Author: Boegie

src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php

@@ -47,11 +47,9 @@ public function getTypeFromMethodCall(
             if ($varType instanceof EntityQueryType) {
                 return $varType->asCount();
             }
-            return new EntityQueryCountType(
-                $varType->getClassName(),
-                $varType->getSubtractedType(),
-                $varType->getClassReflection()
-            );
+            // By now we are sure we can't determine anything about what query
+            // the count method is on, so we ignore it.
+            return $defaultReturnType;
         }
 
         if ($methodName === 'execute') {

tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php

@@ -143,5 +143,10 @@ public function cases(): \Generator
             []
         ];
 
+        yield 'bug-x.php' => [
+            [__DIR__.'/data/bug-545.php'],
+            []
+        ];
+
     }
 }

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace Bug545;
+
+/**
+ * Code snippets from \Drupal\migrate_drupal\Plugin\migrate\source\ContentEntity.
+ */
+class TestClass {
+
+    /**
+     * The entity type manager.
+     *
+     * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+     */
+    protected $entityTypeManager;
+
+
+    /**
+     * The entity type definition.
+     *
+     * @var \Drupal\Core\Entity\EntityTypeInterface
+     */
+    protected $entityType;
+
+    /**
+     * Query to retrieve the entities.
+     *
+     * @return \Drupal\Core\Entity\Query\QueryInterface
+     *   The query.
+     */
+    public function query() {
+        $query = $this->entityTypeManager
+            ->getStorage($this->entityType->id())
+            ->getQuery()
+            ->accessCheck(FALSE);
+        if (!empty($this->configuration['bundle'])) {
+            $query->condition($this->entityType->getKey('bundle'), $this->configuration['bundle']);
+        }
+        // Exclude anonymous user account.
+        if ($this->entityType->id() === 'user' && !empty($this->entityType->getKey('id'))) {
+            $query->condition($this->entityType->getKey('id'), 0, '>');
+        }
+        return $query;
+    }
+
+    protected function doCountInline() {
+        $query = $this->entityTypeManager
+            ->getStorage($this->entityType->id())
+            ->getQuery()
+            ->accessCheck(FALSE)
+            ->count();
+        return $query->execute();
+    }
+
+    protected function doQuery() {
+        return $this->query()->execute();
+    }
+
+    protected function doCount() {
+        return $this->query()->count()->execute();
+    }
+
+}