add JSON_UNESCAPED_UNICODE option (#4191)

3beb1994 · 吕海涛 · Paul Yang · 26eeec93 · 3beb1994 · 3beb1994
Commit 3beb1994 authored Jul 10, 2018 by 吕海涛 Committed by Paul Yang Jul 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

GPBJsonWire.php php/src/Google/Protobuf/Internal/GPBJsonWire.php +1 -1

Message.php php/src/Google/Protobuf/Internal/Message.php +1 -1

No files found.
--- 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:

--- 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: