Inline @var - support overriding variables on right side of =

ondrejmirtes · ondrejmirtes · commit 22d363cdb9f0 · 2021-01-14T14:22:41.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -343,10 +343,6 @@ private function processStmtNode(
 		} elseif (
 			!$stmt instanceof Static_
 			&& !$stmt instanceof Foreach_
-			&& (
-				!$stmt instanceof Node\Stmt\Expression
-				|| !$stmt->expr instanceof Assign && !$stmt->expr instanceof AssignRef
-			)
 		) {
 			$scope = $this->processStmtVarAnnotation($scope, $stmt, null);
 		}
@@ -2734,12 +2730,27 @@ private function processStmtVarAnnotation(MutatingScope $scope, Node\Stmt $stmt,
 				$function !== null ? $function->getName() : null,
 				$comment->getText()
 			);
+
+			$assignedVariable = null;
+			if (
+				$stmt instanceof Node\Stmt\Expression
+				&& ($stmt->expr instanceof Assign || $stmt->expr instanceof AssignRef)
+				&& $stmt->expr->var instanceof Variable
+				&& is_string($stmt->expr->var->name)
+			) {
+				$assignedVariable = $stmt->expr->var->name;
+			}
+
 			foreach ($resolvedPhpDoc->getVarTags() as $name => $varTag) {
 				if (is_int($name)) {
 					$variableLessTags[] = $varTag;
 					continue;
 				}
 
+				if ($name === $assignedVariable) {
+					continue;
+				}
+
 				$certainty = $scope->hasVariableType($name);
 				if ($certainty->no()) {
 					continue;
diff --git a/tests/PHPStan/Rules/Operators/InvalidBinaryOperationRuleTest.php b/tests/PHPStan/Rules/Operators/InvalidBinaryOperationRuleTest.php
@@ -117,4 +117,9 @@ public function testBug2964(): void
 		$this->analyse([__DIR__ . '/data/bug2964.php'], []);
 	}
 
+	public function testBug3515(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3515.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Operators/data/bug-3515.php b/tests/PHPStan/Rules/Operators/data/bug-3515.php
@@ -0,0 +1,13 @@
+<?php
+
+$foo = 'foo';
+
+/** @var int $foo */
+$bar = $foo + 1;
+
+function (): void {
+	$foo = 'foo';
+
+	/** @var int $foo */
+	$bar = $foo + 1;
+};
diff --git a/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php b/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php
@@ -100,4 +100,9 @@ public function testAboveDeclare(): void
 		$this->analyse([__DIR__ . '/data/var-above-declare.php'], []);
 	}
 
+	public function testBug3515(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3515.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/PhpDoc/data/bug-3515.php b/tests/PHPStan/Rules/PhpDoc/data/bug-3515.php
@@ -0,0 +1,4 @@
+<?php
+
+/** @var int $foo */
+$bar = $foo + 1;
diff --git a/tests/PHPStan/Rules/PhpDoc/data/wrong-variable-name-var.php b/tests/PHPStan/Rules/PhpDoc/data/wrong-variable-name-var.php
@@ -188,4 +188,12 @@ public function thisInVar2()
 		$demo = $this->demo();
 	}
 
+	public function overrideDifferentVariableAboveAssign()
+	{
+		$foo = 'foo';
+
+		/** @var int $foo */
+		$bar = $foo + 1;
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -865,4 +865,23 @@ public function testBug1306(): void
 		$this->analyse([__DIR__ . '/data/bug-1306.php'], []);
 	}
 
+	public function testBug3515(): void
+	{
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = false;
+		$this->polluteCatchScopeWithTryAssignments = false;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+		$this->analyse([__DIR__ . '/data/bug-3515.php'], [
+			[
+				'Undefined variable: $anArray',
+				19,
+			],
+			[
+				'Undefined variable: $anArray',
+				20,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Variables/data/bug-3515.php b/tests/PHPStan/Rules/Variables/data/bug-3515.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Bug3515;
+
+/**
+ * @var mixed[] $anArray
+ */
+$value1 = $anArray[0];
+$value2 = $anArray[1];
+
+/** @var int $foo */
+$bar = $foo + 1;
+
+function (): void
+{
+	/**
+	 * @var mixed[] $anArray
+	 */
+	$value1 = $anArray[0];
+	$value2 = $anArray[1];
+};

Original file line number	Diff line number	Diff line change
`@@ -117,4 +117,9 @@ public function testBug2964(): void`
`117`	`117`	`$this->analyse([__DIR__ . '/data/bug2964.php'], []);`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ public function testBug3515(): void`
	`121`	`+ {`
	`122`	`+ $this->analyse([__DIR__ . '/data/bug-3515.php'], []);`
	`123`	`+ }`
	`124`	`+`
`120`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,9 @@ public function testAboveDeclare(): void`
`100`	`100`	`$this->analyse([__DIR__ . '/data/var-above-declare.php'], []);`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ public function testBug3515(): void`
	`104`	`+ {`
	`105`	`+ $this->analyse([__DIR__ . '/data/bug-3515.php'], []);`
	`106`	`+ }`
	`107`	`+`
`103`	`108`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
++
 +/** @var int $foo */
 +$bar = $foo + 1;
Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,12 @@ public function thisInVar2()`
`188`	`188`	`$demo = $this->demo();`
`189`	`189`	`}`
`190`	`190`
	`191`	`+ public function overrideDifferentVariableAboveAssign()`
	`192`	`+ {`
	`193`	`+ $foo = 'foo';`
	`194`	`+`
	`195`	`+ /** @var int $foo */`
	`196`	`+ $bar = $foo + 1;`
	`197`	`+ }`
	`198`	`+`
`191`	`199`	`}`