improve ternary to pass both true/null as true

rectorphp · Feb 9, 2022 · 6999ac5 · 6999ac5
1 parent f660cb8
commit 6999ac5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...2/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/array_assoc.php.inc b/...2/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/array_assoc.php.inc
@@ -20,7 +20,7 @@ final class ArrayAssoc
 {
     public function run($data, array $items)
     {
-        $data = \json_decode($data, $items[0] === null);
+        $data = \json_decode($data, $items[0] === null ?: $items[0]);
     }
 }
 

diff --git a/...tor/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/clue_json_decode.php.inc b/...tor/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/clue_json_decode.php.inc
@@ -39,9 +39,9 @@ final class ClueJsonDecode
     public function run($data)
     {
         if ($this->options === 0) {
-            $data = \json_decode($data, $this->assoc === null, $this->depth);
+            $data = \json_decode($data, $this->assoc === null ?: $this->assoc, $this->depth);
         } else {
-            $data = \json_decode($data, $this->assoc === null, $this->depth, $this->options);
+            $data = \json_decode($data, $this->assoc === null ?: $this->assoc, $this->depth, $this->options);
         }
     }
 }

diff --git a/...Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/possibly_null.php.inc b/...Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/Fixture/possibly_null.php.inc
@@ -24,7 +24,7 @@ class PossiblyNull
 {
     function run(string $json, ?bool $associative)
     {
-        $value = json_decode($json, $associative === null);
+        $value = json_decode($json, $associative === null ?: $associative);
     }
 }
 

diff --git a/rules/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector.php b/rules/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector.php
@@ -104,7 +104,8 @@ public function refactor(Node $node): ?Node
 
         // add conditional ternary
         $nullIdentical = new Identical($associativeValue, $this->nodeFactory->createNull());
-        $args[1]->value = $nullIdentical;
+        $ternary = new Ternary($nullIdentical, null, $associativeValue);
+        $args[1]->value = $ternary;
 
         return $node;
     }