extracting JsonProcessor

Author: vearutop

src/Cli/Diff.php

@@ -29,7 +29,7 @@ class Diff extends Command
     static function setUpDefinition(Definition $definition, $options)
     {
         $definition->name = 'json-diff';
-        $definition->version = 'v1.0.0';
+        $definition->version = 'v1.1.0';
         $definition->description = 'JSON diff and rearrange tool for PHP, https://github.com/swaggest/json-diff';
 
         $options->action = Command\Option::create()->setIsUnnamed()->setIsRequired()

src/Exception.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Swaggest\JsonDiff;
+
+
+class Exception extends \Exception
+{
+
+}

src/JsonDiff.php

@@ -155,8 +155,8 @@ private function process($original, $new)
             if ($original !== $new) {
                 $this->modifiedCnt++;
                 $this->modifiedPaths [] = $this->path;
-                $this->pushByPath($this->modifiedOriginal, $this->path, $original);
-                $this->pushByPath($this->modifiedNew, $this->path, $new);
+                JsonProcessor::pushByPath($this->modifiedOriginal, $this->path, $original);
+                JsonProcessor::pushByPath($this->modifiedNew, $this->path, $new);
             }
             return $new;
         }
@@ -183,7 +183,7 @@ private function process($original, $new)
             } else {
                 $this->removedCnt++;
                 $this->removedPaths [] = $this->path;
-                $this->pushByPath($this->removed, $this->path, $originalValue);
+                JsonProcessor::pushByPath($this->removed, $this->path, $originalValue);
             }
             $this->path = $path;
         }
@@ -192,7 +192,7 @@ private function process($original, $new)
         foreach ($newArray as $key => $value) {
             $newOrdered[$key] = $value;
             $path = $this->path . '/' . urlencode($key);
-            $this->pushByPath($this->added, $path, $value);
+            JsonProcessor::pushByPath($this->added, $path, $value);
             $this->addedCnt++;
             $this->addedPaths [] = $path;
         }
@@ -281,17 +281,4 @@ private function rearrangeArray(array $original, array $new)
 
         return $new;
     }
-
-    private function pushByPath(&$holder, $path, $value)
-    {
-        $pathItems = explode('/', $path);
-        if ('#' === $pathItems[0]) {
-            array_shift($pathItems);
-        }
-        $ref = &$holder;
-        while (null !== $key = array_shift($pathItems)) {
-            $ref = &$ref[(string)$key];
-        }
-        $ref = $value;
-    }
 }

src/JsonProcessor.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace Swaggest\JsonDiff;
+
+
+class JsonProcessor
+{
+    public static function pushByPath(&$holder, $path, $value)
+    {
+        $pathItems = explode('/', $path);
+        if ('#' === $pathItems[0]) {
+            array_shift($pathItems);
+        }
+        $ref = &$holder;
+        while (null !== $key = array_shift($pathItems)) {
+            if (is_string($key)) {
+                $key = urldecode($key);
+            }
+            if ($ref instanceof \stdClass) {
+                $ref = &$ref->$key;
+            } elseif ($ref === null
+                && !is_int($key)
+                && false === filter_var($key, FILTER_VALIDATE_INT)
+            ) {
+                $ref = new \stdClass();
+                $ref = &$ref->$key;
+            } else {
+                $ref = &$ref[$key];
+            }
+        }
+        $ref = $value;
+    }
+
+    public static function getByPath(&$holder, $path)
+    {
+        $pathItems = explode('/', $path);
+        if ('#' === $pathItems[0]) {
+            array_shift($pathItems);
+        }
+        $ref = &$holder;
+        while (null !== $key = array_shift($pathItems)) {
+            $key = urldecode($key);
+            if ($ref instanceof \stdClass) {
+                if (property_exists($ref, $key)) {
+                    $ref = &$ref->$key;
+                } else {
+                    throw new Exception('Key not found: ' . $key);
+                }
+            } else {
+                if (array_key_exists($key, $ref)) {
+                    $ref = &$ref[$key];
+                } else {
+                    throw new Exception('Key not found: ' . $key);
+                }
+            }
+        }
+        return $ref;
+    }
+
+    public static function removeByPath(&$holder, $path)
+    {
+        $pathItems = explode('/', $path);
+        if ('#' === $pathItems[0]) {
+            array_shift($pathItems);
+        }
+        $ref = &$holder;
+        while (null !== $key = array_shift($pathItems)) {
+            $parent = &$ref;
+            $key = urldecode($key);
+            $refKey = $key;
+            if ($ref instanceof \stdClass) {
+                if (property_exists($ref, $key)) {
+                    $ref = &$ref->$key;
+                } else {
+                    throw new Exception('Key not found: ' . $key);
+                }
+            } else {
+                if (array_key_exists($key, $ref)) {
+                    $ref = &$ref[$key];
+                } else {
+                    throw new Exception('Key not found: ' . $key);
+                }
+            }
+        }
+
+        if (isset($parent) && isset($refKey)) {
+            if ($parent instanceof \stdClass) {
+                unset($parent->$refKey);
+            } else {
+                unset($parent[$refKey]);
+            }
+        }
+        return $ref;
+    }
+}

tests/src/ProcessorTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Swaggest\JsonDiff\Tests;
+
+
+use Swaggest\JsonDiff\Exception;
+use Swaggest\JsonDiff\JsonProcessor;
+
+class ProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProcess()
+    {
+        $json = new \stdClass();
+        JsonProcessor::pushByPath($json, '#/l1/l2/l3', 'hello!');
+        $this->assertSame('{"l1":{"l2":{"l3":"hello!"}}}', json_encode($json));
+
+        $this->assertSame('{"l3":"hello!"}', json_encode(JsonProcessor::getByPath($json, '#/l1/l2')));
+
+        try {
+            $this->assertSame('null', json_encode(JsonProcessor::getByPath($json, '#/l1/l2/non-existent')));
+        } catch (Exception $exception) {
+            $this->assertSame('Key not found: non-existent', $exception->getMessage());
+        }
+
+        JsonProcessor::removeByPath($json, '#/l1/l2');
+        $this->assertSame('{"l1":{}}', json_encode($json));
+
+        JsonProcessor::pushByPath($json, '#/l1/l2/0/0', 0);
+        JsonProcessor::pushByPath($json, '#/l1/l2/1/1', 1);
+
+        $this->assertSame('{"l1":{"l2":[[0],{"1":1}]}}', json_encode($json));
+    }
+}