diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 13:38:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-16 16:02:43 +0100 |
| commit | 0d668fee3686d1df8a0415572cebb01025419cd6 (patch) | |
| tree | a07945aab6f517f847e2dbe01eda7c91a9936f9c | |
| parent | 149df2d7b674e601f8f1197fe705a2a23d2a4229 (diff) | |
| download | forums-0d668fee3686d1df8a0415572cebb01025419cd6.tar forums-0d668fee3686d1df8a0415572cebb01025419cd6.tar.gz forums-0d668fee3686d1df8a0415572cebb01025419cd6.tar.bz2 forums-0d668fee3686d1df8a0415572cebb01025419cd6.tar.xz forums-0d668fee3686d1df8a0415572cebb01025419cd6.zip | |
[ticket/12574] Fix incorrect setup() method declaration & ldap extension
PHPBB3-12574
| -rw-r--r-- | tests/auth/provider_ldap_test.php | 2 | ||||
| -rwxr-xr-x | travis/setup-ldap.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php index 7d95f476bc..63cd63eee2 100644 --- a/tests/auth/provider_ldap_test.php +++ b/tests/auth/provider_ldap_test.php @@ -21,7 +21,7 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case protected $user; - protected function setup() + protected function setup() : void { parent::setUp(); diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh index 14b32d4048..9be816d77d 100755 --- a/travis/setup-ldap.sh +++ b/travis/setup-ldap.sh @@ -15,7 +15,7 @@ SLOWTESTS=$1 if [ "$SLOWTESTS" == '1' ] then - sudo apt-get -y install ldap-utils slapd php5-ldap + sudo apt-get -y install ldap-utils slapd php-ldap mkdir /tmp/slapd slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & sleep 3 |