Introduce default hydration mode

Author: VincentLanglet

src/Type/Doctrine/HydrationModeReturnTypeResolver.php

@@ -25,7 +25,7 @@ public function getMethodReturnTypeForHydrationMode(
 		Type $hydrationMode,
 		Type $queryKeyType,
 		Type $queryResultType,
-		?ObjectManager $objectManager
+		Type $defaultHydrationModeType
 	): ?Type
 	{
 		$isVoidType = (new VoidType())->isSuperTypeOf($queryResultType);
@@ -42,6 +42,10 @@ public function getMethodReturnTypeForHydrationMode(
 			return null;
 		}
 
+		if ($hydrationMode->isNull()->yes()) {
+			$hydrationMode = $defaultHydrationModeType;
+		}
+
 		if (!$hydrationMode instanceof ConstantIntegerType) {
 			return null;
 		}

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -84,7 +84,7 @@ public function getTypeFromMethodCall(
 			$hydrationMode,
 			$queryType->getTemplateType(AbstractQuery::class, 'TKey'),
 			$queryType->getTemplateType(AbstractQuery::class, 'TResult'),
-			$this->objectMetadataResolver->getObjectManager(),
+			$queryType->getTemplateType(AbstractQuery::class, 'THydrationMode'),
 		);
 	}
 

stubs/ORM/AbstractQuery.stub

@@ -9,6 +9,7 @@ use Doctrine\ORM\NoResultException;
 /**
  * @template-covariant TKey The type of column used in indexBy
  * @template-covariant TResult The type of results returned by this query in HYDRATE_OBJECT mode
+ * @template-covariant THydrationMode of string|AbstractQuery::HYDRATE_* = AbstractQuery::HYDRATE_OBJECT The default hydration mode when none is provided
  */
 abstract class AbstractQuery
 {
@@ -84,4 +85,13 @@ abstract class AbstractQuery
     {
     }
 
+    /**
+     * @template TNewHydrationMode of string|AbstractQuery::HYDRATE_*
+     * @param TNewHydrationMode $hydrationMode
+     * @phpstan-self-out self<TKey, TResult, TNewHydrationMode>
+     */
+    public function setHydrationMode(string|int $hydrationMode): static
+    {
+    }
+
 }

stubs/ORM/Query.stub

@@ -5,8 +5,9 @@ namespace Doctrine\ORM;
 /**
  * @template-covariant TKey The type of column used in indexBy
  * @template-covariant TResult The type of results returned by this query in HYDRATE_OBJECT mode
+ * @template-covariant THydrationMode of int|string The default hydration mode when none is provided
  *
- * @extends AbstractQuery<TKey, TResult>
+ * @extends AbstractQuery<TKey, TResult, THydrationMode>
  */
 final class Query extends AbstractQuery
 {