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/src/Google/Protobuf/Internal/MapField.php | |
parent | 5a52b3588d35d2fa0b9ce4eda5630546966a26b4 (diff) | |
download | protobuf-ecca6ea95d56a6f70ff7b223ec3f904758acc8b1.tar.gz protobuf-ecca6ea95d56a6f70ff7b223ec3f904758acc8b1.tar.bz2 protobuf-ecca6ea95d56a6f70ff7b223ec3f904758acc8b1.zip |
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/src/Google/Protobuf/Internal/MapField.php')
-rw-r--r-- | php/src/Google/Protobuf/Internal/MapField.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/php/src/Google/Protobuf/Internal/MapField.php b/php/src/Google/Protobuf/Internal/MapField.php index 12f09d61..38736dad 100644 --- a/php/src/Google/Protobuf/Internal/MapField.php +++ b/php/src/Google/Protobuf/Internal/MapField.php @@ -205,7 +205,7 @@ class MapField implements \ArrayAccess, \IteratorAggregate, \Countable */ public function getIterator() { - return new MapFieldIter($this->container); + return new MapFieldIter($this->container, $this->key_type); } /** |