Skip to content

Commit 0ec6452

Browse files
committed
Rename a few parameters in ext/filter
Closes GH-6229
1 parent 7aa2d35 commit 0ec6452

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

ext/filter/filter.stub.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
/** @generate-function-entries */
44

5-
function filter_has_var(int $type, string $variable_name): bool {}
5+
function filter_has_var(int $input_type, string $var_name): bool {}
66

7-
function filter_input(int $type, string $variable_name, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {}
7+
function filter_input(int $type, string $var_name, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {}
88

9-
function filter_var(mixed $variable, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {}
9+
function filter_var(mixed $value, int $filter = FILTER_DEFAULT, array|int $options = 0): mixed {}
1010

1111
function filter_input_array(int $type, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {}
1212

13-
function filter_var_array(array $data, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {}
13+
function filter_var_array(array $array, array|int $options = FILTER_DEFAULT, bool $add_empty = true): array|false|null {}
1414

1515
function filter_list(): array {}
1616

17-
function filter_id(string $filtername): int|false {}
17+
function filter_id(string $name): int|false {}

ext/filter/filter_arginfo.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: dae0cf8beeb47a996123cffd3b429482047d42c1 */
2+
* Stub hash: b5f2e4a79eb6f30fe143b3086845435d0a0a6ef0 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0)
5-
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
6-
ZEND_ARG_TYPE_INFO(0, variable_name, IS_STRING, 0)
5+
ZEND_ARG_TYPE_INFO(0, input_type, IS_LONG, 0)
6+
ZEND_ARG_TYPE_INFO(0, var_name, IS_STRING, 0)
77
ZEND_END_ARG_INFO()
88

99
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_input, 0, 2, IS_MIXED, 0)
1010
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
11-
ZEND_ARG_TYPE_INFO(0, variable_name, IS_STRING, 0)
11+
ZEND_ARG_TYPE_INFO(0, var_name, IS_STRING, 0)
1212
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT")
1313
ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "0")
1414
ZEND_END_ARG_INFO()
1515

1616
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_var, 0, 1, IS_MIXED, 0)
17-
ZEND_ARG_TYPE_INFO(0, variable, IS_MIXED, 0)
17+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
1818
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT")
1919
ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "0")
2020
ZEND_END_ARG_INFO()
@@ -26,7 +26,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_input_array, 0, 1, MAY_BE
2626
ZEND_END_ARG_INFO()
2727

2828
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_var_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
29-
ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
29+
ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
3030
ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "FILTER_DEFAULT")
3131
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, add_empty, _IS_BOOL, 0, "true")
3232
ZEND_END_ARG_INFO()
@@ -35,7 +35,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_list, 0, 0, IS_ARRAY, 0)
3535
ZEND_END_ARG_INFO()
3636

3737
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_id, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
38-
ZEND_ARG_TYPE_INFO(0, filtername, IS_STRING, 0)
38+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
3939
ZEND_END_ARG_INFO()
4040

4141

ext/filter/tests/040.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ bool(true)
3434
bool(true)
3535
bool(false)
3636
bool(false)
37-
filter_has_var(): Argument #1 ($type) must be an INPUT_* constant
37+
filter_has_var(): Argument #1 ($input_type) must be an INPUT_* constant
3838
bool(false)
3939
Done

0 commit comments

Comments
 (0)