diff --git a/lib/Service/Avatar/FaviconDataAccess.php b/lib/Service/Avatar/FaviconDataAccess.php index 539049d0cc..805333e88c 100644 --- a/lib/Service/Avatar/FaviconDataAccess.php +++ b/lib/Service/Avatar/FaviconDataAccess.php @@ -11,6 +11,7 @@ use Exception; use OCA\Mail\Vendor\Favicon\DataAccess; use OCP\Http\Client\IClientService; +use function array_merge; class FaviconDataAccess extends DataAccess { @@ -45,10 +46,12 @@ public function retrieveHeader($url) { // Build the data structure get_headers returns. The status reason // and protocol are inaccurate, but the favicon lib will only extract // the status code. - return [ - 0 => 'HTTP/1.1 ' . $response->getStatusCode() . ' FOO', - ...array_change_key_case($response->getHeaders()), - ]; + return array_merge( + [ + 0 => 'HTTP/1.1 ' . $response->getStatusCode() . ' FOO', + ], + array_change_key_case($response->getHeaders()), + ); } }