summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-09-29 22:32:23 +0200
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-09-30 10:10:28 +0200
commit26af8068288ac58127fcccb26cfe2f353c71bd3a (patch)
tree93e26c40ccfef4b9db58a360439ffb2b70f69a2f
parentfe64d73979506d21469a96492cdd6320dc683aaf (diff)
downloadphp-git-26af8068288ac58127fcccb26cfe2f353c71bd3a.tar.gz
Review parameter names in ext/readline
Closes GH-6240
-rw-r--r--ext/readline/readline.stub.php6
-rw-r--r--ext/readline/readline_arginfo.h8
-rw-r--r--ext/readline/tests/readline_completion_function_001.phpt4
3 files changed, 9 insertions, 9 deletions
diff --git a/ext/readline/readline.stub.php b/ext/readline/readline.stub.php
index ecd81416eb..cfc1d0d8d5 100644
--- a/ext/readline/readline.stub.php
+++ b/ext/readline/readline.stub.php
@@ -5,10 +5,10 @@
function readline(?string $prompt = null): string|false {}
/**
- * @param int|string|bool|null $newvalue
+ * @param int|string|bool|null $value
* @return array|int|string|bool|null
*/
-function readline_info(?string $varname = null, $newvalue = null): mixed {}
+function readline_info(?string $var_name = null, $value = null): mixed {}
function readline_add_history(string $prompt): bool {}
@@ -22,7 +22,7 @@ function readline_read_history(?string $filename = null): bool {}
function readline_write_history(?string $filename = null): bool {}
-function readline_completion_function(callable $funcname): bool {}
+function readline_completion_function(callable $callback): bool {}
#if HAVE_RL_CALLBACK_READ_CHAR
diff --git a/ext/readline/readline_arginfo.h b/ext/readline/readline_arginfo.h
index a83773b786..0b432d1e4e 100644
--- a/ext/readline/readline_arginfo.h
+++ b/ext/readline/readline_arginfo.h
@@ -1,13 +1,13 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c7d13f6960171cab30984837379db25b32f38c36 */
+ * Stub hash: 226b138a99e3e32aea90cbb5c44446ac7c16db71 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_readline, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prompt, IS_STRING, 1, "null")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_info, 0, 0, IS_MIXED, 0)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, varname, IS_STRING, 1, "null")
- ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, newvalue, "null")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, var_name, IS_STRING, 1, "null")
+ ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, value, "null")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_add_history, 0, 1, _IS_BOOL, 0)
@@ -29,7 +29,7 @@ ZEND_END_ARG_INFO()
#define arginfo_readline_write_history arginfo_readline_read_history
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_completion_function, 0, 1, _IS_BOOL, 0)
- ZEND_ARG_TYPE_INFO(0, funcname, IS_CALLABLE, 0)
+ ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
ZEND_END_ARG_INFO()
#if HAVE_RL_CALLBACK_READ_CHAR
diff --git a/ext/readline/tests/readline_completion_function_001.phpt b/ext/readline/tests/readline_completion_function_001.phpt
index 2556027bff..98fae6bbc0 100644
--- a/ext/readline/tests/readline_completion_function_001.phpt
+++ b/ext/readline/tests/readline_completion_function_001.phpt
@@ -26,5 +26,5 @@ foreach ($data as $callback) {
--EXPECT--
bool(true)
bool(true)
-readline_completion_function(): Argument #1 ($funcname) must be a valid callback, no array or string given
-readline_completion_function(): Argument #1 ($funcname) must be a valid callback, no array or string given
+readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given
+readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given