From 0f9e4f8360316848609929e6702cc074352ddb7c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 1 Sep 2021 10:57:06 +0700
Subject: [PATCH] [CodeQuality] Handle recursive on LogicalToBooleanRector
 (#808)

* fix: recursively call rector until no node is a LogicalOr or LogicalAnd

* added fixture for mixed logical and binary

* phpstan

* inline instanceof checks

* fix: recursively call rector until no node is a LogicalOr or LogicalAnd

* phpstan

* inline instanceof checks

* rebase + apply rector

* fix: recursively call rector until no node is a LogicalOr or LogicalAnd

* added fixture for mixed logical and binary

* phpstan

* inline instanceof checks

* rebase + apply rector

* move refactor logic into new function

* move refactor logic into new function

* eol

Co-authored-by: Bl00D4NGEL <kuhlesdominik@gmx.de>
---
 .../Fixture/mixed.php.inc                     | 53 +++++++++++++++++++
 .../Fixture/multi_and.php.inc                 | 32 +++++++++++
 .../Fixture/multi_or.php.inc                  | 32 +++++++++++
 .../LogicalAnd/LogicalToBooleanRector.php     | 17 ++++++
 4 files changed, 134 insertions(+)
 create mode 100644 rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/mixed.php.inc
 create mode 100644 rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_and.php.inc
 create mode 100644 rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_or.php.inc

diff --git a/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/mixed.php.inc b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/mixed.php.inc
new file mode 100644
index 00000000000..f7b237e74ab
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/mixed.php.inc
@@ -0,0 +1,53 @@
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 or
+        1 === $val2 ||
+        1 === $val3 or
+        1 === $val4
+    )
+    ) {
+        //code
+    }
+
+    if (
+    (
+        1 === $val1 and
+        1 === $val2 &&
+        1 === $val3 and
+        1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
+-----
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 || (1 === $val2 ||
+        1 === $val3) || 1 === $val4
+    )
+    ) {
+        //code
+    }
+
+    if (
+    (
+        1 === $val1 && (1 === $val2 &&
+        1 === $val3) && 1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
diff --git a/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_and.php.inc b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_and.php.inc
new file mode 100644
index 00000000000..e6d91ab02ea
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_and.php.inc
@@ -0,0 +1,32 @@
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 and
+        1 === $val2 and
+        1 === $val3 and
+        1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
+-----
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 && 1 === $val2 && 1 === $val3 && 1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
diff --git a/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_or.php.inc b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_or.php.inc
new file mode 100644
index 00000000000..7ef5dc4470f
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/multi_or.php.inc
@@ -0,0 +1,32 @@
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 or
+        1 === $val2 or
+        1 === $val3 or
+        1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
+-----
+<?php
+
+function run($val1, $val2, $val3, $val4)
+{
+    if (
+    (
+        1 === $val1 || 1 === $val2 || 1 === $val3 || 1 === $val4
+    )
+    ) {
+        //code
+    }
+}
+
+?>
diff --git a/rules/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector.php b/rules/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector.php
index f3aff4d44cc..69aef9327b9 100644
--- a/rules/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector.php
+++ b/rules/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector.php
@@ -55,6 +55,23 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        return $this->refactorLogicalToBoolean($node);
+    }
+
+    private function refactorLogicalToBoolean(LogicalOr|LogicalAnd $node): BooleanAnd|BooleanOr
+    {
+        if ($node->left instanceof LogicalOr || $node->left instanceof LogicalAnd) {
+            $node->left = $this->refactorLogicalToBoolean(
+                $node->left,
+            );
+        }
+
+        if ($node->right instanceof LogicalOr || $node->right instanceof LogicalAnd) {
+            $node->right = $this->refactorLogicalToBoolean(
+                $node->right,
+            );
+        }
+
         if ($node instanceof LogicalOr) {
             return new BooleanOr($node->left, $node->right);
         }