Bugfixes and tests

- Fixed bug in writing to array
- Added some tests for write evaluator

Author: remorhaz

README.md

@@ -9,7 +9,12 @@
 This library allows usage of [RFC6901](https://tools.ietf.org/html/rfc6901)-compliant JSON pointers with PHP variables.
 
 ##Requirements
-* PHP 5.6+/PHP 7.0+/HHVM
+* PHP 5.6+
+
+##Features
+* Supports PHP 5.6, PHP 7.0 and HHVM
+* No extensions required
+* SPL exceptions support
 
 #License
 PHP JSON Pointer is licensed under MIT license.

phpunit.xml

@@ -9,7 +9,7 @@
     </testsuites>
     <filter>
         <whitelist
-            getUncoveredFilesFromWhitelist="true"
+            addUncoveredFilesFromWhitelist="true"
             processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>
         </whitelist>

src/Pointer/Evaluate.php

@@ -276,7 +276,7 @@ protected function processArrayIndex(Reference $reference)
 
     protected function processNumericArrayIndex(Reference $reference)
     {
-        $index = (int) $reference->getValue();
+        $index = $this->getArrayIndex($reference);
         return array_key_exists($index, $this->cursor)
             ? $this->processExistingArrayIndex($reference)
             : $this->processNonExistingArrayIndex($reference);
@@ -298,7 +298,7 @@ protected function processNotAllowedNonNumericArrayIndex(Reference $reference)
 
     protected function processAllowedNonNumericArrayIndex(Reference $reference)
     {
-        $index = $reference->getValue();
+        $index = $this->getArrayIndex($reference);
         return array_key_exists($index, $this->cursor)
             ? $this->processExistingArrayIndex($reference)
             : $this->processNonExistingArrayIndex($reference);

src/Pointer/Evaluate/Write.php

@@ -61,11 +61,15 @@ protected function processNonExistingObjectProperty(Reference $reference)
 
     protected function processNonExistingArrayIndex(Reference $reference)
     {
+        $index = $this->getArrayIndex($reference);
         if ($reference->isLast()) {
-            $this->cursor->{$reference->getValue()} = $this->getValue();
+            $this->cursor[$index] = $this->getValue();
             $result = null;
             return $this->setResult($result);
         }
-        throw new EvaluateException("Accessing non-existing index in array");
+        var_export($this->cursor);
+        var_export($index);
+        $indexText = is_int($index) ? "{$index}" : "'{$index}'";
+        throw new EvaluateException("Accessing non-existing index {$indexText} in array");
     }
 }

tests/Pointer/Evaluate/WriteTest.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace Remorhaz\JSONPointer\Test\Pointer\Evaluate;
+
+use Remorhaz\JSONPointer\Locator;
+use Remorhaz\JSONPointer\Parser;
+use Remorhaz\JSONPointer\Pointer\Evaluate\Write;
+
+class WriteTest extends \PHPUnit_Framework_TestCase
+{
+
+
+    /**
+     * @param string $text
+     * @param mixed $data
+     * @dataProvider providerSingleDataWithValidLocator
+     * @expectedException \Remorhaz\JSONPointer\Pointer\Evaluate\Exception
+     */
+    public function testPerformWithNoValueSetThrowsException($text, $data)
+    {
+        $locator = Parser::factory()
+            ->setText($text)
+            ->getLocator();
+        Write::factory()
+            ->setData($data)
+            ->setLocator($locator)
+            ->perform();
+    }
+
+
+    /**
+     * @param string $text
+     * @param mixed $data
+     * @dataProvider providerSingleDataWithValidLocator
+     * @expectedException \LogicException
+     */
+    public function testPerformWithNoValueSetThrowsSplException($text, $data)
+    {
+        $locator = Parser::factory()
+            ->setText($text)
+            ->getLocator();
+        Write::factory()
+            ->setData($data)
+            ->setLocator($locator)
+            ->perform();
+    }
+
+
+    public function providerSingleDataWithValidLocator()
+    {
+        return [
+            [
+                '/a/b',
+                (object) [
+                    'a' => (object) ['b' => 1, 'c' => 2],
+                ]
+            ],
+        ];
+    }
+
+
+    /**
+     * @param string $text
+     * @param mixed $data
+     * @param mixed $value
+     * @param mixed $expectedData
+     * @dataProvider providerDataWithValidLokator
+     */
+    public function testWriteDataWithValidLokator($text, $data, $value, $expectedData)
+    {
+        $locator = Parser::factory()
+            ->setText($text)
+            ->getLocator();
+        Write::factory()
+            ->setData($data)
+            ->setLocator($locator)
+            ->setValue($value)
+            ->perform();
+        $this->assertEquals($expectedData, $data, "Incorrect data after modification");
+    }
+
+
+    public function providerDataWithValidLokator()
+    {
+        return [
+            'rootScalar' => ['', 1, 2, 2],
+            'rootObjectExistingProperty' => [
+                '/a',
+                (object) ['a' => 1, 'b' => 2],
+                3,
+                (object) ['a' => 3, 'b' => 2],
+            ],
+            'rootObjectNewProperty' => [
+                '/c',
+                (object) ['a' => 1, 'b' => 2],
+                3,
+                (object) ['a' => 1, 'b' => 2, 'c' => 3],
+            ],
+            'nestedObjectExistingProperty' => [
+                '/a/b',
+                (object) [
+                    'a' => (object) ['b' => 1, 'c' => 2],
+                ],
+                3,
+                (object) [
+                    'a' => (object) ['b' => 3, 'c' => 2],
+                ],
+            ],
+            'nestedObjectNewProperty' => [
+                '/a/d',
+                (object) [
+                    'a' => (object) ['b' => 1, 'c' => 2],
+                ],
+                3,
+                (object) [
+                    'a' => (object) ['b' => 1, 'c' => 2, 'd' => 3],
+                ],
+            ],
+            'rootArrayExistingIndex' => [
+                '/1',
+                [1, 2, 3],
+                4,
+                [1, 4, 3],
+            ],
+            'rootArrayNextIndex' => [
+                '/-',
+                [1, 2, 3],
+                4,
+                [1, 2, 3, 4],
+            ],
+            'nestedArrayExistingIndex' => [
+                '/1/0',
+                [1, [3, 4], 5],
+                6,
+                [1, [6, 4], 5],
+            ],
+            'nestedArrayNextIndex' => [
+                '/1/-',
+                [1, [3, 4], 5],
+                6,
+                [1, [3, 4, 6], 5],
+            ],
+        ];
+    }
+}

tests/PointerTest.php

@@ -99,11 +99,11 @@ public function testWriteDataWithValidLocator($text, $data, $newValue, $newData)
     public function providerWriteDataWithValidLocator()
     {
         return [
-            'objectProperty' => [
+            'rootProperty' => [
                 '/a',
-                (object) ['a' => 1, 'b' => '2'],
+                (object) ['a' => 1, 'b' => 2],
                 3,
-                (object) ['a' => 3, 'b' => '2'],
+                (object) ['a' => 3, 'b' => 2],
             ],
         ];
     }