Skip to content

Commit 9a2fdbe

Browse files
GirgiasGirgias
committed
ext/mbstring: Use standard wording for ValueError
1 parent 997199e commit 9a2fdbe

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎ext/mbstring/mbstring.c

Lines changed: 4 additions & 4 deletions
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

@@ -5810,7 +5810,7 @@ PHP_FUNCTION(mb_str_pad)
58105810
}
58115811

58125812
if (ZSTR_LEN(pad) == 0) {
5813-
zend_argument_value_error(3, "must be a non-empty string");
5813+
zend_argument_cannot_be_empty_error(3);
58145814
RETURN_THROWS();
58155815
}
58165816

‎ext/mbstring/php_mbregex.c

Lines changed: 2 additions & 2 deletions
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

Lines changed: 8 additions & 8 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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_str_pad.phpt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ echo "--- Error conditions ---\n";
99
try {
1010
var_dump(mb_str_pad('▶▶', 6, '', STR_PAD_RIGHT));
1111
} catch (ValueError $e) {
12-
var_dump($e->getMessage());
12+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1313
}
1414
try {
1515
var_dump(mb_str_pad('▶▶', 6, '', STR_PAD_LEFT));
1616
} catch (ValueError $e) {
17-
var_dump($e->getMessage());
17+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1818
}
1919
try {
2020
var_dump(mb_str_pad('▶▶', 6, '', STR_PAD_BOTH));
2121
} catch (ValueError $e) {
22-
var_dump($e->getMessage());
22+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2323
}
2424
try {
2525
var_dump(mb_str_pad('▶▶', 6, ' ', 123456));
2626
} catch (ValueError $e) {
27-
var_dump($e->getMessage());
27+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2828
}
2929
try {
30-
var_dump(mb_str_pad('▶▶', 6, ' ', STR_PAD_BOTH, 'unexisting'));
30+
var_dump(mb_str_pad('▶▶', 6, ' ', STR_PAD_BOTH, 'non-existing'));
3131
} catch (ValueError $e) {
32-
var_dump($e->getMessage());
32+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
3333
}
3434

3535
echo "--- Simple ASCII strings ---\n";
@@ -87,11 +87,11 @@ foreach ($tests as $encoding => $test) {
8787
?>
8888
--EXPECT--
8989
--- Error conditions ---
90-
string(66) "mb_str_pad(): Argument #3 ($pad_string) must be a non-empty string"
91-
string(66) "mb_str_pad(): Argument #3 ($pad_string) must be a non-empty string"
92-
string(66) "mb_str_pad(): Argument #3 ($pad_string) must be a non-empty string"
93-
string(90) "mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH"
94-
string(82) "mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "unexisting" given"
90+
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
91+
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
92+
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
93+
ValueError: mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH
94+
ValueError: mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "non-existing" given
9595
--- Simple ASCII strings ---
9696
string(7) "+Hello+"
9797
string(10) "+-World+-+"

‎ext/mbstring/tests/mb_substr_count.phpt

Lines changed: 3 additions & 3 deletions
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)