Move code around a bit

phpstan · Jul 6, 2024 · b41f520 · b41f520
1 parent 2c08dfa
commit b41f520
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1318,12 +1318,6 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				$impurePoints = array_merge($arrowFunctionImpurePoints, $arrowFunctionExprResult->getImpurePoints());
 				$usedVariables = [];
 			} else {
-				$closureScope = $this->enterAnonymousFunctionWithoutReflection($node, $callableParameters);
-				$closureReturnStatements = [];
-				$closureYieldStatements = [];
-				$closureExecutionEnds = [];
-				$closureImpurePoints = [];
-				$invalidateExpressions = [];
 				if (self::$resolveClosureTypeDepth >= 2) {
 					return new ClosureType(
 						$parameters,
@@ -1333,6 +1327,14 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				}
 
 				self::$resolveClosureTypeDepth++;
+
+				$closureScope = $this->enterAnonymousFunctionWithoutReflection($node, $callableParameters);
+				$closureReturnStatements = [];
+				$closureYieldStatements = [];
+				$closureExecutionEnds = [];
+				$closureImpurePoints = [];
+				$invalidateExpressions = [];
+
 				try {
 					$closureStatementResult = $this->nodeScopeResolver->processStmtNodes($node, $node->stmts, $closureScope, static function (Node $node, Scope $scope) use ($closureScope, &$closureReturnStatements, &$closureYieldStatements, &$closureExecutionEnds, &$closureImpurePoints, &$invalidateExpressions): void {
 						if ($scope->getAnonymousFunctionReflection() !== $closureScope->getAnonymousFunctionReflection()) {