Skip to content

Commit 331f11f

Browse files
committed
Update error message to mention singly byte string
1 parent a0601a3 commit 331f11f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

ext/standard/array.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2842,14 +2842,14 @@ PHP_FUNCTION(range)
28422842
if (UNEXPECTED(start_type + end_type < 2*IS_STRING)) {
28432843
if (start_type < IS_STRING) {
28442844
if (end_type != IS_ARRAY) {
2845-
php_error_docref(NULL, E_WARNING, "Argument #1 ($start) must be a string if"
2846-
" argument #2 ($end) is a string, argument #2 ($end) converted to 0");
2845+
php_error_docref(NULL, E_WARNING, "Argument #1 ($start) must be a single byte string if"
2846+
" argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0");
28472847
}
28482848
end_type = IS_LONG;
28492849
} else if (end_type < IS_STRING) {
28502850
if (start_type != IS_ARRAY) {
2851-
php_error_docref(NULL, E_WARNING, "Argument #2 ($end) must be a string if"
2852-
" argument #1 ($start) is a string, argument #1 ($start) converted to 0");
2851+
php_error_docref(NULL, E_WARNING, "Argument #2 ($end) must be a single byte string if"
2852+
" argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0");
28532853
}
28542854
start_type = IS_LONG;
28552855
}

ext/standard/tests/array/range/bug32021.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ALIVE
99
--EXPECTF--
1010
Warning: range(): Argument #1 ($start) must not be empty, casted to 0 in %s on line %d
1111

12-
Warning: range(): Argument #1 ($start) must be a string if argument #2 ($end) is a string, argument #2 ($end) converted to 0 in %s on line %d
12+
Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
1313
array(1) {
1414
[0]=>
1515
int(0)

ext/standard/tests/array/range/range_inputs_null_variations.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ null with string boundary
9797

9898
Deprecated: range(): Passing null to parameter #1 ($start) of type string|int|float is deprecated in %s on line %d
9999

100-
Warning: range(): Argument #1 ($start) must be a string if argument #2 ($end) is a string, argument #2 ($end) converted to 0 in %s on line %d
100+
Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
101101
array(1) {
102102
[0]=>
103103
int(0)
104104
}
105105

106106
Deprecated: range(): Passing null to parameter #2 ($end) of type string|int|float is deprecated in %s on line %d
107107

108-
Warning: range(): Argument #2 ($end) must be a string if argument #1 ($start) is a string, argument #1 ($start) converted to 0 in %s on line %d
108+
Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
109109
array(1) {
110110
[0]=>
111111
int(0)

ext/standard/tests/array/range/range_inputs_string_invalid.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@ Range cannot operate on an empty string
3737

3838
Warning: range(): Argument #2 ($end) must not be empty, casted to 0 in %s on line %d
3939

40-
Warning: range(): Argument #2 ($end) must be a string if argument #1 ($start) is a string, argument #1 ($start) converted to 0 in %s on line %d
40+
Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
4141
array(1) {
4242
[0]=>
4343
int(0)
4444
}
4545

4646
Warning: range(): Argument #1 ($start) must not be empty, casted to 0 in %s on line %d
4747

48-
Warning: range(): Argument #1 ($start) must be a string if argument #2 ($end) is a string, argument #2 ($end) converted to 0 in %s on line %d
48+
Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
4949
array(1) {
5050
[0]=>
5151
int(0)
5252
}
5353
Mixing numeric float string and character
5454

55-
Warning: range(): Argument #1 ($start) must be a string if argument #2 ($end) is a string, argument #2 ($end) converted to 0 in %s on line %d
55+
Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
5656
array(4) {
5757
[0]=>
5858
float(3.5)
@@ -64,7 +64,7 @@ array(4) {
6464
float(0.5)
6565
}
6666

67-
Warning: range(): Argument #2 ($end) must be a string if argument #1 ($start) is a string, argument #1 ($start) converted to 0 in %s on line %d
67+
Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
6868
array(4) {
6969
[0]=>
7070
float(0)

0 commit comments

Comments
 (0)