fix a few bugs

Author: bshaffer

.kokoro/system_tests.sh

@@ -53,18 +53,20 @@ export PULL_REQUEST_NUMBER=$KOKORO_GITHUB_PULL_REQUEST_NUMBER
 # Load phpbrew shell
 source /root/.phpbrew/bashrc
 
-# decide which php version to use
-if [ -z "${GOOGLE_ALT_PROJECT_ID}" ]; then
-  # By default use PHP 7.4
-  phpbrew switch $(phpbrew list | grep 7.4)
-elif [ "3" -eq ${GOOGLE_ALT_PROJECT_ID: -1} ]; then
-  phpbrew switch $(phpbrew list | grep 7.3)
+# Decide which php version to use.
+if [ "3" -eq ${GOOGLE_ALT_PROJECT_ID: -1} ]; then
+  PHP_VERSION="7.3"
 elif [ "1" -eq ${GOOGLE_ALT_PROJECT_ID: -1} ]; then
-  phpbrew switch $(phpbrew list | grep 7.4)
+  PHP_VERSION="7.4"
 elif [ "2" -eq ${GOOGLE_ALT_PROJECT_ID: -1} ]; then
-  phpbrew switch $(phpbrew list | grep 8.0)
+  PHP_VERSION="8.0"
+else
+  # By default use PHP 7.4
+  PHP_VERSION="7.4"
 fi
 
+phpbrew switch $(phpbrew list | grep $PHP_VERSION | cut -c 2-)
+
 # If we are running REST tests, disable gRPC
 if [ "${RUN_REST_TESTS_ONLY}" = "true" ]; then
   phpbrew ext disable grpc

testing/run_cs_check.sh

@@ -22,7 +22,7 @@ DIR="${1:-$PROJECT_ROOT}"
 cd $PROJECT_ROOT
 
 # install local version of php-cs-fixer 3.0 from composer.json
-composer -q install -d testing/
+composer install -d testing/
 
 # run php-cs-fixer
 PHP_CS_FIXER="php-cs-fixer"