Remove unnecessary instanceof ConstantBooleanType in loop analysis

phpstan · Oct 23, 2024 · 11e0ab6 · 11e0ab6
1 parent c875e83
commit 11e0ab6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -58,7 +58,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantBooleanType is error\\-prone and deprecated\\. Use Type\\:\\:isTrue\\(\\) or Type\\:\\:isFalse\\(\\) instead\\.$#"
-			count: 3
+			count: 2
 			path: src/Analyser/NodeScopeResolver.php
 
 		-

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1320,12 +1320,7 @@ private function processStmtNode(
 				$initScope = $condResult->getScope();
 				$condResultScope = $condResult->getScope();
 				$condTruthiness = ($this->treatPhpDocTypesAsCertain ? $condResultScope->getType($condExpr) : $condResultScope->getNativeType($condExpr))->toBoolean();
-				if ($condTruthiness instanceof ConstantBooleanType) {
-					$condTruthinessTrinary = TrinaryLogic::createFromBoolean($condTruthiness->getValue());
-				} else {
-					$condTruthinessTrinary = TrinaryLogic::createMaybe();
-				}
-				$isIterableAtLeastOnce = $isIterableAtLeastOnce->and($condTruthinessTrinary);
+				$isIterableAtLeastOnce = $isIterableAtLeastOnce->and($condTruthiness->isTrue());
 				$hasYield = $hasYield || $condResult->hasYield();
 				$throwPoints = array_merge($throwPoints, $condResult->getThrowPoints());
 				$impurePoints = array_merge($impurePoints, $condResult->getImpurePoints());