Handle lack of pagination support

Author: stevebauman

src/Ldap.php

@@ -831,7 +831,7 @@ public function getProtocol()
     protected function executeFailableOperation($method, ...$args)
     {
         set_error_handler(function ($severity, $message, $file, $line) {
-            if (!$this->causedBySizeLimit($message)) {
+            if (!$this->shouldBypassError($message)) {
                 throw new ErrorException($message, $severity, $severity, $file, $line);
             }
         });
@@ -846,15 +846,58 @@ protected function executeFailableOperation($method, ...$args)
     }
 
     /**
-     * Determine if the given error message was a size limit warning.
+     * Determine if the error should be bypassed.
+     *
+     * @param string $error
+     *
+     * @return bool
+     */
+    protected function shouldBypassError($error)
+    {
+        return $this->causedByPaginationSupport($error) || $this->causedBySizeLimit($error);
+    }
+
+    /**
+     * Determine if the error was caused by lack of pagination support.
+     *
+     * @param string $error
+     *
+     * @return bool
+     */
+    protected function causedByPaginationSupport($error)
+    {
+        return $this->errorContainsMessage($error, 'No server controls in result');
+    }
+
+    /**
+     * Determine if the error was caused by a size limit warning.
      *
      * @param $error
      *
      * @return bool
      */
     protected function causedBySizeLimit($error)
     {
-        return strpos($error, 'Partial search results returned') !== false;
+        return $this->errorContainsMessage($error, ['Partial search results returned', 'Size limit exceeded']);
+    }
+
+    /**
+     * Determine if the given error contains the any of the messages.
+     *
+     * @param string       $error
+     * @param string|array $messages
+     *
+     * @return bool
+     */
+    protected function errorContainsMessage($error, $messages = [])
+    {
+        foreach ((array) $messages as $message) {
+            if (strpos($error, $message) !== false) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**