[DowngradePhp72/73/74] Refactor JsonConstCleaner: move defined check …

…after in names check (#1788)
rectorphp · Feb 9, 2022 · 7c14a98 · 7c14a98
1 parent cd7140a
commit 7c14a98
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php b/rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php
@@ -28,7 +28,19 @@ public function __construct(
      */
     public function clean(ConstFetch|BitwiseOr $node, array $constants): ConstFetch|Expr|null
     {
-        $defined = (bool) $this->betterNodeFinder->findFirstPreviousOfNode(
+        if ($node instanceof ConstFetch) {
+            return $this->cleanByConstFetch($node, $constants);
+        }
+
+        return $this->cleanByBitwiseOr($node, $constants);
+    }
+
+    /**
+     * @param string[] $constants
+     */
+    private function hasDefinedCheck(ConstFetch|BitwiseOr $node, array $constants): bool
+    {
+        return (bool) $this->betterNodeFinder->findFirstPreviousOfNode(
             $node,
             function (Node $subNode) use ($constants): bool {
                 if (! $subNode instanceof FuncCall) {
@@ -51,16 +63,6 @@ function (Node $subNode) use ($constants): bool {
                 return in_array($args[0]->value->value, $constants, true);
             }
         );
-
-        if ($defined) {
-            return null;
-        }
-
-        if ($node instanceof ConstFetch) {
-            return $this->cleanByConstFetch($node, $constants);
-        }
-
-        return $this->cleanByBitwiseOr($node, $constants);
     }
 
     /**
@@ -73,11 +75,15 @@ private function cleanByConstFetch(ConstFetch $constFetch, array $constants): ?C
         }
 
         $parent = $constFetch->getAttribute(AttributeKey::PARENT_NODE);
-        if (! $parent instanceof BitwiseOr) {
-            return new ConstFetch(new Name('0'));
+        if ($parent instanceof BitwiseOr) {
+            return null;
         }
 
-        return null;
+        if ($this->hasDefinedCheck($constFetch, $constants)) {
+            return null;
+        }
+
+        return new ConstFetch(new Name('0'));
     }
 
     /**
@@ -92,6 +98,10 @@ private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): ?Expr
             return null;
         }
 
+        if ($this->hasDefinedCheck($bitwiseOr, $constants)) {
+            return null;
+        }
+
         if (! $isLeftTransformed) {
             return $bitwiseOr->left;
         }