Always merge scopes from seemingly dead conditions

ondrejmirtes · ondrejmirtes · commit 87a71c32b8c3 · 2020-01-20T00:11:50.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -499,7 +499,11 @@ private function resolveType(Expr $node): Type
 		}
 
 		if ($node instanceof \PhpParser\Node\Expr\BooleanNot) {
-			$exprBooleanType = $this->getType($node->expr)->toBoolean();
+			if ($this->treatPhpDocTypesAsCertain) {
+				$exprBooleanType = $this->getType($node->expr)->toBoolean();
+			} else {
+				$exprBooleanType = $this->getNativeType($node->expr)->toBoolean();
+			}
 			if ($exprBooleanType instanceof ConstantBooleanType) {
 				return new ConstantBooleanType(!$exprBooleanType->getValue());
 			}
@@ -591,8 +595,14 @@ private function resolveType(Expr $node): Type
 		}
 
 		if ($node instanceof \PhpParser\Node\Expr\BinaryOp\LogicalXor) {
-			$leftBooleanType = $this->getType($node->left)->toBoolean();
-			$rightBooleanType = $this->getType($node->right)->toBoolean();
+			if ($this->treatPhpDocTypesAsCertain) {
+				$leftBooleanType = $this->getType($node->left)->toBoolean();
+				$rightBooleanType = $this->getType($node->right)->toBoolean();
+			} else {
+				$leftBooleanType = $this->getNativeType($node->left)->toBoolean();
+				$rightBooleanType = $this->getNativeType($node->right)->toBoolean();
+			}
+
 			if (
 				$leftBooleanType instanceof ConstantBooleanType
 				&& $rightBooleanType instanceof ConstantBooleanType
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -521,7 +521,7 @@ private function processStmtNode(
 				new StatementExitPoint($stmt, $scope),
 			]);
 		} elseif ($stmt instanceof If_) {
-			$conditionType = $scope->getType($stmt->cond)->toBoolean();
+			$conditionType = $scope->doNotTreatPhpDocTypesAsCertain()->getType($stmt->cond)->toBoolean();
 			$ifAlwaysTrue = $conditionType instanceof ConstantBooleanType && $conditionType->getValue();
 			$condResult = $this->processExprNode($stmt->cond, $scope, $nodeCallback, ExpressionContext::createDeep());
 			$exitPoints = [];
@@ -545,7 +545,7 @@ private function processStmtNode(
 			$condScope = $scope;
 			foreach ($stmt->elseifs as $elseif) {
 				$nodeCallback($elseif, $scope);
-				$elseIfConditionType = $condScope->getType($elseif->cond)->toBoolean();
+				$elseIfConditionType = $condScope->doNotTreatPhpDocTypesAsCertain()->getType($elseif->cond)->toBoolean();
 				$condResult = $this->processExprNode($elseif->cond, $condScope, $nodeCallback, ExpressionContext::createDeep());
 				$condScope = $condResult->getScope();
 				$branchScopeStatementResult = $this->processStmtNodes($elseif, $elseif->stmts, $condResult->getTruthyScope(), $nodeCallback);
diff --git a/tests/PHPStan/Analyser/data/native-types.php b/tests/PHPStan/Analyser/data/native-types.php
@@ -163,9 +163,7 @@ public function doIfElse(\DateTimeInterface $date): void
 		}
 
 		assertType(\DateTimeImmutable::class, $date);
-
-		// in reality it works but here the analyser is ran with treatPhpDocTypesAsCertain=true
-		// assertNativeType(\DateTimeInterface::class, $date);
+		assertNativeType(\DateTimeInterface::class, $date);
 
 		if ($date instanceof \DateTime) {
 
diff --git a/tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php b/tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php
@@ -290,10 +290,12 @@ public function testReportTypesFromPhpDocs(): void
 			[
 				'Instanceof between DateTimeImmutable and DateTimeImmutable will always evaluate to true.',
 				33,
+				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 			],
 			[
 				'Instanceof between DateTimeImmutable and DateTime will always evaluate to false.',
 				36,
+				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 			],
 		]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,7 @@ public function doIfElse(\DateTimeInterface $date): void`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`assertType(\DateTimeImmutable::class, $date);`
`166`		`-`
`167`		`- // in reality it works but here the analyser is ran with treatPhpDocTypesAsCertain=true`
`168`		`- // assertNativeType(\DateTimeInterface::class, $date);`
	`166`	`+ assertNativeType(\DateTimeInterface::class, $date);`
`169`	`167`
`170`	`168`	`if ($date instanceof \DateTime) {`
`171`	`169`
Original file line number	Diff line number	Diff line change
`@@ -290,10 +290,12 @@ public function testReportTypesFromPhpDocs(): void`
`290`	`290`	`[`
`291`	`291`	`'Instanceof between DateTimeImmutable and DateTimeImmutable will always evaluate to true.',`
`292`	`292`	`33,`
	`293`	`+ 'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',`
`293`	`294`	`],`
`294`	`295`	`[`
`295`	`296`	`'Instanceof between DateTimeImmutable and DateTime will always evaluate to false.',`
`296`	`297`	`36,`
	`298`	`+ 'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',`
`297`	`299`	`],`
`298`	`300`	`]);`
`299`	`301`	`}`