[BE] Stricter ++/-- operator check

Author: ondrejmirtes

changelog-2.0.md

@@ -107,7 +107,6 @@ Bleeding edge (TODO move to other sections)
 * Check mixed in binary operator ([#3231](https://github.com/phpstan/phpstan-src/pull/3231)), #7538, #10440, thanks @schlndh!
 * Check vprintf/vsprintf arguments against placeholder count ([#3126](https://github.com/phpstan/phpstan-src/pull/3126)), thanks @staabm!
 * Check mixed in unary operator ([#3253](https://github.com/phpstan/phpstan-src/pull/3253)), thanks @schlndh!
-* Stricter ++/-- operator check ([#3255](https://github.com/phpstan/phpstan-src/pull/3255)), thanks @schlndh!
 * Check preg_quote delimiter sanity ([#3252](https://github.com/phpstan/phpstan-src/pull/3252)), #11338, thanks @staabm!
 * Improved the type of the `$mode` parameter for the `count()` ([#3190](https://github.com/phpstan/phpstan-src/pull/3190)), thanks @kuma3!
 * Check array functions which require stringish values ([#3132](https://github.com/phpstan/phpstan-src/pull/3132)), #11141, #5848, #3694, #11111, thanks @schlndh!
@@ -141,6 +140,7 @@ Improvements 🔧
 * OverridingMethodRule - include template types in prototype declaring class description (https://github.com/phpstan/phpstan-src/commit/ca2c66cc4dff59ba44d52b82cb9e0aa3256240f3)
 * Detect overriding `@final` method in OverridingMethodRule, #9135
 * Improve error wording of the NonexistentOffset, BooleanAndConstantConditionRule, and BooleanOrConstantConditionRule ([#1882](https://github.com/phpstan/phpstan-src/pull/1882)), thanks @VincentLanglet!
+* Stricter ++/-- operator check ([#3255](https://github.com/phpstan/phpstan-src/pull/3255)), thanks @schlndh!
 
 Bugfixes 🐛
 =====================

conf/config.level0.neon

@@ -106,6 +106,7 @@ rules:
 	- PHPStan\Rules\Methods\StaticMethodCallableRule
 	- PHPStan\Rules\Names\UsedNamesRule
 	- PHPStan\Rules\Operators\InvalidAssignVarRule
+	- PHPStan\Rules\Operators\InvalidIncDecOperationRule
 	- PHPStan\Rules\Properties\AccessPropertiesInAssignRule
 	- PHPStan\Rules\Properties\AccessStaticPropertiesInAssignRule
 	- PHPStan\Rules\Properties\InvalidCallablePropertyTypeRule
@@ -203,14 +204,6 @@ services:
 		arguments:
 			checkFunctionNameCase: %checkFunctionNameCase%
 
-	-
-		class: PHPStan\Rules\Operators\InvalidIncDecOperationRule
-		tags:
-			- phpstan.rules.rule
-		arguments:
-			bleedingEdge: %featureToggles.bleedingEdge%
-			checkThisOnly: %checkThisOnly%
-
 	-
 		class: PHPStan\Rules\Properties\AccessPropertiesRule
 		tags:

src/Rules/Operators/InvalidIncDecOperationRule.php

@@ -29,8 +29,6 @@ final class InvalidIncDecOperationRule implements Rule
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
-		private bool $bleedingEdge,
-		private bool $checkThisOnly,
 	)
 	{
 	}
@@ -87,30 +85,16 @@ public function processNode(Node $node, Scope $scope): array
 			];
 		}
 
-		if (!$this->bleedingEdge) {
-			if ($this->checkThisOnly) {
-				return [];
-			}
+		$allowedTypes = new UnionType([new BooleanType(), new FloatType(), new IntegerType(), new StringType(), new NullType(), new ObjectType('SimpleXMLElement')]);
+		$varType = $this->ruleLevelHelper->findTypeToCheck(
+			$scope,
+			$node->var,
+			'',
+			static fn (Type $type): bool => $allowedTypes->isSuperTypeOf($type)->yes(),
+		)->getType();
 
-			$varType = $scope->getType($node->var);
-			if (!$varType->toString() instanceof ErrorType) {
-				return [];
-			}
-			if (!$varType->toNumber() instanceof ErrorType) {
-				return [];
-			}
-		} else {
-			$allowedTypes = new UnionType([new BooleanType(), new FloatType(), new IntegerType(), new StringType(), new NullType(), new ObjectType('SimpleXMLElement')]);
-			$varType = $this->ruleLevelHelper->findTypeToCheck(
-				$scope,
-				$node->var,
-				'',
-				static fn (Type $type): bool => $allowedTypes->isSuperTypeOf($type)->yes(),
-			)->getType();
-
-			if ($varType instanceof ErrorType || $allowedTypes->isSuperTypeOf($varType)->yes()) {
-				return [];
-			}
+		if ($varType instanceof ErrorType || $allowedTypes->isSuperTypeOf($varType)->yes()) {
+			return [];
 		}
 
 		return [

tests/PHPStan/Rules/Operators/InvalidIncDecOperationRuleTest.php

@@ -21,8 +21,6 @@ protected function getRule(): Rule
 	{
 		return new InvalidIncDecOperationRule(
 			new RuleLevelHelper($this->createReflectionProvider(), true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false),
-			true,
-			false,
 		);
 	}