Skip to content

Remove deprecated curl_close() usage for PHP 8.5 compatibility #2009

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
lacatoire wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −10
Open

Remove deprecated curl_close() usage for PHP 8.5 compatibility #2009

Show file tree
Hide file tree
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
10 changes: 1 addition & 9 deletions src/Monolog/Handler/Curl/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ final class Util
* @param CurlHandle $ch curl handler
* @return bool|string @see curl_exec
*/
public static function execute(CurlHandle $ch, int $retries = 5, bool $closeAfterDone = true): bool|string
public static function execute(CurlHandle $ch, int $retries = 5): bool|string
{
while ($retries > 0) {
$retries--;
Expand All @@ -48,19 +48,11 @@ public static function execute(CurlHandle $ch, int $retries = 5, bool $closeAfte
if (false === \in_array($curlErrno, self::$retriableErrorCodes, true) || $retries === 0) {
$curlError = curl_error($ch);

if ($closeAfterDone) {
curl_close($ch);
}

throw new \RuntimeException(sprintf('Curl error (code %d): %s', $curlErrno, $curlError));
}
continue;
}

if ($closeAfterDone) {
curl_close($ch);
}

return $curlResponse;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/Monolog/Handler/LogglyHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ protected function send(string $data, string $endpoint): void
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);

Curl\Util::execute($ch, 5, false);
Curl\Util::execute($ch, 5);
}

protected function getDefaultFormatter(): FormatterInterface
Expand Down