Skip to content

Commit 1f48fee

Browse files
kocsismatekocsismate
committed
Improve some TypeError and ValueError messages
Closes phpGH-5377
1 parent 11c5c78 commit 1f48fee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+188
-189
lines changed

Diff for: ‎ext/bz2/bz2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ PHP_FUNCTION(bzopen)
345345
}
346346

347347
if (mode_len != 1 || (mode[0] != 'r' && mode[0] != 'w')) {
348-
zend_argument_value_error(2, "must be a valid mode. Only 'w' and 'r' are supported");
348+
zend_argument_value_error(2, "must be either 'r' or 'w'");
349349
RETURN_THROWS();
350350
}
351351

Diff for: ‎ext/bz2/tests/001.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ var_dump(bzopen($fp, "r"));
3737

3838
?>
3939
--EXPECTF--
40-
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
40+
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'
4141

4242
Warning: bzopen(): Filename cannot be empty in %s on line %d
4343
bool(false)
4444

4545
Warning: bzopen(): Filename cannot be empty in %s on line %d
4646
bool(false)
47-
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
48-
bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
47+
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'
48+
bzopen(): Argument #2 ($mode) must be either 'r' or 'w'
4949

5050
Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d
5151
bool(false)

Diff for: ‎ext/gd/gd.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ PHP_MINIT_FUNCTION(gd)
338338
/* GD2 image format types */
339339
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
340340
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
341-
REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL, CONST_CS | CONST_PERSISTENT);
341+
REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
342342
REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
343343
REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
344344
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
@@ -3536,7 +3536,7 @@ PHP_FUNCTION(imageflip)
35363536
gdImageFlipVertical(im);
35373537
break;
35383538

3539-
case GD_FLIP_HORINZONTAL:
3539+
case GD_FLIP_HORIZONTAL:
35403540
gdImageFlipHorizontal(im);
35413541
break;
35423542

@@ -3545,7 +3545,7 @@ PHP_FUNCTION(imageflip)
35453545
break;
35463546

35473547
default:
3548-
zend_argument_value_error(2, "must be a valid mode");
3548+
zend_argument_value_error(2, "must be either IMG_FLIP_VERTICAL, IMG_FLIP_HORIZONTAL, or IMG_FLIP_BOTH");
35493549
RETURN_THROWS();
35503550
}
35513551

Diff for: ‎ext/gd/libgd/gd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ void gdImageFlipHorizontal(gdImagePtr im);
824824
void gdImageFlipVertical(gdImagePtr im);
825825
void gdImageFlipBoth(gdImagePtr im);
826826

827-
#define GD_FLIP_HORINZONTAL 1
827+
#define GD_FLIP_HORIZONTAL 1
828828
#define GD_FLIP_VERTICAL 2
829829
#define GD_FLIP_BOTH 3
830830

Diff for: ‎ext/iconv/tests/iconv_strpos.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ var_dump(iconv_strpos("string", ""));
3636
var_dump(iconv_strpos("", "string"));
3737

3838
?>
39-
--EXPECTF--
39+
--EXPECT--
4040
bool(false)
4141
bool(false)
4242
int(5)
4343
int(5)
44-
Offset not contained in string
44+
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
4545
bool(false)
4646
int(7)
4747
int(7)

Diff for: ‎ext/mbstring/mbstring.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1986,10 +1986,10 @@ static void handle_strpos_error(size_t error) {
19861986
php_error_docref(NULL, E_WARNING, "Conversion error");
19871987
break;
19881988
case MBFL_ERROR_OFFSET:
1989-
zend_value_error("Offset not contained in string");
1989+
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
19901990
break;
19911991
default:
1992-
zend_value_error("Unknown error in mb_strpos");
1992+
zend_value_error("mb_strpos(): Unknown error");
19931993
break;
19941994
}
19951995
}

Diff for: ‎ext/mbstring/tests/bug43840.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ bool(false)
5454

5555
-- Offset is 22 --
5656
--Multibyte String:--
57-
Offset not contained in string
57+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5858
--ASCII String:--
59-
Offset not contained in string
59+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6060

6161
-- Offset is 53 --
6262
--Multibyte String:--
63-
Offset not contained in string
63+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6464
--ASCII String:--
65-
Offset not contained in string
65+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6666

6767
-- Offset is 54 --
6868
--Multibyte String:--
69-
Offset not contained in string
69+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
7070
--ASCII String:--
71-
Offset not contained in string
71+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

Diff for: ‎ext/mbstring/tests/bug43841.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ foreach ($offsets as $i) {
4747
--EXPECT--
4848
-- Offset is -25 --
4949
Multibyte String:
50-
Offset not contained in string
50+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5151
ASCII String:
5252
mb_strrpos:
53-
Offset not contained in string
53+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5454
strrpos:
55-
Offset not contained in string
55+
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5656

5757
-- Offset is -24 --
5858
Multibyte String:
59-
Offset not contained in string
59+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6060
ASCII String:
6161
mb_strrpos:
62-
Offset not contained in string
62+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6363
strrpos:
64-
Offset not contained in string
64+
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6565

6666
-- Offset is -13 --
6767
Multibyte String:

Diff for: ‎ext/mbstring/tests/bug45923.phpt

+16-16
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ bool(false)
4444
> Offset: 11
4545
bool(false)
4646
> Offset: 12
47-
Offset not contained in string
47+
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
4848
> Offset: -1
4949
bool(false)
5050
> Offset: -3
5151
int(8)
5252
> Offset: -6
5353
int(8)
5454
> Offset: -20
55-
Offset not contained in string
55+
strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5656

5757
------- mb_strpos -----------
5858

@@ -67,15 +67,15 @@ bool(false)
6767
> Offset: 11
6868
bool(false)
6969
> Offset: 12
70-
Offset not contained in string
70+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
7171
> Offset: -1
7272
bool(false)
7373
> Offset: -3
7474
int(8)
7575
> Offset: -6
7676
int(8)
7777
> Offset: -20
78-
Offset not contained in string
78+
mb_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
7979

8080
------- stripos -----------
8181

@@ -90,15 +90,15 @@ bool(false)
9090
> Offset: 11
9191
bool(false)
9292
> Offset: 12
93-
Offset not contained in string
93+
stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
9494
> Offset: -1
9595
bool(false)
9696
> Offset: -3
9797
int(8)
9898
> Offset: -6
9999
int(8)
100100
> Offset: -20
101-
Offset not contained in string
101+
stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
102102

103103
------- mb_stripos -----------
104104

@@ -113,15 +113,15 @@ bool(false)
113113
> Offset: 11
114114
bool(false)
115115
> Offset: 12
116-
Offset not contained in string
116+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
117117
> Offset: -1
118118
bool(false)
119119
> Offset: -3
120120
int(8)
121121
> Offset: -6
122122
int(8)
123123
> Offset: -20
124-
Offset not contained in string
124+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
125125

126126
------- strrpos -----------
127127

@@ -136,15 +136,15 @@ bool(false)
136136
> Offset: 11
137137
bool(false)
138138
> Offset: 12
139-
Offset not contained in string
139+
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
140140
> Offset: -1
141141
int(8)
142142
> Offset: -3
143143
int(8)
144144
> Offset: -6
145145
int(4)
146146
> Offset: -20
147-
Offset not contained in string
147+
strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
148148

149149
------- mb_strrpos -----------
150150

@@ -159,15 +159,15 @@ bool(false)
159159
> Offset: 11
160160
bool(false)
161161
> Offset: 12
162-
Offset not contained in string
162+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
163163
> Offset: -1
164164
int(8)
165165
> Offset: -3
166166
int(8)
167167
> Offset: -6
168168
int(4)
169169
> Offset: -20
170-
Offset not contained in string
170+
mb_strrpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
171171

172172
------- strripos -----------
173173

@@ -182,15 +182,15 @@ bool(false)
182182
> Offset: 11
183183
bool(false)
184184
> Offset: 12
185-
Offset not contained in string
185+
strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
186186
> Offset: -1
187187
int(8)
188188
> Offset: -3
189189
int(8)
190190
> Offset: -6
191191
int(4)
192192
> Offset: -20
193-
Offset not contained in string
193+
strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
194194

195195
------- mb_strripos -----------
196196

@@ -205,12 +205,12 @@ bool(false)
205205
> Offset: 11
206206
bool(false)
207207
> Offset: 12
208-
Offset not contained in string
208+
mb_strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
209209
> Offset: -1
210210
int(8)
211211
> Offset: -3
212212
int(8)
213213
> Offset: -6
214214
int(4)
215215
> Offset: -20
216-
Offset not contained in string
216+
mb_strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

Diff for: ‎ext/mbstring/tests/mb_stripos_empty_needle.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ int(2)
7373
int(5)
7474

7575
-- ASCII string with out of bound positive offset --
76-
Offset not contained in string
76+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
7777

7878
-- ASCII string with out of bound negative offset --
79-
Offset not contained in string
79+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
8080

8181
-- Multi-byte string without offset --
8282
int(0)
@@ -88,7 +88,7 @@ int(2)
8888
int(19)
8989

9090
-- Multi-byte string with out of bound positive offset --
91-
Offset not contained in string
91+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
9292

9393
-- Multi-byte string with out of bound negative offset --
94-
Offset not contained in string
94+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

Diff for: ‎ext/mbstring/tests/mb_stripos_invalid_offset.phpt

+10-10
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ try {
8181
--EXPECT--
8282
String len: 42
8383
== INVALID OFFSET ==
84-
Offset not contained in string
85-
Offset not contained in string
86-
Offset not contained in string
87-
Offset not contained in string
88-
Offset not contained in string
89-
Offset not contained in string
90-
Offset not contained in string
91-
Offset not contained in string
92-
Offset not contained in string
93-
Offset not contained in string
84+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
85+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
86+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
87+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
88+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
89+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
90+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
91+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
92+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
93+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

Diff for: ‎ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt

+10-10
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ for ($i = -30; $i <= 60; $i += 10) {
5555

5656
**-- Offset is: -30 --**
5757
-- ASCII String --
58-
Offset not contained in string
58+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
5959
--Multibyte String --
60-
Offset not contained in string
60+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
6161

6262
**-- Offset is: -20 --**
6363
-- ASCII String --
@@ -91,24 +91,24 @@ int(20)
9191

9292
**-- Offset is: 30 --**
9393
-- ASCII String --
94-
Offset not contained in string
94+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
9595
--Multibyte String --
96-
Offset not contained in string
96+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
9797

9898
**-- Offset is: 40 --**
9999
-- ASCII String --
100-
Offset not contained in string
100+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
101101
--Multibyte String --
102-
Offset not contained in string
102+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
103103

104104
**-- Offset is: 50 --**
105105
-- ASCII String --
106-
Offset not contained in string
106+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
107107
--Multibyte String --
108-
Offset not contained in string
108+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
109109

110110
**-- Offset is: 60 --**
111111
-- ASCII String --
112-
Offset not contained in string
112+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
113113
--Multibyte String --
114-
Offset not contained in string
114+
mb_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)

0 commit comments

Comments
 (0)