Do not infer getArrayResult for now

Author: ondrejmirtes

src/Type/Doctrine/HydrationModeReturnTypeResolver.php

@@ -10,13 +10,10 @@
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IterableType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
-use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VoidType;
 
 class HydrationModeReturnTypeResolver
@@ -47,9 +44,6 @@ public function getMethodReturnTypeForHydrationMode(
 		switch ($hydrationMode) {
 			case AbstractQuery::HYDRATE_OBJECT:
 				break;
-			case AbstractQuery::HYDRATE_ARRAY:
-				$queryResultType = $this->getArrayHydratedReturnType($queryResultType, $objectManager);
-				break;
 			case AbstractQuery::HYDRATE_SIMPLEOBJECT:
 				$queryResultType = $this->getSimpleObjectHydratedReturnType($queryResultType);
 				break;
@@ -90,48 +84,6 @@ public function getMethodReturnTypeForHydrationMode(
 		}
 	}
 
-	/**
-	 * When we're array-hydrating object, we're not sure of the shape of the array.
-	 * We could return `new ArrayType(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
-	 */
-	private function getArrayHydratedReturnType(Type $queryResultType, ?ObjectManager $objectManager): ?Type
-	{
-		$mixedFound = false;
-		$queryResultType = TypeTraverser::map(
-			$queryResultType,
-			static function (Type $type, callable $traverse) use ($objectManager, &$mixedFound): Type {
-				$isObject = (new ObjectWithoutClassType())->isSuperTypeOf($type);
-				if ($isObject->no()) {
-					return $traverse($type);
-				}
-				if (
-					$isObject->maybe()
-					|| !$type instanceof TypeWithClassName
-					|| $objectManager === null
-				) {
-					$mixedFound = true;
-
-					return new MixedType();
-				}
-
-				/** @var class-string $className */
-				$className = $type->getClassName();
-				if (!$objectManager->getMetadataFactory()->hasMetadataFor($className)) {
-					return $traverse($type);
-				}
-
-				$mixedFound = true;
-
-				return new MixedType();
-			}
-		);
-
-		return $mixedFound ? null : $queryResultType;
-	}
-
 	private function getSimpleObjectHydratedReturnType(Type $queryResultType): ?Type
 	{
 		if ((new ObjectWithoutClassType())->isSuperTypeOf($queryResultType)->yes()) {

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -28,10 +28,6 @@ final class QueryResultDynamicReturnTypeExtension implements DynamicMethodReturn
 		'getSingleResult' => 0,
 	];
 
-	private const METHOD_HYDRATION_MODE = [
-		'getArrayResult' => AbstractQuery::HYDRATE_ARRAY,
-	];
-
 	/** @var ObjectMetadataResolver */
 	private $objectMetadataResolver;
 
@@ -54,8 +50,7 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return isset(self::METHOD_HYDRATION_MODE_ARG[$methodReflection->getName()])
-			|| isset(self::METHOD_HYDRATION_MODE[$methodReflection->getName()]);
+		return isset(self::METHOD_HYDRATION_MODE_ARG[$methodReflection->getName()]);
 	}
 
 	public function getTypeFromMethodCall(
@@ -66,25 +61,23 @@ public function getTypeFromMethodCall(
 	{
 		$methodName = $methodReflection->getName();
 
-		if (isset(self::METHOD_HYDRATION_MODE[$methodName])) {
-			$hydrationMode = new ConstantIntegerType(self::METHOD_HYDRATION_MODE[$methodName]);
-		} elseif (isset(self::METHOD_HYDRATION_MODE_ARG[$methodName])) {
-			$argIndex = self::METHOD_HYDRATION_MODE_ARG[$methodName];
-			$args = $methodCall->getArgs();
-
-			if (isset($args[$argIndex])) {
-				$hydrationMode = $scope->getType($args[$argIndex]->value);
-			} else {
-				$parametersAcceptor = ParametersAcceptorSelector::selectSingle(
-					$methodReflection->getVariants()
-				);
-				$parameter = $parametersAcceptor->getParameters()[$argIndex];
-				$hydrationMode = $parameter->getDefaultValue() ?? new NullType();
-			}
-		} else {
+		if (!isset(self::METHOD_HYDRATION_MODE_ARG[$methodName])) {
 			throw new ShouldNotHappenException();
 		}
 
+		$argIndex = self::METHOD_HYDRATION_MODE_ARG[$methodName];
+		$args = $methodCall->getArgs();
+
+		if (isset($args[$argIndex])) {
+			$hydrationMode = $scope->getType($args[$argIndex]->value);
+		} else {
+			$parametersAcceptor = ParametersAcceptorSelector::selectSingle(
+				$methodReflection->getVariants()
+			);
+			$parameter = $parametersAcceptor->getParameters()[$argIndex];
+			$hydrationMode = $parameter->getDefaultValue() ?? new NullType();
+		}
+
 		$queryType = $scope->getType($methodCall->var);
 
 		if (!$hydrationMode instanceof ConstantIntegerType) {

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

@@ -199,10 +199,6 @@ public function testReturnTypeOfQueryMethodsWithExplicitArrayHydrationMode(Entit
 			'list<array{intColumn: int, stringNullColumn: string|null, datetimeColumn: DateTime}>',
 			$query->getResult(AbstractQuery::HYDRATE_ARRAY)
 		);
-		assertType(
-			'list<array{intColumn: int, stringNullColumn: string|null, datetimeColumn: DateTime}>',
-			$query->getArrayResult()
-		);
 		assertType(
 			'list<array{intColumn: int, stringNullColumn: string|null, datetimeColumn: DateTime}>',
 			$query->execute(null, AbstractQuery::HYDRATE_ARRAY)