Remove unnecessary curl version guards in stubs

We have bumped the libcurl requirement to 7.29.0 in PHP 8.1,
but the function declarations in the stubs were still conditional
on the curl version. Drop them to make it more obvious that these
functions are always available.

Author: nikic

ext/curl/curl.stub.php

@@ -25,15 +25,12 @@ function curl_errno(CurlHandle $handle): int {}
 
 function curl_error(CurlHandle $handle): string {}
 
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 function curl_escape(CurlHandle $handle, string $string): string|false {}
 
 function curl_unescape(CurlHandle $handle, string $string): string|false {}
 
 function curl_multi_setopt(CurlMultiHandle $multi_handle, int $option, mixed $value): bool {}
 
-#endif
-
 function curl_exec(CurlHandle $handle): string|bool {}
 
 function curl_file_create(string $filename, ?string $mime_type = null, ?string $posted_filename = null): CURLFile {}
@@ -64,9 +61,7 @@ function curl_multi_select(CurlMultiHandle $multi_handle, float $timeout = 1.0):
 
 function curl_multi_strerror(int $error_code): ?string {}
 
-#if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */
 function curl_pause(CurlHandle $handle, int $flags): int {}
-#endif
 
 function curl_reset(CurlHandle $handle): void {}
 

ext/curl/curl_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b0f2f56d0a38656637190456e5ebd87bf052ee14 */
+ * Stub hash: 0b574385806ffec3ad96c1b584778cb53bd42535 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -17,24 +17,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_error, 0, 1, IS_STRING, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
 ZEND_END_ARG_INFO()
 
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_escape, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 #define arginfo_curl_unescape arginfo_curl_escape
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_setopt, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, multi_handle, CurlMultiHandle, 0)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
-#endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_exec, 0, 1, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -96,12 +90,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_strerror, 0, 1, IS_ST
 	ZEND_ARG_TYPE_INFO(0, error_code, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_pause, 0, 2, IS_LONG, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
-#endif
 
 #define arginfo_curl_reset arginfo_curl_close
 
@@ -145,15 +137,9 @@ ZEND_FUNCTION(curl_close);
 ZEND_FUNCTION(curl_copy_handle);
 ZEND_FUNCTION(curl_errno);
 ZEND_FUNCTION(curl_error);
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 ZEND_FUNCTION(curl_escape);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 ZEND_FUNCTION(curl_unescape);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 ZEND_FUNCTION(curl_multi_setopt);
-#endif
 ZEND_FUNCTION(curl_exec);
 ZEND_FUNCTION(curl_file_create);
 ZEND_FUNCTION(curl_getinfo);
@@ -168,9 +154,7 @@ ZEND_FUNCTION(curl_multi_init);
 ZEND_FUNCTION(curl_multi_remove_handle);
 ZEND_FUNCTION(curl_multi_select);
 ZEND_FUNCTION(curl_multi_strerror);
-#if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */
 ZEND_FUNCTION(curl_pause);
-#endif
 ZEND_FUNCTION(curl_reset);
 ZEND_FUNCTION(curl_setopt_array);
 ZEND_FUNCTION(curl_setopt);
@@ -188,15 +172,9 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(curl_copy_handle, arginfo_curl_copy_handle)
 	ZEND_FE(curl_errno, arginfo_curl_errno)
 	ZEND_FE(curl_error, arginfo_curl_error)
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 	ZEND_FE(curl_escape, arginfo_curl_escape)
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 	ZEND_FE(curl_unescape, arginfo_curl_unescape)
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
 	ZEND_FE(curl_multi_setopt, arginfo_curl_multi_setopt)
-#endif
 	ZEND_FE(curl_exec, arginfo_curl_exec)
 	ZEND_FE(curl_file_create, arginfo_curl_file_create)
 	ZEND_FE(curl_getinfo, arginfo_curl_getinfo)
@@ -211,9 +189,7 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(curl_multi_remove_handle, arginfo_curl_multi_remove_handle)
 	ZEND_FE(curl_multi_select, arginfo_curl_multi_select)
 	ZEND_FE(curl_multi_strerror, arginfo_curl_multi_strerror)
-#if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */
 	ZEND_FE(curl_pause, arginfo_curl_pause)
-#endif
 	ZEND_FE(curl_reset, arginfo_curl_reset)
 	ZEND_FE(curl_setopt_array, arginfo_curl_setopt_array)
 	ZEND_FE(curl_setopt, arginfo_curl_setopt)