[BE] Check mixed in binary and unary operators

Author: ondrejmirtes

changelog-2.0.md

@@ -104,9 +104,7 @@ Bleeding edge (TODO move to other sections)
 * Check `@param-immediately-invoked-callable` and `@param-later-invoked-callable` (https://github.com/phpstan/phpstan-src/commit/580a6add422f4e34191df9e7a77ba1655e914bda), #10932
 * RegularExpressionPatternRule: validate preg_quote'd patterns ([#3270](https://github.com/phpstan/phpstan-src/pull/3270)), thanks @staabm!
 * Report useless return values of function calls like `var_export` without `$return=true` ([#3225](https://github.com/phpstan/phpstan-src/pull/3225)), #11320, thanks @staabm!
-* 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!
 * 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 +139,8 @@ Improvements 🔧
 * 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!
+* Check mixed in binary operator ([#3231](https://github.com/phpstan/phpstan-src/pull/3231)), #7538, #10440, thanks @schlndh!
+* Check mixed in unary operator ([#3253](https://github.com/phpstan/phpstan-src/pull/3253)), thanks @schlndh!
 
 Bugfixes 🐛
 =====================

conf/config.level2.neon

@@ -39,7 +39,9 @@ rules:
 	- PHPStan\Rules\Generics\UsedTraitsRule
 	- PHPStan\Rules\Methods\CallPrivateMethodThroughStaticRule
 	- PHPStan\Rules\Methods\IncompatibleDefaultParameterTypeRule
+	- PHPStan\Rules\Operators\InvalidBinaryOperationRule
 	- PHPStan\Rules\Operators\InvalidComparisonOperationRule
+	- PHPStan\Rules\Operators\InvalidUnaryOperationRule
 	- PHPStan\Rules\PhpDoc\FunctionConditionalReturnTypeRule
 	- PHPStan\Rules\PhpDoc\MethodConditionalReturnTypeRule
 	- PHPStan\Rules\PhpDoc\FunctionAssertRule
@@ -140,15 +142,3 @@ services:
 
 	-
 		class: PHPStan\Rules\Pure\PureMethodRule
-	-
-		class: PHPStan\Rules\Operators\InvalidBinaryOperationRule
-		arguments:
-			bleedingEdge: %featureToggles.bleedingEdge%
-		tags:
-			- phpstan.rules.rule
-	-
-		class: PHPStan\Rules\Operators\InvalidUnaryOperationRule
-		arguments:
-			bleedingEdge: %featureToggles.bleedingEdge%
-		tags:
-			- phpstan.rules.rule

src/Rules/Operators/InvalidBinaryOperationRule.php

@@ -27,7 +27,6 @@ final class InvalidBinaryOperationRule implements Rule
 	public function __construct(
 		private ExprPrinter $exprPrinter,
 		private RuleLevelHelper $ruleLevelHelper,
-		private bool $bleedingEdge,
 	)
 	{
 	}
@@ -46,10 +45,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$scope->getType($node) instanceof ErrorType && !$this->bleedingEdge) {
-			return [];
-		}
-
 		$leftName = '__PHPSTAN__LEFT__';
 		$rightName = '__PHPSTAN__RIGHT__';
 		$leftVariable = new Node\Expr\Variable($leftName);

src/Rules/Operators/InvalidUnaryOperationRule.php

@@ -23,7 +23,6 @@ final class InvalidUnaryOperationRule implements Rule
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
-		private bool $bleedingEdge,
 	)
 	{
 	}
@@ -43,38 +42,34 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($this->bleedingEdge) {
-			$varName = '__PHPSTAN__LEFT__';
-			$variable = new Node\Expr\Variable($varName);
-			$newNode = clone $node;
-			$newNode->setAttribute('phpstan_cache_printer', null);
-			$newNode->expr = $variable;
+		$varName = '__PHPSTAN__LEFT__';
+		$variable = new Node\Expr\Variable($varName);
+		$newNode = clone $node;
+		$newNode->setAttribute('phpstan_cache_printer', null);
+		$newNode->expr = $variable;
 
-			if ($node instanceof Node\Expr\BitwiseNot) {
-				$callback = static fn (Type $type): bool => $type->isString()->yes() || $type->isInteger()->yes() || $type->isFloat()->yes();
-			} else {
-				$callback = static fn (Type $type): bool => !$type->toNumber() instanceof ErrorType;
-			}
+		if ($node instanceof Node\Expr\BitwiseNot) {
+			$callback = static fn (Type $type): bool => $type->isString()->yes() || $type->isInteger()->yes() || $type->isFloat()->yes();
+		} else {
+			$callback = static fn (Type $type): bool => !$type->toNumber() instanceof ErrorType;
+		}
 
-			$exprType = $this->ruleLevelHelper->findTypeToCheck(
-				$scope,
-				$node->expr,
-				'',
-				$callback,
-			)->getType();
-			if ($exprType instanceof ErrorType) {
-				return [];
-			}
+		$exprType = $this->ruleLevelHelper->findTypeToCheck(
+			$scope,
+			$node->expr,
+			'',
+			$callback,
+		)->getType();
+		if ($exprType instanceof ErrorType) {
+			return [];
+		}
 
-			if (!$scope instanceof MutatingScope) {
-				throw new ShouldNotHappenException();
-			}
+		if (!$scope instanceof MutatingScope) {
+			throw new ShouldNotHappenException();
+		}
 
-			$scope = $scope->assignVariable($varName, $exprType, $exprType, TrinaryLogic::createYes());
-			if (!$scope->getType($newNode) instanceof ErrorType) {
-				return [];
-			}
-		} elseif (!$scope->getType($node) instanceof ErrorType) {
+		$scope = $scope->assignVariable($varName, $exprType, $exprType, TrinaryLogic::createYes());
+		if (!$scope->getType($newNode) instanceof ErrorType) {
 			return [];
 		}
 

tests/PHPStan/Rules/Operators/InvalidBinaryOperationRuleTest.php

@@ -24,7 +24,6 @@ protected function getRule(): Rule
 		return new InvalidBinaryOperationRule(
 			new ExprPrinter(new Printer()),
 			new RuleLevelHelper($this->createReflectionProvider(), true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false),
-			true,
 		);
 	}
 

tests/PHPStan/Rules/Operators/InvalidUnaryOperationRuleTest.php

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