Inline @var above property should not pollute scope inside methods

ondrejmirtes · ondrejmirtes · commit e832df4e9912 · 2021-01-23T13:08:08.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2663,7 +2663,7 @@ private function enterFunctionLike(
 		bool $preserveThis
 	): self
 	{
-		$variableTypes = $this->getVariableTypes();
+		$variableTypes = [];
 		$nativeExpressionTypes = [];
 		foreach (ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getParameters() as $parameter) {
 			$parameterType = $parameter->getType();
@@ -2674,8 +2674,8 @@ private function enterFunctionLike(
 			$nativeExpressionTypes[sprintf('$%s', $parameter->getName())] = $parameter->getNativeType();
 		}
 
-		if (!$preserveThis && array_key_exists('this', $variableTypes)) {
-			unset($variableTypes['this']);
+		if ($preserveThis && array_key_exists('this', $this->variableTypes)) {
+			$variableTypes['this'] = $this->variableTypes['this'];
 		}
 
 		return $this->scopeFactory->create(
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2777,6 +2777,10 @@ private function processStmtVarAnnotation(MutatingScope $scope, Node\Stmt $stmt,
 					continue;
 				}
 
+				if ($scope->isInClass() && $scope->getFunction() === null) {
+					continue;
+				}
+
 				if ($scope->canAnyVariableExist()) {
 					$certainty = TrinaryLogic::createYes();
 				}
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -884,4 +884,19 @@ public function testBug3515(): void
 		]);
 	}
 
+	public function testBug4412(): void
+	{
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = false;
+		$this->polluteCatchScopeWithTryAssignments = false;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+		$this->analyse([__DIR__ . '/data/bug-4412.php'], [
+			[
+				'Undefined variable: $a',
+				17,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Variables/data/bug-4412.php b/tests/PHPStan/Rules/Variables/data/bug-4412.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Bug4412;
+
+/**
+ * @phpstan-template T of \Exception
+ */
+class B
+{
+	/** @var self<\Exception> $a */
+	public $a;
+
+	/**
+	 * @phpstan-return T
+	 */
+	public function get() {
+		return $a->get();
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -2663,7 +2663,7 @@ private function enterFunctionLike(`
`2663`	`2663`	`bool $preserveThis`
`2664`	`2664`	`): self`
`2665`	`2665`	`{`
`2666`		`- $variableTypes = $this->getVariableTypes();`
	`2666`	`+ $variableTypes = [];`
`2667`	`2667`	`$nativeExpressionTypes = [];`
`2668`	`2668`	`foreach (ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getParameters() as $parameter) {`
`2669`	`2669`	`$parameterType = $parameter->getType();`
`@@ -2674,8 +2674,8 @@ private function enterFunctionLike(`
`2674`	`2674`	`$nativeExpressionTypes[sprintf('$%s', $parameter->getName())] = $parameter->getNativeType();`
`2675`	`2675`	`}`
`2676`	`2676`
`2677`		`- if (!$preserveThis && array_key_exists('this', $variableTypes)) {`
`2678`		`- unset($variableTypes['this']);`
	`2677`	`+ if ($preserveThis && array_key_exists('this', $this->variableTypes)) {`
	`2678`	`+ $variableTypes['this'] = $this->variableTypes['this'];`
`2679`	`2679`	`}`
`2680`	`2680`
`2681`	`2681`	`return $this->scopeFactory->create(`
Original file line number	Diff line number	Diff line change
`@@ -2777,6 +2777,10 @@ private function processStmtVarAnnotation(MutatingScope $scope, Node\Stmt $stmt,`
`2777`	`2777`	`continue;`
`2778`	`2778`	`}`
`2779`	`2779`
	`2780`	`+ if ($scope->isInClass() && $scope->getFunction() === null) {`
	`2781`	`+ continue;`
	`2782`	`+ }`
	`2783`	`+`
`2780`	`2784`	`if ($scope->canAnyVariableExist()) {`
`2781`	`2785`	`$certainty = TrinaryLogic::createYes();`
`2782`	`2786`	`}`