Add missing ->enterDeep() calls

ondrejmirtes · ondrejmirtes · commit 46da18d71740 · 2025-11-30T08:21:30.000+01:00
diff --git a/src/Analyser/Generator/ExprHandler/BinaryShiftLeftHandler.php b/src/Analyser/Generator/ExprHandler/BinaryShiftLeftHandler.php
@@ -33,8 +33,8 @@ public function supports(Expr $expr): bool
 
 	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
 	{
-		$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);
-		$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);
+		$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context->enterDeep(), $alternativeNodeCallback);
+		$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context->enterDeep(), $alternativeNodeCallback);
 
 		return new ExprAnalysisResult(
 			$this->initializerExprTypeResolver->getShiftLeftTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BinaryShiftRightHandler.php b/src/Analyser/Generator/ExprHandler/BinaryShiftRightHandler.php
@@ -33,8 +33,8 @@ public function supports(Expr $expr): bool
 
 	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
 	{
-		$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);
-		$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);
+		$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context->enterDeep(), $alternativeNodeCallback);
+		$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context->enterDeep(), $alternativeNodeCallback);
 
 		return new ExprAnalysisResult(
 			$this->initializerExprTypeResolver->getShiftRightTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ public function supports(Expr $expr): bool`
`33`	`33`
`34`	`34`	`public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator`
`35`	`35`	`{`
`36`		`- $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);`
`37`		`- $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);`
	`36`	`+ $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context->enterDeep(), $alternativeNodeCallback);`
	`37`	`+ $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context->enterDeep(), $alternativeNodeCallback);`
`38`	`38`
`39`	`39`	`return new ExprAnalysisResult(`
`40`	`40`	`$this->initializerExprTypeResolver->getShiftLeftTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),`