fix: remove deprecation message on curl_close

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

datadog-setup.php

@@ -1506,7 +1506,7 @@ function download($url, $destination, $retry = false)
             }
         }
 
-        curl_close($ch);
+        if (PHP_VERSION_ID < 80000) { curl_close($ch); }
         fclose($fp);
 
         if (false !== $return) {

dockerfiles/testing-environment/Wordpress5/app/wp-includes/Requests/Transport/cURL.php

@@ -24,7 +24,7 @@ function repetitive_function()
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     $output = curl_exec($ch);
     error_log('Received response: ' . var_export($output, 1));
-    curl_close($ch);
+    if (PHP_VERSION_ID < 80000) { curl_close($ch); }
 }
 
 $count = 0;

dockerfiles/testing-environment/Wordpress5/app/wp-includes/SimplePie/File.php

@@ -28,7 +28,7 @@ if (empty($response['headers']['X-Datadog-Origin']) || $response['headers']['X-D
     throw new Exception('Unexpected origin header. ' . var_export($response, true));
 }
 
-curl_close($ch);
+if (PHP_VERSION_ID < 80000) { curl_close($ch); }
 
 var_dump($context->origin);
 echo "OK\n";

dockerfiles/testing-environment/Wordpress5/app/wp-includes/class-wp-http-curl.php

@@ -111,7 +111,7 @@ public function sendTracesToTestAgent($traces)
         $response = self::curlWithoutSpan($curl);
 
         // Close the cURL session
-        curl_close($curl);
+        if (PHP_VERSION_ID < 80000) { curl_close($curl); }
 
         // Output the response for debugging purposes
         //echo $response;
@@ -201,7 +201,7 @@ public function inWebServer($fn, $rootPath, $envs = [], $inis = [], &$curlInfo =
                     if (\is_array($curlInfo)) {
                         $curlInfo = \array_merge($curlInfo, \curl_getinfo($curl));
                     }
-                    \curl_close($curl);
+                    \if (PHP_VERSION_ID < 80000) { curl_close($curl); }
                     $webServer->stop();
                     return $response;
                 }

examples/long-running/long-running-script.php

@@ -262,7 +262,7 @@ protected function sendRequest($method, $url, $headers = [], $body = [], $change
             }
             $response = curl_exec($ch);
             if ($response === false && $i < 9) {
-                \curl_close($ch);
+                \if (PHP_VERSION_ID < 80000) { curl_close($ch); }
                 // sleep for 100 milliseconds before trying again
                 \usleep(100 * 1000);
             } else {
@@ -281,12 +281,12 @@ protected function sendRequest($method, $url, $headers = [], $body = [], $change
                 curl_error($ch),
                 curl_errno($ch)
             );
-            curl_close($ch);
+            if (PHP_VERSION_ID < 80000) { curl_close($ch); }
             $this->fail($message);
             return null;
         }
 
-        curl_close($ch);
+        if (PHP_VERSION_ID < 80000) { curl_close($ch); }
 
         return $response;
     }

tests/C2PHP/get_context_distributed_tracing_test.phpt

@@ -7,4 +7,4 @@
 curl_setopt($ch, CURLOPT_URL, $url);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 $output = curl_exec($ch);
-curl_close($ch);
+if (PHP_VERSION_ID < 80000) { curl_close($ch); }

tests/Common/TracerTestTrait.php

@@ -11,7 +11,7 @@ function my_app()
     $ch = curl_init('http://httpbin-integration/status/200');
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     curl_exec($ch);
-    curl_close($ch);
+    if (PHP_VERSION_ID < 80000) { curl_close($ch); }
 
     $mysqli = \mysqli_connect('mysql-integration', 'test', 'test', 'test');
     if ($mysqli) {