fix #1 properly handle null values

swaggest · Nov 29, 2017 · b0bc1ba · b0bc1ba
1 parent 34b4d41
commit b0bc1ba
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/JsonDiff.php b/src/JsonDiff.php
@@ -177,7 +177,7 @@ private function process($original, $new)
             $path = $this->path;
             $this->path .= '/' . urlencode($key);
 
-            if (isset($newArray[$key])) {
+            if (array_key_exists($key, $newArray)) {
                 $newOrdered[$key] = $this->process($originalValue, $newArray[$key]);
                 unset($newArray[$key]);
             } else {

diff --git a/tests/src/RearrangeTest.php b/tests/src/RearrangeTest.php
@@ -140,4 +140,48 @@ public function testRemoved()
 
     }
 
+
+    public function testNull()
+    {
+        $originalJson = <<<'JSON'
+{
+    "key2": 2,
+    "key3": null,
+    "key4": [
+        {"a":1, "b":true}, {"a":2, "b":false}, {"a":3}
+    ]
+}
+JSON;
+
+        $newJson = <<<'JSON'
+{
+    "key3": null
+}
+JSON;
+
+        $expected = <<<'JSON'
+{
+    "key2": 2,
+    "key4": [
+        {"a":1, "b":true}, {"a":2, "b":false}, {"a":3}
+    ]
+}
+JSON;
+
+        $r = new JsonDiff(json_decode($originalJson), json_decode($newJson));
+        $this->assertSame(array(
+            '#/key2',
+            '#/key4',
+        ), $r->getRemovedPaths());
+
+        $this->assertSame(2, $r->getRemovedCnt());
+
+        $this->assertSame(
+            json_encode(json_decode($expected), JSON_PRETTY_PRINT),
+            json_encode($r->getRemoved(), JSON_PRETTY_PRINT)
+        );
+
+    }
+
+
 }