From cb76aec59ddbbbc938bce001b1c864f4b6bf0a0b Mon Sep 17 00:00:00 2001 From: downtownallday Date: Sat, 25 Jun 2022 12:37:11 -0400 Subject: [PATCH] Tests that run php should run the version of php selected by setup --- tests/assets/mail/roundcube/carddav_refresh.sh | 2 +- tests/lib/carddav.sh | 2 +- tests/system-setup/setup-defaults.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/assets/mail/roundcube/carddav_refresh.sh b/tests/assets/mail/roundcube/carddav_refresh.sh index 16f927ee..c26a1f4e 100755 --- a/tests/assets/mail/roundcube/carddav_refresh.sh +++ b/tests/assets/mail/roundcube/carddav_refresh.sh @@ -45,7 +45,7 @@ if (empty($password)) { // ----- // init application, start session, init output class, etc. -$RCMAIL = rcmail::get_instance(0, $GLOBALS['env']); +$RCMAIL = rcmail::get_instance(0, isset($GLOBALS['env']) ? $GLOBALS['env'] : null); // trigger startup plugin hook $startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action)); diff --git a/tests/lib/carddav.sh b/tests/lib/carddav.sh index 9d90cef2..0d9e1321 100644 --- a/tests/lib/carddav.sh +++ b/tests/lib/carddav.sh @@ -261,7 +261,7 @@ roundcube_force_carddav_refresh() { fi pushd "$RCM_DIR" >/dev/null - bin/carddav_refresh.sh "$user" "$pass" + /usr/bin/php${PHP_VER} bin/carddav_refresh.sh "$user" "$pass" code=$? popd >/dev/null return $code diff --git a/tests/system-setup/setup-defaults.sh b/tests/system-setup/setup-defaults.sh index 692b9b37..c3d7d274 100755 --- a/tests/system-setup/setup-defaults.sh +++ b/tests/system-setup/setup-defaults.sh @@ -55,3 +55,6 @@ export UPSTREAM_TAG="${UPSTREAM_TAG:-}" export MIABLDAP_GIT="${MIABLDAP_GIT:-https://github.com/downtownallday/mailinabox-ldap.git}" export MIABLDAP_RELEASE_TAG="${MIABLDAP_RELEASE_TAG:-v55}" +# When running tests that require php, use this version of php. This +# should be the same as what's in setup/functions.sh. +export PHP_VER=8.0