[RFC] Deprecate curl_close()

ext/curl/curl.stub.php

@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
     public readonly array $options;
 }
 
+#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
 function curl_close(CurlHandle $handle): void {}
 
 /** @refcount 1 */

ext/curl/tests/bug27023.phpt

@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
 $params = array('file' => $file);
 curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
 var_dump(curl_exec($ch));
-
-
-curl_close($ch);
 ?>
 --EXPECTF--
 string(%d) "curl_testdata1.txt|application/octet-stream|6"

ext/curl/tests/bug48203.phpt

@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
 fclose($fp); // <-- premature close of $fp caused a crash!
 
 curl_exec($ch);
-curl_close($ch);
 
 echo "Ok\n";
 

ext/curl/tests/bug48207.phpt

@@ -43,7 +43,6 @@ try {
 }
 
 curl_exec($ch);
-curl_close($ch);
 is_file($tempfile) and @unlink($tempfile);
 isset($tempname) and is_file($tempname) and @unlink($tempname);
 ?>

ext/curl/tests/bug54798-unix.phpt

@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {
 
     curl_exec($ch);
 
-    curl_close($ch);
-
     echo "Ok for $description\n";
 }
 

ext/curl/tests/bug54798.phpt

@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {
 
     curl_exec($ch);
 
-    curl_close($ch);
-
     echo "Ok for $description\n";
 }
 

ext/curl/tests/bug55767.phpt

@@ -20,7 +20,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
 
   var_dump( $curl_content );
 ?>

ext/curl/tests/bug61948-unix.phpt

@@ -14,7 +14,6 @@ open_basedir="/tmp"
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
-  curl_close($ch);
 ?>
 --EXPECTF--
 bool(true)

ext/curl/tests/bug61948.phpt

@@ -13,7 +13,6 @@ curl
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
   var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
-  curl_close($ch);
 ?>
 --CLEAN--
 <?php

ext/curl/tests/bug63795.phpt

@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
 var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
 var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
 var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));
-
-curl_close($ch);
 ?>
 --EXPECTF--
 bool(true)

ext/curl/tests/bug65458.phpt

@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
 }
 
 $preclose = memory_get_usage();
-curl_close($ch);
+$ch = null;
 
 // This is a slightly tricky heuristic, but basically, we want to ensure
 // $preclose - $init has a delta in the order of bytes, not megabytes. Given

ext/curl/tests/bug65646.phpt

@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
 <?php
 $ch = curl_init();
 var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/bug65646_open_basedir_new.phpt

@@ -10,7 +10,6 @@ $ch = curl_init();
 var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
 var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
 var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
-curl_close($ch);
 ?>
 --EXPECTF--
 bool(true)

ext/curl/tests/bug66109.phpt

@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));
 
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
 var_dump(curl_exec($ch));
-
-curl_close($ch);
-
 ?>
 --EXPECT--
 string(6) "DELETE"

ext/curl/tests/bug68937.phpt

@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
 }
 
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECT--
 NULL

ext/curl/tests/bug68937_2.phpt

@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
 }
 
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECTF--
 resource(%d) of type (stream)

ext/curl/tests/bug69316.phpt

@@ -27,7 +27,6 @@ curl
   curl_setopt($ch, CURLOPT_FILE, $f_file);
   curl_setopt($ch, CURLOPT_URL, $url);
   curl_exec($ch);
-  curl_close($ch);
 ?>
 --CLEAN--
 <?php

ext/curl/tests/bug72202.phpt

@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
 }
 object(CurlHandle)#1 (0) {
 }
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 object(CurlHandle)#1 (0) {
 }
 object(CurlHandle)#1 (0) {

ext/curl/tests/bug76675.phpt

@@ -42,7 +42,6 @@ do {
             if ($handle !== null) {
                 $transfers--;
                 curl_multi_remove_handle($mh, $handle);
-                curl_close($handle);
             }
         }
     } while ($info);

ext/curl/tests/bug77711.phpt

@@ -19,7 +19,6 @@ $params = array('file' => $file);
 var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));
 
 var_dump(curl_exec($ch));
-curl_close($ch);
 ?>
 --EXPECTF--
 bool(true)

ext/curl/tests/bug77946.phpt

@@ -25,10 +25,6 @@ do {
     }
 } while ($status === CURLM_CALL_MULTI_PERFORM || $active);
 
-foreach ($urls as $i => $url) {
-    curl_close($conn[$i]);
-}
-
 curl_multi_close($mh);
 ?>
 --EXPECTF--

ext/curl/tests/bug78775.phpt

