Skip to content

Commit b164b59

Browse files
committed
ext/mbstring: Use standard wording for ValueError
1 parent 727c068 commit b164b59

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

ext/mbstring/mbstring.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -2238,7 +2238,7 @@ PHP_FUNCTION(mb_substr_count)
22382238
ZEND_PARSE_PARAMETERS_END();
22392239

22402240
if (ZSTR_LEN(needle) == 0) {
2241-
zend_argument_value_error(2, "must not be empty");
2241+
zend_argument_cannot_be_empty_error(2);
22422242
RETURN_THROWS();
22432243
}
22442244

@@ -2278,7 +2278,7 @@ PHP_FUNCTION(mb_substr_count)
22782278
if (ZSTR_LEN(needle_u8) == 0) {
22792279
zend_string_free(haystack_u8);
22802280
zend_string_free(needle_u8);
2281-
zend_argument_value_error(2, "must not be empty");
2281+
zend_argument_cannot_be_empty_error(2);
22822282
RETURN_THROWS();
22832283
}
22842284
}
@@ -5673,7 +5673,7 @@ PHP_FUNCTION(mb_ord)
56735673
ZEND_PARSE_PARAMETERS_END();
56745674

56755675
if (str_len == 0) {
5676-
zend_argument_value_error(1, "must not be empty");
5676+
zend_argument_cannot_be_empty_error(1);
56775677
RETURN_THROWS();
56785678
}
56795679

ext/mbstring/php_mbregex.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
900900
}
901901

902902
if (arg_pattern_len == 0) {
903-
zend_argument_value_error(1, "must not be empty");
903+
zend_argument_cannot_be_empty_error(1);
904904
RETURN_THROWS();
905905
}
906906

@@ -1468,7 +1468,7 @@ PHP_FUNCTION(mb_ereg_search_init)
14681468
}
14691469

14701470
if (arg_pattern && arg_pattern_len == 0) {
1471-
zend_argument_value_error(2, "must not be empty");
1471+
zend_argument_cannot_be_empty_error(2);
14721472
RETURN_THROWS();
14731473
}
14741474

ext/mbstring/tests/bug43994.phpt

+8-8
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,28 @@ foreach($inputs as $input) {
4343
--EXPECT--
4444
-- Iteration 1 --
4545
Without $regs arg:
46-
mb_ereg(): Argument #1 ($pattern) must not be empty
46+
mb_ereg(): Argument #1 ($pattern) cannot be empty
4747
With $regs arg:
48-
mb_ereg(): Argument #1 ($pattern) must not be empty
48+
mb_ereg(): Argument #1 ($pattern) cannot be empty
4949
NULL
5050

5151
-- Iteration 2 --
5252
Without $regs arg:
53-
mb_ereg(): Argument #1 ($pattern) must not be empty
53+
mb_ereg(): Argument #1 ($pattern) cannot be empty
5454
With $regs arg:
55-
mb_ereg(): Argument #1 ($pattern) must not be empty
55+
mb_ereg(): Argument #1 ($pattern) cannot be empty
5656
NULL
5757

5858
-- Iteration 3 --
5959
Without $regs arg:
60-
mb_ereg(): Argument #1 ($pattern) must not be empty
60+
mb_ereg(): Argument #1 ($pattern) cannot be empty
6161
With $regs arg:
62-
mb_ereg(): Argument #1 ($pattern) must not be empty
62+
mb_ereg(): Argument #1 ($pattern) cannot be empty
6363
NULL
6464

6565
-- Iteration 4 --
6666
Without $regs arg:
67-
mb_ereg(): Argument #1 ($pattern) must not be empty
67+
mb_ereg(): Argument #1 ($pattern) cannot be empty
6868
With $regs arg:
69-
mb_ereg(): Argument #1 ($pattern) must not be empty
69+
mb_ereg(): Argument #1 ($pattern) cannot be empty
7070
NULL

ext/mbstring/tests/empty_pattern.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ try {
2525

2626
?>
2727
--EXPECT--
28-
mb_ereg_search_init(): Argument #2 ($pattern) must not be empty
28+
mb_ereg_search_init(): Argument #2 ($pattern) cannot be empty
2929
No pattern was provided

ext/mbstring/tests/mb_ereg1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ array(3) {
3535
array(0) {
3636
}
3737
}
38-
ValueError: mb_ereg(): Argument #1 ($pattern) must not be empty
38+
ValueError: mb_ereg(): Argument #1 ($pattern) cannot be empty
3939
array(3) {
4040
[0]=>
4141
string(0) ""

ext/mbstring/tests/mb_ord.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ try {
5656
bool(true)
5757
bool(true)
5858
bool(true)
59-
mb_ord(): Argument #1 ($string) must not be empty
59+
mb_ord(): Argument #1 ($string) cannot be empty
6060
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "typo" given
6161
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "pass" given
6262
mb_ord() does not support the "JIS" encoding

ext/mbstring/tests/mb_substr_count.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ output_handler=
6969
?>
7070
--EXPECT--
7171
== Empty needle should raise an error ==
72-
mb_substr_count(): Argument #2 ($needle) must not be empty
73-
mb_substr_count(): Argument #2 ($needle) must not be empty
74-
mb_substr_count(): Argument #2 ($needle) must not be empty
72+
mb_substr_count(): Argument #2 ($needle) cannot be empty
73+
mb_substr_count(): Argument #2 ($needle) cannot be empty
74+
mb_substr_count(): Argument #2 ($needle) cannot be empty
7575
== Return value for empty haystack should always be zero ==
7676
int(0)
7777
int(0)

0 commit comments

Comments
 (0)