If condition improvement

Author: ondrejmirtes

phpstan-baseline.neon

@@ -42,12 +42,6 @@ parameters:
 			count: 1
 			path: src/Analyser/MutatingScope.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Analyser/NodeScopeResolver.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType

src/Analyser/NodeScopeResolver.php

@@ -171,7 +171,6 @@
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
@@ -1091,7 +1090,7 @@ private function processStmtNode(
 
 			$branchScopeStatementResult = $this->processStmtNodes($stmt, $stmt->stmts, $condResult->getTruthyScope(), $nodeCallback, $context);
 
-			if (!$conditionType instanceof ConstantBooleanType || $conditionType->getValue()) {
+			if (!$conditionType->isTrue()->no()) {
 				$exitPoints = $branchScopeStatementResult->getExitPoints();
 				$throwPoints = array_merge($throwPoints, $branchScopeStatementResult->getThrowPoints());
 				$impurePoints = array_merge($impurePoints, $branchScopeStatementResult->getImpurePoints());
@@ -1123,13 +1122,8 @@ private function processStmtNode(
 
 				if (
 					!$ifAlwaysTrue
-					&& (
-						!$lastElseIfConditionIsTrue
-						&& (
-							!$elseIfConditionType instanceof ConstantBooleanType
-							|| $elseIfConditionType->getValue()
-						)
-					)
+					&& !$lastElseIfConditionIsTrue
+					&& !$elseIfConditionType->isTrue()->no()
 				) {
 					$exitPoints = array_merge($exitPoints, $branchScopeStatementResult->getExitPoints());
 					$throwPoints = array_merge($throwPoints, $branchScopeStatementResult->getThrowPoints());