Last few edits

Author: pdphilip

src/Eloquent/Builder.php

@@ -524,12 +524,8 @@ public function getQuery(): QueryBuilder
      *
      * @throws MissingOrderException|BindingResolutionException
      */
-    public function cursorPaginate(
-        $perPage = null,
-        $columns = ['*'],
-        $cursorName = 'cursor',
-        $cursor = null
-    ): CursorPaginator {
+    public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null): SearchAfterPaginator
+    {
         if (empty($this->query->orders)) {
             //try set created_at & updated_at
             if (! $this->inferSort()) {

src/Eloquent/Docs/ModelDocs.php

@@ -8,9 +8,10 @@
 use Illuminate\Contracts\Database\Query\Expression;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Cursor;
-use Illuminate\Pagination\CursorPaginator;
 use PDPhilip\Elasticsearch\Collection\ElasticCollection;
 use PDPhilip\Elasticsearch\Eloquent\Model;
+use PDPhilip\Elasticsearch\Pagination\SearchAfterPaginator;
+use PDPhilip\Elasticsearch\Query\Builder;
 
 /**
  * @method static $this term(string $term, $boostFactor = null)
@@ -72,19 +73,17 @@
  * @method static array getIndexSettings()
  * @method static bool indexExists()
  * @method static LengthAwarePaginator paginate(int $perPage = 15, array $columns = ['*'], string $pageName = 'page', ?int $page = null, ?int $total = null)
- * @method static CursorPaginator cursorPaginate(int|null $perPage = null, array $columns = [], string $cursorName = 'cursor', ?Cursor $cursor = null)
+ * @method static SearchAfterPaginator cursorPaginate(int|null $perPage = null, array $columns = [], string $cursorName = 'cursor', ?Cursor $cursor = null)
  * @method static string getQualifiedKeyName()
  * @method static string getConnection()
  * @method static void truncate()
- * @method static ElasticCollection insert($values, $returnData = null)
+ * @method static ElasticCollection insert($values, $returnData = null):
  * @method static ElasticCollection insertWithoutRefresh($values, $returnData = null)
  *
  * @property object $search_highlights
  * @property object $with_highlights
  * @property array $search_highlights_as_array
  *
- * @mixin \Illuminate\Database\Query\Builder
+ * @mixin Builder
  */
-trait ModelDocs
-{
-}
+trait ModelDocs {}

src/Pagination/SearchAfterPaginator.php

@@ -7,11 +7,12 @@
 use Illuminate\Pagination\Cursor;
 use Illuminate\Pagination\CursorPaginator;
 use Illuminate\Support\Collection;
+use PDPhilip\Elasticsearch\Eloquent\Model;
 
 class SearchAfterPaginator extends CursorPaginator
 {
     /**
-     * @param  \PDPhilip\Elasticsearch\Eloquent\Model  $item
+     * @param  Model  $item
      */
     public function getParametersForItem($item): array
     {
@@ -56,19 +57,18 @@ public function showingFrom(): int
     {
         $perPage = $this->perPage();
         $currentPage = $this->currentPageNumber();
-        $start = ($currentPage - 1) * $perPage + 1;
 
-        return $start;
+        return ($currentPage - 1) * $perPage + 1;
+
     }
 
     public function showingTo(): int
     {
         $records = count($this->items);
         $currentPage = $this->currentPageNumber();
         $perPage = $this->perPage();
-        $end = (($currentPage - 1) * $perPage) + $records;
 
-        return $end;
+        return (($currentPage - 1) * $perPage) + $records;
     }
 
     public function lastPage(): int