diff options
author | Brent Shaffer <betterbrent@google.com> | 2018-05-02 14:40:15 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2018-05-25 13:03:58 -0700 |
commit | c9b404d23bdf3dd8f1556b19a27dcba40565e3e4 (patch) | |
tree | e62606471c739037a4f7e40757c26f0225b15649 /util | |
parent | 7eba62465375b15a28d3f7bbd08f4f517b90b076 (diff) |
PHP array constructors for protobuf messages (#4530)
* PHP array constructors for protobuf messages
* removes Descriptor from error message
* allows mergeFrom to accept an array
* only use initWithDescriptor if instanceof MapEntry
* adds doc comments
* removes ability for constructors to take arrays for submessages
* Revert "allows mergeFrom to accept an array"
This reverts commit b7b72182d561634af12c5c5c56a7cda3b33241f9.
* makes mergeFromArray protected and fixes mergeFrom whitespace
* Separates merging from JSON and merging from PHP array
* removes well-known types and json keys from array construction
* Addresses PR review comments
* cleans up tests
* fixes exception messages
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions