Support @var above echo for the statement itself

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -301,6 +301,10 @@ private function processStmtNode(
 		\Closure $nodeCallback
 	): StatementResult
 	{
+		if ($stmt instanceof Echo_) {
+			$scope = $this->processStmtVarAnnotation($scope, $stmt);
+		}
+
 		$nodeCallback($stmt, $scope);
 
 		if ($stmt instanceof Node\Stmt\Declare_) {
@@ -415,7 +419,6 @@ private function processStmtNode(
 				), $methodScope);
 			}
 		} elseif ($stmt instanceof Echo_) {
-			$scope = $this->processStmtVarAnnotation($scope, $stmt);
 			$hasYield = false;
 			foreach ($stmt->exprs as $echoExpr) {
 				$result = $this->processExprNode($echoExpr, $scope, $nodeCallback, ExpressionContext::createDeep());

tests/PHPStan/Rules/Cast/EchoRuleTest.php

@@ -24,27 +24,27 @@ public function testEchoRule(): void
 		$this->analyse([__DIR__ . '/data/echo.php'], [
 			[
 				'Parameter #1 (array()) of echo cannot be converted to string.',
-				5,
+				7,
 			],
 			[
 				'Parameter #1 (stdClass) of echo cannot be converted to string.',
-				7,
+				9,
 			],
 			[
 				'Parameter #1 (array()) of echo cannot be converted to string.',
-				9,
+				11,
 			],
 			[
 				'Parameter #2 (stdClass) of echo cannot be converted to string.',
-				9,
+				11,
 			],
 			[
 				'Parameter #1 (Closure(): mixed) of echo cannot be converted to string.',
-				11,
+				13,
 			],
 			[
 				'Parameter #1 (\'string\'|array(\'string\')) of echo cannot be converted to string.',
-				15,
+				17,
 			],
 		]);
 	}

tests/PHPStan/Rules/Cast/data/echo.php

@@ -2,14 +2,24 @@
 
 declare(strict_types=1);
 
-echo [];
+function ()
+{
+	echo [];
 
-echo new stdClass();
+	echo new stdClass();
 
-echo [], new stdClass();
+	echo [], new stdClass();
 
-echo function () {};
+	echo function () {};
 
-echo 13132, 'string';
+	echo 13132, 'string';
 
-echo random_int(0, 1) ? ['string'] : 'string';
+	echo random_int(0, 1) ? ['string'] : 'string';
+
+};
+
+function (array $test)
+{
+	/** @var string $test */
+	echo $test;
+};

tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php

@@ -70,6 +70,10 @@ public function testRule(): void
 				'Multiple PHPDoc @var tags above single variable assignment are not supported.',
 				125,
 			],
+			[
+				'Variable $b in PHPDoc tag @var does not exist.',
+				134,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/PhpDoc/data/wrong-variable-name-var.php

@@ -125,4 +125,13 @@ public function multiplePrefixedTagsAreFine()
 		$test = doFoo(); // error
 	}
 
+	public function testEcho($a)
+	{
+		/** @var string $a */
+		echo $a;
+
+		/** @var string $b */
+		echo $a;
+	}
+
 }