Preserve expiry dates from nested cache collectors - #19507
Closed
timkelty wants to merge 1 commit into
Closed
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an edge case in craft\services\Elements cache-info collection where a nested cache collector’s computed expiry duration could be lost when unwinding back to an outer collector that hadn’t set a duration yet—allowing outer caches to potentially outlive expirable nested content.
Changes:
- Preserve a nested collector’s
$durationwhen the parent collector’s duration is currentlynull. - Add a unit test covering nested cache-info collection where only the inner collector sets an expiry date.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/services/Elements.php |
Ensures nested cache duration is propagated to the parent collector when the parent has no duration yet. |
tests/unit/services/ElementsTest.php |
Adds regression coverage asserting nested cache expiry duration survives unwinding to the outer collector. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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
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.
Nested element-cache collectors could discard their expiry when the parent collector did not have one yet. Preserve the nested duration so outer caches cannot outlive expirable content.
Discovered while reviewing #19505.