Skip to content

Preserve expiry dates from nested cache collectors #19509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
timkelty wants to merge 2 commits into
base: 5.x
Choose a base branch
from
Draft

Preserve expiry dates from nested cache collectors #19509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1db9da
Preserve nested cache expiry dates
timkelty Aug 28, 2026
dabb0f9
Clarify nested cache duration handling
timkelty Aug 28, 2026
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
4 changes: 2 additions & 2 deletions src/services/Elements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,9 @@ public function stopCollectingCacheInfo(): array
if (!empty($this->_cacheTagBuffers)) {
$this->_cacheTags = array_merge(array_pop($this->_cacheTagBuffers), $tags);

// Override the parent duration if ours is shorter
// Preserve the shortest duration across nested collections
$this->_cacheDuration = array_pop($this->_cacheDurationBuffers);
if ($duration && $duration < $this->_cacheDuration) {
if ($duration && (!$this->_cacheDuration || $duration < $this->_cacheDuration)) {
$this->_cacheDuration = $duration;
}
} else {
Expand Down
15 changes: 15 additions & 0 deletions tests/unit/services/ElementsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use Craft;
use craft\elements\Entry;
use craft\helpers\DateTimeHelper;
use craft\services\Elements;
use craft\test\TestCase;
use craft\test\TestSetup;
Expand Down Expand Up @@ -83,6 +84,20 @@ public function testParseRefs(): void
}
}

public function testNestedCacheInfoPreservesExpiry(): void
{
$this->elements->startCollectingCacheInfo();
$this->elements->collectCacheTags(['test']);
$this->elements->startCollectingCacheInfo();
$this->elements->setCacheExpiryDate(DateTimeHelper::now()->modify('+60 seconds'));
$this->elements->stopCollectingCacheInfo();
[, $duration] = $this->elements->stopCollectingCacheInfo();

self::assertNotNull($duration);
self::assertGreaterThan(0, $duration);
self::assertLessThanOrEqual(60, $duration);
}

/**
* @inheritdoc
*/
Expand Down
Loading