[RFC] Deprecate curl_close() (#19451)

https://wiki.php.net/rfc/deprecations_php_8_5

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/curl_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 682d257b0235e5f6f81ffe3ddf563f384125a271 */
+ * Stub hash: 172dc89afccd670434ce2ca0a6c905c77edcf337 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -185,7 +185,7 @@ ZEND_FUNCTION(curl_strerror);
 ZEND_FUNCTION(curl_version);
 
 static const zend_function_entry ext_functions[] = {
-	ZEND_FE(curl_close, arginfo_curl_close)
+	ZEND_RAW_FENTRY("curl_close", zif_curl_close, arginfo_curl_close, ZEND_ACC_DEPRECATED, NULL, NULL)
 	ZEND_FE(curl_copy_handle, arginfo_curl_copy_handle)
 	ZEND_FE(curl_errno, arginfo_curl_errno)
 	ZEND_FE(curl_error, arginfo_curl_error)
@@ -986,6 +986,13 @@ static void register_curl_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("CURLOPT_SAFE_UPLOAD", CURLOPT_SAFE_UPLOAD, CONST_PERSISTENT);
 
 
+	zend_attribute *attribute_Deprecated_func_curl_close_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "curl_close", sizeof("curl_close") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_curl_close_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_curl_close_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_curl_close_0_arg1_str = zend_string_init("as it has no effect since PHP 8.0", strlen("as it has no effect since PHP 8.0"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_curl_close_0->args[1].value, attribute_Deprecated_func_curl_close_0_arg1_str);
+	attribute_Deprecated_func_curl_close_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+
 	zend_attribute *attribute_Deprecated_const_CURLOPT_BINARYTRANSFER_0 = zend_add_global_constant_attribute(const_CURLOPT_BINARYTRANSFER, ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
 	ZVAL_STR(&attribute_Deprecated_const_CURLOPT_BINARYTRANSFER_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_4));
 	attribute_Deprecated_const_CURLOPT_BINARYTRANSFER_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);

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);
+    $c2 = null;
-    curl_close($c1);
+    $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)

ext/curl/tests/curl_basic_025.phpt

@@ -22,7 +22,6 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 curl_setopt($ch, CURLOPT_POSTFIELDS, "data");
 curl_exec($ch);
 var_dump(curl_getinfo($ch, CURLINFO_EFFECTIVE_METHOD));
-curl_close($ch);
 ?>
 --EXPECT--
 string(4) "POST"

ext/curl/tests/curl_basic_026.phpt

@@ -21,7 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 var_dump(curl_setopt($ch, CURLOPT_MIME_OPTIONS, CURLMIMEOPT_FORMESCAPE));
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_basic_027.phpt

@@ -29,7 +29,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSH_HOSTKEYFUNCTION, function ($ch, $keytype,
     return CURLKHMATCH_OK;
 }));
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_basic_028.phpt

@@ -25,7 +25,6 @@ var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "FilE,DICT"));
 var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "DICT"));
 var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS_STR, "HTTP"));
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECTF--
 Warning: curl_setopt(): The FILE protocol cannot be activated when an open_basedir is set in %s on line %d

ext/curl/tests/curl_basic_029.phpt

@@ -23,7 +23,6 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 var_dump(curl_setopt($ch, CURLOPT_WS_OPTIONS, 0));
 var_dump(curl_setopt($ch, CURLOPT_WS_OPTIONS, CURLWS_RAW_MODE));
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECTF--
 bool(%s)

ext/curl/tests/curl_basic_030.phpt

@@ -22,7 +22,6 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 var_dump(curl_setopt($ch, CURLOPT_CA_CACHE_TIMEOUT, 1));
 var_dump(curl_setopt($ch, CURLOPT_QUICK_EXIT, 1000));
 curl_exec($ch);
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_close_basic.phpt

