From 0d668fee3686d1df8a0415572cebb01025419cd6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 1 Nov 2019 13:38:09 +0100
Subject: [PATCH] [ticket/12574] Fix incorrect setup() method declaration &
 ldap extension

PHPBB3-12574
---
 tests/auth/provider_ldap_test.php | 2 +-
 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