Add missing ->enterDeep calls

ondrejmirtes · ondrejmirtes · commit c8635d2980aa · 2025-11-30T08:18:36.000+01:00
diff --git a/src/Analyser/Generator/ExprHandler/BinaryConcatHandler.php b/src/Analyser/Generator/ExprHandler/BinaryConcatHandler.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->resolveConcatType($leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BinaryDivHandler.php b/src/Analyser/Generator/ExprHandler/BinaryDivHandler.php
@@ -37,8 +37,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);
 
 		$throwPoints = array_merge($leftResult->throwPoints, $rightResult->throwPoints);
 		if (
diff --git a/src/Analyser/Generator/ExprHandler/BinaryMinusHandler.php b/src/Analyser/Generator/ExprHandler/BinaryMinusHandler.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->getMinusTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BinaryModHandler.php b/src/Analyser/Generator/ExprHandler/BinaryModHandler.php
@@ -37,8 +37,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);
 
 		$throwPoints = array_merge($leftResult->throwPoints, $rightResult->throwPoints);
 		if (
diff --git a/src/Analyser/Generator/ExprHandler/BinaryMulHandler.php b/src/Analyser/Generator/ExprHandler/BinaryMulHandler.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->getMulTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BinaryPlusHandler.php b/src/Analyser/Generator/ExprHandler/BinaryPlusHandler.php
@@ -34,8 +34,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->getPlusTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BinaryPowHandler.php b/src/Analyser/Generator/ExprHandler/BinaryPowHandler.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->getPowTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BitwiseAndHandler.php b/src/Analyser/Generator/ExprHandler/BitwiseAndHandler.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->getBitwiseAndTypeFromTypes($leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BitwiseOrHandler.php b/src/Analyser/Generator/ExprHandler/BitwiseOrHandler.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->getBitwiseOrTypeFromTypes($leftResult->type, $rightResult->type),
diff --git a/src/Analyser/Generator/ExprHandler/BitwiseXorHandler.php b/src/Analyser/Generator/ExprHandler/BitwiseXorHandler.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->getBitwiseXorTypeFromTypes($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->resolveConcatType($leftResult->type, $rightResult->type),`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public function supports(Expr $expr): bool`
`37`	`37`
`38`	`38`	`public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator`
`39`	`39`	`{`
`40`		`- $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);`
`41`		`- $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);`
	`40`	`+ $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context->enterDeep(), $alternativeNodeCallback);`
	`41`	`+ $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context->enterDeep(), $alternativeNodeCallback);`
`42`	`42`
`43`	`43`	`$throwPoints = array_merge($leftResult->throwPoints, $rightResult->throwPoints);`
`44`	`44`	`if (`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public function supports(Expr $expr): bool`
`34`	`34`
`35`	`35`	`public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator`
`36`	`36`	`{`
`37`		`- $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);`
`38`		`- $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);`
	`37`	`+ $leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context->enterDeep(), $alternativeNodeCallback);`
	`38`	`+ $rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context->enterDeep(), $alternativeNodeCallback);`
`39`	`39`
`40`	`40`	`return new ExprAnalysisResult(`
`41`	`41`	`$this->initializerExprTypeResolver->getPlusTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),`