Skip to content

Commit cafceea

Browse files
nikicnikic
committed
Update mbstring parameter names
Closes GH-6207.
1 parent d411ea2 commit cafceea

19 files changed

+92
-92
lines changed

‎ext/mbstring/mbstring.stub.php

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ 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

24-
function mb_str_split(string $string, int $split_length = 1, ?string $encoding = null): array {}
24+
function mb_str_split(string $string, int $length = 1, ?string $encoding = null): array {}
2525

2626
function mb_strlen(string $string, ?string $encoding = null): int {}
2727

@@ -33,13 +33,13 @@ function mb_stripos(string $haystack, string $needle, int $offset = 0, ?string $
3333

3434
function mb_strripos(string $haystack, string $needle, int $offset = 0, ?string $encoding = null): int|false {}
3535

36-
function mb_strstr(string $haystack, string $needle, bool $part = false, ?string $encoding = null): string|false {}
36+
function mb_strstr(string $haystack, string $needle, bool $before_needle = false, ?string $encoding = null): string|false {}
3737

38-
function mb_strrchr(string $haystack, string $needle, bool $part = false, ?string $encoding = null): string|false {}
38+
function mb_strrchr(string $haystack, string $needle, bool $before_needle = false, ?string $encoding = null): string|false {}
3939

40-
function mb_stristr(string $haystack, string $needle, bool $part = false, ?string $encoding = null): string|false {}
40+
function mb_stristr(string $haystack, string $needle, bool $before_needle = false, ?string $encoding = null): string|false {}
4141

42-
function mb_strrichr(string $haystack, string $needle, bool $part = false, ?string $encoding = null): string|false {}
42+
function mb_strrichr(string $haystack, string $needle, bool $before_needle = false, ?string $encoding = null): string|false {}
4343

4444
function mb_substr_count(string $haystack, string $needle, ?string $encoding = null): int {}
4545

@@ -51,76 +51,76 @@ function mb_strwidth(string $string, ?string $encoding = null): int {}
5151

5252
function mb_strimwidth(string $string, int $start, int $width, string $trim_marker = "", ?string $encoding = null): string {}
5353

54-
function mb_convert_encoding(array|string $string, string $to, array|string|null $from = null): array|string|false {}
54+
function mb_convert_encoding(array|string $string, string $to_encoding, array|string|null $from_encoding = null): array|string|false {}
5555

5656
function mb_convert_case(string $string, int $mode, ?string $encoding = null): string {}
5757

5858
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 = 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

72-
function mb_convert_kana(string $string, string $option = "KV", ?string $encoding = null): string {}
72+
function mb_convert_kana(string $string, string $mode = "KV", ?string $encoding = null): string {}
7373

74-
function mb_convert_variables(string $to, array|string $from, mixed &$var, mixed &...$vars): string|false {}
74+
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 $convmap, ?string $encoding = null, bool $is_hex = false): string {}
76+
function mb_encode_numericentity(string $string, array $map, ?string $encoding = null, bool $hex = false): string {}
7777

78-
function mb_decode_numericentity(string $string, array $convmap, ?string $encoding = null): string {}
78+
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

84-
function mb_check_encoding(array|string|null $var = null, ?string $encoding = null): bool {}
84+
function mb_check_encoding(array|string|null $value = null, ?string $encoding = null): bool {}
8585

8686
function mb_scrub(string $string, ?string $encoding = null): string {}
8787

8888
function mb_ord(string $string, ?string $encoding = null): int|false {}
8989

90-
function mb_chr(int $cp, ?string $encoding = null): string|false {}
90+
function mb_chr(int $codepoint, ?string $encoding = null): string|false {}
9191

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

101-
function mb_ereg_replace(string $pattern, string $replacement, string $string, ?string $option = null): string|false|null {}
101+
function mb_ereg_replace(string $pattern, string $replacement, string $string, ?string $options = null): string|false|null {}
102102

103-
function mb_eregi_replace(string $pattern, string $replacement, string $string, ?string $option = null): string|false|null {}
103+
function mb_eregi_replace(string $pattern, string $replacement, string $string, ?string $options = null): string|false|null {}
104104

105-
function mb_ereg_replace_callback(string $pattern, callable $callback, string $string, ?string $option = null): string|false|null {}
105+
function mb_ereg_replace_callback(string $pattern, callable $callback, string $string, ?string $options = null): string|false|null {}
106106

107107
function mb_split(string $pattern, string $string, int $limit = -1): array|false {}
108108

109-
function mb_ereg_match(string $pattern, string $string, ?string $option = null): bool {}
109+
function mb_ereg_match(string $pattern, string $string, ?string $options = null): bool {}
110110

111-
function mb_ereg_search(?string $pattern = null, ?string $option = null): bool {}
111+
function mb_ereg_search(?string $pattern = null, ?string $options = null): bool {}
112112

113-
function mb_ereg_search_pos(?string $pattern = null, ?string $option = null): array|false {}
113+
function mb_ereg_search_pos(?string $pattern = null, ?string $options = null): array|false {}
114114

115-
function mb_ereg_search_regs(?string $pattern = null, ?string $option = null): array|false {}
115+
function mb_ereg_search_regs(?string $pattern = null, ?string $options = null): array|false {}
116116

117-
function mb_ereg_search_init(string $string, ?string $pattern = null, ?string $option = null): bool {}
117+
function mb_ereg_search_init(string $string, ?string $pattern = null, ?string $options = null): bool {}
118118

119119
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: 27 additions & 27 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: 85cabf678a06175d4da073be79a0951d4f3786ed */
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,18 +28,18 @@ 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

4040
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_str_split, 0, 1, IS_ARRAY, 0)
4141
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
42-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, split_length, IS_LONG, 0, "1")
42+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "1")
4343
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
4444
ZEND_END_ARG_INFO()
4545

@@ -64,7 +64,7 @@ ZEND_END_ARG_INFO()
6464
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_strstr, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
6565
ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
6666
ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
67-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, part, _IS_BOOL, 0, "false")
67+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, before_needle, _IS_BOOL, 0, "false")
6868
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
6969
ZEND_END_ARG_INFO()
7070

@@ -101,8 +101,8 @@ ZEND_END_ARG_INFO()
101101

102102
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_convert_encoding, 0, 2, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_FALSE)
103103
ZEND_ARG_TYPE_MASK(0, string, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
104-
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
105-
ZEND_ARG_TYPE_MASK(0, from, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
104+
ZEND_ARG_TYPE_INFO(0, to_encoding, IS_STRING, 0)
105+
ZEND_ARG_TYPE_MASK(0, from_encoding, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
106106
ZEND_END_ARG_INFO()
107107

108108
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_convert_case, 0, 2, IS_STRING, 0)
@@ -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

@@ -134,8 +134,8 @@ ZEND_END_ARG_INFO()
134134
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_encode_mimeheader, 0, 1, IS_STRING, 0)
135135
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
136136
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
137-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, transfer, IS_STRING, 1, "null")
138-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, linefeed, IS_STRING, 0, "\"\\r\\n\"")
137+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, transfer_encoding, IS_STRING, 1, "null")
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

@@ -145,27 +145,27 @@ ZEND_END_ARG_INFO()
145145

146146
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_convert_kana, 0, 1, IS_STRING, 0)
147147
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
148-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 0, "\"KV\"")
148+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 0, "\"KV\"")
149149
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
150150
ZEND_END_ARG_INFO()
151151

152152
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_convert_variables, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
153-
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
154-
ZEND_ARG_TYPE_MASK(0, from, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
153+
ZEND_ARG_TYPE_INFO(0, to_encoding, IS_STRING, 0)
154+
ZEND_ARG_TYPE_MASK(0, from_encoding, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
155155
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
156156
ZEND_ARG_VARIADIC_TYPE_INFO(1, vars, IS_MIXED, 0)
157157
ZEND_END_ARG_INFO()
158158

159159
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_encode_numericentity, 0, 2, IS_STRING, 0)
160160
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
161-
ZEND_ARG_TYPE_INFO(0, convmap, IS_ARRAY, 0)
161+
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, is_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)
167167
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
168-
ZEND_ARG_TYPE_INFO(0, convmap, IS_ARRAY, 0)
168+
ZEND_ARG_TYPE_INFO(0, map, IS_ARRAY, 0)
169169
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
170170
ZEND_END_ARG_INFO()
171171

@@ -174,15 +174,15 @@ 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)
181181
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "\"all\"")
182182
ZEND_END_ARG_INFO()
183183

