Forráskód Böngészése

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

Co-authored-by: lacatoire <louis-arnaud.catoire@external.drivalia.com>
Louis-Arnaud 1 hete
szülő
commit
daa0acaec2

+ 1 - 9
src/Monolog/Handler/Curl/Util.php

@@ -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--;
@@ -48,19 +48,11 @@ final class Util
                 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;

+ 1 - 1
src/Monolog/Handler/LogglyHandler.php

@@ -146,7 +146,7 @@ class LogglyHandler extends AbstractProcessingHandler
         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