From 1742fb65c53a2a6cd6a310d225add25ee20c14b6 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Tue, 10 Dec 2024 18:58:17 +0000
Subject: Use the spread operator instead of 'array_merge' in more places.

PHP 8.1 introduced support for merging string-key arrays (last array with a wins).
---
 classes/DiskCache.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'classes/DiskCache.php')

diff --git a/classes/DiskCache.php b/classes/DiskCache.php
index 249079b36..c52759a75 100644
--- a/classes/DiskCache.php
+++ b/classes/DiskCache.php
@@ -301,8 +301,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;
-- 
cgit v1.2.3-54-g00ecf