Commit 0c996dfa authored by Thibaut Vallee's avatar Thibaut Vallee
Browse files

fixe pour php>=8.1 : ldap_get_attibutes ne prend plus une ressources mais une LDAP\Connection

parent 56fd3fef
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -323,21 +323,20 @@ abstract class AbstractService implements

    /**
     * Retourne un tableau d'attributs
     *
     * @param resource $resource
     * @param resource|\Ldap\Connection $resource
     * @param resource $entry
     * @return null|array
     * @desc depuis php 8.1 $resource est de type Ldap\Connection
 */
    private function __getEntryAttributes($resource, $entry)
    {
        if (!is_resource($resource)) {

        if (!is_resource($resource) && !$resource instanceof \Ldap\Connection) {
        return null;
        }

        $berIdentifier = null;

        $name = ldap_first_attribute(
            $resource, $entry//, $berIdentifier
            $resource, $entry
        );

        $attributes = array();
@@ -359,7 +358,7 @@ abstract class AbstractService implements
            $attributes[$attrName] = $data;

            $name = ldap_next_attribute(
                $resource, $entry//, $berIdentifier
                $resource, $entry
            );
        }
        ksort($attributes, SORT_LOCALE_STRING);