Skip to content

Remove deprecated curl_close calls #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChiragAgg5k wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −41
Open

Remove deprecated curl_close calls #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 37 additions & 41 deletions src/Analytics/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,56 +136,52 @@ public function call(string $method, string $path = '', array $headers = [], arr
unset($headers[$i]);
}

try {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, php_uname('s').'-'.php_uname('r').':php-'.phpversion());
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders) {
$len = strlen($header);
$header = explode(':', strtolower($header), 2);

if (count($header) < 2) { // ignore invalid headers
return $len;
}

$responseHeaders[strtolower(trim($header[0]))] = trim($header[1]);

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, php_uname('s').'-'.php_uname('r').':php-'.phpversion());
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders) {
$len = strlen($header);
$header = explode(':', strtolower($header), 2);

if (count($header) < 2) { // ignore invalid headers
return $len;
});

if ($method != 'GET') {
curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
}

$responseBody = curl_exec($ch);
$responseHeaders[strtolower(trim($header[0]))] = trim($header[1]);

$responseType = $responseHeaders['Content-Type'] ?? '';
$responseStatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
return $len;
});

switch (substr($responseType, 0, strpos($responseType, ';'))) {
case 'application/json':
$responseBody = json_decode($responseBody, true);
break;
}
if ($method != 'GET') {
curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
}

if (curl_errno($ch)) {
throw new Exception(curl_error($ch), $responseStatus);
}
$responseBody = curl_exec($ch);

if ($responseStatus >= 400) {
if (is_array($responseBody)) {
throw new Exception(json_encode($responseBody), $responseStatus);
} else {
throw new Exception($responseStatus.': '.$responseBody, $responseStatus);
}
}
$responseType = $responseHeaders['Content-Type'] ?? '';
$responseStatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);

return $responseBody;
} finally {
curl_close($ch);
switch (substr($responseType, 0, strpos($responseType, ';'))) {
case 'application/json':
$responseBody = json_decode($responseBody, true);
break;
}

if (curl_errno($ch)) {
throw new Exception(curl_error($ch), $responseStatus);
}

if ($responseStatus >= 400) {
if (is_array($responseBody)) {
throw new Exception(json_encode($responseBody), $responseStatus);
} else {
throw new Exception($responseStatus.': '.$responseBody, $responseStatus);
}
}

return $responseBody;
}

/**
Expand Down
Loading