@@ -11,6 +11,7 @@ $ch = curl_init();
 curl_close($ch);
 var_dump($ch);
 ?>
---EXPECT--
+--EXPECTF--
-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)#%d (0) {
 }

ext/curl/tests/curl_copy_handle_basic_001.phpt

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

ext/curl/tests/curl_copy_handle_basic_002.phpt

@@ -22,10 +22,9 @@ curl
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
 
   $copy = curl_copy_handle($ch);
-  curl_close($ch);
+  $ch = null;
 
   $curl_content = curl_exec($copy);
-  curl_close($copy);
 
   var_dump( $curl_content );
 ?>

ext/curl/tests/curl_copy_handle_basic_004.phpt

@@ -23,10 +23,9 @@ curl
 
   $curl_content = curl_exec($ch);
   $copy = curl_copy_handle($ch);
-  curl_close($ch);
+  $ch = null;
 
   $curl_content_copy = curl_exec($copy);
-  curl_close($copy);
 
   var_dump( $curl_content_copy );
 ?>

ext/curl/tests/curl_copy_handle_basic_005.phpt

@@ -25,10 +25,9 @@ curl
 
   $curl_content = curl_exec($ch);
   $copy = curl_copy_handle($ch);
-  curl_close($ch);
+  $ch = null;
 
   $curl_content_copy = curl_exec($copy);
-  curl_close($copy);
 
   var_dump( $curl_content_copy );
 ?>

ext/curl/tests/curl_copy_handle_basic_006.phpt

@@ -30,7 +30,11 @@ curl
   curl_close($copy);
 
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing curl copy handle with User Agent ***
 string(9) "cURL phpt"
 string(9) "cURL phpt"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d

ext/curl/tests/curl_copy_handle_basic_007.phpt

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

ext/curl/tests/curl_copy_handle_variation3.phpt

@@ -29,7 +29,11 @@ curl_close($ch2);
 --EXPECTF--
 bool(true)
 string(%d) "curl_copy_handle_variation3.txt|application/octet-stream|5"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 string(%d) "curl_copy_handle_variation3.txt|application/octet-stream|5"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/curl_copy_handle_variation3.txt');

ext/curl/tests/curl_copy_handle_variation5.phpt

@@ -42,8 +42,14 @@ curl_close($ch3);
 bool(true)
 bool(true)
 string(%d) "abc.txt|application/octet-stream|5"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 string(%d) "def.txt|application/octet-stream|11"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 string(%d) "def.txt|application/octet-stream|11"
+
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 ===DONE===
 --CLEAN--
 <?php

ext/curl/tests/curl_error_basic.phpt

@@ -33,8 +33,6 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
 curl_exec($ch);
 var_dump(curl_error($ch));
-curl_close($ch);
-
 ?>
 --EXPECTF--
 == Testing curl_error with a fake URL ==

ext/curl/tests/curl_file_deleted_before_curl_close.phpt

@@ -35,5 +35,6 @@ echo "Closed correctly\n";
 <?php
 unlink(__DIR__ . '/curl_file_deleted_before_curl_close.tmp');
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
 Closed correctly

ext/curl/tests/curl_file_upload.phpt

@@ -61,8 +61,6 @@ curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=post");
 $params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt');
 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/curl_file_upload_stream.phpt

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

ext/curl/tests/curl_ftp_pasv.phpt

@@ -50,8 +50,6 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
 
   $result  =  curl_exec ( $ch );
   var_dump ( $result );
-  curl_close ( $ch );
-
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_multi_info_read.phpt

