external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-29 04:17:07 +00:00
Code Issues Releases Wiki Activity

Tests that run php should run the version of php selected by setup

Browse Source
This commit is contained in:
downtownallday 2022-06-25 12:37:11 -04:00
parent fd44210ee7
commit cb76aec59d
3 changed files with 5 additions and 2 deletions
tests
assets/mail/roundcube
carddav_refresh.sh
lib
carddav.sh
system-setup
setup-defaults.sh

2
tests/assets/mail/roundcube/carddav_refresh.sh
View File

@ -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));

2
tests/lib/carddav.sh
View File

@ -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

3
tests/system-setup/setup-defaults.sh
View File

@ -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