Improved compatibility with PHPStan 1.0

Author: ondrejmirtes

rules.neon

@@ -12,7 +12,9 @@ parameters:
 	reportMaybesInPropertyPhpDocTypes: true
 
 rules:
+	- PHPStan\Rules\BooleansInConditions\BooleanInBooleanAndRule
 	- PHPStan\Rules\BooleansInConditions\BooleanInBooleanNotRule
+	- PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule
 	- PHPStan\Rules\BooleansInConditions\BooleanInElseIfConditionRule
 	- PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule
 	- PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule
@@ -44,20 +46,6 @@ rules:
 	- PHPStan\Rules\VariableVariables\VariableVariablesRule
 
 services:
-	-
-		class: PHPStan\Rules\BooleansInConditions\BooleanInBooleanAndRule
-		arguments:
-			checkLogicalAndConstantCondition: %featureToggles.checkLogicalAndConstantCondition%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule
-		arguments:
-			checkLogicalOrConstantCondition: %featureToggles.checkLogicalOrConstantCondition%
-		tags:
-			- phpstan.rules.rule
-
 	-
 		class: PHPStan\Rules\BooleansInConditions\BooleanRuleHelper
 

src/Rules/BooleansInConditions/BooleanInBooleanAndRule.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
-use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PHPStan\Node\BooleanAndNode;
 use PHPStan\Type\VerbosityLevel;
 
@@ -15,13 +14,9 @@ class BooleanInBooleanAndRule implements \PHPStan\Rules\Rule
 	/** @var BooleanRuleHelper */
 	private $helper;
 
-	/** @var bool */
-	private $checkLogicalAndConstantCondition;
-
-	public function __construct(BooleanRuleHelper $helper, bool $checkLogicalAndConstantCondition = false)
+	public function __construct(BooleanRuleHelper $helper)
 	{
 		$this->helper = $helper;
-		$this->checkLogicalAndConstantCondition = $checkLogicalAndConstantCondition;
 	}
 
 	public function getNodeType(): string
@@ -32,10 +27,6 @@ public function getNodeType(): string
 	public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scope): array
 	{
 		$originalNode = $node->getOriginalNode();
-		if (!$originalNode instanceof BooleanAnd && !$this->checkLogicalAndConstantCondition) {
-			return [];
-		}
-
 		$messages = [];
 		if (!$this->helper->passesAsBoolean($scope, $originalNode->left)) {
 			$leftType = $scope->getType($originalNode->left);

src/Rules/BooleansInConditions/BooleanInBooleanOrRule.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
-use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PHPStan\Node\BooleanOrNode;
 use PHPStan\Type\VerbosityLevel;
 
@@ -15,13 +14,9 @@ class BooleanInBooleanOrRule implements \PHPStan\Rules\Rule
 	/** @var BooleanRuleHelper */
 	private $helper;
 
-	/** @var bool */
-	private $checkLogicalOrConstantCondition;
-
-	public function __construct(BooleanRuleHelper $helper, bool $checkLogicalOrConstantCondition = false)
+	public function __construct(BooleanRuleHelper $helper)
 	{
 		$this->helper = $helper;
-		$this->checkLogicalOrConstantCondition = $checkLogicalOrConstantCondition;
 	}
 
 	public function getNodeType(): string
@@ -32,10 +27,6 @@ public function getNodeType(): string
 	public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scope): array
 	{
 		$originalNode = $node->getOriginalNode();
-		if (!$originalNode instanceof BooleanOr && !$this->checkLogicalOrConstantCondition) {
-			return [];
-		}
-
 		$messages = [];
 		if (!$this->helper->passesAsBoolean($scope, $originalNode->left)) {
 			$leftType = $scope->getType($originalNode->left);

tests/Rules/BooleansInConditions/BooleanInBooleanAndRuleTest.php

@@ -16,8 +16,7 @@ protected function getRule(): Rule
 		return new BooleanInBooleanAndRule(
 			new BooleanRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class)
-			),
-			true
+			)
 		);
 	}
 

tests/Rules/BooleansInConditions/BooleanInBooleanOrRuleTest.php

@@ -16,8 +16,7 @@ protected function getRule(): Rule
 		return new BooleanInBooleanOrRule(
 			new BooleanRuleHelper(
 				self::getContainer()->getByType(RuleLevelHelper::class)
-			),
-			true
+			)
 		);
 	}