Scope - fix specifyExpressionType+removeTypeFromExpression for native types

ondrejmirtes · ondrejmirtes · commit 251d1f78fead · 2020-01-20T00:11:50.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2680,10 +2680,15 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 
 	public function removeTypeFromExpression(Expr $expr, Type $type): self
 	{
-		return $this->specifyExpressionType(
+		$scope = $this->specifyExpressionType(
 			$expr,
 			TypeCombinator::remove($this->getType($expr), $type)
 		);
+		if ($expr instanceof Variable && is_string($expr->name)) {
+			$scope->nativeExpressionTypes[sprintf('$%s', $expr->name)] = TypeCombinator::remove($this->getNativeType($expr), $type);
+		}
+
+		return $scope;
 	}
 
 	/**
@@ -2742,10 +2747,11 @@ public function filterBySpecifiedTypes(SpecifiedTypes $specifiedTypes): self
 			$expr = $typeSpecification['expr'];
 			$type = $typeSpecification['type'];
 			if ($typeSpecification['sure']) {
-				if (!$specifiedTypes->shouldOverwrite()) {
-					$type = TypeCombinator::intersect($type, $this->getType($expr));
+				$scope = $scope->specifyExpressionType($expr, $specifiedTypes->shouldOverwrite() ? $type : TypeCombinator::intersect($type, $this->getType($expr)));
+
+				if ($expr instanceof Variable && is_string($expr->name)) {
+					$scope->nativeExpressionTypes[sprintf('$%s', $expr->name)] = $specifiedTypes->shouldOverwrite() ? $type : TypeCombinator::intersect($type, $this->getNativeType($expr));
 				}
-				$scope = $scope->specifyExpressionType($expr, $type);
 			} else {
 				$scope = $scope->removeTypeFromExpression($expr, $type);
 			}
diff --git a/tests/PHPStan/Analyser/data/native-types.php b/tests/PHPStan/Analyser/data/native-types.php
@@ -138,6 +138,40 @@ public function doForeachArrayDestructuring(array $array)
 		}
 	}
 
+	/**
+	 * @param \DateTimeImmutable $date
+	 */
+	public function doIfElse(\DateTimeInterface $date): void
+	{
+		if ($date instanceof \DateTimeInterface) {
+			assertType(\DateTimeImmutable::class, $date);
+			assertNativeType(\DateTimeInterface::class, $date);
+		} else {
+			assertType('*NEVER*', $date);
+			assertNativeType('*NEVER*', $date);
+		}
+
+		assertType(\DateTimeImmutable::class, $date);
+		assertNativeType(\DateTimeInterface::class, $date);
+
+		if ($date instanceof \DateTimeImmutable) {
+			assertType(\DateTimeImmutable::class, $date);
+			assertNativeType(\DateTimeImmutable::class, $date);
+		} else {
+			assertType('*NEVER*', $date);
+			assertNativeType('DateTimeInterface~DateTimeImmutable', $date);
+		}
+
+		assertType(\DateTimeImmutable::class, $date);
+
+		// in reality it works but here the analyser is ran with treatPhpDocTypesAsCertain=true
+		// assertNativeType(\DateTimeInterface::class, $date);
+
+		if ($date instanceof \DateTime) {
+
+		}
+	}
+
 }
 
 /**
