organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Update commit number in Docker to update composer dependency (#2869)

Browse source
This commit is contained in:
Paul Yang 2017-03-21 10:18:49 -07:00 • committed by GitHub
parent ffa932bf10
commit 1387a6795c
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jenkins/docker/Dockerfile
View file

@ -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 && \

2
jenkins/docker32/Dockerfile
View file

@ -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 && \

2
php/ext/google/protobuf/array.c
View file

@ -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,

2
php/ext/google/protobuf/map.c
View file

@ -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,

6
php/ext/google/protobuf/type_check.c
View file

@ -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);