Skip to content

fix: json string inside json with comment like value breaks #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2022
Merged

fix: json string inside json with comment like value breaks #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d878a
fix: json string inside json with comment like value breaks
adhocore Oct 1, 2022
7ca526b
test: add subjson testcase
adhocore Oct 1, 2022
41926bb
Apply fixes from StyleCI
StyleCIBot Oct 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Comment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ protected function doStrip(string $json): string
$crlf = ["\n" => '\n', "\r" => '\r'];

while (isset($json[++$this->index])) {
$oldprev = $prev ?? '';
list($prev, $char, $next) = $this->getSegments($json);

$return = $this->checkTrail($char, $return);

if ($this->inStringOrCommentEnd($prev, $char, $char . $next)) {
if ($this->inStringOrCommentEnd($prev, $char, $char . $next, $oldprev)) {
$return .= $this->inStr && isset($crlf[$char]) ? $crlf[$char] : $char;

continue;
Expand Down Expand Up @@ -115,19 +116,19 @@ protected function checkTrail(string $char, string $json): string
return $json;
}

protected function inStringOrCommentEnd(string $prev, string $char, string $next): bool
protected function inStringOrCommentEnd(string $prev, string $char, string $next, string $oldprev): bool
{
return $this->inString($char, $prev, $next) || $this->inCommentEnd($next);
return $this->inString($char, $prev, $next, $oldprev) || $this->inCommentEnd($next);
}

protected function inString(string $char, string $prev, string $next): bool
protected function inString(string $char, string $prev, string $next, string $oldprev): bool
{
if (0 === $this->comment && $char === '"' && $prev !== '\\') {
return $this->inStr = !$this->inStr;
}

if ($this->inStr && \in_array($next, ['":', '",', '"]', '"}'], true)) {
$this->inStr = false;
$this->inStr = "$oldprev$prev" !== '\\\\';
}

return $this->inStr;
Expand Down
24 changes: 24 additions & 0 deletions tests/CommentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,33 @@ public function testParseFromFile()
$parsed = Comment::parseFromFile(__DIR__ . '/composer.json', true);

$this->assertTrue(is_array($parsed));
$this->assertNotEmpty($parsed);
$this->assertSame('adhocore/json-comment', $parsed['name']);
}

public function testSubJson()
{
// https://github.com/adhocore/php-json-comment/issues/15
$parsed = Comment::parse('{
"jo": "{
/* comment */
\"url\": \"http://example.com\"//comment
}",
"x": {
/* comment 1
comment 2 */
"y": {
// comment
"XY\\\": "//no comment/*",
},
}
}', true);

$this->assertArrayHasKey('jo', $parsed);
$this->assertSame('//no comment/*', $parsed['x']['y']['XY\\']);
$this->assertSame('http://example.com', Comment::parse($parsed['jo'])->url);
}

public function theTests()
{
return [
Expand Down