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, 3 insertions, 3 deletions

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 6de790ff9..59bf403b3 100755
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -201,7 +201,7 @@ class FeedItem_Atom extends FeedItem_Common {
 			}
 		}
 
-		$encs = array_merge($encs, parent::get_enclosures());
+		array_push($encs, ...parent::get_enclosures());
 
 		return $encs;
 	}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 6a9be8aca..fde481179 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -189,7 +189,7 @@ abstract class FeedItem_Common extends FeedItem {
 		$tmp = [];
 
 		foreach ($cats as $rawcat) {
-			$tmp = array_merge($tmp, explode(",", $rawcat));
+			array_push($tmp, ...explode(",", $rawcat));
 		}
 
 		$tmp = array_map(function($srccat) {
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 7017d04e9..132eabff5 100755
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -153,7 +153,7 @@ class FeedItem_RSS extends FeedItem_Common {
 			array_push($encs, $enc);
 		}
 
-		$encs = array_merge($encs, parent::get_enclosures());
+		array_push($encs, ...parent::get_enclosures());
 
 		return $encs;
 	}