@@ -25,10 +25,6 @@ do {
 while ($info = curl_multi_info_read($mh)) {
     var_dump($info);
 }
-
-foreach ($urls as $i => $url) {
-    curl_close($conn[$i]);
-}
 ?>
 --EXPECTF--
 array(3) {

ext/curl/tests/curl_multi_segfault.phpt

@@ -47,7 +47,6 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
 
   var_dump(is_string(curl_multi_getcontent($ch)));
   curl_multi_remove_handle($cmh, $ch);
-  curl_close($ch);
   curl_multi_close($cmh);
 ?>
 --EXPECT--

ext/curl/tests/curl_postfields_array.phpt

@@ -38,7 +38,6 @@ $ch = curl_init();
 curl_setopt_array($ch, $options);
 
 $curl_content = curl_exec($ch);
-curl_close($ch);
 	
 $conn = stream_socket_accept($socket);
 echo stream_get_contents($conn);

ext/curl/tests/curl_pushfunction.phpt

@@ -44,7 +44,6 @@ do {
             if ($handle !== null) {
 		        $responses[] = curl_multi_getcontent($info['handle']);
                 curl_multi_remove_handle($mh, $handle);
-                curl_close($handle);
             }
         }
     } while ($info);

ext/curl/tests/curl_pushfunction_trampoline.phpt

@@ -48,7 +48,6 @@ do {
             if ($handle !== null) {
 		        $responses[] = curl_multi_getcontent($info['handle']);
                 curl_multi_remove_handle($mh, $handle);
-                curl_close($handle);
             }
         }
     } while ($info);

ext/curl/tests/curl_read_callback.phpt

@@ -31,7 +31,6 @@ curl_setopt($oCurl, CURLOPT_UPLOAD,       1);
 curl_setopt($oCurl, CURLOPT_READFUNCTION, "custom_readfunction" );
 curl_setopt($oCurl, CURLOPT_INFILE,       $hReadHandle );
 curl_exec($oCurl);
-curl_close($oCurl);
 
 fclose ($hReadHandle);
 

ext/curl/tests/curl_read_trampoline.phpt

@@ -28,7 +28,6 @@ curl_setopt($oCurl, CURLOPT_UPLOAD,       1);
 curl_setopt($oCurl, CURLOPT_READFUNCTION, $callback);
 curl_setopt($oCurl, CURLOPT_INFILE,       $hReadHandle );
 curl_exec($oCurl);
-curl_close($oCurl);
 
 fclose ($hReadHandle);
 

ext/curl/tests/curl_reset.phpt

@@ -23,8 +23,6 @@ curl_reset($ch);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
 
-curl_close($ch);
-
 fclose($testfile_fp);
 
 echo file_get_contents($test_file);

ext/curl/tests/curl_setopt_CURLOPT_ACCEPT_ENCODING.phpt

@@ -24,8 +24,6 @@ echo curl_getinfo($ch, CURLINFO_HEADER_OUT);
 curl_setopt($ch, CURLOPT_ACCEPT_ENCODING, NULL);
 curl_exec($ch);
 echo curl_getinfo($ch, CURLINFO_HEADER_OUT);
-
-curl_close($ch);
 ?>
 --EXPECTF--
 GET /get.inc?test= HTTP/1.1

ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION.phpt

@@ -21,7 +21,6 @@ foreach ([
 	curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
 	var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $follow));
 	var_dump(curl_exec($ch));
-	curl_close($ch);
 }
 ?>
 --EXPECTF--

ext/curl/tests/curl_setopt_array_basic.phpt

@@ -43,7 +43,6 @@ ob_start(); // start output buffering
 
 curl_setopt_array($ch, $options);
 $returnContent = curl_exec($ch);
-curl_close($ch);
 
 var_dump($returnContent);
 isset($tempname) and is_file($tempname) and @unlink($tempname);

ext/curl/tests/curl_setopt_basic002.phpt

@@ -41,9 +41,6 @@ fclose($handle);
 unset($handle);
 var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);
-
-curl_close($ch);
-
 ?>
 --EXPECTF--
 *** Testing curl_setopt with CURLOPT_STDERR

ext/curl/tests/curl_setopt_basic003.phpt

@@ -24,7 +24,7 @@ try {
 }
 
 $curl_content = curl_exec($ch);