184184
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_check_encoding, 0, 0, _IS_BOOL, 0)
185-
ZEND_ARG_TYPE_MASK(0, var, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
185+
ZEND_ARG_TYPE_MASK(0, value, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
186186
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
187187
ZEND_END_ARG_INFO()
188188

@@ -194,7 +194,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ord, 0, 1, MAY_BE_LONG|MAY_BE
194194
ZEND_END_ARG_INFO()
195195

196196
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_chr, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
197-
ZEND_ARG_TYPE_INFO(0, cp, IS_LONG, 0)
197+
ZEND_ARG_TYPE_INFO(0, codepoint, IS_LONG, 0)
198198
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
199199
ZEND_END_ARG_INFO()
200200

@@ -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

@@ -221,7 +221,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg_replace, 0, 3, MAY_BE_ST
221221
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
222222
ZEND_ARG_TYPE_INFO(0, replacement, IS_STRING, 0)
223223
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
224-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
224+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
225225
ZEND_END_ARG_INFO()
226226
#endif
227227

@@ -234,7 +234,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg_replace_callback, 0, 3,
234234
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
235235
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
236236
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
237-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
237+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
238238
ZEND_END_ARG_INFO()
239239
#endif
240240

@@ -250,21 +250,21 @@ ZEND_END_ARG_INFO()
250250
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_ereg_match, 0, 2, _IS_BOOL, 0)
251251
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
252252
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
253-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
253+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
254254
ZEND_END_ARG_INFO()
255255
#endif
256256

257257
#if defined(HAVE_MBREGEX)
258258
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_ereg_search, 0, 0, _IS_BOOL, 0)
259259
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
260-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
260+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
261261
ZEND_END_ARG_INFO()
262262
#endif
263263

264264
#if defined(HAVE_MBREGEX)
265265
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_ereg_search_pos, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
266266
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
267-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
267+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
268268
ZEND_END_ARG_INFO()
269269
#endif
270270

@@ -276,7 +276,7 @@ ZEND_END_ARG_INFO()
276276
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_ereg_search_init, 0, 1, _IS_BOOL, 0)
277277
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
278278
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
279-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_STRING, 1, "null")
279+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_STRING, 1, "null")
280280
ZEND_END_ARG_INFO()
281281
#endif
282282

@@ -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/bug79149.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ try {
2424

2525
?>
2626
--EXPECTF--
27-
mb_convert_encoding(): Argument #3 ($from) contains invalid encoding "0"
27+
mb_convert_encoding(): Argument #3 ($from_encoding) contains invalid encoding "0"
2828

2929
Warning: Array to string conversion in %s on line %d
30-
mb_convert_encoding(): Argument #3 ($from) contains invalid encoding "Array"
31-
mb_convert_encoding(): Argument #3 ($from) contains invalid encoding "foo"
30+
mb_convert_encoding(): Argument #3 ($from_encoding) contains invalid encoding "Array"
31+
mb_convert_encoding(): Argument #3 ($from_encoding) contains invalid encoding "foo"

‎ext/mbstring/tests/mb_convert_encoding.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
124124
== INVALID PARAMETER ==
125125
INT: 1234
126126
EUC-JP:
127-
mb_convert_encoding(): Argument #2 ($to) must be a valid encoding, "BAD" given
127+
mb_convert_encoding(): Argument #2 ($to_encoding) must be a valid encoding, "BAD" given

‎ext/mbstring/tests/mb_convert_encoding_empty_encoding_list.phpt

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

2424
?>
2525
--EXPECT--
26-
mb_convert_encoding(): Argument #3 ($from) must specify at least one encoding
27-
mb_convert_encoding(): Argument #3 ($from) must specify at least one encoding
26+
mb_convert_encoding(): Argument #3 ($from_encoding) must specify at least one encoding
27+
mb_convert_encoding(): Argument #3 ($from_encoding) must specify at least one encoding

‎ext/mbstring/tests/mb_convert_variables_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_convert_variables(): Argument #2 ($from) must specify at least one encoding
26-
mb_convert_variables(): Argument #2 ($from) must specify at least one encoding
25+
mb_convert_variables(): Argument #2 ($from_encoding) must specify at least one encoding
26+
mb_convert_variables(): Argument #2 ($from_encoding) must specify at least one encoding

‎ext/mbstring/tests/mb_decode_numericentity.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ aŒbœcŠdše€fg
4949
&#0000000000
5050
&#000000000
5151
föo
52-
mb_decode_numericentity(): Argument #2 ($convmap) must have a multiple of 4 elements
52+
mb_decode_numericentity(): Argument #2 ($map) must have a multiple of 4 elements

‎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

0 commit comments

Comments
 (0)