Merge pull request #10225 from deannagarcia/3.20.x

Cherry-pick composer fix
protocolbuffers · Jul 8, 2022 · fb6f8da · fb6f8da
2 parents d6ea7fe + bd6afa3
commit fb6f8da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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

diff --git 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": {