diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 12:16:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-16 16:02:42 +0100 |
| commit | 9aee50968e0ecb8b88000815b273d0395418e1ff (patch) | |
| tree | d7ad61672a6f31f241a3d832f2b045aa55597db3 | |
| parent | 0cd7033baad12acc2abcee38b023031322623dc4 (diff) | |
| download | forums-9aee50968e0ecb8b88000815b273d0395418e1ff.tar forums-9aee50968e0ecb8b88000815b273d0395418e1ff.tar.gz forums-9aee50968e0ecb8b88000815b273d0395418e1ff.tar.bz2 forums-9aee50968e0ecb8b88000815b273d0395418e1ff.tar.xz forums-9aee50968e0ecb8b88000815b273d0395418e1ff.zip | |
[ticket/12574] Don't add extension to php config & set default username
PHPBB3-12574
| -rw-r--r-- | tests/auth/provider_ldap_test.php | 1 | ||||
| -rwxr-xr-x | travis/setup-ldap.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php index 2b3c377d9e..211966875e 100644 --- a/tests/auth/provider_ldap_test.php +++ b/tests/auth/provider_ldap_test.php @@ -38,6 +38,7 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $this->user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user->data['username'] = 'admin'; $this->provider = new \phpbb\auth\provider\ldap($config, $db, $lang, $this->user); } diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh index 699bb9eae8..14b32d4048 100755 --- a/travis/setup-ldap.sh +++ b/travis/setup-ldap.sh @@ -16,7 +16,6 @@ SLOWTESTS=$1 if [ "$SLOWTESTS" == '1' ] then sudo apt-get -y install ldap-utils slapd php5-ldap - echo "extension = ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini mkdir /tmp/slapd slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & sleep 3 |