Return a generic array in Query

Makefile

@@ -23,6 +23,6 @@ cs-fix:
 phpstan:
 	php vendor/bin/phpstan analyse -l 8 -c phpstan.neon src tests
 
-.PHONY: phpstan-generate-baseline
+.PHONY: phpstan-generate-baselmake ine
 phpstan-generate-baseline:
 	php vendor/bin/phpstan analyse -l 8 -c phpstan.neon src tests -b phpstan-baseline.neon

src/Type/Doctrine/CreateQueryDynamicReturnTypeExtension.php

@@ -84,6 +84,7 @@ public function getTypeFromMethodCall(
 				$typeBuilder = new QueryResultTypeBuilder();
 
 				try {
+					/** @var Query<array-key, mixed> $query */
 					$query = $em->createQuery($queryString);
 					QueryResultTypeWalker::walk($query, $typeBuilder, $this->descriptorRegistry);
 				} catch (ORMException | DBALException | NewDBALException | CommonException $e) {

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -79,7 +79,7 @@ class QueryResultTypeWalker extends SqlWalker
 	 */
 	private $newObjectCounter = 0;
 
-	/** @var Query<mixed> */
+	/** @var Query<array-key, mixed> */
 	private $query;
 
 	/** @var EntityManagerInterface */
@@ -108,7 +108,7 @@ class QueryResultTypeWalker extends SqlWalker
 	private $hasGroupByClause;
 
 	/**
-	 * @param Query<mixed> $query
+	 * @param Query<array-key, mixed> $query
 	 */
 	public static function walk(Query $query, QueryResultTypeBuilder $typeBuilder, DescriptorRegistry $descriptorRegistry): void
 	{
@@ -123,7 +123,7 @@ public static function walk(Query $query, QueryResultTypeBuilder $typeBuilder, D
 	/**
 	 * {@inheritDoc}
 	 *
-	 * @param Query<mixed> $query
+	 * @param Query<array-key, mixed> $query
 	 * @param ParserResult $parserResult
 	 * @param array<QueryComponent> $queryComponents
 	 */

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 use Doctrine\DBAL\DBALException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMException;
+use Doctrine\ORM\Query;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Identifier;
 use PHPStan\Analyser\Scope;
@@ -159,6 +160,7 @@ private function getQueryType(string $dql): Type
 		$typeBuilder = new QueryResultTypeBuilder();
 
 		try {
+			/** @var Query<array-key, mixed> $query */
 			$query = $em->createQuery($dql);
 			QueryResultTypeWalker::walk($query, $typeBuilder, $this->descriptorRegistry);
 		} catch (ORMException | DBALException | CommonException $e) {

stubs/ORM/Query.stub

@@ -3,10 +3,24 @@
 namespace Doctrine\ORM;
 
 /**
+ * @template TKey as array-key
  * @template TResult The type of results returned by this query in HYDRATE_OBJECT mode
  *
  * @extends AbstractQuery<TResult>
  */
 final class Query extends AbstractQuery
 {
+    public const HYDRATE_OBJECT = 1;
+
+    /**
+     * @param int|string $hydrationMode
+     *
+     * @return ($hydrationMode is self::HYDRATE_OBJECT
+     *    ? array<TKey, TResult>
+     *    : mixed
+     * )
+     */
+    public function getResult($hydrationMode = self::HYDRATE_OBJECT)
+    {
+    }
 }

stubs/ORM/QueryBuilder.stub

@@ -15,7 +15,7 @@ class QueryBuilder
 	}
 
 	/**
-	 * @return Query<mixed>
+	 * @return Query<array-key, mixed>
 	 */
 	public function getQuery()
 	{

stubs/bleedingEdge/ORM/QueryBuilder.stub

@@ -8,7 +8,7 @@ class QueryBuilder
 {
 
 	/**
-	 * @return Query<mixed>
+	 * @return Query<array-key, mixed>
 	 */
 	public function getQuery()
 	{
@@ -143,7 +143,7 @@ class QueryBuilder
 	{
 
 	}
-	
+
 	/**
 	 * @param literal-string|object|array<mixed> $predicates
 	 * @return $this

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -8,6 +8,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\AST\TypedExpression;
 use Doctrine\ORM\Tools\SchemaTool;
 use PHPStan\Testing\PHPStanTestCase;
@@ -190,6 +191,7 @@ public function test(Type $expectedType, string $dql, ?string $expectedException
 	{
 		$em = self::$em;
 
+		/** @var Query<array-key, mixed> $query */
 		$query = $em->createQuery($dql);
 
 		$typeBuilder = new QueryResultTypeBuilder();

tests/Type/Doctrine/data/QueryResult/queryBuilderGetQuery.php

@@ -49,7 +49,7 @@ public function testQueryResultTypeIsMixedWhenDQLIsNotKnown(QueryBuilder $builde
 	{
 		$query = $builder->getQuery();
 
-		assertType('Doctrine\ORM\Query<mixed>', $query);
+		assertType('Doctrine\ORM\Query<(int|string), mixed>', $query);
 	}
 
 	public function testQueryResultTypeIsMixedWhenDQLIsInvalid(EntityManagerInterface $em): void

tests/Type/Doctrine/data/QueryResult/queryResult.php

@@ -232,36 +232,36 @@ public function testReturnTypeOfQueryMethodsWithExplicitNonConstantHydrationMode
 	 * Test that we return the original return type when ResultType may be
 	 * VoidType
 	 *
-	 * @param Query<mixed> $query
+	 * @param Query<array-key, mixed> $query
 	 */
 	public function testReturnTypeOfQueryMethodsWithReturnTypeIsMixed(EntityManagerInterface $em, Query $query): void
 	{
 		assertType(
-			'mixed',
+			'array<(int|string)>',
 			$query->getResult(AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'iterable',
+			'iterable<(int|string)>',
 			$query->toIterable([], AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'mixed',
+			'array<(int|string)>',
 			$query->execute(null, AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'mixed',
+			'array<(int|string)>',
 			$query->executeIgnoreQueryCache(null, AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'mixed',
+			'array<(int|string)>',
 			$query->executeUsingQueryCache(null, AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'mixed',
+			'(int|string)',
 			$query->getSingleResult(AbstractQuery::HYDRATE_OBJECT)
 		);
 		assertType(
-			'mixed',
+			'int|string|null',
 			$query->getOneOrNullResult(AbstractQuery::HYDRATE_OBJECT)
 		);
 	}