@@ -24,7 +24,6 @@ curl_setopt_array(
 );
 
 var_dump(curl_exec($handle));
-curl_close($handle);
 
 fwrite($sock, "GET / HTTP/1.0\n\n");
 var_dump(fread($sock, 8));

ext/curl/tests/bug79199.phpt

@@ -8,8 +8,8 @@ $mem_old = 0;
 for($i = 0; $i < 50; ++$i) {
     $c1 = curl_init();
     $c2 = curl_copy_handle($c1);
-    curl_close($c2);
-    curl_close($c1);
+    $c2 = null;
+    $c1 = null;
     $mem_new = memory_get_usage();
     if ($mem_new <= $mem_old) {
         break;

ext/curl/tests/curl_CURLOPT_READDATA.phpt

@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
     echo $response;
 }
 
-curl_close($ch);
-
 // Clean the temporary file
 @unlink($tempname);
 ?>

ext/curl/tests/curl_basic_001.phpt

@@ -19,7 +19,6 @@ curl
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
   $ok = curl_exec($ch);
-  curl_close($ch);
   $curl_content = ob_get_contents();
   ob_end_clean();
 

ext/curl/tests/curl_basic_002.phpt

@@ -21,8 +21,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
-
   var_dump( $curl_content );
 ?>
 --EXPECT--

ext/curl/tests/curl_basic_003.phpt

@@ -23,8 +23,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
-
   var_dump( $curl_content );
 ?>
 --EXPECT--

ext/curl/tests/curl_basic_004.phpt

@@ -22,8 +22,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
-
   var_dump( $curl_content );
 ?>
 --EXPECT--

ext/curl/tests/curl_basic_005.phpt

@@ -22,8 +22,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
-
   var_dump( $curl_content );
 ?>
 --EXPECT--

ext/curl/tests/curl_basic_006.phpt

@@ -24,7 +24,6 @@ curl
   });
 
   curl_exec($ch);
-  curl_close($ch);
   ob_end_flush();
   echo "Data: $alldata";
 ?>

ext/curl/tests/curl_basic_007.phpt

@@ -15,9 +15,6 @@ $ch = curl_init();
 curl_exec($ch);
 var_dump(curl_error($ch));
 var_dump(curl_errno($ch));
-curl_close($ch);
-
-
 ?>
 --EXPECTF--
 string(%d) "No URL set%A"

ext/curl/tests/curl_basic_008.phpt

@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
 curl_exec($ch);
 var_dump(curl_error($ch));
 var_dump(curl_errno($ch));
-curl_close($ch);
-
-
 ?>
 --EXPECTF--
 %s resolve%s

ext/curl/tests/curl_basic_009.phpt

@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
 curl_exec($ch);
 var_dump(curl_error($ch));
 var_dump(curl_errno($ch));
-curl_close($ch);
-
-
 ?>
 --EXPECTF--
 string(%d) "%Srotocol%s"

ext/curl/tests/curl_basic_010.phpt

@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
 curl_exec($ch);
 var_dump(curl_error($ch));
 var_dump(curl_errno($ch));
-curl_close($ch);
-
-
 ?>
 --EXPECTF--
 string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"

ext/curl/tests/curl_basic_011.phpt

@@ -21,7 +21,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
 
   var_dump( $curl_content );
 ?>

ext/curl/tests/curl_basic_012.phpt

@@ -21,7 +21,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
 
   var_dump( $curl_content );
 ?>

ext/curl/tests/curl_basic_013.phpt

@@ -21,7 +21,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $curl_content = curl_exec($ch);
-  curl_close($ch);
 
   var_dump( $curl_content );
 ?>

ext/curl/tests/curl_basic_019.phpt

@@ -16,7 +16,6 @@ curl
   curl_exec($ch);
   $info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
   var_dump($url == $info);
-  curl_close($ch);
 ?>
 --EXPECT--
 Hello World!

ext/curl/tests/curl_basic_020.phpt

@@ -14,7 +14,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url);
   curl_exec($ch);
   var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
-  curl_close($ch);
 ?>
 --EXPECT--
 Hello World!

ext/curl/tests/curl_basic_021.phpt

@@ -14,7 +14,6 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url);
   curl_exec($ch);
   var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
-  curl_close($ch);
 ?>
 --EXPECT--
 string(24) "text/plain;charset=utf-8"

ext/curl/tests/curl_basic_023.phpt

@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 curl_exec($ch);
 var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_basic_024.phpt

@@ -17,7 +17,6 @@ curl_exec($ch);
 var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
 var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
 var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
-curl_close($ch);
 ?>
 --EXPECTF--
 bool(true)