Skip to content

fix(appstore): honor subclass cache invalidation duration in fetchers #63131

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

Open
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −8
Open

fix(appstore): honor subclass cache invalidation duration in fetchers #63131

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
cfaa976
fix(appstore): honor subclass cache invalidation duration
joshtrichards Aug 10, 2026
dce67f3
test(appstore): fix stale cache fixtures for AppDiscoverFetcher
joshtrichards Aug 11, 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 lib/private/App/AppStore/Fetcher/Fetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ public function get($allowUnstable = false): array {
if (is_array($jsonBlob)) {
// No caching when the version has been updated
if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
// If the timestamp is older than 3600 seconds request the files new
$invalidateAfterSeconds = self::INVALIDATE_AFTER_SECONDS;
// If the timestamp is old, request the files new
$invalidateAfterSeconds = static::INVALIDATE_AFTER_SECONDS;

if ($allowUnstable) {
$invalidateAfterSeconds = self::INVALIDATE_AFTER_SECONDS_UNSTABLE;
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/App/AppStore/Fetcher/FetcherBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
->expects($this->exactly(2))
->method('getTime')
->willReturnOnConsecutiveCalls(
4801,
1502
90001,
90002,
);
$client = $this->createMock(IClient::class);
$this->clientService
Expand Down Expand Up @@ -474,8 +474,8 @@ public function testGetMatchingETag(): void {
->expects($this->exactly(2))
->method('getTime')
->willReturnOnConsecutiveCalls(
4801,
4802
90001,
90002,
);
$client = $this->createMock(IClient::class);
$this->clientService
Expand Down Expand Up @@ -557,8 +557,8 @@ public function testGetNoMatchingETag(): void {
->expects($this->exactly(2))
->method('getTime')
->willReturnOnConsecutiveCalls(
4801,
4802,
90001,
90002,
);
$client = $this->createMock(IClient::class);
$this->clientService
Expand Down
Loading