diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-06-30 12:14:09 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-30 12:14:09 -0700 |
| commit | ecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (patch) | |
| tree | 728f4aff0d5f00c78a741cf737ea6de58f4ba645 /php/ext/google/protobuf/protobuf.h | |
| parent | 5a52b3588d35d2fa0b9ce4eda5630546966a26b4 (diff) | |
Add json encode/decode for php. (#3226)
* Add json encode/decode for php.
* Fix php conformance test on 32-bit machines.
* Fix conformance test for c extension.
* Fix comments
Diffstat (limited to 'php/ext/google/protobuf/protobuf.h')
| -rw-r--r-- | php/ext/google/protobuf/protobuf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index e6d42eba..406a09a5 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -593,8 +593,8 @@ const upb_pbdecodermethod *new_fillmsg_decodermethod(Descriptor *desc, PHP_METHOD(Message, serializeToString); PHP_METHOD(Message, mergeFromString); -PHP_METHOD(Message, jsonEncode); -PHP_METHOD(Message, jsonDecode); +PHP_METHOD(Message, serializeToJsonString); +PHP_METHOD(Message, mergeFromJsonString); // ----------------------------------------------------------------------------- // Type check / conversion. |