Updated paginator with comments from fadion#3

AlexanderWright · Jul 27, 2015 · 5e9b993 · vikram0460 · Jun 19, 2017 · vikram0460
1 parent fe213ac
commit 5e9b993
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "alexanderwright/bouncy",
+    "name": "fadion/bouncy",
     "description": "Map Elasticsearch results to Eloquent models",
     "license": "MIT",
     "keywords": ["laravel", "elasticsearch", "eloquent"],

diff --git a/src/Fadion/Bouncy/ElasticCollection.php b/src/Fadion/Bouncy/ElasticCollection.php
@@ -2,6 +2,8 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Pagination\LengthAwarePaginator;
+
 
 class ElasticCollection extends Collection {
 
@@ -28,12 +30,12 @@ public function __construct($response, $instance)
      */
     public function paginate($perPage = 15)
     {
-        $paginator = new Paginator($this->items, $perPage);
-
-        $start = ($paginator->currentPage() - 1) * $perPage;
-        $sliced = array_slice($this->items, $start, $perPage);
+        $page   = Paginator::resolveCurrentPage() ?: 1;
+        $path   = '/' . \Request::path();
+        $sliced = array_slice($this->items, ($page - 1) * $perPage, $perPage);
+        $total  = count($this->items);
 
-        return new Paginator($sliced, $perPage);
+        return new LengthAwarePaginator($sliced, $total, $perPage, $page, compact('path'));
     }
 
     /**