Skip to content

Commit 086f58f

Browse files
nikicnikic
committed
Review updates
1 parent d02fc96 commit 086f58f

8 files changed

+33
-33
lines changed

‎ext/mbstring/mbstring.stub.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ function mb_substitute_character(string|int|null $substitute_character = null):
1717
function mb_preferred_mime_name(string $encoding): string|false {}
1818

1919
/** @param array $result */
20-
function mb_parse_str(string $encoded_string, &$result): bool {}
20+
function mb_parse_str(string $string, &$result): bool {}
2121

22-
function mb_output_handler(string $contents, int $status): string {}
22+
function mb_output_handler(string $string, int $status): string {}
2323

2424
function mb_str_split(string $string, int $length = 1, ?string $encoding = null): array {}
2525

@@ -59,25 +59,25 @@ function mb_strtoupper(string $string, ?string $encoding = null): string {}
5959

6060
function mb_strtolower(string $string, ?string $encoding = null): string {}
6161

62-
function mb_detect_encoding(string $string, array|string|null $encoding_list = null, bool $strict = false): string|false {}
62+
function mb_detect_encoding(string $string, array|string|null $encodings = null, bool $strict = false): string|false {}
6363

6464
function mb_list_encodings(): array {}
6565

6666
function mb_encoding_aliases(string $encoding): array {}
6767

68-
function mb_encode_mimeheader(string $string, ?string $charset = null, ?string $transfer_encoding = null, string $linefeed = "\r\n", int $indent = 0): string {}
68+
function mb_encode_mimeheader(string $string, ?string $charset = null, ?string $transfer_encoding = null, string $newline = "\r\n", int $indent = 0): string {}
6969

7070
function mb_decode_mimeheader(string $string): string {}
7171

7272
function mb_convert_kana(string $string, string $mode = "KV", ?string $encoding = null): string {}
7373

7474
function mb_convert_variables(string $to_encoding, array|string $from_encoding, mixed &$var, mixed &...$vars): string|false {}
7575

76-
function mb_encode_numericentity(string $string, array $map, ?string $encoding = null, bool $use_hex = false): string {}
76+
function mb_encode_numericentity(string $string, array $map, ?string $encoding = null, bool $hex = false): string {}
7777

7878
function mb_decode_numericentity(string $string, array $map, ?string $encoding = null): string {}
7979

80-
function mb_send_mail(string $to, string $subject, string $message, array|string $additional_headers = [], ?string $additional_parameters = null): bool {}
80+
function mb_send_mail(string $to, string $subject, string $message, array|string $additional_headers = [], ?string $additional_params = null): bool {}
8181

8282
function mb_get_info(string $type = "all"): array|string|int|false {}
8383

@@ -92,11 +92,11 @@ function mb_chr(int $codepoint, ?string $encoding = null): string|false {}
9292
#ifdef HAVE_MBREGEX
9393
function mb_regex_encoding(?string $encoding = null): string|bool {}
9494

95-
/** @param array $registers */
96-
function mb_ereg(string $pattern, string $string, &$registers = null): int|false {}
95+
/** @param array $matches */
96+
function mb_ereg(string $pattern, string $string, &$matches = null): int|false {}
9797

98-
/** @param array $registers */
99-
function mb_eregi(string $pattern, string $string, &$registers = null): int|false {}
98+
/** @param array $matches */
99+
function mb_eregi(string $pattern, string $string, &$matches = null): int|false {}
100100

101101
function mb_ereg_replace(string $pattern, string $replacement, string $string, ?string $options = null): string|false|null {}
102102

@@ -120,7 +120,7 @@ function mb_ereg_search_getregs(): array|false {}
120120

121121
function mb_ereg_search_getpos(): int {}
122122

123-
function mb_ereg_search_setpos(int $position): bool {}
123+
function mb_ereg_search_setpos(int $offset): bool {}
124124

125125
function mb_regex_set_options(?string $options = null): string {}
126126
#endif

