diff options
Diffstat (limited to 'classes/DiskCache.php')
| -rw-r--r-- | classes/DiskCache.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/classes/DiskCache.php b/classes/DiskCache.php index 249079b36..70b8de173 100644 --- a/classes/DiskCache.php +++ b/classes/DiskCache.php @@ -1,10 +1,9 @@ <?php class DiskCache implements Cache_Adapter { - /** @var Cache_Adapter $adapter */ - private $adapter; + private Cache_Adapter $adapter; /** @var array<string, DiskCache> $instances */ - private static $instances = []; + private static array $instances = []; /** * https://stackoverflow.com/a/53662733 @@ -301,8 +300,11 @@ class DiskCache implements Cache_Adapter { if ($this->exists($local_filename) && !$force) return true; - $data = UrlHelper::fetch(array_merge(["url" => $url, - "max_size" => Config::get(Config::MAX_CACHE_FILE_SIZE)], $options)); + $data = UrlHelper::fetch([ + 'url' => $url, + 'max_size' => Config::get(Config::MAX_CACHE_FILE_SIZE), + ...$options, + ]); if ($data) return $this->put($local_filename, $data) > 0; |