Sdd support for numeric string computation

Author: VincentLanglet

src/Reflection/InitializerExprTypeResolver.php

@@ -1446,23 +1446,26 @@ private function callOperatorTypeSpecifyingExtensions(Expr\BinaryOp $expr, Type
 	 */
 	private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $rightType): Type
 	{
-		if (($leftType instanceof IntegerRangeType || $leftType instanceof ConstantIntegerType || $leftType instanceof UnionType) &&
-			($rightType instanceof IntegerRangeType || $rightType instanceof ConstantIntegerType || $rightType instanceof UnionType)
+		$leftNumberType = $leftType->toNumber();
+		$rightNumberType = $rightType->toNumber();
+
+		if (($leftNumberType instanceof IntegerRangeType || $leftNumberType instanceof ConstantIntegerType || $leftType instanceof UnionType) &&
+			($rightNumberType instanceof IntegerRangeType || $rightNumberType instanceof ConstantIntegerType || $rightType instanceof UnionType)
 		) {
 
-			if ($leftType instanceof ConstantIntegerType) {
+			if ($leftNumberType instanceof ConstantIntegerType) {
 				return $this->integerRangeMath(
-					$leftType,
+					$leftNumberType,
 					$expr,
-					$rightType,
+					$rightNumberType,
 				);
 			} elseif ($leftType instanceof UnionType) {
-
 				$unionParts = [];
 
 				foreach ($leftType->getTypes() as $type) {
-					if ($type instanceof IntegerRangeType || $type instanceof ConstantIntegerType) {
-						$unionParts[] = $this->integerRangeMath($type, $expr, $rightType);
+					$numberType = $type->toNumber();
+					if ($numberType instanceof IntegerRangeType || $numberType instanceof ConstantIntegerType) {
+						$unionParts[] = $this->integerRangeMath($numberType, $expr, $rightNumberType);
 					} else {
 						$unionParts[] = $type;
 					}
@@ -1493,8 +1496,6 @@ private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $ri
 			return new ErrorType();
 		}
 
-		$leftNumberType = $leftType->toNumber();
-		$rightNumberType = $rightType->toNumber();
 		if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
 			return new ErrorType();
 		}

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1249,6 +1249,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8956.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8917.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/ds-copy.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8803.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/trait-type-alias.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8609.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/PhpDoc/data/bug-8609-function.php');

tests/PHPStan/Analyser/data/bug-8803.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Bug8803;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function sayHello(): void
+	{
+		$from = new \DateTimeImmutable('2023-01-30');
+		for ($offset = 1; $offset <= 14; $offset++) {
+			$value = $from->format('N') + $offset;
+
+			assertType("'1'|'2'|'3'|'4'|'5'|'6'|'7'", $from->format('N'));
+			assertType('int<1, 14>', $offset);
+			assertType('int<2, 21>', $value);
+		}
+	}
+}