‎ext/mbstring/mbstring_arginfo.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 78f2c0279d16ea58c551260b84d3504177ae4733 */
2+
* Stub hash: 3e5b45cf71fe75bde026062816cb28eceea4aa38 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL)
55
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null")
@@ -28,12 +28,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_preferred_mime_name, 0, 1, MA
2828
ZEND_END_ARG_INFO()
2929

3030
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_parse_str, 0, 2, _IS_BOOL, 0)
31-
ZEND_ARG_TYPE_INFO(0, encoded_string, IS_STRING, 0)
31+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
3232
ZEND_ARG_INFO(1, result)
3333
ZEND_END_ARG_INFO()
3434

3535
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_output_handler, 0, 2, IS_STRING, 0)
36-
ZEND_ARG_TYPE_INFO(0, contents, IS_STRING, 0)
36+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
3737
ZEND_ARG_TYPE_INFO(0, status, IS_LONG, 0)
3838
ZEND_END_ARG_INFO()
3939

@@ -120,7 +120,7 @@ ZEND_END_ARG_INFO()
120120

121121
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_detect_encoding, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
122122
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
123-
ZEND_ARG_TYPE_MASK(0, encoding_list, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
123+
ZEND_ARG_TYPE_MASK(0, encodings, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
124124
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, strict, _IS_BOOL, 0, "false")
125125
ZEND_END_ARG_INFO()
126126

@@ -135,7 +135,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_encode_mimeheader, 0, 1, IS_S
135135
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
136136
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
137137
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, transfer_encoding, IS_STRING, 1, "null")
138-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, linefeed, IS_STRING, 0, "\"\\r\\n\"")
138+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, newline, IS_STRING, 0, "\"\\r\\n\"")
139139
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, indent, IS_LONG, 0, "0")
140140
ZEND_END_ARG_INFO()
141141

@@ -160,7 +160,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_encode_numericentity, 0, 2, I
160160
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
161161
ZEND_ARG_TYPE_INFO(0, map, IS_ARRAY, 0)
162162
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
163-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, use_hex, _IS_BOOL, 0, "false")
163+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, hex, _IS_BOOL, 0, "false")
164164
ZEND_END_ARG_INFO()
165165

166166
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_decode_numericentity, 0, 2, IS_STRING, 0)
@@ -174,7 +174,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_send_mail, 0, 3, _IS_BOOL, 0)
174174
ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
175175
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
176176
ZEND_ARG_TYPE_MASK(0, additional_headers, MAY_BE_ARRAY|MAY_BE_STRING, "[]")
177-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_parameters, IS_STRING, 1, "null")
177+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_params, IS_STRING, 1, "null")
178178
ZEND_END_ARG_INFO()
179179

180180
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_get_info, 0, 0, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE)
@@ -208,7 +208,7 @@ ZEND_END_ARG_INFO()
208208
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
209209
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
210210
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
211-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, registers, "null")
211+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matches, "null")
212212
ZEND_END_ARG_INFO()
213213
#endif
214214

@@ -292,7 +292,7 @@ ZEND_END_ARG_INFO()
292292

293293
#if defined(HAVE_MBREGEX)
294294
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_ereg_search_setpos, 0, 1, _IS_BOOL, 0)
295-
ZEND_ARG_TYPE_INFO(0, position, IS_LONG, 0)
295+
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
296296
ZEND_END_ARG_INFO()
297297
#endif
298298

‎ext/mbstring/tests/mb_detect_encoding.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ SJIS: SJIS
108108
== INVALID PARAMETER ==
109109
INT: EUC-JP
110110
EUC-JP: EUC-JP
111-
mb_detect_encoding(): Argument #2 ($encoding_list) contains invalid encoding "BAD"
111+
mb_detect_encoding(): Argument #2 ($encodings) contains invalid encoding "BAD"

‎ext/mbstring/tests/mb_detect_encoding_empty_encoding_list.phpt

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

