From c07720c3b363708c58da894b015c95d1a66a57bc Mon Sep 17 00:00:00 2001
From: Stanley Cheung <stanleycheung@google.com>
Date: Wed, 21 Feb 2024 22:37:24 +0000
Subject: [PATCH] More places to upgrade phpunit versions

---
 src/php/docker/alpine/Dockerfile              |  4 +--
 src/php/docker/centos7/Dockerfile             |  4 +--
 src/php/docker/grpc-ext/Dockerfile            |  4 +--
 src/php/docker/grpc-src/Dockerfile            |  4 +--
 src/php/docker/i386/Dockerfile                |  4 +--
 src/php/docker/php-src/Dockerfile             |  4 +--
 src/php/docker/php-zts/Dockerfile             |  4 +--
 .../src/php/docker/alpine/Dockerfile.template |  2 +-
 .../php/docker/centos7/Dockerfile.template    |  2 +-
 .../src/php/docker/download_phpunit.include   |  3 --
 .../php/docker/grpc-ext/Dockerfile.template   |  2 +-
 .../php/docker/grpc-src/Dockerfile.template   |  2 +-
 .../src/php/docker/i386/Dockerfile.template   |  2 +-
 .../php/docker/php-src/Dockerfile.template    |  2 +-
 .../php/docker/php-zts/Dockerfile.template    |  2 +-
 .../src/php/docker/php8/Dockerfile.template   | 32 -------------------
 .../helper_scripts/prepare_build_macos_rc     |  4 +++
 17 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100644 templates/src/php/docker/download_phpunit.include
 delete mode 100644 templates/src/php/docker/php8/Dockerfile.template

diff --git a/src/php/docker/alpine/Dockerfile b/src/php/docker/alpine/Dockerfile
index e483c442d61..ba90d586179 100644
--- a/src/php/docker/alpine/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/centos7/Dockerfile b/src/php/docker/centos7/Dockerfile
index ae82aa7a335..f02340384b9 100644
--- a/src/php/docker/centos7/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/grpc-ext/Dockerfile b/src/php/docker/grpc-ext/Dockerfile
index f93eab9d719..8f4367f6a63 100644
--- a/src/php/docker/grpc-ext/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/grpc-src/Dockerfile b/src/php/docker/grpc-src/Dockerfile
index 2efb609776e..b27b10d644a 100644
--- a/src/php/docker/grpc-src/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/i386/Dockerfile b/src/php/docker/i386/Dockerfile
index 7a1908b4aa1..345a89a8d29 100644
--- a/src/php/docker/i386/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/php-src/Dockerfile b/src/php/docker/php-src/Dockerfile
index 25004ea909b..47f89535e4b 100644
--- a/src/php/docker/php-src/Dockerfile
+++ b/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
 
 
diff --git a/src/php/docker/php-zts/Dockerfile b/src/php/docker/php-zts/Dockerfile
index 804d8638b93..c5da22f549c 100644
--- a/src/php/docker/php-zts/Dockerfile
+++ b/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
 
 
diff --git a/templates/src/php/docker/alpine/Dockerfile.template b/templates/src/php/docker/alpine/Dockerfile.template
index b761a633712..58aafb8c560 100644
--- a/templates/src/php/docker/alpine/Dockerfile.template
+++ b/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" />
 
diff --git a/templates/src/php/docker/centos7/Dockerfile.template b/templates/src/php/docker/centos7/Dockerfile.template
index b5b28645f60..3d80278019c 100644
--- a/templates/src/php/docker/centos7/Dockerfile.template
+++ b/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" />
 
diff --git a/templates/src/php/docker/download_phpunit.include b/templates/src/php/docker/download_phpunit.include
deleted file mode 100644
index 11da1d8d0df..00000000000
--- a/templates/src/php/docker/download_phpunit.include
+++ /dev/null
@@ -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
diff --git a/templates/src/php/docker/grpc-ext/Dockerfile.template b/templates/src/php/docker/grpc-ext/Dockerfile.template
index 8b4b9e000f9..516b818e876 100644
--- a/templates/src/php/docker/grpc-ext/Dockerfile.template
+++ b/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" />
 
diff --git a/templates/src/php/docker/grpc-src/Dockerfile.template b/templates/src/php/docker/grpc-src/Dockerfile.template
index 40a2ab1da1e..888f99d35d2 100644
--- a/templates/src/php/docker/grpc-src/Dockerfile.template
+++ b/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
 
diff --git a/templates/src/php/docker/i386/Dockerfile.template b/templates/src/php/docker/i386/Dockerfile.template
index 0c498fe6db3..ae3724d4b32 100644
--- a/templates/src/php/docker/i386/Dockerfile.template
+++ b/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" />
 
diff --git a/templates/src/php/docker/php-src/Dockerfile.template b/templates/src/php/docker/php-src/Dockerfile.template
index 3c1ae4cedd1..f90e57ee7c2 100644
--- a/templates/src/php/docker/php-src/Dockerfile.template
+++ b/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
 
diff --git a/templates/src/php/docker/php-zts/Dockerfile.template b/templates/src/php/docker/php-zts/Dockerfile.template
index cddcaaddb10..630f9225bbb 100644
--- a/templates/src/php/docker/php-zts/Dockerfile.template
+++ b/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" />
 
diff --git a/templates/src/php/docker/php8/Dockerfile.template b/templates/src/php/docker/php8/Dockerfile.template
deleted file mode 100644
index 558d15d947a..00000000000
--- a/templates/src/php/docker/php8/Dockerfile.template
+++ /dev/null
@@ -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" />
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
index 3865beb29e0..b5768a0c317 100644
--- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc
+++ b/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