[6.x] Prevent recache tokens from leaking into pagination URLs - #15314
Merged
Conversation
jackmcdade
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #15294.
Background recache requests include Statamic's reserved recache token in the query string. The custom paginator was appending the raw request query, causing that token to appear in generated pagination links and become part of the static cache.
This delegates query-string handling to Laravel's resolver, then removes Statamic's configured recache token while preserving legitimate query parameters. It also restores support for custom query-string resolvers.
Testing
./vendor/bin/phpunit tests/Extensions/Pagination/LengthAwarePaginatorTest.php tests/StaticCaching/RecacheTokenTest.php./vendor/bin/phpunit tests/StaticCaching/HalfMeasureStaticCachingTest.php./vendor/bin/phpunit tests/StaticCaching/FullMeasureStaticCachingTest.php./vendor/bin/pint --test src/Extensions/Pagination/LengthAwarePaginator.php tests/Extensions/Pagination/LengthAwarePaginatorTest.php./vendor/bin/phpstan analyse --memory-limit=2G src/Extensions/Pagination/LengthAwarePaginator.php