Bleeding edge - report unused results of "&&" and "||"

phpstan · Dec 8, 2023 · cf2c8bb · staabm · Dec 8, 2023 · cf2c8bb
1 parent 9664f7a
commit cf2c8bb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/Rules/DeadCode/NoopRule.php b/src/Rules/DeadCode/NoopRule.php
@@ -61,6 +61,20 @@ public function processNode(Node $node, Scope $scope): array
 				];
 			}
 
+			if ($expr instanceof Node\Expr\BinaryOp\BooleanAnd || $expr instanceof Node\Expr\BinaryOp\BooleanOr) {
+				if (!$this->isNoopExpr($expr->right)) {
+					return [];
+				}
+
+				return [
+					RuleErrorBuilder::message(sprintf(
+						'Unused result of "%s" operator.',
+						$expr->getOperatorSigil(),
+					))->line($expr->getLine())
+						->build(),
+				];
+			}
+
 			if ($expr instanceof Node\Expr\Ternary) {
 				$if = $expr->if;
 				if ($if === null) {

diff --git a/tests/PHPStan/Rules/DeadCode/NoopRuleTest.php b/tests/PHPStan/Rules/DeadCode/NoopRuleTest.php
@@ -100,6 +100,14 @@ public function testRule(): void
 				'Unused result of ternary operator.',
 				41,
 			],
+			[
+				'Unused result of "||" operator.',
+				46,
+			],
+			[
+				'Unused result of "&&" operator.',
+				49,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/DeadCode/data/noop.php b/tests/PHPStan/Rules/DeadCode/data/noop.php
@@ -42,4 +42,10 @@ function (stdClass $foo, bool $a, bool $b) {
 	$a ? doFoo() : $s;
 	$a ? $b : doFoo();
 	$a ? doFoo() : doBar();
+
+	$a || $b;
+	$a || doFoo();
+
+	$a && $b;
+	$a && doFoo();
 };