Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions lib/private/AppConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,14 @@ private function getTypedValue(
throw new AppConfigTypeConflictException('conflict with value type from database');
}

if ($lazy) {
return $this->lazyCache[$app][$key] ?? $default;
}

return $this->fastCache[$app][$key] ?? $default;
/**
* - the pair $app/$key cannot exist in both array,
* - we should still returns an existing non-lazy value even if current method
* is called with $lazy is true
*
* This way, lazyCache will be empty until the load for lazy config value is requested.
*/
return $this->lazyCache[$app][$key] ?? $this->fastCache[$app][$key] ?? $default;
}

/**
Expand Down