diff options
| author | Bo Yang <teboring@google.com> | 2018-07-13 09:10:16 +0000 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-15 21:01:48 -0700 |
| commit | b23429ea324818150754e3b7a78a996871fbd2ae (patch) | |
| tree | 0b724f2d45540a6d8fd9c6c66470a6b7a47fe82f /php/src/Google/Protobuf/Internal/MapField.php | |
| parent | 8758cc160641d0a51e560611ef6fa4896366c0e9 (diff) | |
| download | protobuf-b23429ea324818150754e3b7a78a996871fbd2ae.tar.gz protobuf-b23429ea324818150754e3b7a78a996871fbd2ae.tar.bz2 protobuf-b23429ea324818150754e3b7a78a996871fbd2ae.zip | |
Fix 32bit php tests
Diffstat (limited to 'php/src/Google/Protobuf/Internal/MapField.php')
| -rw-r--r-- | php/src/Google/Protobuf/Internal/MapField.php | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/php/src/Google/Protobuf/Internal/MapField.php b/php/src/Google/Protobuf/Internal/MapField.php index f7d7b710..1b2b0cf0 100644 --- a/php/src/Google/Protobuf/Internal/MapField.php +++ b/php/src/Google/Protobuf/Internal/MapField.php @@ -156,15 +156,22 @@ class MapField implements \ArrayAccess, \IteratorAggregate, \Countable $this->checkKey($this->key_type, $key); switch ($this->value_type) { + case GPBType::SFIXED32: + case GPBType::SINT32: case GPBType::INT32: + case GPBType::ENUM: GPBUtil::checkInt32($value); break; + case GPBType::FIXED32: case GPBType::UINT32: GPBUtil::checkUint32($value); break; + case GPBType::SFIXED64: + case GPBType::SINT64: case GPBType::INT64: GPBUtil::checkInt64($value); break; + case GPBType::FIXED64: case GPBType::UINT64: GPBUtil::checkUint64($value); break; @@ -249,36 +256,24 @@ class MapField implements \ArrayAccess, \IteratorAggregate, \Countable private function checkKey($key_type, &$key) { switch ($key_type) { + case GPBType::SFIXED32: + case GPBType::SINT32: case GPBType::INT32: GPBUtil::checkInt32($key); break; + case GPBType::FIXED32: case GPBType::UINT32: GPBUtil::checkUint32($key); break; + case GPBType::SFIXED64: + case GPBType::SINT64: case GPBType::INT64: GPBUtil::checkInt64($key); break; - case GPBType::UINT64: - GPBUtil::checkUint64($key); - break; case GPBType::FIXED64: + case GPBType::UINT64: GPBUtil::checkUint64($key); break; - case GPBType::FIXED32: - GPBUtil::checkUint32($key); - break; - case GPBType::SFIXED64: - GPBUtil::checkInt64($key); - break; - case GPBType::SFIXED32: - GPBUtil::checkInt32($key); - break; - case GPBType::SINT64: - GPBUtil::checkInt64($key); - break; - case GPBType::SINT32: - GPBUtil::checkInt32($key); - break; case GPBType::BOOL: GPBUtil::checkBool($key); break; |