LogicalXor is not shortcircuited

phpstan · Dec 7, 2023 · 3b011f6 · 3b011f6
1 parent 3a12724
commit 3b011f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/Rules/Comparison/LogicalXorConstantConditionRule.php b/src/Rules/Comparison/LogicalXorConstantConditionRule.php
@@ -63,7 +63,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$rightType = $this->helper->getBooleanType($scope, $node->right);
-		if ($rightType instanceof ConstantBooleanType && !$scope->isInFirstLevelStatement()) {
+		if ($rightType instanceof ConstantBooleanType) {
 			$addTipRight = function (RuleErrorBuilder $ruleErrorBuilder) use ($scope, $node, $tipText): RuleErrorBuilder {
 				if (!$this->treatPhpDocTypesAsCertain) {
 					return $ruleErrorBuilder;

diff --git a/tests/PHPStan/Rules/Comparison/LogicalXorConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/LogicalXorConstantConditionRuleTest.php
@@ -65,6 +65,14 @@ public function testRule(): void
 				20,
 				$tipText,
 			],
+			[
+				'Left side of xor is always true.',
+				24,
+			],
+			[
+				'Right side of xor is always false.',
+				24,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Comparison/data/logical-xor.php b/tests/PHPStan/Rules/Comparison/data/logical-xor.php
@@ -20,6 +20,8 @@ public function doFoo($a, $b)
 		if ($a xor $b) {
 
 		}
+
+		1 xor 0;
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,14 @@ public function testRule(): void @@
 ,
     				$tipText,
     			],
+    			[
+    				'Left side of xor is always true.',
+,
+    			],
+    			[
+    				'Right side of xor is always false.',
+,
+    			],
     		]);
     	}
@@ Expand Down @@