mirror_php/json-machine
1
0
Fork 0
mirror of https://github.com/halaxa/json-machine.git synced 2025-01-18 05:28:14 +01:00
Code Issues Releases Wiki Activity

Fix JSON stream parser test for root JSON pointer

Browse Source
This commit is contained in:
Florian Wolfsjäger 2022-01-19 15:27:36 +01:00
parent 80779cedc0
commit dc763526bd
No known key found for this signature in database
GPG Key ID: 50B2172DEA035DFC
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Parser.php
View File

@ -368,11 +368,13 @@ class Parser implements \IteratorAggregate, PositionAware
throw new JsonMachineException('getCurrentJsonPointer() must not be called outside of a loop'); throw new JsonMachineException('getCurrentJsonPointer() must not be called outside of a loop');
} }
$currentJsonPointer = implode('/', array_map(function ($jsonPointerPart) { $currentJsonPointer = array_map(function ($jsonPointerPart) {
return str_replace(['~', '/'], ['~0', '~1'], $jsonPointerPart); return str_replace(['~', '/'], ['~0', '~1'], $jsonPointerPart);
}, $this->currentJsonPath)); }, $this->currentJsonPath);
return ($currentJsonPointer !== '') ? '/'.$currentJsonPointer : ''; array_unshift($currentJsonPointer, '');
return implode('/', $currentJsonPointer);
} }
public function getMatchedJsonPointer(): string public function getMatchedJsonPointer(): string

3
src/ValidJsonPointers.php
View File

@ -17,6 +17,9 @@ final class ValidJsonPointers
$this->jsonPointers = array_values($jsonPointers); $this->jsonPointers = array_values($jsonPointers);
} }
/**
* @throws InvalidArgumentException
*/
public function toArray(): array public function toArray(): array
{ {
if (! $this->validated) { if (! $this->validated) {

1
test/JsonMachineTest/ParserTest.php
View File

@ -324,6 +324,7 @@ class ParserTest extends \PHPUnit_Framework_TestCase
{ {
return [ return [
['', '{"c":1,"d":2}', ['', '']], ['', '{"c":1,"d":2}', ['', '']],
['/', '{"":{"c":1,"d":2}}', ['/', '/']],
['/~0', '{"~":{"c":1,"d":2}}', ['/~0', '/~0']], ['/~0', '{"~":{"c":1,"d":2}}', ['/~0', '/~0']],
['/~1', '{"/":{"c":1,"d":2}}', ['/~1', '/~1']], ['/~1', '{"/":{"c":1,"d":2}}', ['/~1', '/~1']],
['/~1/c', '{"/":{"c":[1,2],"d":2}}', ['/~1/c', '/~1/c']], ['/~1/c', '{"/":{"c":[1,2],"d":2}}', ['/~1/c', '/~1/c']],