aboutsummaryrefslogtreecommitdiff
path: root/php
diff options
context:
space:
mode:
author吕海涛 <i@lvht.net>2018-07-10 08:00:02 +0800
committerPaul Yang <TeBoring@users.noreply.github.com>2018-07-09 17:00:02 -0700
commit3beb19945b599d448c2524666effe1acdf29165f (patch)
treec864ba8abc22360e277e82519f09cca606b7cab5 /php
parent26eeec93e44024ee10c0b8c536ea2410e4bfa7f3 (diff)
downloadprotobuf-3beb19945b599d448c2524666effe1acdf29165f.tar.gz
protobuf-3beb19945b599d448c2524666effe1acdf29165f.tar.bz2
protobuf-3beb19945b599d448c2524666effe1acdf29165f.zip
add JSON_UNESCAPED_UNICODE option (#4191)
Diffstat (limited to 'php')
-rw-r--r--php/src/Google/Protobuf/Internal/GPBJsonWire.php2
-rw-r--r--php/src/Google/Protobuf/Internal/Message.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/php/src/Google/Protobuf/Internal/GPBJsonWire.php b/php/src/Google/Protobuf/Internal/GPBJsonWire.php
index 9ae57ab3..43f4745d 100644
--- a/php/src/Google/Protobuf/Internal/GPBJsonWire.php
+++ b/php/src/Google/Protobuf/Internal/GPBJsonWire.php
@@ -226,7 +226,7 @@ class GPBJsonWire
$output->writeRaw("\"", 1);
break;
case GPBType::STRING:
- $value = json_encode($value);
+ $value = json_encode($value, JSON_UNESCAPED_UNICODE);
$output->writeRaw($value, strlen($value));
break;
// case GPBType::GROUP:
diff --git a/php/src/Google/Protobuf/Internal/Message.php b/php/src/Google/Protobuf/Internal/Message.php
index 73ac375e..8ff141ca 100644
--- a/php/src/Google/Protobuf/Internal/Message.php
+++ b/php/src/Google/Protobuf/Internal/Message.php
@@ -1563,7 +1563,7 @@ class Message
}
break;
case GPBType::STRING:
- $value = json_encode($value);
+ $value = json_encode($value, JSON_UNESCAPED_UNICODE);
$size += strlen($value);
break;
case GPBType::BYTES: