Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Extensions/Pagination/LengthAwarePaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

use Illuminate\Http\Resources\Json\PaginatedResourceResponse;
use Illuminate\Pagination\LengthAwarePaginator as BasePaginator;
use Illuminate\Support\Arr;
use Statamic\Facades\StaticCache;

class LengthAwarePaginator extends BasePaginator
{
Expand Down Expand Up @@ -64,7 +66,9 @@ private function pluckResourcesForApi()

public function withQueryString()
{
$this->appends(request()->query());
$query = static::resolveQueryString(request()->query());

$this->appends(Arr::except($query, StaticCache::recacheTokenParameter()));

return $this;
}
Expand Down
46 changes: 46 additions & 0 deletions tests/Extensions/Pagination/LengthAwarePaginatorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace Tests\Extensions\Pagination;

use Illuminate\Pagination\Paginator;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Extensions\Pagination\LengthAwarePaginator;
use Tests\TestCase;

class LengthAwarePaginatorTest extends TestCase
{
#[Test]
public function it_appends_the_query_string()
{
$this->get('/?foo=bar');

$paginator = $this->paginator()->withQueryString();

$this->assertEquals('/?foo=bar&page=2', $paginator->url(2));
}

#[Test]
public function it_doesnt_append_the_recache_token()
{
$this->get('/?foo=bar&__recache=abc');

$paginator = $this->paginator()->withQueryString();

$this->assertEquals('/?foo=bar&page=2', $paginator->url(2));
}

#[Test]
public function it_uses_the_query_string_resolver()
{
Paginator::queryStringResolver(fn () => ['foo' => 'bar']);

$paginator = $this->paginator()->withQueryString();

$this->assertEquals('/?foo=bar&page=2', $paginator->url(2));
}

private function paginator()
{
return new LengthAwarePaginator(collect(['a', 'b', 'c']), 3, 1, 1, ['path' => '/']);
}
}
Loading