Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Jul 20, 2024 · d930bcf · d930bcf
2 parents 7d64d5c + 27e0f91
commit d930bcf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -394,10 +394,14 @@ public function processStmtNodes(
 		if ($stmtCount === 0 && $shouldCheckLastStatement) {
 			/** @var Node\Stmt\Function_|Node\Stmt\ClassMethod|Expr\Closure $parentNode */
 			$parentNode = $parentNode;
+			$returnTypeNode = $parentNode->returnType;
+			if ($parentNode instanceof Expr\Closure) {
+				$parentNode = new Node\Stmt\Expression($parentNode, $parentNode->getAttributes());
+			}
 			$nodeCallback(new ExecutionEndNode(
 				$parentNode,
 				$statementResult,
-				$parentNode->returnType !== null,
+				$returnTypeNode !== null,
 			), $scope);
 		}
 

diff --git a/src/Node/ExecutionEndNode.php b/src/Node/ExecutionEndNode.php
@@ -11,15 +11,15 @@ class ExecutionEndNode extends NodeAbstract implements VirtualNode
 {
 
 	public function __construct(
-		private Node $node,
+		private Node\Stmt $node,
 		private StatementResult $statementResult,
 		private bool $hasNativeReturnTypehint,
 	)
 	{
 		parent::__construct($node->getAttributes());
 	}
 
-	public function getNode(): Node
+	public function getNode(): Node\Stmt
 	{
 		return $this->node;
 	}