Fix undefined variable in @var in unreachable code

ondrejmirtes · ondrejmirtes · commit ec4e7edfe622 · 2021-02-08T14:16:40.000+01:00
diff --git a/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php b/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php
@@ -6,6 +6,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\UnreachableStatementNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\FileTypeMapper;
@@ -35,6 +36,7 @@ public function processNode(Node $node, Scope $scope): array
 			|| $node instanceof Node\Stmt\PropertyProperty
 			|| $node instanceof Node\Stmt\ClassConst
 			|| $node instanceof Node\Stmt\Const_
+			|| $node instanceof UnreachableStatementNode
 		) {
 			return [];
 		}
diff --git a/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php b/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php
@@ -156,4 +156,9 @@ public function testBug4504(): void
 		$this->analyse([__DIR__ . '/data/bug-4504.php'], []);
 	}
 
+	public function testBug4505(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-4505.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/PhpDoc/data/bug-4505.php b/tests/PHPStan/Rules/PhpDoc/data/bug-4505.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug4505;
+
+class Foo
+{
+
+	public function doFoo(): void {
+		if (true) {
+			return;
+		}
+
+		/** @var int $foobar */
+		$foobar = 1;
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -156,4 +156,9 @@ public function testBug4504(): void`
`156`	`156`	`$this->analyse([__DIR__ . '/data/bug-4504.php'], []);`
`157`	`157`	`}`
`158`	`158`
	`159`	`+ public function testBug4505(): void`
	`160`	`+ {`
	`161`	`+ $this->analyse([__DIR__ . '/data/bug-4505.php'], []);`
	`162`	`+ }`
	`163`	`+`
`159`	`164`	`}`