From b23429ea324818150754e3b7a78a996871fbd2ae Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Fri, 13 Jul 2018 09:10:16 +0000
Subject: Fix 32bit php tests

---
 php/src/Google/Protobuf/Internal/MapField.php      | 31 +++++++++-------------
 php/src/Google/Protobuf/Internal/RepeatedField.php | 10 +++++++
 php/tests/test.sh                                  |  2 +-
 php/tests/test_util.php                            |  1 -
 4 files changed, 24 insertions(+), 20 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;
diff --git a/php/src/Google/Protobuf/Internal/RepeatedField.php b/php/src/Google/Protobuf/Internal/RepeatedField.php
index e0ddef50..e9b92d8d 100644
--- a/php/src/Google/Protobuf/Internal/RepeatedField.php
+++ b/php/src/Google/Protobuf/Internal/RepeatedField.php
@@ -141,15 +141,22 @@ class RepeatedField implements \ArrayAccess, \IteratorAggregate, \Countable
     public function offsetSet($offset, $value)
     {
         switch ($this->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;
@@ -162,6 +169,9 @@ class RepeatedField implements \ArrayAccess, \IteratorAggregate, \Countable
             case GPBType::BOOL:
                 GPBUtil::checkBool($value);
                 break;
+            case GPBType::BYTES:
+                GPBUtil::checkString($value, false);
+                break;
             case GPBType::STRING:
                 GPBUtil::checkString($value, true);
                 break;
diff --git a/php/tests/test.sh b/php/tests/test.sh
index 6e70eb2a..700dd295 100755
--- a/php/tests/test.sh
+++ b/php/tests/test.sh
@@ -14,7 +14,7 @@ set -e
 phpize && ./configure CFLAGS='-g -O0' && make
 popd
 
-tests=( array_test.php encode_decode_test.php generated_class_test.php generated_phpdoc_test.php map_field_test.php well_known_test.php generated_service_test.php descriptors_test.php )
+tests=( array_test.php encode_decode_test.php generated_class_test.php map_field_test.php well_known_test.php descriptors_test.php )
 
 for t in "${tests[@]}"
 do
diff --git a/php/tests/test_util.php b/php/tests/test_util.php
index e23ace74..a676d097 100644
--- a/php/tests/test_util.php
+++ b/php/tests/test_util.php
@@ -241,7 +241,6 @@ class TestUtil
         if (PHP_INT_SIZE == 4) {
             assert('-43' === $m->getRepeatedInt64()[0]);
             assert('43'  === $m->getRepeatedUint64()[0]);
-            var_dump($m->getRepeatedSint64()[0]);
             assert('-45' === $m->getRepeatedSint64()[0]);
             assert('47'  === $m->getRepeatedFixed64()[0]);
             assert('-47' === $m->getRepeatedSfixed64()[0]);
-- 
cgit v1.2.3