Fixed pagination count total bug  #213

Author: Webklex

src/IMAP/Query/Query.php

@@ -134,6 +134,32 @@ public function markAsRead() {
         return $this;
     }
 
+    /**
+     * Perform an imap search request
+     *
+     * @return \Illuminate\Support\Collection
+     * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException
+     */
+    protected function search(){
+        $this->generate_query();
+
+        /**
+         * Don't set the charset if it isn't used - prevent strange outlook mail server errors
+         * @see https://github.com/Webklex/laravel-imap/issues/100
+         */
+        if($this->getCharset() === null){
+            $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
+        }else{
+            $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
+        }
+
+        if ($available_messages !== false) {
+            return collect($available_messages);
+        }
+
+        return collect();
+    }
+
     /**
      * Fetch the current query and return all found messages
      *
@@ -144,21 +170,13 @@ public function get() {
         $messages = MessageCollection::make([]);
 
         try {
-            $this->generate_query();
-
-            /**
-             * Don't set the charset if it isn't used - prevent strange outlook mail server errors
-             * @see https://github.com/Webklex/laravel-imap/issues/100
-             */
-            if($this->getCharset() === null){
-                $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
-            }else{
-                $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
-            }
+            $available_messages = $this->search();
+            $available_messages_count = $available_messages->count();
+
+            if ($available_messages_count > 0) {
 
-            if ($available_messages !== false) {
+                $messages->total($available_messages_count);
 
-                $available_messages = collect($available_messages);
                 $options = config('imap.options');
 
                 if(strtolower($options['fetch_order']) === 'desc'){

src/IMAP/Support/PaginatedCollection.php

@@ -23,6 +23,9 @@
  */
 class PaginatedCollection extends Collection {
 
+    /** @var int $total */
+    protected $total;
+
     /**
      * Paginate the current collection.
      *
@@ -35,7 +38,9 @@ class PaginatedCollection extends Collection {
     public function paginate($per_page = 15, $page = null, $page_name = 'page') {
         $page = $page ?: Paginator::resolveCurrentPage($page_name);
 
-        $results = ($total = $this->count()) ? $this->forPage($page, $per_page) : $this->all();
+        $total = $this->total ? $this->total : $this->count();
+
+        $results = $total ? $this->forPage($page, $per_page) : $this->all();
 
         return $this->paginator($results, $total, $per_page, $page, [
             'path'      => Paginator::resolveCurrentPath(),
@@ -57,4 +62,17 @@ public function paginate($per_page = 15, $page = null, $page_name = 'page') {
     protected function paginator($items, $total, $per_page, $current_page, array $options) {
         return new LengthAwarePaginator($items, $total, $per_page, $current_page, $options);
     }
+
+    /**
+     * @param null $total
+     *
+     * @return int|null
+     */
+    public function total($total = null) {
+        if($total === null) {
+            return $this->total;
+        }
+
+        return $this->total = $total;
+    }
 }