Use benevolent union for scalar in queries

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -797,7 +797,7 @@ public function walkSelectExpression($selectExpression): string
 
 			$type = $this->resolveDoctrineType($typeName, $enumType, $nullable);
 
-			$this->typeBuilder->addScalar($resultAlias, $type);
+			$this->addScalar($resultAlias, $type);
 
 			return '';
 		}
@@ -857,7 +857,7 @@ public function walkSelectExpression($selectExpression): string
 				});
 			}
 
-			$this->typeBuilder->addScalar($resultAlias, $type);
+			$this->addScalar($resultAlias, $type);
 
 			return '';
 		}
@@ -1298,6 +1298,18 @@ public function walkResultVariable($resultVariable): string
 		return $this->marshalType(new MixedType());
 	}
 
+	/**
+	 * @param array-key $alias
+	 */
+	private function addScalar($alias, Type $type): void
+	{
+		if ($type instanceof UnionType) {
+			$type = TypeUtils::toBenevolentUnion($type);
+		}
+
+		$this->typeBuilder->addScalar($alias, $type);
+	}
+
 	private function unmarshalType(string $marshalledType): Type
 	{
 		$type = unserialize($marshalledType);