Simplify

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -944,11 +944,8 @@ public function walkAggregateExpression($aggExpression): string
 					$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)
 				);
 
-				if (count($type->getConstantScalarValues()) !== 1) {
-					$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());
-				}
-
-				$type = TypeCombinator::union($type, $type->toFloat(), $type->toFloat()->toString());
+				$type = TypeCombinator::union($type, $type->toFloat());
+				$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());
 
 				return $this->marshalType(TypeCombinator::addNull($type));
 

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -14,7 +14,6 @@
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
-use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantTypeHelper;
@@ -723,10 +722,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()
 					),
 				],