Move cursor resolution into CursorPaginator

Author: stevebauman

composer.json

@@ -28,7 +28,7 @@
   },
   "require": {
     "php": "^8.2",
-    "directorytree/opensearch-adapter": "^1.0.3",
+    "directorytree/opensearch-adapter": "^1.0.4",
     "directorytree/opensearch-client": "^1.0",
     "laravel/scout": "^10.0|^11.0|^12.0|^13.0"
   },

src/CursorPaginator.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Pagination\Cursor;
 use Illuminate\Pagination\CursorPaginator as BaseCursorPaginator;
 use UnexpectedValueException;
 
@@ -19,6 +20,22 @@ class CursorPaginator extends BaseCursorPaginator
      */
     protected array $searchAfter = [];
 
+    /**
+     * Resolve the cursor from the current request or explicit value.
+     */
+    public static function resolveCursor(Cursor|string|null $cursor, string $cursorName = 'cursor'): ?Cursor
+    {
+        if ($cursor instanceof Cursor) {
+            return $cursor;
+        }
+
+        if (is_string($cursor)) {
+            return Cursor::fromEncoded($cursor);
+        }
+
+        return BaseCursorPaginator::resolveCurrentCursor($cursorName);
+    }
+
     /**
      * Get the cursor parameters for a given item.
      */

src/Engine.php

@@ -13,7 +13,6 @@
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\Cursor;
-use Illuminate\Pagination\CursorPaginator as IlluminateCursorPaginator;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection as BaseCollection;
 use Illuminate\Support\LazyCollection;
@@ -101,15 +100,15 @@ public function cursorPaginate(Builder $builder, $perPage = null, string $cursor
     {
         $perPage = (int) ($perPage ?: $builder->model->getPerPage());
 
-        $cursor = $this->resolveCursor($cursor, $cursorName);
+        $cursor = CursorPaginator::resolveCursor($cursor, $cursorName);
 
         $searchRequest = $this->searchRequestFactory->makeFromBuilder($builder, [
             'perPage' => $perPage + 1,
             'reversed' => $cursor?->pointsToPreviousItems() ?? false,
             'searchAfter' => $cursor?->parameter(CursorPaginator::SEARCH_AFTER_PARAMETER),
         ]);
 
-        if (empty($searchRequest->request()->toArray()['body']['sort'] ?? [])) {
+        if (! $searchRequest->request()->hasSort()) {
             throw new InvalidArgumentException('OpenSearch cursor pagination requires at least one explicit sort.');
         }
 
@@ -160,22 +159,6 @@ public function getTotalCount($results): ?int
         return $results->total();
     }
 
-    /**
-     * Resolve the cursor from the current request or explicit value.
-     */
-    protected function resolveCursor(Cursor|string|null $cursor, string $cursorName): ?Cursor
-    {
-        if ($cursor instanceof Cursor) {
-            return $cursor;
-        }
-
-        if (is_string($cursor)) {
-            return Cursor::fromEncoded($cursor);
-        }
-
-        return IlluminateCursorPaginator::resolveCurrentCursor($cursorName);
-    }
-
     /**
      * Get hit sort values keyed by document ID.
      *