Skip to content

Commit 22ccea7

Browse files
committed
Discovery: Don't cache if TTL is zero.
1 parent 117a7df commit 22ccea7

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Discovery/CollaboraDiscoveryFetcher.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ protected function getDiscoveryXml(): string {
108108
$discovery_url = $this->getDiscoveryUrl($config);
109109
$xml = $this->loadDiscoveryXml($discovery_url, $disable_checks);
110110

111+
/** @var non-negative-int $max_age */
111112
$max_age = $config->get('cool.discovery_cache_ttl') ?? 3600;
113+
if ($max_age === 0) {
114+
// The discovery cache is disabled.
115+
return $xml;
116+
}
117+
112118
$expire = $max_age + $this->time->getRequestTime();
113119

114120
$this->cache->set(

tests/src/Kernel/DiscoveryFetcherTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@ public function testGetDiscoveryIsCached(): void {
188188
$fetcher->getDiscovery();
189189
$this->assertCount(5, $this->httpClientGetCalls);
190190
$fetcher->getDiscovery();
191-
$this->assertCount(5, $this->httpClientGetCalls);
192-
$this->mockRequestTime = $this->mockRequestTime->add(new \DateInterval('PT1S'));
193-
$fetcher->getDiscovery();
194191
$this->assertCount(6, $this->httpClientGetCalls);
195192
}
196193

0 commit comments

Comments
 (0)