From 90b4d3ee8f14fb3e92c0350ce03155f59cc3d85a Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 23 Jul 2026 07:49:46 +0200 Subject: [PATCH 1/2] Iterate in getBooleanExpressionDepth() --- src/Analyser/ExprHandler/BooleanAndHandler.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Analyser/ExprHandler/BooleanAndHandler.php b/src/Analyser/ExprHandler/BooleanAndHandler.php index 383b03c7d66..689d68bd16b 100644 --- a/src/Analyser/ExprHandler/BooleanAndHandler.php +++ b/src/Analyser/ExprHandler/BooleanAndHandler.php @@ -164,15 +164,16 @@ public function specifyTypes(TypeSpecifier $typeSpecifier, Scope $scope, Expr $e public static function getBooleanExpressionDepth(Expr $expr, int $depth = 0): int { + $depth = 0; while ( - $expr instanceof BooleanOr - || $expr instanceof LogicalOr - || $expr instanceof BooleanAnd - || $expr instanceof LogicalAnd + $expr instanceof BooleanOr || + $expr instanceof LogicalOr || + $expr instanceof BooleanAnd || + $expr instanceof LogicalAnd ) { - return self::getBooleanExpressionDepth($expr->left, $depth + 1); + $depth++; + $expr = $expr->left; } - return $depth; } From bf4b91f3f7c1be0dda4ebd41fa599bd9330fba3d Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 23 Jul 2026 07:51:33 +0200 Subject: [PATCH 2/2] Update BooleanAndHandler.php --- src/Analyser/ExprHandler/BooleanAndHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Analyser/ExprHandler/BooleanAndHandler.php b/src/Analyser/ExprHandler/BooleanAndHandler.php index 689d68bd16b..085fc8190dc 100644 --- a/src/Analyser/ExprHandler/BooleanAndHandler.php +++ b/src/Analyser/ExprHandler/BooleanAndHandler.php @@ -162,7 +162,7 @@ public function specifyTypes(TypeSpecifier $typeSpecifier, Scope $scope, Expr $e return $types; } - public static function getBooleanExpressionDepth(Expr $expr, int $depth = 0): int + public static function getBooleanExpressionDepth(Expr $expr): int { $depth = 0; while (