Fix tri-combination in + and /

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1707,11 +1707,11 @@ private function inferPlusMinusTimesType(array $termTypes): Type
 			if ($this->containsOnlyTypes($unionWithoutNull, [new FloatType(), new StringType()])) {
 				return $this->createFloat($nullable);
 			}
-		}
 
-		// TODO all 3?
-		// TODO string
-		// TODO string with number in it?
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType(), $this->createNumericString(false)])) {
+				return $this->createFloat($nullable);
+			}
+		}
 
 		// postgre fails and other drivers are unknown
 		return new MixedType();
@@ -1795,6 +1795,10 @@ private function inferDivisionType(array $termTypes): Type
 				return $this->createFloat($nullable);
 			}
 
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType(), $this->createNumericString(false)])) {
+				return $this->createFloat($nullable);
+			}
+
 			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new StringType()])) {
 				return $this->createFloat(true);
 			}

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -594,6 +594,24 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield 't.col_int + t.col_float + t.col_decimal' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT t.col_int + t.col_float + t.col_decimal FROM %s t',
+			'mysql' => self::float(),
+			'sqlite' => self::float(),
+			'pdo_pgsql' => self::numericString(),
+			'pgsql' => self::float(),
+			'mssql' => new MixedType(),
+			'mysqlResult' => 9.225,
+			'sqliteResult' => 9.225,
+			'pdoPgsqlResult' => '9.225',
+			'pgsqlResult' => 9.225,
+			'mssqlResult' => 9.225,
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield 't.col_decimal + t.col_decimal' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT t.col_decimal + t.col_decimal FROM %s t',
@@ -630,6 +648,24 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield 't.col_int + t.col_string (int data)' => [
+			'data' => self::dataAllIntLike(),
+			'select' => 'SELECT t.col_int + t.col_string FROM %s t',
+			'mysql' => self::float(),
+			'sqlite' => self::int(),
+			'pdo_pgsql' => null, // Undefined function
+			'pgsql' => null, // Undefined function
+			'mssql' => self::mixed(),
+			'mysqlResult' => 2.0,
+			'sqliteResult' => 2,
+			'pdoPgsqlResult' => null,
+			'pgsqlResult' => null,
+			'mssqlResult' => 2,
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield 't.col_int + t.col_bool' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT t.col_int + t.col_bool FROM %s t',
@@ -774,6 +810,24 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield 't.col_int / t.col_float / t.col_decimal' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT t.col_int / t.col_float / t.col_decimal FROM %s t',
+			'mysql' => self::float(),
+			'sqlite' => self::float(),
+			'pdo_pgsql' => self::numericString(),
+			'pgsql' => self::float(),
+			'mssql' => new MixedType(),
+			'mysqlResult' => 720.0,
+			'sqliteResult' => 720.0,
+			'pdoPgsqlResult' => '720',
+			'pgsqlResult' => 720.0,
+			'mssqlResult' => 720.0,
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield 't.col_bigint / t.col_float' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT t.col_bigint / t.col_float FROM %s t',
@@ -900,6 +954,24 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield 't.col_int / t.col_string (int data)' => [
+			'data' => self::dataAllIntLike(),
+			'select' => 'SELECT t.col_int / t.col_string FROM %s t',
+			'mysql' => self::floatOrNull(),
+			'sqlite' => self::intOrNull(),
+			'pdo_pgsql' => null, // Undefined function
+			'pgsql' => null, // Undefined function
+			'mssql' => self::mixed(),
+			'mysqlResult' => 1.0,
+			'sqliteResult' => 1,
+			'pdoPgsqlResult' => null,
+			'pgsqlResult' => null,
+			'mssqlResult' => 1,
+			'shouldStringify' => static function (string $driver, int $php, string $configName): bool {
+				return self::defaultStringification($driver, $php, $configName);
+			},
+		];
+
 		yield 't.col_string / t.col_int' => [
 			'data' => self::dataDefault(),
 			'select' => 'SELECT t.col_string / t.col_int FROM %s t',
@@ -3491,10 +3563,6 @@ public static function provideCases(): iterable
 				return false;
 			},
 		];
-
-		// TODO would col_numeric_string differ from col_string results ?
-		// TODO dbal/orm versions
-		// TODO run sqlsrv with custom setup (numeric, leading zero, native datetimes), check if implementable with current API
 	}
 
 	/**