More testcases, less magic, allow all php

Author: janedbal

src/Type/Doctrine/HydrationModeReturnTypeResolver.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Doctrine;
 
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\Persistence\ObjectManager;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BenevolentUnionType;
@@ -24,7 +25,8 @@ public function getMethodReturnTypeForHydrationMode(
 		string $methodName,
 		int $hydrationMode,
 		Type $queryKeyType,
-		Type $queryResultType
+		Type $queryResultType,
+		?ObjectManager $objectManager
 	): ?Type
 	{
 		$isVoidType = (new VoidType())->isSuperTypeOf($queryResultType);
@@ -45,7 +47,7 @@ public function getMethodReturnTypeForHydrationMode(
 			case AbstractQuery::HYDRATE_OBJECT:
 				break;
 			case AbstractQuery::HYDRATE_ARRAY:
-				$queryResultType = $this->getArrayHydratedReturnType($queryResultType);
+				$queryResultType = $this->getArrayHydratedReturnType($queryResultType, $objectManager);
 				break;
 			case AbstractQuery::HYDRATE_SIMPLEOBJECT:
 				$queryResultType = $this->getSimpleObjectHydratedReturnType($queryResultType);
@@ -94,10 +96,8 @@ public function getMethodReturnTypeForHydrationMode(
 	 *
 	 * @see https://github.com/phpstan/phpstan-doctrine/pull/412#issuecomment-1497092934
 	 */
-	private function getArrayHydratedReturnType(Type $queryResultType): ?Type
+	private function getArrayHydratedReturnType(Type $queryResultType, ?ObjectManager $objectManager): ?Type
 	{
-		$objectManager = $this->objectMetadataResolver->getObjectManager();
-
 		$mixedFound = false;
 		$queryResultType = TypeTraverser::map(
 			$queryResultType,

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -8,24 +8,12 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Type\Accessory\AccessoryArrayListType;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Doctrine\HydrationModeReturnTypeResolver;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
-use PHPStan\Type\IntegerType;
-use PHPStan\Type\IterableType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
-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;
 
 final class QueryResultDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -107,7 +95,8 @@ public function getTypeFromMethodCall(
 			$methodReflection->getName(),
 			$hydrationMode->getValue(),
 			$queryType->getTemplateType(AbstractQuery::class, 'TKey'),
-			$queryType->getTemplateType(AbstractQuery::class, 'TResult')
+			$queryType->getTemplateType(AbstractQuery::class, 'TResult'),
+			$this->objectMetadataResolver->getObjectManager()
 		);
 	}