Virtual nodes - pass specific reflection so that Scope::getFunction() does not need to be used

ondrejmirtes · ondrejmirtes · commit f18bd86495fc · 2022-06-17T17:23:20.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -421,7 +421,12 @@ private function processStmtNode(
 				$isPure,
 				$acceptsNamedArguments,
 			);
-			$nodeCallback(new InFunctionNode($stmt), $functionScope);
+			$functionReflection = $functionScope->getFunction();
+			if (!$functionReflection instanceof FunctionReflection) {
+				throw new ShouldNotHappenException();
+			}
+
+			$nodeCallback(new InFunctionNode($functionReflection, $stmt), $functionScope);
 
 			$gatheredReturnStatements = [];
 			$executionEnds = [];
@@ -506,7 +511,11 @@ private function processStmtNode(
 			}
 
 			if ($stmt->getAttribute('virtual', false) === false) {
-				$nodeCallback(new InClassMethodNode($stmt), $methodScope);
+				$methodReflection = $methodScope->getFunction();
+				if (!$methodReflection instanceof MethodReflection) {
+					throw new ShouldNotHappenException();
+				}
+				$nodeCallback(new InClassMethodNode($methodReflection, $stmt), $methodScope);
 			}
 
 			if ($stmt->stmts !== null) {
@@ -2978,7 +2987,12 @@ private function processClosureNode(
 
 		$closureScope = $scope->enterAnonymousFunction($expr, $callableParameters);
 		$closureScope = $closureScope->processClosureScope($scope, null, $byRefUses);
-		$nodeCallback(new InClosureNode($expr), $closureScope);
+		$closureType = $closureScope->getAnonymousFunctionReflection();
+		if (!$closureType instanceof ClosureType) {
+			throw new ShouldNotHappenException();
+		}
+
+		$nodeCallback(new InClosureNode($closureType, $expr), $closureScope);
 
 		$gatheredReturnStatements = [];
 		$gatheredYieldStatements = [];
diff --git a/src/Node/InClassMethodNode.php b/src/Node/InClassMethodNode.php
@@ -3,16 +3,25 @@
 namespace PHPStan\Node;
 
 use PhpParser\Node;
+use PHPStan\Reflection\MethodReflection;
 
 /** @api */
 class InClassMethodNode extends Node\Stmt implements VirtualNode
 {
 
-	public function __construct(private Node\Stmt\ClassMethod $originalNode)
+	public function __construct(
+		private MethodReflection $methodReflection,
+		private Node\Stmt\ClassMethod $originalNode,
+	)
 	{
 		parent::__construct($originalNode->getAttributes());
 	}
 
+	public function getMethodReflection(): MethodReflection
+	{
+		return $this->methodReflection;
+	}
+
 	public function getOriginalNode(): Node\Stmt\ClassMethod
 	{
 		return $this->originalNode;
diff --git a/src/Node/InClosureNode.php b/src/Node/InClosureNode.php
@@ -5,19 +5,25 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\NodeAbstract;
+use PHPStan\Type\ClosureType;
 
 /** @api */
 class InClosureNode extends NodeAbstract implements VirtualNode
 {
 
 	private Node\Expr\Closure $originalNode;
 
-	public function __construct(Closure $originalNode)
+	public function __construct(private ClosureType $closureType, Closure $originalNode)
 	{
 		parent::__construct($originalNode->getAttributes());
 		$this->originalNode = $originalNode;
 	}
 
+	public function getClosureType(): ClosureType
+	{
+		return $this->closureType;
+	}
+
 	public function getOriginalNode(): Closure
 	{
 		return $this->originalNode;
diff --git a/src/Node/InFunctionNode.php b/src/Node/InFunctionNode.php
@@ -3,16 +3,25 @@
 namespace PHPStan\Node;
 
 use PhpParser\Node;
+use PHPStan\Reflection\FunctionReflection;
 
 /** @api */
 class InFunctionNode extends Node\Stmt implements VirtualNode
 {
 
-	public function __construct(private Node\Stmt\Function_ $originalNode)
+	public function __construct(
+		private FunctionReflection $functionReflection,
+		private Node\Stmt\Function_ $originalNode,
+	)
 	{
 		parent::__construct($originalNode->getAttributes());
 	}
 
+	public function getFunctionReflection(): FunctionReflection
+	{
+		return $this->functionReflection;
+	}
+
 	public function getOriginalNode(): Node\Stmt\Function_
 	{
 		return $this->originalNode;

Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,25 @@`
`3`	`3`	`namespace PHPStan\Node;`
`4`	`4`
`5`	`5`	`use PhpParser\Node;`
	`6`	`+use PHPStan\Reflection\MethodReflection;`
`6`	`7`
`7`	`8`	`/** @api */`
`8`	`9`	`class InClassMethodNode extends Node\Stmt implements VirtualNode`
`9`	`10`	`{`
`10`	`11`
`11`		`- public function __construct(private Node\Stmt\ClassMethod $originalNode)`
	`12`	`+ public function __construct(`
	`13`	`+ private MethodReflection $methodReflection,`
	`14`	`+ private Node\Stmt\ClassMethod $originalNode,`
	`15`	`+ )`
`12`	`16`	`{`
`13`	`17`	`parent::__construct($originalNode->getAttributes());`
`14`	`18`	`}`
`15`	`19`
	`20`	`+ public function getMethodReflection(): MethodReflection`
	`21`	`+ {`
	`22`	`+ return $this->methodReflection;`
	`23`	`+ }`
	`24`	`+`
`16`	`25`	`public function getOriginalNode(): Node\Stmt\ClassMethod`
`17`	`26`	`{`
`18`	`27`	`return $this->originalNode;`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,25 @@`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\Node\Expr\Closure;`
`7`	`7`	`use PhpParser\NodeAbstract;`
	`8`	`+use PHPStan\Type\ClosureType;`
`8`	`9`
`9`	`10`	`/** @api */`
`10`	`11`	`class InClosureNode extends NodeAbstract implements VirtualNode`
`11`	`12`	`{`
`12`	`13`
`13`	`14`	`private Node\Expr\Closure $originalNode;`
`14`	`15`
`15`		`- public function __construct(Closure $originalNode)`
	`16`	`+ public function __construct(private ClosureType $closureType, Closure $originalNode)`
`16`	`17`	`{`
`17`	`18`	`parent::__construct($originalNode->getAttributes());`
`18`	`19`	`$this->originalNode = $originalNode;`
`19`	`20`	`}`
`20`	`21`
	`22`	`+ public function getClosureType(): ClosureType`
	`23`	`+ {`
	`24`	`+ return $this->closureType;`
	`25`	`+ }`
	`26`	`+`
`21`	`27`	`public function getOriginalNode(): Closure`
`22`	`28`	`{`
`23`	`29`	`return $this->originalNode;`