aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2018-07-13 03:44:49 +0000
committerFeng Xiao <xfxyjwf@gmail.com>2018-07-15 21:01:48 -0700
commit8758cc160641d0a51e560611ef6fa4896366c0e9 (patch)
tree04ef58a6353f7384a2277a7c33341ddf0a4f1746
parentbd1224e7b6b1fa93d7979b6a0b1b66c34e6decdd (diff)
downloadprotobuf-8758cc160641d0a51e560611ef6fa4896366c0e9.tar.gz
protobuf-8758cc160641d0a51e560611ef6fa4896366c0e9.tar.bz2
protobuf-8758cc160641d0a51e560611ef6fa4896366c0e9.zip
Fix php tests
-rw-r--r--php/ext/google/protobuf/message.c1
-rwxr-xr-xphp/tests/compatibility_test.sh2
-rw-r--r--php/tests/test_util.php1
3 files changed, 4 insertions, 0 deletions
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c
index a40e0f63..06853874 100644
--- a/php/ext/google/protobuf/message.c
+++ b/php/ext/google/protobuf/message.c
@@ -283,6 +283,7 @@ void build_class_from_descriptor(
// -----------------------------------------------------------------------------
void Message_construct(zval* msg, zval* array_wrapper) {
+ TSRMLS_FETCH();
zend_class_entry* ce = Z_OBJCE_P(msg);
MessageHeader* intern = NULL;
if (EXPECTED(class_added(ce))) {
diff --git a/php/tests/compatibility_test.sh b/php/tests/compatibility_test.sh
index b5b255ea..b377d85c 100755
--- a/php/tests/compatibility_test.sh
+++ b/php/tests/compatibility_test.sh
@@ -122,6 +122,8 @@ composer install
tests=( array_test.php encode_decode_test.php generated_class_test.php map_field_test.php well_known_test.php )
sed -i.bak '/php_implementation_test.php/d' phpunit.xml
sed -i.bak '/generated_phpdoc_test.php/d' phpunit.xml
+sed -i.bak 's/generated_phpdoc_test.php//g' tests/test.sh
+sed -i.bak '/memory_leak_test.php/d' tests/test.sh
for t in "${tests[@]}"
do
remove_error_test tests/$t
diff --git a/php/tests/test_util.php b/php/tests/test_util.php
index a676d097..e23ace74 100644
--- a/php/tests/test_util.php
+++ b/php/tests/test_util.php
@@ -241,6 +241,7 @@ 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]);