Merge branch 'master' into ConformanceTestYilunChong

1 files changed, 11 insertions, 3 deletions

diff --git a/php/src/Google/Protobuf/Internal/MapFieldIter.php b/php/src/Google/Protobuf/Internal/MapFieldIter.php
index a0388d92..cb707955 100644
--- a/php/src/Google/Protobuf/Internal/MapFieldIter.php
+++ b/php/src/Google/Protobuf/Internal/MapFieldIter.php
@@ -54,11 +54,13 @@ class MapFieldIter implements \Iterator
      *
      * @param MapField The MapField instance for which this iterator is
      * created.
+     * @param GPBType Map key type.
      * @ignore
      */
-    public function __construct($container)
+    public function __construct($container, $key_type)
     {
         $this->container = $container;
+        $this->key_type = $key_type;
     }
 
     /**
@@ -88,7 +90,13 @@ class MapFieldIter implements \Iterator
      */
     public function key()
     {
-        return key($this->container);
+        $key = key($this->container);
+        // PHP associative array stores bool as integer for key.
+        if ($this->key_type === GPBType::BOOL) {
+            return boolval($key);
+        } else {
+            return $key;
+        }
     }
 
     /**
@@ -110,4 +118,4 @@ class MapFieldIter implements \Iterator
     {
         return key($this->container) !== null;
     }
-}
\ No newline at end of file
+}