diff options
| -rw-r--r-- | jenkins/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 | ||||
| -rw-r--r-- | php/src/Google/Protobuf/Internal/GPBUtil.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 6a9e7e47..fcebe167 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -145,7 +145,7 @@ RUN mv mirror php-5.5.38.tar.bz2 RUN tar -xvf php-5.5.38.tar.bz2 RUN cd php-5.5.38 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.5-zts && \ make && make install && cd .. -RUN cd php-5.5.38 && make clean && ./configure --prefix=/usr/local/php-5.5 && \ +RUN cd php-5.5.38 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-5.5 && \ make && make install && cd .. RUN wget http://am1.php.net/get/php-5.6.30.tar.bz2/from/this/mirror @@ -153,7 +153,7 @@ RUN mv mirror php-5.6.30.tar.bz2 RUN tar -xvf php-5.6.30.tar.bz2 RUN cd php-5.6.30 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.6-zts && \ make && make install && cd .. -RUN cd php-5.6.30 && make clean && ./configure --prefix=/usr/local/php-5.6 && \ +RUN cd php-5.6.30 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-5.6 && \ make && make install && cd .. RUN wget http://am1.php.net/get/php-7.0.18.tar.bz2/from/this/mirror @@ -161,7 +161,7 @@ RUN mv mirror php-7.0.18.tar.bz2 RUN tar -xvf php-7.0.18.tar.bz2 RUN cd php-7.0.18 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-7.0-zts && \ make && make install && cd .. -RUN cd php-7.0.18 && make clean && ./configure --prefix=/usr/local/php-7.0 && \ +RUN cd php-7.0.18 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-7.0 && \ make && make install && cd .. RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" @@ -174,7 +174,7 @@ RUN cd /tmp && \ rm -rf protobuf && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ - git reset --hard 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ + git reset --hard 8d97b3d8b5a33650e822460b3b561802c969e86e && \ cd php && \ ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \ ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index ab3fd957..d9925d8d 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 --hard 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ + git reset --hard 8d97b3d8b5a33650e822460b3b561802c969e86e && \ 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/src/Google/Protobuf/Internal/GPBUtil.php b/php/src/Google/Protobuf/Internal/GPBUtil.php index 1b71f7b7..8c97e9fa 100644 --- a/php/src/Google/Protobuf/Internal/GPBUtil.php +++ b/php/src/Google/Protobuf/Internal/GPBUtil.php @@ -252,7 +252,7 @@ class GPBUtil return $prefix; } - $reserved_words = array("Empty"); + $reserved_words = array("Empty", "ECHO", "ARRAY"); foreach ($reserved_words as $reserved_word) { if ($classname === $reserved_word) { if ($file_proto->getPackage() === "google.protobuf") { |