diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2021-10-26 16:43:39 +0200 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2021-12-16 09:43:30 +0100 |
| commit | f3dcbfe146782d2c7dec8760651e79605ddc96e7 (patch) | |
| tree | a22984b0976ae1b7ac4ba3082217bc5dd8b34f61 /apps/user_ldap/tests | |
| parent | 37f8f7a5a18e57507330036b747d4b12e58efae4 (diff) | |
| download | nextcloud-server-f3dcbfe146782d2c7dec8760651e79605ddc96e7.tar.gz nextcloud-server-f3dcbfe146782d2c7dec8760651e79605ddc96e7.zip | |
Fix PHP 8.1 support for user_ldap application
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'apps/user_ldap/tests')
| -rw-r--r-- | apps/user_ldap/tests/AccessTest.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index e1f262165f5..16f79d7819d 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -559,7 +559,7 @@ class AccessTest extends TestCase { ->expects($this->any()) ->method('isResource') ->willReturnCallback(function ($resource) { - return is_resource($resource); + return is_resource($resource) || is_object($resource); }); $this->ldap ->expects($this->any()) diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php index c171fa06b55..fa46f73054c 100644 --- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php +++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php @@ -146,7 +146,7 @@ class ExceptionOnLostConnection { * tests whether a curl operation ran successfully. If not, an exception * is thrown * - * @param resource $ch + * @param resource|\CurlHandle $ch * @param mixed $result * @throws \Exception */ @@ -182,7 +182,7 @@ class ExceptionOnLostConnection { /** * initializes a curl handler towards the toxiproxy LDAP proxy service - * @return resource + * @return resource|\CurlHandle */ private function getCurl() { $ch = curl_init(); |