Replace use of 'array_merge' with the spread operator and 'array_push' in various places.

This isn't supported for arrays with string keys until PHP 8.1.

https://wiki.php.net/rfc/spread_operator_for_array

3 files changed, 16 insertions, 14 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index bb638f166..6cf979b0a 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -172,7 +172,7 @@ class Pref_Feeds extends Handler_Protected {
 			if ($enable_cats) {
 				array_push($root['items'], $cat);
 			} else {
-				$root['items'] = array_merge($root['items'], $cat['items']);
+				array_push($root['items'], ...$cat['items']);
 			}
 
 			$sth = $this->pdo->prepare("SELECT * FROM
@@ -202,7 +202,7 @@ class Pref_Feeds extends Handler_Protected {
 				if ($enable_cats) {
 					array_push($root['items'], $cat);
 				} else {
-					$root['items'] = array_merge($root['items'], $cat['items']);
+					array_push($root['items'], ...$cat['items']);
 				}
 			}
 		}
@@ -848,7 +848,7 @@ class Pref_Feeds extends Handler_Protected {
 				if ($qpart) {
 					$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
 						AND owner_uid = ?");
-					$sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
+					$sth->execute([...$feed_ids, $_SESSION['uid']]);
 				}
 			}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e7c7877a7..19ec8d39e 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -538,7 +538,7 @@ class Pref_Filters extends Handler_Protected {
 
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2 WHERE id IN ($ids_qmarks)
 			AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+		$sth->execute([...$ids, $_SESSION['uid']]);
 	}
 
 	private function _save_rules_and_actions(int $filter_id): void {
@@ -781,11 +781,11 @@ class Pref_Filters extends Handler_Protected {
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_filters2_rules
 				SET filter_id = ? WHERE filter_id IN ($ids_qmarks)");
-			$sth->execute(array_merge([$base_id], $ids));
+			$sth->execute([$base_id, ...$ids]);
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions
 				SET filter_id = ? WHERE filter_id IN ($ids_qmarks)");
-			$sth->execute(array_merge([$base_id], $ids));
+			$sth->execute([$base_id, ...$ids]);
 
 			$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2 WHERE id IN ($ids_qmarks)");
 			$sth->execute($ids);
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 01b58005b..ce9030cdc 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -631,10 +631,11 @@ class Pref_Prefs extends Handler_Protected {
 
 					} else if ($pref_name == Prefs::USER_CSS_THEME) {
 
-						$theme_files = array_map("basename",
-							array_merge(glob("themes/*.php"),
-								glob("themes/*.css"),
-								glob("themes.local/*.css")));
+						$theme_files = array_map("basename", [
+							...glob("themes/*.php") ?: [],
+							...glob("themes/*.css") ?: [],
+							...glob("themes.local/*.css") ?: [],
+						]);
 
 						asort($theme_files);
 
@@ -867,10 +868,11 @@ class Pref_Prefs extends Handler_Protected {
 
 						$feed_handler_whitelist = [ "Af_Comics" ];
 
-						$feed_handlers = array_merge(
-							PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
-							PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
-							PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED));
+						$feed_handlers = [
+							...PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
+							...PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
+							...PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED),
+						];
 
 						$feed_handlers = array_filter($feed_handlers,
 							fn($plugin) => in_array(get_class($plugin), $feed_handler_whitelist) === false);