Small refactor to PR

Adldap2 · Aug 9, 2021 · c2a8f72 · c2a8f72
1 parent 98ec844
commit c2a8f72
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/Connections/ConnectionInterface.php b/src/Connections/ConnectionInterface.php
@@ -120,7 +120,7 @@ public function getConnection();
      *
      * @link http://php.net/manual/en/function.ldap-get-entries.php
      *
-     * @param $searchResult
+     * @param resource $searchResult
      *
      * @return mixed
      */
@@ -131,7 +131,7 @@ public function getEntries($searchResult);
      *
      * @link http://php.net/manual/en/function.ldap-count-entries.php
      *
-     * @param $searchResult
+     * @param resource $searchResult
      *
      * @return int
      */
@@ -155,7 +155,7 @@ public function compare($dn, $attribute, $value);
      *
      * @link http://php.net/manual/en/function.ldap-first-entry.php
      *
-     * @param $searchResult
+     * @param resource $searchResult
      *
      * @return mixed
      */

diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -593,17 +593,13 @@ protected function compatiblePaginationCallback($filter, $perPage, $isCritical)
      */
     protected function parse($resource)
     {
-        // Normalize entries. Get entries returns false on failure.
-        // We'll always want an array in this situation.
-        if ($resource === false) {
-             $entries = []; 
-        } else { 
-            $entries = $this->connection->getEntries($resource); 
-        }
-
-        // Free up memory.
         if (is_resource($resource)) {
+            $entries = $this->connection->getEntries($resource);
+
+            // Free up memory.
             $this->connection->freeResult($resource);
+        } else {
+            $entries = [];
         }
 
         return $entries;