Relax stringification of constant floats to numeric-string

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1139,7 +1139,7 @@ public function walkSelectExpression($selectExpression): string
 						return $traverse($type);
 					}
 
-					if ($type instanceof IntegerType || $type instanceof FloatType) {
+					if ($type instanceof IntegerType) {
 						$stringify = $this->shouldStringifyExpressions($type);
 
 						if ($stringify->yes()) {
@@ -1150,6 +1150,23 @@ public function walkSelectExpression($selectExpression): string
 
 						return $type;
 					}
+
+					if ($type instanceof FloatType) {
+						$stringify = $this->shouldStringifyExpressions($type);
+
+						// e.g. 1.0 on sqlite results to '1' with pdo_stringify on PHP 8.1, but '1.0' on PHP 8.0 with no setup
+						// so we relax constant types and return just numeric-string to avoid those issues
+						$stringifiedFloat = $this->createNumericString(false);
+
+						if ($stringify->yes()) {
+							return $stringifiedFloat;
+						} elseif ($stringify->maybe()) {
+							return TypeCombinator::union($stringifiedFloat, $type);
+						}
+
+						return $type;
+					}
+
 					if ($type instanceof BooleanType) {
 						$stringify = $this->shouldStringifyExpressions($type);
 

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -195,6 +195,24 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield ' 1.00' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT 1.00 FROM %s t',
+			'mysql' => new ConstantStringType('1.00'),
+			'sqlite' => new ConstantFloatType(1.0),
+			'pdo_pgsql' => new ConstantStringType('1.00'),
+			'pgsql' => new ConstantStringType('1.00'),
+			'mssql' => new MixedType(),
+			'mysqlResult' => '1.00',
+			'sqliteResult' => 1.0,
+			'pdoPgsqlResult' => '1.00',
+			'pgsqlResult' => '1.00',
+			'mssqlResult' => '1.00',
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield ' 0.1' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT 0.1 FROM %s t',
@@ -213,6 +231,42 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield ' 0.10' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT 0.10 FROM %s t',
+			'mysql' => new ConstantStringType('0.10'),
+			'sqlite' => new ConstantFloatType(0.1),
+			'pdo_pgsql' => new ConstantStringType('0.10'),
+			'pgsql' => new ConstantStringType('0.10'),
+			'mssql' => new MixedType(),
+			'mysqlResult' => '0.10',
+			'sqliteResult' => 0.1,
+			'pdoPgsqlResult' => '0.10',
+			'pgsqlResult' => '0.10',
+			'mssqlResult' => '.10',
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
+		yield '0.125e0' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT 0.125e0 FROM %s t',
+			'mysql' => new ConstantFloatType(0.125),
+			'sqlite' => new ConstantFloatType(0.125),
+			'pdo_pgsql' => new ConstantStringType('0.125'),
+			'pgsql' => new ConstantStringType('0.125'),
+			'mssql' => new MixedType(),
+			'mysqlResult' => 0.125,
+			'sqliteResult' => 0.125,
+			'pdoPgsqlResult' => '0.125',
+			'pgsqlResult' => '0.125',
+			'mssqlResult' => 0.125,
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield ' 1e0' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT 1e0 FROM %s t',
@@ -1221,42 +1275,6 @@ public static function provideCases(): iterable
 			},
 		];
 
-		yield '0.1' => [
-			'data' => self::dataDefault(),
-			'select' => 'SELECT 0.1 FROM %s t',
-			'mysql' => new ConstantStringType('0.1'),
-			'sqlite' => new ConstantFloatType(0.1),
-			'pdo_pgsql' => new ConstantStringType('0.1'),
-			'pgsql' => new ConstantStringType('0.1'),
-			'mssql' => new MixedType(),
-			'mysqlResult' => '0.1',
-			'sqliteResult' => 0.1,
-			'pdoPgsqlResult' => '0.1',
-			'pgsqlResult' => '0.1',
-			'mssqlResult' => '.1',
-			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
-				return self::defaultStringification($driver, $php, $configName);
-			},
-		];
-
-		yield '0.125e0' => [
-			'data' => self::dataDefault(),
-			'select' => 'SELECT 0.125e0 FROM %s t',
-			'mysql' => new ConstantFloatType(0.125),
-			'sqlite' => new ConstantFloatType(0.125),
-			'pdo_pgsql' => new ConstantStringType('0.125'),
-			'pgsql' => new ConstantStringType('0.125'),
-			'mssql' => new MixedType(),
-			'mysqlResult' => 0.125,
-			'sqliteResult' => 0.125,
-			'pdoPgsqlResult' => '0.125',
-			'pgsqlResult' => '0.125',
-			'mssqlResult' => 0.125,
-			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
-				return self::defaultStringification($driver, $php, $configName);
-			},
-		];
-
 		yield "''" => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT \'\' FROM %s t',
@@ -3978,10 +3996,14 @@ private static function stringifyType(Type $type): Type
 				return $traverse($type);
 			}
 
-			if ($type instanceof IntegerType || $type instanceof FloatType) {
+			if ($type instanceof IntegerType) {
 				return $type->toString();
 			}
 
+			if ($type instanceof FloatType) {
+				return self::numericString();
+			}
+
 			if ($type instanceof BooleanType) {
 				return $type->toInteger()->toString();
 			}