Merge pull request #509 from nextcloud/fix/php-compat

blizzz · web-flow · commit 65ac9ef97df1 · 2022-09-29T17:48:57.000+02:00
Starting PHP 8.1 the LDAP connection is an object
diff --git a/lib/LDAPConnect.php b/lib/LDAPConnect.php
@@ -51,7 +51,7 @@ public function connect() {
 
         // Connecting to LDAP - TODO: connect directly via LDAP plugin
         $cr = ldap_connect($ldapHost, $ldapPort);
-        if(!is_resource($cr)) {
+        if(!is_resource($cr) && !is_object($cr)) {
 			throw new ServerNotAvailableException('LDAP server not available');
 		}
 
diff --git a/lib/LDAPUserManager.php b/lib/LDAPUserManager.php
@@ -122,7 +122,7 @@ public function setDisplayName($uid, $displayName) {
 			);
 		}
 
-		if (!is_resource($connection)) {
+		if (!is_resource($connection) && !is_object($connection)) {
 			$this->logger->debug('LDAP resource not available', ['app' => 'ldap_write_support']);
 			throw new ServerNotAvailableException('LDAP server is not available');
 		}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function connect() {`
`51`	`51`
`52`	`52`	`// Connecting to LDAP - TODO: connect directly via LDAP plugin`
`53`	`53`	`$cr = ldap_connect($ldapHost, $ldapPort);`
`54`		`- if(!is_resource($cr)) {`
	`54`	`+ if(!is_resource($cr) && !is_object($cr)) {`
`55`	`55`	`throw new ServerNotAvailableException('LDAP server not available');`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function setDisplayName($uid, $displayName) {`
`122`	`122`	`);`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (!is_resource($connection)) {`
	`125`	`+ if (!is_resource($connection) && !is_object($connection)) {`
`126`	`126`	`$this->logger->debug('LDAP resource not available', ['app' => 'ldap_write_support']);`
`127`	`127`	`throw new ServerNotAvailableException('LDAP server is not available');`
`128`	`128`	`}`