More precise type inference with unary plus and minus

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1261,7 +1261,19 @@ public function walkArithmeticFactor($factor): string
 		$primary = $factor->arithmeticPrimary;
 
 		$type = $this->unmarshalType($this->walkArithmeticPrimary($primary));
-		$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());
+
+		if ($type instanceof ConstantIntegerType && $factor->sign === false) {
+			$type = new ConstantIntegerType($type->getValue() * -1);
+
+		} elseif ($type instanceof IntegerRangeType && $factor->sign === false) {
+			$type = IntegerRangeType::fromInterval(
+				$type->getMax() === null ? null : $type->getMax() * -1,
+				$type->getMin() === null ? null : $type->getMin() * -1
+			);
+
+		} elseif ($type instanceof ConstantFloatType && $factor->sign === false) {
+			$type = new ConstantFloatType($type->getValue() * -1);
+		}
 
 		return $this->marshalType($type);
 	}

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -1189,7 +1189,7 @@ public function getTestData(): iterable
 		yield 'arithmetic' => [
 			$this->constantArray([
 				[new ConstantStringType('intColumn'), new IntegerType()],
-				[new ConstantIntegerType(1), $this->intStringified()],
+				[new ConstantIntegerType(1), TypeCombinator::union(new ConstantIntegerType(1), new ConstantStringType('1'))],
 				[new ConstantIntegerType(2), $this->intStringified()],
 				[new ConstantIntegerType(3), TypeCombinator::addNull($this->intStringified())],
 				[new ConstantIntegerType(4), $this->intStringified()],