New testcases, partially fix numeric-string literal issue

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -54,6 +54,7 @@
 use function get_class;
 use function gettype;
 use function is_int;
+use function is_numeric;
 use function is_object;
 use function is_string;
 use function method_exists;
@@ -566,14 +567,14 @@ public function walkFunction($function): string
 				$type = $firstExprType;
 				$typeNoNull = TypeCombinator::removeNull($type);
 
-				// TODO simplify?
-
-				if ($typeNoNull->isInteger()->yes()) {
-					$type = TypeCombinator::containsNull($type)
-						? TypeCombinator::addNull(IntegerRangeType::fromInterval(0, null))
-						: IntegerRangeType::fromInterval(0, null);
+				if (!$typeNoNull->isInteger()->yes()) {
+					return $this->marshalType(new MixedType()); // dont try to deal with non-integer chaos
 				}
 
+				$type = TypeCombinator::containsNull($type)
+					? TypeCombinator::addNull(IntegerRangeType::fromInterval(0, null))
+					: IntegerRangeType::fromInterval(0, null);
+
 				if (TypeCombinator::containsNull($firstExprType) || TypeCombinator::containsNull($secondExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
@@ -586,8 +587,6 @@ public function walkFunction($function): string
 					$type = TypeCombinator::addNull($type);
 				}
 
-				// TODO more invalid usages
-
 				return $this->marshalType($this->generalizeLiteralType($type, false));
 
 			case $function instanceof AST\Functions\SqrtFunction:
@@ -746,6 +745,10 @@ private function inferAvgFunction(AST\Functions\AvgFunction $function): Type
 				return $this->createNumericString($nullable);
 			}
 
+			if ($exprTypeNoNull->isString()->yes() && !$exprTypeNoNull->isNumericString()->yes()) {
+				return $this->createFloat($nullable);
+			}
+
 			return $this->generalizeLiteralType($exprType, $nullable);
 		}
 
@@ -780,6 +783,10 @@ private function inferSumFunction(AST\Functions\SumFunction $function): Type
 		$driver = $this->em->getConnection()->getDriver();
 
 		if ($driver instanceof Sqlite3Driver || $driver instanceof PdoSqliteDriver) {
+			if ($exprTypeNoNull->isString()->yes() && !$exprTypeNoNull->isNumericString()->yes()) {
+				return $this->createFloat($nullable);
+			}
+
 			return $this->generalizeLiteralType($exprType, $nullable);
 		}
 
@@ -788,6 +795,10 @@ private function inferSumFunction(AST\Functions\SumFunction $function): Type
 				return $this->createNumericString($nullable);
 			}
 
+			if ($exprTypeNoNull->isString()->yes() && !$exprTypeNoNull->isNumericString()->yes()) {
+				return $this->createFloat($nullable);
+			}
+
 			return $this->generalizeLiteralType($exprType, $nullable);
 		}
 
@@ -1382,12 +1393,21 @@ public function walkInParameter($inParam): string
 	public function walkLiteral($literal): string
 	{
 		$driver = $this->em->getConnection()->getDriver();
+		$isMysql = $driver instanceof MysqliDriver || $driver instanceof PdoMysqlDriver;
 
 		switch ($literal->type) {
 			case AST\Literal::STRING:
 				$value = $literal->value;
 				assert(is_string($value));
-				$type = new ConstantStringType($value);
+				if (is_numeric($value)) {
+					if (strpos($value, '.') === false && strpos($value, 'e') === false && !$isMysql) {
+						$type = new ConstantIntegerType((int) $value);
+					} else {
+						$type = new ConstantFloatType((float) $value);
+					}
+				} else {
+					$type = new ConstantStringType($value);
+				}
 				break;
 
 			case AST\Literal::BOOLEAN:
@@ -1678,27 +1698,41 @@ private function inferDivisionType(array $termTypes): Type
 			return new MixedType();
 		}
 
-		if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType(), $this->createNumericString(false)])) {
-			if ($driver instanceof PdoPgSQLDriver) {
-				return $this->createNumericString($nullable);
+		if ($driver instanceof PdoPgSQLDriver) {
+			return $this->createNumericString($nullable);
+		}
+
+		if ($driver instanceof SQLite3Driver || $driver instanceof PdoSqliteDriver) {
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType()])) {
+				return $this->createFloat($nullable);
+			}
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new StringType()])) {
+				return $this->createInteger(true);
 			}
-			if ($driver instanceof SQLite3Driver || $driver instanceof PdoSqliteDriver) {
+			if ($this->containsOnlyTypes($unionWithoutNull, [new FloatType(), new StringType()])) {
+				return $this->createFloat(true);
+			}
+		}
+
+		if ($driver instanceof MysqliDriver || $driver instanceof PdoMysqlDriver || $driver instanceof PgSQLDriver) {
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType()])) {
 				return $this->createFloat($nullable);
 			}
-			if ($driver instanceof MysqliDriver || $driver instanceof PdoMysqlDriver || $driver instanceof PgSQLDriver) {
-				return TypeCombinator::union( // float vs decimal
-					$this->createNumericString($nullable),
-					$this->createFloat($nullable)
-				);
+
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), $this->createNumericString(false)])) {
+				return $this->createNumericString($nullable);
+			}
+
+			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new StringType()])) {
+				return $this->createFloat(true);
+			}
+
+			if ($this->containsOnlyTypes($unionWithoutNull, [new FloatType(), new StringType()])) {
+				return $this->createFloat(true);
 			}
 		}
 
-		// incompatible types, not trying to be precise here, very chaotic behaviour + postgre fails
-		return TypeCombinator::union(
-			$this->createNumericString(true),
-			$this->createFloat(true),
-			$this->createInteger(true)
-		);
+		return new MixedType();
 	}
 
 	/**