[4.x] Remove duplication of code in search:results tag, and treat pag…

…ination params as integer types (#8314) Co-authored-by: Jason Varga <[email protected]>
statamic · Jun 29, 2023 · fb9b3c0 · fb9b3c0
1 parent 241253e
commit fb9b3c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Search/Tags.php b/src/Search/Tags.php
@@ -30,9 +30,7 @@ public function results()
         $builder = Search::index($this->params->get('index'))
             ->ensureExists()
             ->search($query)
-            ->withData($supplementData)
-            ->limit($this->params->get('limit'))
-            ->offset($this->params->get('offset'));
+            ->withData($supplementData);
 
         $this->querySite($builder);
         $this->queryStatus($builder);

diff --git a/src/Tags/Concerns/GetsQueryResults.php b/src/Tags/Concerns/GetsQueryResults.php
@@ -10,15 +10,15 @@ protected function results($query)
     {
         $this->setPaginationParameterPrecedence();
 
-        if ($paginate = $this->params->get('paginate')) {
+        if ($paginate = $this->params->int('paginate')) {
             return $this->paginatedResults($query, $paginate);
         }
 
-        if ($limit = $this->params->get('limit')) {
+        if ($limit = $this->params->int('limit')) {
             $query->limit($limit);
         }
 
-        if ($offset = $this->params->get('offset')) {
+        if ($offset = $this->params->int('offset')) {
             $query->offset($offset);
         }