maxmitti
/
fast-json-stream
forked from vitalif/fast-json-stream
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: maxmitti:master
Branches Tags
maxmitti:unicode-escape-fix
maxmitti:master
vitalif:master
...
pull from: vitalif:master
Branches Tags
vitalif:master
maxmitti:unicode-escape-fix
maxmitti:master

5 Commits
master ... master

Author SHA1 Message Date
vitalif a40e5fc3cb Merge branch 'unicode-escape-fix' of maxmitti/fast-json-stream into master 
Thanks :)
 2020-09-07 18:07:42 +03:00
maxmitti c553b74c89 Fix handling of \u escapes 2020-08-20 16:14:05 +02:00
vitalif 2e96029789 Merge branch 'fixes' of maxmitti/fast-json-stream into master 2020-08-18 02:16:20 +03:00
Markus Mittendrein ae3cc7d883 Only return false in readValue when isEnded is already true 2020-08-15 18:25:29 +02:00
Markus Mittendrein 8607a7f516 Fix handling of empty arrays and objects 2020-08-15 18:23:49 +02:00
1 changed files with 10 additions and 2 deletions
Show Stats Expand all files Collapse all files

12
JSONStream.php
View File

@ -47,6 +47,10 @@ class JSONStream
$this->offset++; $this->offset++;
$this->skipWhitespace(); $this->skipWhitespace();
$st = $this->buffer[$this->offset] === '}' ? 2 : 1; $st = $this->buffer[$this->offset] === '}' ? 2 : 1;
if ($st == 2)
{
$this->offset++;
}
$this->in[] = [ $st, self::OBJ, NULL, false ]; $this->in[] = [ $st, self::OBJ, NULL, false ];
} }
@ -64,6 +68,10 @@ class JSONStream
$this->offset++; $this->offset++;
$this->skipWhitespace(); $this->skipWhitespace();
$st = $this->buffer[$this->offset] === ']' ? 2 : 1; $st = $this->buffer[$this->offset] === ']' ? 2 : 1;
if ($st == 2)
{
$this->offset++;
}
$this->in[] = [ $st, self::ARR, NULL, false ]; $this->in[] = [ $st, self::ARR, NULL, false ];
} }
@ -119,7 +127,7 @@ class JSONStream
$v = $this->readToken(); $v = $this->readToken();
} while (count($this->in) > $n); } while (count($this->in) > $n);
$value = $v; $value = $v;
return ($this->in[count($this->in)-1][0] == 1); return true;
} }
public function unreadBuffer() public function unreadBuffer()
@ -224,7 +232,7 @@ class JSONStream
$this->offset += strlen($m[0]); $this->offset += strlen($m[0]);
if ($m[0][0] == "\\") if ($m[0][0] == "\\")
{ {
if ($m[0] == 'u') if ($m[0][1] == 'u')
$v .= mb_convert_encoding(pack('H*', str_replace('\\u', '', $m[0])), 'UTF-8', 'UTF-16BE'); $v .= mb_convert_encoding(pack('H*', str_replace('\\u', '', $m[0])), 'UTF-8', 'UTF-16BE');
else else
{ {