fixing get by numeric key

Author: vearutop

.gitignore

@@ -2,4 +2,5 @@
 /.idea
 /json-diff
 /json-diff.tar.gz
-/composer.lock
+/composer.lock
+/composer.phar

.travis.yml

@@ -19,6 +19,7 @@ cache:
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
   - composer install --dev --no-interaction --prefer-dist
+  - cat composer.lock
 
 matrix:
   allow_failures:

Makefile

@@ -1,2 +1,9 @@
 phar:
 	composer require php-yaoi/php-yaoi:^1;composer install --no-dev;rm -rf tests/;rm ./json-diff;rm ./json-diff.tar.gz;phar-composer build;mv ./json-diff.phar ./json-diff;tar -zcvf ./json-diff.tar.gz ./json-diff;git reset --hard;composer install
+
+docker56-composer-update:
+	test -f ./composer.phar || wget https://getcomposer.org/composer.phar
+	docker run -v $$(pwd):/code php:5.6-cli bash -c "apt-get update;apt-get install -y unzip;cd /code;php composer.phar update --prefer-source"
+
+docker56-test:
+	docker run -v $$(pwd):/code php:5.6-cli bash -c "cd /code;php vendor/bin/phpunit"

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.1.1';
+        $definition->version = 'v1.1.2';
         $definition->description = 'JSON diff and rearrange tool for PHP, https://github.com/swaggest/json-diff';
 
         $options->action = Command\Option::create()->setIsUnnamed()->setIsRequired()

src/JsonProcessor.php

@@ -22,16 +22,43 @@ public static function pushByPath(&$holder, $path, $value)
                 && !is_int($key)
                 && false === filter_var($key, FILTER_VALIDATE_INT)
             ) {
+                $key = (string)$key;
                 $ref = new \stdClass();
-                $ref = &$ref->$key;
+                $ref = &$ref->{$key};
             } else {
                 $ref = &$ref[$key];
             }
         }
         $ref = $value;
     }
 
-    public static function getByPath(&$holder, $path)
+    private static function arrayKeyExists($key, array $a)
+    {
+        if (array_key_exists($key, $a)) {
+            return true;
+        }
+        $key = (string)$key;
+        foreach ($a as $k => $v) {
+            if ((string)$k === $key) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static function arrayGet($key, array $a)
+    {
+        $key = (string)$key;
+        foreach ($a as $k => $v) {
+            if ((string)$k === $key) {
+                return $v;
+            }
+        }
+        return false;
+    }
+
+
+    public static function getByPath($holder, $path)
     {
         $pathItems = explode('/', $path);
         if ('#' === $pathItems[0]) {
@@ -41,14 +68,14 @@ public static function getByPath(&$holder, $path)
         while (null !== $key = array_shift($pathItems)) {
             $key = urldecode($key);
             if ($ref instanceof \stdClass) {
-                $vars = get_object_vars($ref);
-                if (array_key_exists($key, $vars)) {
-                    $ref = $vars[$key];
+                $vars = (array)$ref;
+                if (self::arrayKeyExists($key, $vars)) {
+                    $ref = self::arrayGet($key, $vars);
                 } else {
                     throw new Exception('Key not found: ' . $key);
                 }
             } else {
-                if (array_key_exists($key, $ref)) {
+                if (self::arrayKeyExists($key, $ref)) {
                     $ref = $ref[$key];
                 } else {
                     throw new Exception('Key not found: ' . $key);

tests/src/ProcessorTest.php

@@ -32,4 +32,10 @@ public function testProcess()
 
         $this->assertSame(1, JsonProcessor::getByPath($json, '#/l1/l2/1/1'));
     }
-}
+
+    public function testNumericKey()
+    {
+        $json = json_decode('{"l1":{"200":1}}');
+        $this->assertSame(1, JsonProcessor::getByPath($json, '#/l1/200'));
+    }
+}