From 190b5270c8717ca343db42da489e5e7d6d9efb2c Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Wed, 19 Apr 2017 16:23:51 -0700
Subject: Make PHP c extension work with PHP7 (#2951)

---
 php/src/Google/Protobuf/Internal/MapField.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'php/src/Google/Protobuf/Internal/MapField.php')

diff --git a/php/src/Google/Protobuf/Internal/MapField.php b/php/src/Google/Protobuf/Internal/MapField.php
index 68c10c08..f65bd9b8 100644
--- a/php/src/Google/Protobuf/Internal/MapField.php
+++ b/php/src/Google/Protobuf/Internal/MapField.php
@@ -284,6 +284,9 @@ class MapField implements \ArrayAccess, \IteratorAggregate, \Countable
                 GPBUtil::checkString($value, true);
                 break;
             case GPBType::MESSAGE:
+                if (is_null($value)) {
+                  trigger_error("Map element cannot be null.", E_USER_ERROR);
+                }
                 GPBUtil::checkMessage($value, $this->klass);
                 break;
             default:
-- 
cgit v1.2.3