Fix, use JSON Pointer release handling array/object casting correctly -

closes #33
raphaelstolt · Aug 22, 2016 · af14521 · af14521
1 parent 0700023
commit af14521
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.4",
         "symfony/polyfill-mbstring": "^1.1",
-        "php-jsonpointer/php-jsonpointer": "^2.0"
+        "php-jsonpointer/php-jsonpointer": "^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "4.6.*",

diff --git a/src/Rs/Json/Patch/Operations/Add.php b/src/Rs/Json/Patch/Operations/Add.php
@@ -129,6 +129,13 @@ public function perform($targetDocument)
                         $targetArray[$additionIndex] = $value;
                     }
                 }
+            }
+
+            if (is_object($targetArray)) {
+                $targetArray->{$additionIndex} = $value;
+            }
+
+            if (is_array($targetArray) || is_object($targetArray)) {
                 $augmentedDocument = &$targetDocument;
                 foreach ($pointerParts as $pointerPart) {
                     if (is_array($augmentedDocument)) {

diff --git a/src/Rs/Json/Patch/Operations/Test.php b/src/Rs/Json/Patch/Operations/Test.php
@@ -50,19 +50,35 @@ public function perform($targetDocument)
             $get = $pointer->get($this->getPath());
             // Pointer::get() method can return mixed result, we should force type to array for json string
             if ($this->isValidJsonString($get)) {
-                $get = json_decode($get, true);
+                $get = json_decode($get);
             }
         } catch (NonexistentValueReferencedException $e) {
             $get = null;
         }
 
-        $value = is_object($this->getValue()) ? (array) $this->getValue() : $this->getValue();
+        $value = $this->getValue();
+
+        /**
+         * to remain backwards compatible, we support testing a $value of array with non-numeric indexes
+         * to a $get of object.. in that case, we cast $value to object
+         */
+        if (is_array($value) && !empty($value)) {
+            // in if to remain php 5.4 compatible
+            $keys = array_keys($value);
+            if (!ctype_digit((string) $keys[0])) {
+                $value = (object) $value;
+            }
+        }
 
         if (is_array($value) && is_array($get)) {
             return $this->arraysAreIdentical($value, $get);
         }
 
-        return $get === $this->getValue();
+        if (is_object($value) && is_object($get)) {
+            return ($get == $value);
+        }
+
+        return ($get === $value);
     }
 
     /**

diff --git a/tests/integration/Rs/Json/PatchAddTest.php b/tests/integration/Rs/Json/PatchAddTest.php
@@ -41,6 +41,24 @@ public function shouldAddEmptyObject()
             $patchedDocument
         );
     }
+    /**
+     * @test
+     * @ticket 33 (https://github.com/raphaelstolt/php-jsonpatch/issues/33)
+     */
+    public function shouldPreserveEmptyObjectSameLevel()
+    {
+        $targetDocument = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "value"}}}}';
+        $patchDocument = '[{"op":"add", "path":"/foo/bar/baz/qux", "value":"otherValue"}]';
+        $expectedDocument = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "otherValue"}}}}';
+
+        $patch = new Patch($targetDocument, $patchDocument);
+        $patchedDocument = $patch->apply();
+
+        $this->assertJsonStringEqualsJsonString(
+            $expectedDocument,
+            $patchedDocument
+        );
+    }
     /**
      * @test
      */

diff --git a/tests/integration/Rs/Json/PatchReplaceTest.php b/tests/integration/Rs/Json/PatchReplaceTest.php
@@ -104,4 +104,23 @@ public function shouldPreserveObjects()
             $patchedDocument
         );
     }
+
+    /**
+     * @test
+     * @ticket 33 (https://github.com/raphaelstolt/php-jsonpatch/issues/33)
+     */
+    public function shouldPreserveObjectsSameLevel()
+    {
+        $targetDocument = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "value"}}}}';
+        $patchDocument = '[{"op":"replace", "path":"/foo/bar/baz/qux", "value":"otherValue"}]';
+        $expectedDocument = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "otherValue"}}}}';
+
+        $patch = new Patch($targetDocument, $patchDocument);
+        $patchedDocument = $patch->apply();
+
+        $this->assertJsonStringEqualsJsonString(
+            $expectedDocument,
+            $patchedDocument
+        );
+    }
 }
diff --git a/tests/unit/Rs/Json/Patch/Operations/AddTest.php b/tests/unit/Rs/Json/Patch/Operations/AddTest.php
@@ -117,6 +117,27 @@ public function shouldKeepObjectsAsObjects()
         );
     }
 
+    /**
+     * @test
+     * @ticket 33 (https://github.com/raphaelstolt/php-jsonpatch/issues/33)
+     */
+    public function shouldPreserveEmptyObjectSameLevel()
+    {
+        $targetJson = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "value"}}}}';
+        $expectedJson = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "otherValue"}}}}';
+
+        $operation = new \stdClass;
+        $operation->path = '/foo/bar/baz/qux';
+        $operation->value = 'otherValue';
+
+        $addOperation = new Add($operation);
+
+        $this->assertJsonStringEqualsJsonString(
+            $expectedJson,
+            $addOperation->perform($targetJson)
+        );
+    }
+
     /**
      * @test
      */

diff --git a/tests/unit/Rs/Json/Patch/Operations/ReplaceTest.php b/tests/unit/Rs/Json/Patch/Operations/ReplaceTest.php
@@ -75,6 +75,27 @@ public function shouldKeepObjectsAsObjects()
         );
     }
 
+    /**
+     * @test
+     * @ticket 33 (https://github.com/raphaelstolt/php-jsonpatch/issues/33)
+     */
+    public function shouldPreserveEmptyObjectSameLevel()
+    {
+        $targetJson = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "value"}}}}';
+        $expectedJson = '{"foo": {"bar": {"baz": {"boo": {}, "qux": "otherValue"}}}}';
+
+        $operation = new \stdClass;
+        $operation->path = '/foo/bar/baz/qux';
+        $operation->value = 'otherValue';
+
+        $replaceOperation = new Replace($operation);
+
+        $this->assertJsonStringEqualsJsonString(
+            $expectedJson,
+            $replaceOperation->perform($targetJson)
+        );
+    }
+
     /**
      * @test
      * @ticket 5 (https://github.com/raphaelstolt/php-jsonpatch/issues/5)