Fixes #125

Author: halaxa

CHANGELOG.md

@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <br>
 
 ## master
-Nothing yet
+### Fixed
+- The key of a scalar value after a compound value is lost (#125). Thanks [@smiletoeverybody](https://github.com/smiletoeverybody)
 
 <br>
 

src/Parser.php

@@ -266,6 +266,9 @@ private function createGenerator(): Generator
                     // no break
                 case ']':
                     --$currentLevel;
+                    if ($currentLevel < $iteratorLevel) {
+                        $iteratorStruct = null;
+                    }
                     $inObject = $stack[$currentLevel] == '{';
                     // no break
                 default:

test/JsonMachineTest/ItemsTest.php

@@ -146,25 +146,4 @@ public function testCountViaIteratorCount()
 
         $this->assertSame(3, iterator_count($items));
     }
-
-    public function testIssue125()
-    {
-        $data = '{
-            "code": "some value",
-            "key_one": 1,
-            "key_two": [1]
-        }';
-
-        $pointer = Items::fromString($data, ['pointer' => '/key_one']);
-        $result = iterator_to_array($pointer);
-        $this->assertSame([
-            'key_one' => 1,
-        ], $result);
-
-        $pointer = Items::fromString($data, ['pointer' => '/key_two']);
-        $result = iterator_to_array($pointer);
-        $this->assertSame([
-            0 => 1,
-        ], $result);
-    }
 }

test/JsonMachineTest/ParserTest.php

@@ -263,7 +263,7 @@ public function testGeneratorQuitsAfterFirstFoundCollectionHasBeenFinished()
     public function testScalarResult()
     {
         $result = $this->createParser('{"result":{"items": [1,2,3],"count": 3}}', '/result/count');
-        $this->assertSame([3], iterator_to_array($result));
+        $this->assertSame(['count' => 3], iterator_to_array($result));
     }
 
     public function testScalarResultInArray()
@@ -656,4 +656,46 @@ public function testGetPositionWorksInsideRecursion()
             $this->assertSame(0, $item->getPosition());
         }
     }
+
+    /**
+     * @dataProvider data_testIssue125
+     */
+    public function testIssue125TheKeyOfAScalarValueAfterACompoundValueIsLost($tokens)
+    {
+        $toAssert = [
+            'keytwo' => 12,
+            'keythree' => 13,
+        ];
+
+        foreach ($toAssert as $key => $value) {
+            $items = new Parser(
+                new \ArrayIterator($tokens),
+                "/$key"
+            );
+            $result = iterator_to_array($items);
+            $this->assertSame([
+                $key => $value,
+            ], $result);
+        }
+    }
+
+    public function data_testIssue125()
+    {
+        return [
+            'after array' => [[
+                '{',
+                    '"keyone"', ':', '[', '11', ']', ',',
+                    '"keytwo"', ':', '12', ',',
+                    '"keythree"', ':', '13',
+                '}',
+            ]],
+            'after object' => [[
+                '{',
+                    '"keyone"', ':', '{', '"key"', ':', '11', '}', ',',
+                    '"keytwo"', ':', '12', ',',
+                    '"keythree"', ':', '13',
+                '}',
+            ]],
+        ];
+    }
 }