From 9c39cd23772b8cd5d6a48bb516298b14df5cb036 Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Wed, 6 Jul 2022 22:34:42 +0000
Subject: [PATCH 1/2] Change composer download

---
 kokoro/linux/dockerfile/test/php_32bit/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kokoro/linux/dockerfile/test/php_32bit/Dockerfile b/kokoro/linux/dockerfile/test/php_32bit/Dockerfile
index d657af1649..2fd620e1b2 100644
--- a/kokoro/linux/dockerfile/test/php_32bit/Dockerfile
+++ b/kokoro/linux/dockerfile/test/php_32bit/Dockerfile
@@ -47,8 +47,10 @@ RUN cd /var/local \
   && make install
 
 # Install composer
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php composer-setup.php
+RUN mv composer.phar /usr/bin/composer
+RUN php -r "unlink('composer-setup.php');"
 
 # Download php source code
 RUN git clone https://github.com/php/php-src

From 75cc3a2af4693f14b27c7290d7f2148c77bce3d7 Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Fri, 8 Jul 2022 16:15:02 +0000
Subject: [PATCH 2/2] Update phpunit version

---
 php/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/composer.json b/php/composer.json
index f712f0ebb9..756704f8fc 100644
--- a/php/composer.json
+++ b/php/composer.json
@@ -9,7 +9,7 @@
     "php": ">=7.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=5.0.0"
+    "phpunit/phpunit": ">=5.0.0 <8.5.27"
   },
   "autoload": {
     "psr-4": {