-curl_close($ch);
+$ch = null;
 
 var_dump( $curl_content );
 
@@ -36,7 +36,7 @@ curl_setopt($ch, CURLOPT_URL, $host);
 
 $curl_content = curl_exec($ch);
 ob_end_clean();
-curl_close($ch);
+$ch = null;
 
 var_dump( $curl_content );
 ?>

ext/curl/tests/curl_setopt_basic004.phpt

@@ -21,7 +21,7 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 curl_setopt($ch, CURLOPT_URL, $url);
 
 $curl_content = curl_exec($ch);
-curl_close($ch);
+$ch = null;
 
 var_dump( $curl_content );
 
@@ -34,7 +34,7 @@ curl_setopt($ch, CURLOPT_URL, $url);
 ob_start();
 $curl_content = curl_exec($ch);
 ob_end_clean();
-curl_close($ch);
+$ch = null;
 
 var_dump( $curl_content );
 ?>

ext/curl/tests/curl_setopt_ssl.phpt

@@ -82,7 +82,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 2: empty client cert and key from string\n";
@@ -96,7 +96,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 3: client cert and empty key from string\n";
@@ -110,7 +110,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 4: client cert and key from file\n";
@@ -124,7 +124,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 5: issuer cert from file\n";
@@ -140,7 +140,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 6: issuer cert from string\n";
@@ -156,7 +156,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
     echo "\n";
     echo "case 7: empty issuer cert from string\n";
@@ -172,7 +172,7 @@ try {
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
     check_error($ch);
-    curl_close($ch);
+    $ch = null;
 
 } finally {
     // clean up server process

ext/curl/tests/curl_ssh_hostkey_trampoline.phpt

@@ -33,8 +33,6 @@ var_dump($host);
 curl_setopt($ch, CURLOPT_URL, $url);
 var_dump(curl_setopt($ch, CURLOPT_SSH_HOSTKEYFUNCTION, $callback));
 curl_exec($ch);
-curl_close($ch);
-
 ?>
 --EXPECT--
 Trampoline for trampoline

ext/curl/tests/curl_upkeep_001.phpt

@@ -22,7 +22,6 @@ if (curl_exec($ch)) {
     usleep(300);
     var_dump(curl_upkeep($ch));
 }
-curl_close($ch);
 ?>
 --EXPECT--
 bool(true)

ext/curl/tests/curl_write_callback.phpt

@@ -26,7 +26,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_WRITEFUNCTION, 'curl_callback');
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
-curl_close($ch);
 
 // cleanup
 unlink($log_file);

ext/curl/tests/curl_write_file.phpt

@@ -23,7 +23,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_FILE, $testfile_fp);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
-curl_close($ch);
 
 fclose($testfile_fp);
 

ext/curl/tests/curl_write_return.phpt

@@ -21,7 +21,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 $result = curl_exec($ch);
-curl_close($ch);
 
 echo $result;
 

ext/curl/tests/curl_write_stdout.phpt

@@ -20,7 +20,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_FILE, STDOUT);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
-curl_close($ch);
 
 // cleanup
 unlink($log_file);

ext/curl/tests/curl_write_trampoline.phpt

@@ -24,7 +24,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_WRITEFUNCTION, $callback);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
-curl_close($ch);
 
 ?>
 --CLEAN--

ext/curl/tests/curl_writeheader_callback.phpt

@@ -24,8 +24,6 @@ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'curl_header_callback');
 curl_setopt($ch, CURLOPT_URL, $host);
 curl_exec($ch);
-curl_close($ch);
-
 ?>
 --EXPECTF--
 HTTP/1.1 %d %s

ext/curl/tests/skipif-nocaddy.inc

@@ -6,8 +6,6 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 
 $body = curl_exec($ch);
 
-curl_close($ch);
-
 if ($body !== "Caddy is up and running") {
     die("skip test needs Caddy");
 }