Revert "Avoid false positive about array result"

This reverts commit b3a7b16.
phpstan · May 4, 2023 · 24fc706 · 24fc706
1 parent 84bf895
commit 24fc706
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php b/src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php
@@ -199,14 +199,9 @@ static function (Type $type, callable $traverse) use ($objectManager): Type {
 					return new MixedType();
 				}
 
-				if (!$objectManager->getMetadataFactory()->hasMetadataFor($type->getClassName())) {
-					return $traverse($type);
-				}
-
-				// We could return `new ArrayTyp(new MixedType(), new MixedType())`
-				// but the lack of precision in the array keys/values would give false positive
-				// @see https://github.com/phpstan/phpstan-doctrine/pull/412#issuecomment-1497092934
-				return new MixedType();
+				return $objectManager->getMetadataFactory()->hasMetadataFor($type->getClassName())
+					? new ArrayType(new MixedType(), new MixedType())
+					: $traverse($type);
 			}
 		);
 	}

diff --git a/tests/Type/Doctrine/data/QueryResult/queryResult.php b/tests/Type/Doctrine/data/QueryResult/queryResult.php
@@ -155,35 +155,35 @@ public function testReturnTypeOfQueryMethodsWithExplicitArrayHydrationMode(Entit
 		');
 
 		assertType(
-			'list<mixed>',
+			'list<array>',
 			$query->getResult(AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'list<mixed>',
+			'list<array>',
 			$query->getArrayResult()
 		);
 		assertType(
-			'iterable<int, mixed>',
+			'iterable<int, array>',
 			$query->toIterable([], AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'list<mixed>',
+			'list<array>',
 			$query->execute(null, AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'list<mixed>',
+			'list<array>',
 			$query->executeIgnoreQueryCache(null, AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'list<mixed>',
+			'list<array>',
 			$query->executeUsingQueryCache(null, AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'mixed',
+			'array',
 			$query->getSingleResult(AbstractQuery::HYDRATE_ARRAY)
 		);
 		assertType(
-			'mixed',
+			'array|null',
 			$query->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY)
 		);