More places to upgrade phpunit versions

src/php/docker/alpine/Dockerfile

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

src/php/docker/centos7/Dockerfile

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

src/php/docker/grpc-ext/Dockerfile

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

src/php/docker/grpc-src/Dockerfile

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

src/php/docker/i386/Dockerfile

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

src/php/docker/php-src/Dockerfile

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

src/php/docker/php-zts/Dockerfile

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

templates/src/php/docker/alpine/Dockerfile.template

@@ -23,7 +23,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   <%include file="../pecl_ext_build_src.include" />
 

templates/src/php/docker/centos7/Dockerfile.template

@@ -37,7 +37,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   <%include file="../pecl_ext_build_src.include" />
 

templates/src/php/docker/download_phpunit.include

@@ -1,3 +0,0 @@
-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

templates/src/php/docker/grpc-ext/Dockerfile.template

@@ -25,7 +25,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   <%include file="../pecl_ext_build_src.include" />
 

templates/src/php/docker/grpc-src/Dockerfile.template

@@ -25,7 +25,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   WORKDIR /github/grpc
 

templates/src/php/docker/i386/Dockerfile.template

@@ -25,7 +25,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   <%include file="../pecl_ext_build_src.include" />
 

templates/src/php/docker/php-src/Dockerfile.template

@@ -25,7 +25,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   WORKDIR /github/php-src
 

templates/src/php/docker/php-zts/Dockerfile.template

@@ -25,7 +25,7 @@
 
   WORKDIR /tmp
 
-  <%include file="../download_phpunit.include" />
+  <%include file="../download_phpunit9.include" />
 
   <%include file="../pecl_ext_build_src.include" />
 

templates/src/php/docker/php8/Dockerfile.template

@@ -1,32 +0,0 @@
-%YAML 1.2
---- |
-  # Copyright 2020 gRPC authors.
-  #
-  # Licensed under the Apache License, Version 2.0 (the "License");
-  # you may not use this file except in compliance with the License.
-  # You may obtain a copy of the License at
-  #
-  #     http://www.apache.org/licenses/LICENSE-2.0
-  #
-  # Unless required by applicable law or agreed to in writing, software
-  # distributed under the License is distributed on an "AS IS" BASIS,
-  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  # See the License for the specific language governing permissions and
-  # limitations under the License.
-
-  FROM php:8.1-buster
-
-  RUN apt-get -qq update && apt-get -qq -y upgrade && apt-get -qq install -y ${'\\'}
-    autoconf automake git libtool pkg-config ${'\\'}
-    valgrind wget zlib1g-dev
-
-  ARG MAKEFLAGS=-j8
-
-
-  WORKDIR /tmp
-
-  <%include file="../download_phpunit9.include" />
-
-  <%include file="../pecl_ext_build_src.include" />
-
-  <%include file="../dockerfile_cmd.include" />

tools/internal_ci/helper_scripts/prepare_build_macos_rc

@@ -208,6 +208,10 @@ then
 
   # Workaround for https://github.com/Homebrew/homebrew-core/issues/41081
   mkdir -p /usr/local/lib/php/pecl
+
+  # Download the right version of phpunit to match PHP version
+  sudo curl -sSL https://phar.phpunit.de/phpunit-9.5.9.phar -o /usr/local/bin/phpunit
+  sudo chmod +x /usr/local/bin/phpunit
 fi
 
 # TODO(jtattermusch): better debugging of clock skew, remove once not needed