aboutsummaryrefslogtreecommitdiff
path: root/php/src/Google/Protobuf/Internal/MapField.php
diff options
context:
space:
mode:
authorYilun Chong <chongyilun250@sina.com>2017-06-30 17:38:50 -0700
committerGitHub <noreply@github.com>2017-06-30 17:38:50 -0700
commite82ba0b8026eb16c40ceba861f02c643c36e8232 (patch)
tree2aa89a917c6091923682221026507aa9eea1aba4 /php/src/Google/Protobuf/Internal/MapField.php
parent726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff)
parentecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (diff)
downloadprotobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.gz
protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.bz2
protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.zip
Merge branch 'master' into ConformanceTestYilunChong
Diffstat (limited to 'php/src/Google/Protobuf/Internal/MapField.php')
-rw-r--r--php/src/Google/Protobuf/Internal/MapField.php2
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);
}
/**