Merge branch 'protocolbuffers:main' into sync-stage

3 years ago · 87d285c785
parent 617ee9dc66 651a60cfdc
commit 87d285c785
3 changed files with 5 additions and 3 deletions
--- a/kokoro/macos/php7.0_mac/build.sh
+++ b/kokoro/macos/php7.0_mac/build.sh
@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc

-./tests.sh php7.0_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.0_mac
--- a/kokoro/macos/php7.3_mac/build.sh
+++ b/kokoro/macos/php7.3_mac/build.sh
@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc

-./tests.sh php7.3_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.3_mac
--- 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": {