Handle BcMath\Number operators for simple cases

conf/config.neon

@@ -1047,6 +1047,10 @@ services:
 		arguments:
 			reportMagicProperties: %reportMagicProperties%
 			checkDynamicProperties: %checkDynamicProperties%
+	-
+		class: PHPStan\Type\Php\BcMathNumberOperatorTypeSpecifyingExtension
+		tags:
+			- phpstan.broker.operatorTypeSpecifyingExtension
 
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule

src/Php/PhpVersion.php

@@ -395,4 +395,9 @@ public function substrReturnFalseInsteadOfEmptyString(): bool
 		return $this->versionId < 80000;
 	}
 
+	public function supportsBcMathNumberOperatorOverloading(): bool
+	{
+		return $this->versionId >= 80400;
+	}
+
 }

src/Reflection/InitializerExprTypeResolver.php

@@ -872,6 +872,11 @@ public function getModType(Expr $left, Expr $right, callable $getTypeCallback):
 			return $this->getNeverType($leftType, $rightType);
 		}
 
+		$extensionSpecified = $this->callOperatorTypeSpecifyingExtensions(new BinaryOp\Mod($left, $right), $leftType, $rightType);
+		if ($extensionSpecified !== null) {
+			return $extensionSpecified;
+		}
+
 		if ($leftType->toNumber() instanceof ErrorType || $rightType->toNumber() instanceof ErrorType) {
 			return new ErrorType();
 		}
@@ -1234,16 +1239,16 @@ public function getPowType(Expr $left, Expr $right, callable $getTypeCallback):
 		$leftType = $getTypeCallback($left);
 		$rightType = $getTypeCallback($right);
 
-		$exponentiatedTyped = $leftType->exponentiate($rightType);
-		if (!$exponentiatedTyped instanceof ErrorType) {
-			return $exponentiatedTyped;
-		}
-
 		$extensionSpecified = $this->callOperatorTypeSpecifyingExtensions(new BinaryOp\Pow($left, $right), $leftType, $rightType);
 		if ($extensionSpecified !== null) {
 			return $extensionSpecified;
 		}
 
+		$exponentiatedTyped = $leftType->exponentiate($rightType);
+		if (!$exponentiatedTyped instanceof ErrorType) {
+			return $exponentiatedTyped;
+		}
+
 		return new ErrorType();
 	}
 

src/Type/ObjectType.php

@@ -31,6 +31,8 @@
 use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
