AdAdd support for boolean

Author: VincentLanglet

src/Reflection/InitializerExprTypeResolver.php

@@ -1446,30 +1446,38 @@ private function callOperatorTypeSpecifyingExtensions(Expr\BinaryOp $expr, Type
 	 */
 	private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $rightType): Type
 	{
+		$types = TypeCombinator::union($leftType, $rightType);
 		$leftNumberType = $leftType->toNumber();
 		$rightNumberType = $rightType->toNumber();
 
-		if ($rightNumberType instanceof IntegerRangeType || $rightNumberType instanceof ConstantIntegerType || $rightType instanceof UnionType) {
+		if (
+			!$types instanceof MixedType
+			&& (
+				$rightNumberType instanceof IntegerRangeType
+				|| $rightNumberType instanceof ConstantIntegerType
+				|| $rightNumberType instanceof UnionType
+			)
+		) {
 			if ($leftNumberType instanceof IntegerRangeType || $leftNumberType instanceof ConstantIntegerType) {
 				return $this->integerRangeMath(
 					$leftNumberType,
 					$expr,
 					$rightNumberType,
 				);
-			} elseif ($leftType instanceof UnionType) {
+			} elseif ($leftNumberType instanceof UnionType) {
 				$unionParts = [];
 
-				foreach ($leftType->getTypes() as $type) {
+				foreach ($leftNumberType->getTypes() as $type) {
 					$numberType = $type->toNumber();
 					if ($numberType instanceof IntegerRangeType || $numberType instanceof ConstantIntegerType) {
 						$unionParts[] = $this->integerRangeMath($numberType, $expr, $rightNumberType);
 					} else {
-						$unionParts[] = $type;
+						$unionParts[] = $numberType;
 					}
 				}
 
 				$union = TypeCombinator::union(...$unionParts);
-				if ($leftType instanceof BenevolentUnionType) {
+				if ($leftNumberType instanceof BenevolentUnionType) {
 					return TypeUtils::toBenevolentUnion($union)->toNumber();
 				}
 
@@ -1482,7 +1490,6 @@ private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $ri
 			return $specifiedTypes;
 		}
 
-		$types = TypeCombinator::union($leftType, $rightType);
 		if (
 			$leftType->isArray()->yes()
 			|| $rightType->isArray()->yes()

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1250,6 +1250,7 @@ public function dataFileAsserts(): iterable
 		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/bug-8827.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-8827.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8827;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function test(): void
+	{
+		$efferent = $afferent = 0;
+		$nbElements = random_int(0, 30);
+
+		$elements = array_fill(0, $nbElements, random_int(0, 2));
+
+		foreach ($elements as $element)
+		{
+			$efferent += ($element === 1);
+			$afferent += ($element === 2);
+		}
+
+		assertType('int<0, max>', $efferent); // Expected: int<0, $nbElements> | Actual: 0|1
+		assertType('int<0, max>', $afferent); // Expected: int<0, $nbElements> | Actual: 0|1
+
+		$instability = ($efferent + $afferent > 0) ? $efferent / ($afferent + $efferent) : 0;
+	}
+}