From d1c2807a3a6d6a4d91a0690cdcd389dfee8ddb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Mon, 28 Sep 2020 22:48:34 +0200 Subject: [PATCH 1/2] Rename a few parameters in ext/filter --- ext/filter/filter.stub.php | 8 ++++---- ext/filter/filter_arginfo.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/filter/filter.stub.php b/ext/filter/filter.stub.php index 56f926b913f3c..738863a0fcaa9 100644 --- a/ext/filter/filter.stub.php +++ b/ext/filter/filter.stub.php @@ -2,11 +2,11 @@ /** @generate-function-entries */ -function filter_has_var(int $type, string $variable_name): bool {} +function filter_has_var(int $type, string $var_name): bool {} -function filter_input(int $type, string $variable_name, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} +function filter_input(int $type, string $var_name, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} -function filter_var(mixed $variable, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} +function filter_var(mixed $var, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} function filter_input_array(int $type, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {} @@ -14,4 +14,4 @@ function filter_var_array(array $data, array|int $options = FILTER_DEFAULT, bool function filter_list(): array {} -function filter_id(string $filtername): int|false {} +function filter_id(string $name): int|false {} diff --git a/ext/filter/filter_arginfo.h b/ext/filter/filter_arginfo.h index bb3ab54666c5b..9cb442487e73a 100644 --- a/ext/filter/filter_arginfo.h +++ b/ext/filter/filter_arginfo.h @@ -1,20 +1,20 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: dae0cf8beeb47a996123cffd3b429482047d42c1 */ + * Stub hash: f142a4ab193423967ce78e39d15a2d3eba14b901 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, variable_name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, var_name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_input, 0, 2, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, variable_name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, var_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT") ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_var, 0, 1, IS_MIXED, 0) - ZEND_ARG_TYPE_INFO(0, variable, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, var, IS_MIXED, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT") ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "0") ZEND_END_ARG_INFO() @@ -35,7 +35,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_list, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_id, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) - ZEND_ARG_TYPE_INFO(0, filtername, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() From 5e887468e19976c682fe1fe0cac1c76728291e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 29 Sep 2020 10:10:48 +0200 Subject: [PATCH 2/2] Address review comments --- ext/filter/filter.stub.php | 6 +++--- ext/filter/filter_arginfo.h | 8 ++++---- ext/filter/tests/040.phpt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/filter/filter.stub.php b/ext/filter/filter.stub.php index 738863a0fcaa9..de92b935192a7 100644 --- a/ext/filter/filter.stub.php +++ b/ext/filter/filter.stub.php @@ -2,15 +2,15 @@ /** @generate-function-entries */ -function filter_has_var(int $type, string $var_name): bool {} +function filter_has_var(int $input_type, string $var_name): bool {} function filter_input(int $type, string $var_name, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} -function filter_var(mixed $var, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} +function filter_var(mixed $value, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {} function filter_input_array(int $type, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {} -function filter_var_array(array $data, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {} +function filter_var_array(array $array, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {} function filter_list(): array {} diff --git a/ext/filter/filter_arginfo.h b/ext/filter/filter_arginfo.h index 9cb442487e73a..c4e4479e792a9 100644 --- a/ext/filter/filter_arginfo.h +++ b/ext/filter/filter_arginfo.h @@ -1,8 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: f142a4ab193423967ce78e39d15a2d3eba14b901 */ + * Stub hash: b5f2e4a79eb6f30fe143b3086845435d0a0a6ef0 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, input_type, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, var_name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -14,7 +14,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_input, 0, 2, IS_MIXED, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_var, 0, 1, IS_MIXED, 0) - ZEND_ARG_TYPE_INFO(0, var, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT") ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "0") ZEND_END_ARG_INFO() @@ -26,7 +26,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_input_array, 0, 1, MAY_BE ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_var_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL) - ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0) ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "FILTER_DEFAULT") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, add_empty, _IS_BOOL, 0, "true") ZEND_END_ARG_INFO() diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt index 6f0a79199f2ef..1d742c89a49b1 100644 --- a/ext/filter/tests/040.phpt +++ b/ext/filter/tests/040.phpt @@ -34,6 +34,6 @@ bool(true) bool(true) bool(false) bool(false) -filter_has_var(): Argument #1 ($type) must be an INPUT_* constant +filter_has_var(): Argument #1 ($input_type) must be an INPUT_* constant bool(false) Done