prep

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -564,7 +564,7 @@ private function processStmtNode(
 			$stmtScope = $this->processStmtVarAnnotation($scope, $stmt, $stmt->expr, $nodeCallback);
 		}
 
-		$this->callNodeCallback($nodeCallback, $stmt, $stmt, $stmtScope, $storage, ExpressionContext::createTopLevel());
+		$this->callNodeCallback($nodeCallback, $stmt, $stmtScope, $storage);
 
 		$overridingThrowPoints = $this->getOverridingThrowPoints($stmt, $scope);
 
@@ -575,8 +575,8 @@ private function processStmtNode(
 			$alwaysTerminating = false;
 			$exitPoints = [];
 			foreach ($stmt->declares as $declare) {
-				$this->callNodeCallback($nodeCallback, $stmt, $declare, $scope, $storage, ExpressionContext::createTopLevel());
-				$this->callNodeCallback($nodeCallback, $stmt, $declare->value, $scope, $storage, ExpressionContext::createTopLevel());
+				$this->callNodeCallback($nodeCallback, $declare, $scope, $storage);
+				$this->callNodeCallback($nodeCallback, $declare->value, $scope, $storage);
 				if (
 					$declare->key->name !== 'strict_types'
 					|| !($declare->value instanceof Node\Scalar\Int_)
@@ -2579,7 +2579,7 @@ public function processExprNode(
 			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', get_class($expr), $expr->getStartLine()));
 		}
 
-		$this->callNodeCallbackWithExpression($nodeCallback, $stmt, $expr, $scope, $storage, $context);
+		$this->callNodeCallbackWithExpression($nodeCallback, $expr, $scope, $storage, $context);
 
 		if ($expr instanceof Variable) {
 			$hasYield = false;
@@ -3562,7 +3562,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$leftMergedWithRightScope = $leftResult->getScope()->mergeWith($rightResult->getScope());
 			}
 
-			$this->callNodeCallbackWithExpression($nodeCallback, $stmt, new BooleanAndNode($expr, $leftResult->getTruthyScope()), $scope, $storage, $context);
+			$this->callNodeCallbackWithExpression($nodeCallback, new BooleanAndNode($expr, $leftResult->getTruthyScope()), $scope, $storage, $context);
 
 			$result = new ExpressionResult(
 				$leftMergedWithRightScope,
@@ -3585,7 +3585,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$leftMergedWithRightScope = $leftResult->getScope()->mergeWith($rightResult->getScope());
 			}
 
-			$this->callNodeCallbackWithExpression($nodeCallback, $stmt, new BooleanOrNode($expr, $leftResult->getFalseyScope()), $scope, $storage, $context);
+			$this->callNodeCallbackWithExpression($nodeCallback, new BooleanOrNode($expr, $leftResult->getFalseyScope()), $scope, $storage, $context);
 
 			$result = new ExpressionResult(
 				$leftMergedWithRightScope,
@@ -4882,7 +4882,6 @@ private function getAssignedVariables(Expr $expr): array
 	 */
 	private function callNodeCallbackWithExpression(
 		callable $nodeCallback,
-		Node\Stmt $stmt,
 		Expr $expr,
 		MutatingScope $scope,
 		ExpressionResultStorage $storage,
@@ -4892,16 +4891,14 @@ private function callNodeCallbackWithExpression(
 		if ($context->isDeep()) {
 			$scope = $scope->exitFirstLevelStatements();
 		}
-		$this->callNodeCallback($nodeCallback, $stmt, $expr, $scope, $storage, $context);
+		$this->callNodeCallback($nodeCallback, $expr, $scope, $storage);
 	}
 
 	protected function callNodeCallback(
 		callable $nodeCallback,
-		Node\Stmt $stmt,
 		Node $node,
 		MutatingScope $scope,
 		ExpressionResultStorage $storage,
-		ExpressionContext $context,
 	): void
 	{
 		$nodeCallback($node, $scope);
@@ -5609,7 +5606,7 @@ private function processArgs(
 					}
 				}
 
-				$this->callNodeCallbackWithExpression($nodeCallback, $stmt, $arg->value, $scopeToPass, $storage, $context);
+				$this->callNodeCallbackWithExpression($nodeCallback, $arg->value, $scopeToPass, $storage, $context);
 				$closureResult = $this->processClosureNode($stmt, $arg->value, $scopeToPass, $storage, $nodeCallback, $context, $parameterType ?? null);
 				if ($callCallbackImmediately) {
 					$throwPoints = array_merge($throwPoints, array_map(static fn (InternalThrowPoint $throwPoint) => $throwPoint->isExplicit() ? InternalThrowPoint::createExplicit($scope, $throwPoint->getType(), $arg->value, $throwPoint->canContainAnyThrowable()) : InternalThrowPoint::createImplicit($scope, $arg->value), $closureResult->getThrowPoints()));
@@ -5664,7 +5661,7 @@ private function processArgs(
 					}
 				}
 
-				$this->callNodeCallbackWithExpression($nodeCallback, $stmt, $arg->value, $scopeToPass, $storage, $context);
+				$this->callNodeCallbackWithExpression($nodeCallback, $arg->value, $scopeToPass, $storage, $context);
 				$arrowFunctionResult = $this->processArrowFunctionNode($stmt, $arg->value, $scopeToPass, $storage, $nodeCallback, $parameterType ?? null);
 				if ($callCallbackImmediately) {
 					$throwPoints = array_merge($throwPoints, array_map(static fn (InternalThrowPoint $throwPoint) => $throwPoint->isExplicit() ? InternalThrowPoint::createExplicit($scope, $throwPoint->getType(), $arg->value, $throwPoint->canContainAnyThrowable()) : InternalThrowPoint::createImplicit($scope, $arg->value), $arrowFunctionResult->getThrowPoints()));