From abe31d57608bf4df6863e48e4c26cf5be24266b4 Mon Sep 17 00:00:00 2001
From: Emil Vaagland <emil.vaagland@schibsted.com>
Date: Wed, 26 Oct 2016 22:06:57 +0200
Subject: [PATCH] #12 change from  to php union operator to combine curl
 options

---
 lib/Client.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Client.php b/lib/Client.php
index 1e77470..a383cc0 100644
--- a/lib/Client.php
+++ b/lib/Client.php
@@ -141,12 +141,12 @@ public function makeRequest($method, $url, $body = null, $headers = null)
     {
         $curl = curl_init($url);
 
-        curl_setopt_array($curl, array_merge([
+        curl_setopt_array($curl, [
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_HEADER => 1,
             CURLOPT_CUSTOMREQUEST => strtoupper($method),
             CURLOPT_SSL_VERIFYPEER => false,
-        ], $this->curlOptions));
+        ] + $this->curlOptions);
 
         if (isset($headers)) {
             $this->headers = array_merge($this->headers, $headers);