Avoid useless benevolent unions

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -848,6 +848,8 @@ public function walkSelectExpression($selectExpression)
 				// Here we assume that the value may or may not be casted to
 				// string by the driver.
 				$casted = false;
+				$originalType = $type;
+
 				$type = TypeTraverser::map($type, static function (Type $type, callable $traverse) use (&$casted): Type {
 					if ($type instanceof UnionType || $type instanceof IntersectionType) {
 						return $traverse($type);
@@ -865,7 +867,7 @@ public function walkSelectExpression($selectExpression)
 
 				// Since we made supposition about possibly casted values,
 				// we can only provide a benevolent union.
-				if ($casted && $type instanceof UnionType) {
+				if ($casted && $type instanceof UnionType && !$originalType->equals($type)) {
 					$type = TypeUtils::toBenevolentUnion($type);
 				}
 			}

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -714,10 +714,10 @@ public function getTestData(): iterable
 			$this->constantArray([
 				[
 					new ConstantIntegerType(1),
-					TypeUtils::toBenevolentUnion(TypeCombinator::union(
+					TypeCombinator::union(
 						new StringType(),
 						new IntegerType()
-					)),
+					),
 				],
 				[
 					new ConstantIntegerType(2),
@@ -743,10 +743,10 @@ public function getTestData(): iterable
 			$this->constantArray([
 				[
 					new ConstantIntegerType(1),
-					TypeUtils::toBenevolentUnion(TypeCombinator::union(
+					TypeCombinator::union(
 						new StringType(),
 						new ConstantIntegerType(0)
-					)),
+					),
 				],
 			]),
 			'
@@ -763,10 +763,10 @@ public function getTestData(): iterable
 			$this->constantArray([
 				[
 					new ConstantIntegerType(1),
-					TypeUtils::toBenevolentUnion(TypeCombinator::union(
+					TypeCombinator::union(
 						new StringType(),
 						new ConstantIntegerType(0)
-					)),
+					),
 				],
 			]),
 			'