diff options
| author | deannagarcia <69992229+deannagarcia@users.noreply.github.com> | 2022-07-08 20:54:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 20:54:46 +0000 |
| commit | fb6f8da08b60b6beb5bb360d79dd3feda0147da7 (patch) | |
| tree | cc100d784523f7715ed46063c0d02f11da23a083 | |
| parent | d6ea7fe01d0f02fe64cfd3c73943728852b0ffa8 (diff) | |
| parent | bd6afa3688d406ee290220ff4ea5515bad38960e (diff) | |
| download | protobuf-android-games-sdk-games-controller-release.tar.gz | |
Merge pull request #10225 from deannagarcia/3.20.xandroid-games-sdk-games-performance-tuner-releaseandroid-games-sdk-games-controller-release
Cherry-pick composer fix
| -rw-r--r-- | kokoro/linux/dockerfile/test/php_32bit/Dockerfile | 6 | ||||
| -rw-r--r-- | php/composer.json | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kokoro/linux/dockerfile/test/php_32bit/Dockerfile b/kokoro/linux/dockerfile/test/php_32bit/Dockerfile index d657af164..2fd620e1b 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 diff --git a/php/composer.json b/php/composer.json index f712f0ebb..756704f8f 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": { |