Merge branch 'intech-6.0' into 6.0

Author: yajra

src/Engines/BaseEngine.php

@@ -584,7 +584,7 @@ public function setSerializer($serializer)
      */
     public function make($mDataSupport = false, $orderFirst = false)
     {
-        $this->totalRecords = $this->count();
+        $this->totalRecords = $this->totalCount();
 
         if ($this->totalRecords) {
             $this->orderRecords(! $orderFirst);
@@ -603,6 +603,13 @@ public function make($mDataSupport = false, $orderFirst = false)
      */
     abstract public function count();
 
+    /**
+     * Count total items
+     *
+     * @return integer
+     */
+    abstract public function totalCount();
+
     /**
      * Sort records.
      *

src/Engines/CollectionEngine.php

@@ -86,6 +86,14 @@ public function count()
     {
         return $this->collection->count();
     }
+    
+    /**
+     * @inheritdoc
+     */
+    public function totalCount()
+    {
+        return $this->count();
+    }
 
     /**
      * @inheritdoc

src/Engines/QueryBuilderEngine.php

@@ -85,6 +85,14 @@ public function count()
         return $this->connection->table($this->connection->raw('(' . $myQuery->toSql() . ') count_row_table'))
                                 ->setBindings($myQuery->getBindings())->count();
     }
+    
+    /**
+     * @inheritdoc
+     */
+    public function totalCount()
+    {
+        return $this->count();
+    }
 
     /**
      * @inheritdoc