Inline @var above property should not pollute scope inside methods

phpstan · Jan 23, 2021 · e832df4 · e832df4
1 parent 39b5a71
commit e832df4
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
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();
+	}
+
+}