From 1387a6795c743fa41a21e8e1501953cb018be760 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Tue, 21 Mar 2017 10:18:49 -0700 Subject: [PATCH] Update commit number in Docker to update composer dependency (#2869) --- jenkins/docker/Dockerfile | 2 +- jenkins/docker32/Dockerfile | 2 +- php/ext/google/protobuf/array.c | 2 +- php/ext/google/protobuf/map.c | 2 +- php/ext/google/protobuf/type_check.c | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index b7583fc7..659336d8 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ - git reset bf379715c93b581eeb078cec1f0dd8a7d79df431 && \ + git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ ./autogen.sh && \ ./configure && \ make -j4 && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 94d9a4c3..02e9df17 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ + git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ diff --git a/php/ext/google/protobuf/array.c b/php/ext/google/protobuf/array.c index ab2eaf90..2186ab1f 100644 --- a/php/ext/google/protobuf/array.c +++ b/php/ext/google/protobuf/array.c @@ -230,7 +230,7 @@ void repeated_field_create_with_field(zend_class_entry *ce, zval **repeated_field TSRMLS_DC) { upb_fieldtype_t type = upb_fielddef_type(field); const zend_class_entry *msg_ce = field_type_class(field TSRMLS_CC); - repeated_field_create_with_type(ce, type, msg_ce, repeated_field); + repeated_field_create_with_type(ce, type, msg_ce, repeated_field TSRMLS_CC); } void repeated_field_create_with_type(zend_class_entry *ce, diff --git a/php/ext/google/protobuf/map.c b/php/ext/google/protobuf/map.c index 4a3829d6..fae152e3 100644 --- a/php/ext/google/protobuf/map.c +++ b/php/ext/google/protobuf/map.c @@ -247,7 +247,7 @@ void map_field_create_with_field(zend_class_entry *ce, const upb_fielddef *field const upb_fielddef *value_field = map_field_value(field); map_field_create_with_type( ce, upb_fielddef_type(key_field), upb_fielddef_type(value_field), - field_type_class(value_field TSRMLS_CC), map_field); + field_type_class(value_field TSRMLS_CC), map_field TSRMLS_CC); } void map_field_create_with_type(zend_class_entry *ce, upb_fieldtype_t key_type, diff --git a/php/ext/google/protobuf/type_check.c b/php/ext/google/protobuf/type_check.c index 718682ac..fe9b18f0 100644 --- a/php/ext/google/protobuf/type_check.c +++ b/php/ext/google/protobuf/type_check.c @@ -439,7 +439,8 @@ PHP_METHOD(Util, checkRepeatedField) { zend_hash_get_current_data_ex(table, (void**)&memory, &pointer) == SUCCESS; zend_hash_move_forward_ex(table, &pointer)) { - repeated_field_handlers->write_dimension(repeated_field, NULL, *(zval**)memory); + repeated_field_handlers->write_dimension(repeated_field, NULL, + *(zval**)memory TSRMLS_CC); } Z_DELREF_P(repeated_field); @@ -497,7 +498,8 @@ PHP_METHOD(Util, checkMapField) { SUCCESS; zend_hash_move_forward_ex(table, &pointer)) { zend_hash_get_current_key_zval_ex(table, &key, &pointer); - map_field_handlers->write_dimension(map_field, &key, *(zval**)value); + map_field_handlers->write_dimension(map_field, &key, + *(zval**)value TSRMLS_CC); } Z_DELREF_P(map_field);