Crude(?) fix attempt

Author: Boegie

src/Type/DrupalStaticEntityQueryDynamicReturnTypeExtension.php

@@ -57,8 +57,13 @@ public function getTypeFromStaticMethodCall(
         if ($type instanceof ConstantStringType) {
             $entityTypeId = $type->getValue();
         } else {
-            // @todo determine what these types are, and try to resolve entity name from.
-            return $returnType;
+            // We're unsure what specific EntityQueryType it is, so let's stick
+            // with the general class itself, so at least it gets access checked
+            return new EntityQueryType(
+                $returnType->getClassName(),
+                $returnType->getSubtractedType(),
+                $returnType->getClassReflection()
+            );
         }
         $entityType = $this->entityDataRepository->get($entityTypeId);
         $entityStorageType = $entityType->getStorageType();

src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php

@@ -72,6 +72,11 @@ public function getTypeFromMethodCall(
                     ? new ArrayType(new IntegerType(), new StringType())
                     : new EntityQueryExecuteWithoutAccessCheckType(new IntegerType(), new StringType());
             }
+            if ($varType instanceof EntityQueryType) {
+                return $varType->hasAccessCheck()
+                    ? new ArrayType(new IntegerType(), new StringType())
+                    : new EntityQueryExecuteWithoutAccessCheckType(new IntegerType(), new StringType());
+            }
             return $defaultReturnType;
         }
 

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

@@ -5,10 +5,25 @@
 class TestClass {
 
     /**
-     * Tests entity count queries with access check and unknown entity type.
+     * Tests entity queries with access check and unknown entity type.
      */
     public function bug494(string $entity_type): void
     {
+        \Drupal::entityQuery($entity_type)
+            ->accessCheck(FALSE)
+            ->condition('field_test', 'foo', '=')
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(FALSE)
+            ->execute();
+
+        \Drupal::entityQuery($entity_type)
+            ->condition('field_test', 'foo', '=')
+            ->accessCheck(FALSE)
+            ->execute();        
+
         \Drupal::entityQuery($entity_type)
             ->accessCheck(FALSE)
             ->condition('field_test', 'foo', '=')