upgrade phpunit to 8.5.13 to support php8

pull/24900/head
root 4 years ago
parent d0f0aac905
commit dc84194d23
  1. 4
      src/php/docker/alpine/Dockerfile
  2. 4
      src/php/docker/centos7/Dockerfile
  3. 4
      src/php/docker/grpc-ext/Dockerfile
  4. 4
      src/php/docker/grpc-src/Dockerfile
  5. 4
      src/php/docker/i386/Dockerfile
  6. 4
      src/php/docker/php-future/Dockerfile
  7. 4
      src/php/docker/php-src/Dockerfile
  8. 4
      src/php/docker/php-zts/Dockerfile
  9. 7
      src/php/docker/php8/Dockerfile
  10. 4
      templates/src/php/docker/download_phpunit.include
  11. 4
      templates/src/php/docker/php8/Dockerfile.template

@ -21,8 +21,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -35,8 +35,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ RUN apt-get -qq update && apt-get -qq install -y \
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit

@ -29,6 +29,11 @@ RUN apt-get install expect -y && \
expect -c 'spawn php ./go-pear.phar; expect "or Enter to continue:"; send "\n"; expect "Currently used php.ini"; send "\n"; expect eof' && \
rm go-pear.phar
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && \
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit
WORKDIR /github/grpc
COPY . .
@ -37,4 +42,4 @@ RUN pear package && \
find . -name grpc-*.tgz | xargs -I{} pecl install {}
CMD php -d extension=grpc.so -r '$a = new \Grpc\Channel("dummy", []); echo get_class($a)."\n";'
CMD ["/github/grpc/src/php/bin/run_tests.sh", "--skip-persistent-channel-tests", "--ignore-valgrind-undef-errors"]

@ -1,3 +1,3 @@
RUN wget https://phar.phpunit.de/phpunit-8.5.8.phar && ${'\\'}
mv phpunit-8.5.8.phar /usr/local/bin/phpunit && ${'\\'}
RUN wget https://phar.phpunit.de/phpunit-8.5.13.phar && ${'\\'}
mv phpunit-8.5.13.phar /usr/local/bin/phpunit && ${'\\'}
chmod +x /usr/local/bin/phpunit

@ -31,6 +31,8 @@
expect -c 'spawn php ./go-pear.phar; expect "or Enter to continue:"; send "\n"; expect "Currently used php.ini"; send "\n"; expect eof' && ${'\\'}
rm go-pear.phar
<%include file="../download_phpunit.include" />
<%include file="../pecl_ext_build_src.include" />
CMD php -d extension=grpc.so -r '$a = new \Grpc\Channel("dummy", []); echo get_class($a)."\n";'
CMD ["/github/grpc/src/php/bin/run_tests.sh", "--skip-persistent-channel-tests", "--ignore-valgrind-undef-errors"]

Loading…
Cancel
Save