Simplify

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -940,18 +940,6 @@ public function walkAggregateExpression($aggExpression): string
 				return $this->marshalType(TypeCombinator::addNull($type));
 
 			case 'AVG':
-				$type = $this->unmarshalType(
-					$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)
-				);
-
-				if (count($type->getConstantScalarValues()) !== 1) {
-					$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());
-				}
-
-				$type = TypeCombinator::union($type, $type->toFloat(), $type->toFloat()->toString());
-
-				return $this->marshalType(TypeCombinator::addNull($type));
-
 			case 'SUM':
 				$type = $this->unmarshalType(
 					$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -723,10 +723,8 @@ public function getTestData(): iterable
 				[
 					new ConstantIntegerType(5),
 					TypeCombinator::union(
-						new ConstantStringType('1'),
-						new ConstantIntegerType(1),
-						new ConstantStringType('1.0'),
-						new ConstantFloatType(1.0),
+						$this->intStringified(),
+						new FloatType(),
 						new NullType()
 					),
 				],