Skip to content

Commit 7e29e6b

Browse files
Merge pull request #13 from emilva/fix_curl_options_array
#12 change from to php union operator to combine curl options
2 parents aa09fb8 + abe31d5 commit 7e29e6b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Client.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ public function makeRequest($method, $url, $body = null, $headers = null)
141141
{
142142
$curl = curl_init($url);
143143

144-
curl_setopt_array($curl, array_merge([
144+
curl_setopt_array($curl, [
145145
CURLOPT_RETURNTRANSFER => true,
146146
CURLOPT_HEADER => 1,
147147
CURLOPT_CUSTOMREQUEST => strtoupper($method),
148148
CURLOPT_SSL_VERIFYPEER => false,
149-
], $this->curlOptions));
149+
] + $this->curlOptions);
150150

151151
if (isset($headers)) {
152152
$this->headers = array_merge($this->headers, $headers);

0 commit comments

Comments
 (0)