From 52ba0c17023885fd635c097ee069241505f550d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Thu, 17 Sep 2020 20:15:01 +0200 Subject: [PATCH 1/2] Improve parameter names in ext/curl --- ext/curl/curl.stub.php | 14 +++++++------- ext/curl/curl_arginfo.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php index c2951b1c6aa31..ecdf3cb9ced3a 100644 --- a/ext/curl/curl.stub.php +++ b/ext/curl/curl.stub.php @@ -33,7 +33,7 @@ function curl_multi_setopt(CurlMultiHandle $multi_handle, int $option, mixed $va function curl_exec(CurlHandle $handle): string|bool {} -function curl_file_create(string $filename, ?string $mimetype = null, ?string $postname = null): CURLFile {} +function curl_file_create(string $filename, ?string $mime_type = null, ?string $posted_filename = null): CURLFile {} function curl_getinfo(CurlHandle $handle, ?int $option = null): mixed {} @@ -50,8 +50,8 @@ function curl_multi_exec(CurlMultiHandle $multi_handle, &$still_running): int {} function curl_multi_getcontent(CurlHandle $multi_handle): ?string {} -/** @param int|null $msgs_in_queue */ -function curl_multi_info_read(CurlMultiHandle $multi_handle, &$msgs_in_queue = null): array|false {} +/** @param int $queued_message_count */ +function curl_multi_info_read(CurlMultiHandle $multi_handle, &$queued_message_count = null): array|false {} function curl_multi_init(): CurlMultiHandle {} @@ -59,10 +59,10 @@ function curl_multi_remove_handle(CurlMultiHandle $multi_handle, CurlHandle $han function curl_multi_select(CurlMultiHandle $multi_handle, float $timeout = 1.0): int {} -function curl_multi_strerror(int $error_number): ?string {} +function curl_multi_strerror(int $error_code): ?string {} #if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */ -function curl_pause(CurlHandle $handle, int $bitmask): int {} +function curl_pause(CurlHandle $handle, int $options): int {} #endif function curl_reset(CurlHandle $handle): void {} @@ -79,8 +79,8 @@ function curl_share_init(): CurlShareHandle {} function curl_share_setopt(CurlShareHandle $share_handle, int $option, mixed $value): bool {} -function curl_share_strerror(int $error_number): ?string {} +function curl_share_strerror(int $error_code): ?string {} -function curl_strerror(int $error_number): ?string {} +function curl_strerror(int $error_code): ?string {} function curl_version(): array|false {} diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h index 30f2e839a815a..b8e16bf945db7 100644 --- a/ext/curl/curl_arginfo.h +++ b/ext/curl/curl_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ca65615cacfe914f3511007fd393169ffededf34 */ + * Stub hash: 83e2035ae9ce2a53e132ff47e8030ef4bffe638b */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0) @@ -42,8 +42,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_curl_file_create, 0, 1, CURLFile, 0) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mimetype, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, postname, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mime_type, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, posted_filename, IS_STRING, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_getinfo, 0, 1, IS_MIXED, 0) @@ -79,7 +79,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_multi_info_read, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_OBJ_INFO(0, multi_handle, CurlMultiHandle, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, msgs_in_queue, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, queued_message_count, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_curl_multi_init, 0, 0, CurlMultiHandle, 0) @@ -93,13 +93,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_select, 0, 1, IS_LONG ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_strerror, 0, 1, IS_STRING, 1) - ZEND_ARG_TYPE_INFO(0, error_number, IS_LONG, 0) + 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, bitmask, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) ZEND_END_ARG_INFO() #endif From 35cc06bb462d0c3ba4d2c3cf73b34a4db248c662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 22 Sep 2020 22:42:06 +0200 Subject: [PATCH 2/2] Address comments --- ext/curl/curl.stub.php | 6 +++--- ext/curl/curl_arginfo.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php index ecdf3cb9ced3a..2eba460d6c66a 100644 --- a/ext/curl/curl.stub.php +++ b/ext/curl/curl.stub.php @@ -50,8 +50,8 @@ function curl_multi_exec(CurlMultiHandle $multi_handle, &$still_running): int {} function curl_multi_getcontent(CurlHandle $multi_handle): ?string {} -/** @param int $queued_message_count */ -function curl_multi_info_read(CurlMultiHandle $multi_handle, &$queued_message_count = null): array|false {} +/** @param int $queued_messages */ +function curl_multi_info_read(CurlMultiHandle $multi_handle, &$queued_messages = null): array|false {} function curl_multi_init(): CurlMultiHandle {} @@ -62,7 +62,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 $options): int {} +function curl_pause(CurlHandle $handle, int $flags): int {} #endif function curl_reset(CurlHandle $handle): void {} diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h index b8e16bf945db7..e213f9d3184e7 100644 --- a/ext/curl/curl_arginfo.h +++ b/ext/curl/curl_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 83e2035ae9ce2a53e132ff47e8030ef4bffe638b */ + * Stub hash: afeae538b49eb43a661e5b491da79c17d10c6bfe */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0) @@ -79,7 +79,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_multi_info_read, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_OBJ_INFO(0, multi_handle, CurlMultiHandle, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, queued_message_count, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, queued_messages, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_curl_multi_init, 0, 0, CurlMultiHandle, 0) @@ -99,7 +99,7 @@ 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, options, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0) ZEND_END_ARG_INFO() #endif