Fix more tests

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -10,6 +10,7 @@
 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\ObjectMetadataResolver;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
@@ -21,6 +22,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeTraverser;
+use PHPStan\Type\TypeUtils;
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VoidType;
 use function count;
@@ -156,7 +158,12 @@ private function getMethodReturnTypeForHydrationMode(
 			case 'getSingleResult':
 				return $queryResultType;
 			case 'getOneOrNullResult':
-				return TypeCombinator::addNull($queryResultType);
+				$nullableQueryResultType = TypeCombinator::addNull($queryResultType);
+				if ($queryResultType instanceof BenevolentUnionType) {
+					$nullableQueryResultType = TypeUtils::toBenevolentUnion($nullableQueryResultType);
+				}
+
+				return $nullableQueryResultType;
 			case 'toIterable':
 				return new IterableType(
 					$queryKeyType->isNull()->yes() ? new IntegerType() : $queryKeyType,

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -13,7 +13,6 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
-use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -30,7 +29,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use QueryResult\Entities\Embedded;
 use QueryResult\Entities\JoinedChild;
@@ -1343,7 +1341,7 @@ public function getTestData(): iterable
 					new ConstantIntegerType(2),
 					$this->hasTypedExpressions()
 					? $this->uint(true)
-					: $this->uintStringified(true)
+					: $this->uintStringified(true),
 				],
 				[
 					new ConstantIntegerType(3),
@@ -1670,7 +1668,7 @@ private function unumericStringified(bool $nullable = false): Type
 		$types = [
 			new FloatType(),
 			IntegerRangeType::fromInterval(0, null),
-			$this->numericString()
+			$this->numericString(),
 		];
 		if ($nullable) {
 			$types[] = new NullType();

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

@@ -384,31 +384,31 @@ public function testReturnTypeOfQueryMethodsWithExplicitSingleScalarHydrationMod
 		');
 
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->getResult(AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->getSingleScalarResult()
 		);
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->execute(null, AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->executeIgnoreQueryCache(null, AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->executeUsingQueryCache(null, AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 		assertType(
-			'int<0, max>|numeric-string',
+			'(int<0, max>|numeric-string)',
 			$query->getSingleResult(AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 		assertType(
-			'int<0, max>|numeric-string|null',
+			'(int<0, max>|numeric-string|null)',
 			$query->getOneOrNullResult(AbstractQuery::HYDRATE_SINGLE_SCALAR)
 		);
 	}