Merge pull request #10 from allentsai/issue-9

Handle Array/Object Conversion

Author: vearutop

src/JsonPointer.php

@@ -108,6 +108,9 @@ public static function add(&$holder, $pathItems, $value, $recursively = true)
                     } else {
                         throw new Exception('Non-existent path item: ' . $key);
                     }
+                } elseif ([] === $ref && false === $intKey && '-' !== $key) {
+                    $ref = new \stdClass();
+                    $ref = &$ref->{$key};
                 } else {
                     if ($recursively && $ref === null) $ref = array();
                     if ('-' === $key) {
@@ -244,4 +247,4 @@ public static function remove(&$holder, $pathItems)
         }
         return $ref;
     }
-}
+}

tests/src/Issues/Issue9Test.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Swaggest\JsonDiff\Tests\Issues;
+
+use Swaggest\JsonDiff\JsonDiff;
+
+/**
+ * @see https://github.com/swaggest/json-diff/issues/9
+ */
+class Issue9Test extends \PHPUnit_Framework_TestCase
+{
+    public function testPatchApply()
+    {
+        $old = json_decode(json_encode(["emptyObject" => []]));
+        $new = json_decode(json_encode(["emptyObject" => ["notEmpty"=>"value"]]));
+        $diff = new JsonDiff($old, $new);
+        $patch = $diff->getPatch();
+        $this->assertNotEquals($new, $old);
+        $patch->apply($old);
+        $this->assertEquals($new, $old);
+    }
+}