2323
?>
2424
--EXPECT--
25-
mb_detect_encoding(): Argument #2 ($encoding_list) must specify at least one encoding
26-
mb_detect_encoding(): Argument #2 ($encoding_list) must specify at least one encoding
25+
mb_detect_encoding(): Argument #2 ($encodings) must specify at least one encoding
26+
mb_detect_encoding(): Argument #2 ($encodings) must specify at least one encoding

‎ext/mbstring/tests/mb_ereg_search_setpos.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ foreach($positions as $pos) {
3636
?>
3737
--EXPECT--
3838
bool(true)
39-
mb_ereg_search_setpos(): Argument #1 ($position) is out of range
39+
mb_ereg_search_setpos(): Argument #1 ($offset) is out of range
4040

4141
* Position: 5 :
4242
bool(true)
@@ -47,11 +47,11 @@ bool(true)
4747
int(20)
4848

4949
* Position: 21 :
50-
mb_ereg_search_setpos(): Argument #1 ($position) is out of range
50+
mb_ereg_search_setpos(): Argument #1 ($offset) is out of range
5151
int(20)
5252

5353
* Position: 25 :
54-
mb_ereg_search_setpos(): Argument #1 ($position) is out of range
54+
mb_ereg_search_setpos(): Argument #1 ($offset) is out of range
5555
int(20)
5656

5757
* Position: 0 :
@@ -67,5 +67,5 @@ bool(true)
6767
int(0)
6868

6969
* Position: -30 :
70-
mb_ereg_search_setpos(): Argument #1 ($position) is out of range
70+
mb_ereg_search_setpos(): Argument #1 ($offset) is out of range
7171
int(0)

‎ext/mbstring/tests/mb_send_mail_null_bytes.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ mb_send_mail(): Argument #1 ($to) must not contain any null bytes
3535
mb_send_mail(): Argument #2 ($subject) must not contain any null bytes
3636
mb_send_mail(): Argument #3 ($message) must not contain any null bytes
3737
mb_send_mail(): Argument #4 ($additional_headers) must not contain any null bytes
38-
mb_send_mail(): Argument #5 ($additional_parameters) must not contain any null bytes
38+
mb_send_mail(): Argument #5 ($additional_params) must not contain any null bytes

‎ext/standard/basic_functions.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ function strip_tags(string $str, array|string|null $allowable_tags = null): stri
652652
function setlocale(int $category, $locales, ...$rest): string|false {}
653653

654654
/** @param array $result */
655-
function parse_str(string $encoded_string, &$result): void {}
655+
function parse_str(string $string, &$result): void {}
656656

657657
function str_getcsv(string $string, string $delimiter = ",", string $enclosure = "\"", string $escape = '\\'): array {}
658658

@@ -1027,7 +1027,7 @@ function link(string $target, string $link): bool {}
10271027

10281028
/* mail.c */
10291029

1030-
function mail(string $to, string $subject, string $message, array|string $additional_headers = [], string $additional_parameters = ""): bool {}
1030+
function mail(string $to, string $subject, string $message, array|string $additional_headers = [], string $additional_params = ""): bool {}
10311031

10321032
/* math.c */
10331033

‎ext/standard/basic_functions_arginfo.h

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

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -1012,7 +1012,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_setlocale, 0, 2, MAY_BE_STRING|M
10121012
ZEND_END_ARG_INFO()
10131013

10141014
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_parse_str, 0, 2, IS_VOID, 0)
1015-
ZEND_ARG_TYPE_INFO(0, encoded_string, IS_STRING, 0)
1015+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
10161016
ZEND_ARG_INFO(1, result)
10171017
ZEND_END_ARG_INFO()
10181018

@@ -1595,7 +1595,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mail, 0, 3, _IS_BOOL, 0)
15951595
ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
15961596
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
15971597
ZEND_ARG_TYPE_MASK(0, additional_headers, MAY_BE_ARRAY|MAY_BE_STRING, "[]")
1598-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_parameters, IS_STRING, 0, "\"\"")
1598+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_params, IS_STRING, 0, "\"\"")
15991599
ZEND_END_ARG_INFO()
16001600

16011601
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_abs, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE)

0 commit comments

Comments
 (0)