TypeSpecifier - fix assignments

phpstan · May 8, 2021 · b2bf703 · b2bf703
1 parent ea1313b
commit b2bf703
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -114,9 +114,6 @@ public function specifyTypesInCondition(
 	{
 		if ($expr instanceof Instanceof_) {
 			$exprNode = $expr->expr;
-			if ($exprNode instanceof Expr\Assign) {
-				$exprNode = $exprNode->var;
-			}
 			if ($expr->class instanceof Name) {
 				$className = (string) $expr->class;
 				$lowercasedClassName = strtolower($className);
@@ -178,9 +175,6 @@ public function specifyTypesInCondition(
 			if ($expressions !== null) {
 				/** @var Expr $exprNode */
 				$exprNode = $expressions[0];
-				if ($exprNode instanceof Expr\Assign) {
-					$exprNode = $exprNode->var;
-				}
 				/** @var \PHPStan\Type\ConstantScalarType $constantType */
 				$constantType = $expressions[1];
 				if ($constantType->getValue() === false) {
@@ -914,6 +908,10 @@ public function create(
 			return new SpecifiedTypes();
 		}
 
+		while ($expr instanceof Expr\Assign) {
+			$expr = $expr->var;
+		}
+
 		if ($scope !== null) {
 			if ($context->true()) {
 				$resultType = TypeCombinator::intersect($scope->getType($expr), $type);

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -395,6 +395,7 @@ public function dataFileAsserts(): iterable
 		}
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4814.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4982.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/bug-4982.php b/tests/PHPStan/Analyser/data/bug-4982.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Bug4982;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function doFoo(): void
+	{
+		if (!is_null($c = $this->doBar())) {
+			assertType('int', $c);
+		}
+	}
+
+	public function doBar(): ?int
+	{
+
+	}
+
+}