Query generic type fixes

Author: ondrejmirtes

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -11,13 +11,14 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
-use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\GenericTypeVariableResolver;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VoidType;
 
 final class QueryResultDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
@@ -80,13 +81,16 @@ public function getTypeFromMethodCall(
 
 	private function getQueryResultType(Type $queryType): Type
 	{
-		if (!$queryType instanceof GenericObjectType) {
+		if (!$queryType instanceof TypeWithClassName) {
 			return new MixedType();
 		}
 
-		$types = $queryType->getTypes();
+		$resultType = GenericTypeVariableResolver::getType($queryType, AbstractQuery::class, 'TResult');
+		if ($resultType === null) {
+			return new MixedType();
+		}
 
-		return $types[0] ?? new MixedType();
+		return $resultType;
 	}
 
 	private function getMethodReturnTypeForHydrationMode(

stubs/ORM/AbstractQuery.stub

@@ -5,7 +5,7 @@ namespace Doctrine\ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * @template TResult The type of results returned by this query in HYDRATE_OBJECT mode
+ * @template-covariant TResult The type of results returned by this query in HYDRATE_OBJECT mode
  */
 abstract class AbstractQuery
 {

stubs/ORM/Query.stub

@@ -3,7 +3,7 @@
 namespace Doctrine\ORM;
 
 /**
- * @template TResult The type of results returned by this query in HYDRATE_OBJECT mode
+ * @template-covariant TResult The type of results returned by this query in HYDRATE_OBJECT mode
  *
  * @extends AbstractQuery<TResult>
  */