+use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -593,6 +595,14 @@ public function toFloat(): Type
 
 	public function toString(): Type
 	{
+		if ($this->isInstanceOf('BcMath\Number')->yes()) {
+			return new IntersectionType([
+				new StringType(),
+				new AccessoryNumericStringType(),
+				new AccessoryNonEmptyStringType(),
+			]);
+		}
+
 		$classReflection = $this->getClassReflection();
 		if ($classReflection === null) {
 			return new ErrorType();
@@ -673,7 +683,10 @@ public function toArrayKey(): Type
 
 	public function toBoolean(): BooleanType
 	{
-		if ($this->isInstanceOf('SimpleXMLElement')->yes()) {
+		if (
+			$this->isInstanceOf('SimpleXMLElement')->yes()
+			|| $this->isInstanceOf('BcMath\Number')->yes()
+		) {
 			return new BooleanType();
 		}
 

src/Type/Php/BcMathNumberOperatorTypeSpecifyingExtension.php

@@ -0,0 +1,53 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Php;
+
+use PHPStan\Php\PhpVersion;
+use PHPStan\Type\ErrorType;
+use PHPStan\Type\NeverType;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\OperatorTypeSpecifyingExtension;
+use PHPStan\Type\Type;
+use function in_array;
+
+final class BcMathNumberOperatorTypeSpecifyingExtension implements OperatorTypeSpecifyingExtension
+{
+
+	public function __construct(private PhpVersion $phpVersion)
+	{
+	}
+
+	public function isOperatorSupported(string $operatorSigil, Type $leftSide, Type $rightSide): bool
+	{
+		if (!$this->phpVersion->supportsBcMathNumberOperatorOverloading() || $leftSide instanceof NeverType || $rightSide instanceof NeverType) {
+			return false;
+		}
+
+		$bcMathNumberType = new ObjectType('BcMath\Number');
+
+		return in_array($operatorSigil, ['-', '+', '*', '/', '**', '%'], true)
+			&& (
+				$bcMathNumberType->isSuperTypeOf($leftSide)->yes()
+				|| $bcMathNumberType->isSuperTypeOf($rightSide)->yes()
+			);
+	}
+
+	public function specifyType(string $operatorSigil, Type $leftSide, Type $rightSide): Type
+	{
+		$bcMathNumberType = new ObjectType('BcMath\Number');
+		$otherSide = $bcMathNumberType->isSuperTypeOf($leftSide)->yes()
+			? $rightSide
+			: $leftSide;
+
+		if (
+			$otherSide->isInteger()->yes()
+			|| $otherSide->isNumericString()->yes()
+			|| $bcMathNumberType->isSuperTypeOf($otherSide)->yes()
+		) {
+			return $bcMathNumberType;
+		}
+
+		return new ErrorType();
+	}
+
+}

src/Type/TypeCombinator.php

@@ -37,6 +37,8 @@
 use function md5;
 use function sprintf;
 use function usort;
+use const PHP_INT_MAX;
+use const PHP_INT_MIN;
 
 /**
  * @api
@@ -185,6 +187,7 @@ public static function union(Type ...$types): Type
 		$scalarTypes = [];
 		$hasGenericScalarTypes = [];
 		$enumCaseTypes = [];
+		$integerRangeTypes = [];
 		for ($i = 0; $i < $typesCount; $i++) {
 			if ($types[$i] instanceof ConstantScalarType) {
 				$type = $types[$i];
@@ -212,6 +215,13 @@ public static function union(Type ...$types): Type
 				continue;
 			}
 
+			if ($types[$i] instanceof IntegerRangeType) {
+				$integerRangeTypes[] = $types[$i];
+				unset($types[$i]);
+
+				continue;
+			}
+
 			if (!$types[$i]->isArray()->yes()) {
 				continue;
 			}
@@ -225,6 +235,12 @@ public static function union(Type ...$types): Type
 		}
 
 		$enumCaseTypes = array_values($enumCaseTypes);
+		usort(
+			$integerRangeTypes,
+			static fn (IntegerRangeType $a, IntegerRangeType $b): int => ($a->getMin() ?? PHP_INT_MIN) <=> ($b->getMin() ?? PHP_INT_MIN)
+				?: ($a->getMax() ?? PHP_INT_MAX) <=> ($b->getMax() ?? PHP_INT_MAX)
+		);
+		$types = array_merge($types, $integerRangeTypes);
 		$types = array_values($types);
 		$typesCount = count($types);
 

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -195,6 +195,10 @@ private static function findTestFiles(): iterable
 			yield __DIR__ . '/../Rules/Comparison/data/bug-9499.php';
 		}
 
+		if (PHP_VERSION_ID >= 80400) {
+			yield __DIR__ . '/../Rules/Operators/data/bcmath-number.php';
+		}
+
 		yield __DIR__ . '/../Rules/PhpDoc/data/bug-8609-function.php';
 		yield __DIR__ . '/../Rules/Comparison/data/bug-5365.php';
 		yield __DIR__ . '/../Rules/Comparison/data/bug-6551.php';

tests/PHPStan/Analyser/nsrt/pow.php

@@ -47,11 +47,11 @@ function (): void {
 		$x = 4;
 	}
 
-	assertType('int<4, 27>|int<16, 81>', pow($range, $x));
-	assertType('int<4, 27>|int<16, 81>', $range ** $x);
+	assertType('int<4, 81>', pow($range, $x));
+	assertType('int<4, 81>', $range ** $x);
 
-	assertType('int<4, 27>|int<16, 64>', pow($x, $range));
-	assertType('int<4, 27>|int<16, 64>', $x ** $range);
+	assertType('int<4, 64>', pow($x, $range));
+	assertType('int<4, 64>', $x ** $range);
 
 	assertType('int<4, 27>', pow($range, $range));
 	assertType('int<4, 27>', $range ** $range);

tests/PHPStan/Rules/Comparison/BooleanAndConstantConditionRuleTest.php

@@ -433,4 +433,10 @@ public function testBug5365(): void
 		$this->analyse([__DIR__ . '/data/bug-5365.php'], []);
 	}
 
+	public function testBug8555(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-8555.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/BooleanNotConstantConditionRuleTest.php

@@ -146,6 +146,12 @@ public function testBug8797(): void
 		$this->analyse([__DIR__ . '/data/bug-8797.php'], []);
 	}
 
+	public function testBug7937(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-7937.php'], []);
+	}
+
 	public function dataReportAlwaysTrueInLastCondition(): iterable
 	{
 		yield [false, [

tests/PHPStan/Rules/Comparison/data/bug-7937.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace Bug7937;
+
+class HelloWorld
+{
+	public function f(int $a, int $b)
+	{
+		if (!$a && !$b) {
+			return "";
+		}
+
+		$output = " ";
+
+		if ($a) {
+			$output .= "$a";
+		}
+
+		\PHPStan\dumpType($a);
+
+		if ($b) {
+			\PHPStan\dumpType($a);
+
+			if (!$a) {
+				$output .= "_";
+			}
+		}
+
+		return $output;
+	}
+}

tests/PHPStan/Rules/Comparison/data/bug-8555.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Bug8555;
+
+/**
+ * @return array<string, int|null>
+ */
+function test(int $first, int $second): array
+{
+	return [
+		'test' => $first && $second ? $first : null,
+		'test2' => $first && $second ? $first : null,
+	];
+}