Allow BcMath\Number increment/decrement

mpesari · mpesari · commit 01b67d197c86 · 2026-02-24T14:32:09.000+02:00
diff --git a/src/Rules/Operators/OperatorRuleHelper.php b/src/Rules/Operators/OperatorRuleHelper.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\BenevolentUnionType;
@@ -12,6 +13,7 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
@@ -21,9 +23,12 @@ class OperatorRuleHelper
 
 	private RuleLevelHelper $ruleLevelHelper;
 
-	public function __construct(RuleLevelHelper $ruleLevelHelper)
+	private PhpVersion $phpVersion;
+
+	public function __construct(RuleLevelHelper $ruleLevelHelper, PhpVersion $phpVersion)
 	{
 		$this->ruleLevelHelper = $ruleLevelHelper;
+		$this->phpVersion = $phpVersion;
 	}
 
 	public function isValidForArithmeticOperation(Scope $scope, Expr $expr): bool
@@ -68,7 +73,13 @@ public function isValidForDecrement(Scope $scope, Expr $expr): bool
 
 	private function isSubtypeOfNumber(Scope $scope, Expr $expr): bool
 	{
-		$acceptedType = new UnionType([new IntegerType(), new FloatType(), new IntersectionType([new StringType(), new AccessoryNumericStringType()])]);
+		$acceptedTypes = [new IntegerType(), new FloatType(), new IntersectionType([new StringType(), new AccessoryNumericStringType()])];
+
+		if ($this->phpVersion->supportsBcMathNumberOperatorOverloading()) {
+			$acceptedTypes[] = new ObjectType('BcMath\Number');
+		}
+
+		$acceptedType = new UnionType($acceptedTypes);
 
 		$type = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
diff --git a/tests/Rules/Operators/OperandInArithmeticIncrementOrDecrementRuleTestCase.php b/tests/Rules/Operators/OperandInArithmeticIncrementOrDecrementRuleTestCase.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -18,6 +19,7 @@ protected function getRule(): Rule
 		return $this->createRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandInArithmeticPostDecrementRuleTest.php b/tests/Rules/Operators/OperandInArithmeticPostDecrementRuleTest.php
@@ -49,12 +49,7 @@ protected function getExpectedErrors(): array
 	 */
 	protected function getExpectedErrorsWithBcMath(): array
 	{
-		return [
-			[
-				'Only numeric types are allowed in post-decrement, BcMath\Number given.',
-				8,
-			],
-		];
+		return [];
 	}
 
 }
diff --git a/tests/Rules/Operators/OperandInArithmeticPostIncrementRuleTest.php b/tests/Rules/Operators/OperandInArithmeticPostIncrementRuleTest.php
@@ -45,12 +45,7 @@ protected function getExpectedErrors(): array
 	 */
 	protected function getExpectedErrorsWithBcMath(): array
 	{
-		return [
-			[
-				'Only numeric types are allowed in post-increment, BcMath\Number given.',
-				12,
-			],
-		];
+		return [];
 	}
 
 }
diff --git a/tests/Rules/Operators/OperandInArithmeticPreDecrementRuleTest.php b/tests/Rules/Operators/OperandInArithmeticPreDecrementRuleTest.php
@@ -49,12 +49,7 @@ protected function getExpectedErrors(): array
 	 */
 	protected function getExpectedErrorsWithBcMath(): array
 	{
-		return [
-			[
-				'Only numeric types are allowed in pre-decrement, BcMath\Number given.',
-				16,
-			],
-		];
+		return [];
 	}
 
 }
diff --git a/tests/Rules/Operators/OperandInArithmeticPreIncrementRuleTest.php b/tests/Rules/Operators/OperandInArithmeticPreIncrementRuleTest.php
@@ -45,12 +45,7 @@ protected function getExpectedErrors(): array
 	 */
 	protected function getExpectedErrorsWithBcMath(): array
 	{
-		return [
-			[
-				'Only numeric types are allowed in pre-increment, BcMath\Number given.',
-				20,
-			],
-		];
+		return [];
 	}
 
 }
diff --git a/tests/Rules/Operators/OperandInArithmeticUnaryMinusRuleTest.php b/tests/Rules/Operators/OperandInArithmeticUnaryMinusRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandInArithmeticUnaryMinusRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandInArithmeticUnaryPlusRuleTest.php b/tests/Rules/Operators/OperandInArithmeticUnaryPlusRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandInArithmeticUnaryPlusRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -19,6 +20,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticAdditionRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticDivisionRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticExponentiationRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticModuloRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticMultiplicationRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Operators;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
@@ -17,6 +18,7 @@ protected function getRule(): Rule
 		return new OperandsInArithmeticSubtractionRule(
 			new OperatorRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class),
+				self::getContainer()->getByType(PhpVersion::class),
 			),
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,7 @@ protected function getExpectedErrors(): array`
`49`	`49`	`*/`
`50`	`50`	`protected function getExpectedErrorsWithBcMath(): array`
`51`	`51`	`{`
`52`		`- return [`
`53`		`- [`
`54`		`- 'Only numeric types are allowed in post-decrement, BcMath\Number given.',`
`55`		`- 8,`
`56`		`- ],`
`57`		`- ];`
	`52`	`+ return [];`
`58`	`53`	`}`
`59`	`54`
`60`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,7 @@ protected function getExpectedErrors(): array`
`45`	`45`	`*/`
`46`	`46`	`protected function getExpectedErrorsWithBcMath(): array`
`47`	`47`	`{`
`48`		`- return [`
`49`		`- [`
`50`		`- 'Only numeric types are allowed in post-increment, BcMath\Number given.',`
`51`		`- 12,`
`52`		`- ],`
`53`		`- ];`
	`48`	`+ return [];`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`}`