Merge branch '2.3' into 2

Author: github-actions[bot]

src/Iterators/LDAPIterator.php

@@ -114,14 +114,29 @@ private function fetchPagedResult(): bool
             $baseDn = $ldap->getBaseDn();
         }
 
-        ldap_control_paged_result($resource, $this->getPageSize(), true, $this->cookie);
-        if ($this->getReturnAttributes() !== null) {
-            $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '', $this->getReturnAttributes() ?? []);
+        if (version_compare(PHP_VERSION, '8.0.0') < 0) {
+            ldap_control_paged_result($resource, $this->getPageSize(), true, $this->cookie);
+            if ($this->getReturnAttributes() !== null) {
+                $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '', $this->getReturnAttributes() ?? []);
+            } else {
+                $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '');
+            }
+            if (! is_resource($resultResource)) {
+                throw new \Exception('ldap_search returned a non-resource type value' . ldap_error($resource));
+            }
         } else {
-            $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '');
-        }
-        if (! is_resource($resultResource)) {
-            throw new \Exception('ldap_search returned a non-resource type value' . ldap_error($resource));
+            if ($this->getReturnAttributes() !== null) {
+                $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '', $this->getReturnAttributes() ?? [],
+                         0, 0, 0, LDAP_DEREF_NEVER,
+                         [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => $this->getPageSize(), 'cookie' => $this->cookie]]]
+                );
+            } else {
+                $resultResource = ldap_search($resource, $baseDn ?? '', $this->getFilter() ?? '', [],
+                         0, 0, 0, LDAP_DEREF_NEVER,
+                         [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => $this->getPageSize(), 'cookie' => $this->cookie]]]
+                );
+            }
+            $response = ldap_parse_result($resource, $resultResource, $errcode , $matcheddn , $errmsg , $referrals, $controls);
         }
 
         $entries = ldap_get_entries($resource, $resultResource);
@@ -130,9 +145,18 @@ private function fetchPagedResult(): bool
         }
         $entries = $this->getConvertedEntries($entries);
 
-        ErrorHandler::start();
-        $response = ldap_control_paged_result_response($resource, $resultResource, $this->cookie);
-        ErrorHandler::stop();
+        if (version_compare(PHP_VERSION, '8.0.0') < 0) {
+            ErrorHandler::start();
+            $response = ldap_control_paged_result_response($resource, $resultResource, $this->cookie);
+            ErrorHandler::stop();
+        } else {
+            if (isset($controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
+                // You need to pass the cookie from the last call to the next one
+                $this->cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'];
+            } else {
+                $this->cookie = '';
+            }
+        }
 
         if ($response !== true) {
             throw new LdapException($ldap, 'Paged result was empty');

src/Model/LDAPGateway.php

@@ -62,8 +62,10 @@ protected function searchWithIterator($filter, $baseDn = null, $attributes = [])
         $records = new LDAPIterator($this->getLdap(), $filter, $baseDn, $attributes, $pageSize);
         $results = $this->processSearchResults($records);
 
-        // Reset the LDAP pagination control back to the original, otherwise all further LDAP read queries fail
-        ldap_control_paged_result($this->getLdap()->getResource(), 1000);
+        if (version_compare(PHP_VERSION, '8.0.0') < 0) {
+          // Reset the LDAP pagination control back to the original, otherwise all further LDAP read queries fail
+          ldap_control_paged_result($this->getLdap()->getResource(), 1000);
+        }
 
         return $results;
     }