Bleeding edge - report unused results of "and" and "or"

Author: ondrejmirtes

src/Rules/DeadCode/NoopRule.php

@@ -36,14 +36,30 @@ public function processNode(Node $node, Scope $scope): array
 		) {
 			$expr = $expr->expr;
 		}
-		if ($this->logicalXor && $expr instanceof Node\Expr\BinaryOp\LogicalXor) {
-			return [
-				RuleErrorBuilder::message(
-					'Unused result of "xor" operator.',
-				)->line($expr->getLine())
-					->tip('This operator has unexpected precedence, try disambiguating the logic with parentheses ().')
-					->build(),
-			];
+		if ($this->logicalXor) {
+			if ($expr instanceof Node\Expr\BinaryOp\LogicalXor) {
+				return [
+					RuleErrorBuilder::message(
+						'Unused result of "xor" operator.',
+					)->line($expr->getLine())
+						->tip('This operator has unexpected precedence, try disambiguating the logic with parentheses ().')
+						->build(),
+				];
+			}
+			if ($expr instanceof Node\Expr\BinaryOp\LogicalAnd || $expr instanceof Node\Expr\BinaryOp\LogicalOr) {
+				if (!$this->isNoopExpr($expr->right)) {
+					return [];
+				}
+
+				return [
+					RuleErrorBuilder::message(sprintf(
+						'Unused result of "%s" operator.',
+						$expr->getOperatorSigil(),
+					))->line($expr->getLine())
+						->tip('This operator has unexpected precedence, try disambiguating the logic with parentheses ().')
+						->build(),
+				];
+			}
 		}
 		if (!$this->isNoopExpr($expr)) {
 			return [];

tests/PHPStan/Rules/DeadCode/NoopRuleTest.php

@@ -82,6 +82,16 @@ public function testRule(): void
 				32,
 				'This operator has unexpected precedence, try disambiguating the logic with parentheses ().',
 			],
+			[
+				'Unused result of "and" operator.',
+				35,
+				'This operator has unexpected precedence, try disambiguating the logic with parentheses ().',
+			],
+			[
+				'Unused result of "or" operator.',
+				38,
+				'This operator has unexpected precedence, try disambiguating the logic with parentheses ().',
+			],
 		]);
 	}
 

tests/PHPStan/Rules/DeadCode/data/noop.php

@@ -30,4 +30,10 @@ function (stdClass $foo, bool $a, bool $b) {
 	(string) 1;
 
 	$r = $a xor $b;
+
+	$s = $a and doFoo();
+	$t = $a and $b;
+
+	$s = $a or doFoo();
+	$t = $a or $b;
 };