Skip to content

Commit efbf846

Browse files
carusogabrielcarusogabriel
committed
Make array parsing parameters error messages consistency with ZPP failure
1 parent 52ea129 commit efbf846

File tree

54 files changed

+1668
-1666
lines changed

Some content is hidden

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

54 files changed

+1668
-1666
lines changed

‎NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ PHP NEWS
2323
- Standard:
2424
. Fixed bug #76755 (setcookie does not accept "double" type for expire time).
2525
(Laruence)
26+
. Fixed bug #76674 (improve array_* failure messages exposing what was passed
27+
instead of an array). (carusogabriel)
2628

2729
16 Aug 2018, PHP 7.3.0beta2
2830

‎ext/standard/array.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3752,7 +3752,7 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
37523752
zval *arg = args + i;
37533753

37543754
if (Z_TYPE_P(arg) != IS_ARRAY) {
3755-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
3755+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg));
37563756
RETURN_NULL();
37573757
}
37583758
}
@@ -3781,7 +3781,7 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
37813781
zval *arg = args + i;
37823782

37833783
if (Z_TYPE_P(arg) != IS_ARRAY) {
3784-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
3784+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg));
37853785
RETURN_NULL();
37863786
}
37873787
count += zend_hash_num_elements(Z_ARRVAL_P(arg));
@@ -4639,7 +4639,7 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
46394639

46404640
for (i = 0; i < argc; i++) {
46414641
if (Z_TYPE(args[i]) != IS_ARRAY) {
4642-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
4642+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
46434643
RETURN_NULL();
46444644
}
46454645
}
@@ -4810,7 +4810,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
48104810

48114811
for (i = 0; i < arr_argc; i++) {
48124812
if (Z_TYPE(args[i]) != IS_ARRAY) {
4813-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
4813+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
48144814
arr_argc = i; /* only free up to i - 1 */
48154815
goto out;
48164816
}
@@ -5050,7 +5050,7 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty
50505050

50515051
for (i = 0; i < argc; i++) {
50525052
if (Z_TYPE(args[i]) != IS_ARRAY) {
5053-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5053+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
50545054
RETURN_NULL();
50555055
}
50565056
}
@@ -5221,7 +5221,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
52215221

52225222
for (i = 0; i < arr_argc; i++) {
52235223
if (Z_TYPE(args[i]) != IS_ARRAY) {
5224-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5224+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
52255225
arr_argc = i; /* only free up to i - 1 */
52265226
goto out;
52275227
}
@@ -5398,15 +5398,15 @@ PHP_FUNCTION(array_diff)
53985398
ZEND_PARSE_PARAMETERS_END();
53995399

54005400
if (Z_TYPE(args[0]) != IS_ARRAY) {
5401-
php_error_docref(NULL, E_WARNING, "Argument #1 is not an array");
5401+
php_error_docref(NULL, E_WARNING, "Expected parameter 1 to be an array, %s given", zend_zval_type_name(&args[0]));
54025402
RETURN_NULL();
54035403
}
54045404

54055405
num = zend_hash_num_elements(Z_ARRVAL(args[0]));
54065406
if (num == 0) {
54075407
for (i = 1; i < argc; i++) {
54085408
if (Z_TYPE(args[i]) != IS_ARRAY) {
5409-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5409+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
54105410
RETURN_NULL();
54115411
}
54125412
}
@@ -5424,7 +5424,7 @@ PHP_FUNCTION(array_diff)
54245424
if (!value) {
54255425
for (i = 1; i < argc; i++) {
54265426
if (Z_TYPE(args[i]) != IS_ARRAY) {
5427-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5427+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
54285428
RETURN_NULL();
54295429
}
54305430
}
@@ -5436,7 +5436,7 @@ PHP_FUNCTION(array_diff)
54365436

54375437
for (i = 1; i < argc; i++) {
54385438
if (Z_TYPE(args[i]) != IS_ARRAY) {
5439-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5439+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
54405440
RETURN_NULL();
54415441
}
54425442
if (!found) {
@@ -5466,7 +5466,7 @@ PHP_FUNCTION(array_diff)
54665466
num = 0;
54675467
for (i = 1; i < argc; i++) {
54685468
if (Z_TYPE(args[i]) != IS_ARRAY) {
5469-
php_error_docref(NULL, E_WARNING, "Argument #%d is not an array", i + 1);
5469+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
54705470
RETURN_NULL();
54715471
}
54725472
num += zend_hash_num_elements(Z_ARRVAL(args[i]));
@@ -6117,7 +6117,7 @@ PHP_FUNCTION(array_map)
61176117
int ret;
61186118

61196119
if (Z_TYPE(arrays[0]) != IS_ARRAY) {
6120-
php_error_docref(NULL, E_WARNING, "Argument #%d should be an array", 2);
6120+
php_error_docref(NULL, E_WARNING, "Expected parameter 2 to be an array, %s given", zend_zval_type_name(&arrays[0]));
61216121
return;
61226122
}
61236123
maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[0]));
@@ -6155,7 +6155,7 @@ PHP_FUNCTION(array_map)
61556155

61566156
for (i = 0; i < n_arrays; i++) {
61576157
if (Z_TYPE(arrays[i]) != IS_ARRAY) {
6158-
php_error_docref(NULL, E_WARNING, "Argument #%d should be an array", i + 2);
6158+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[0]));
61596159
efree(array_pos);
61606160
return;
61616161
}

‎ext/standard/tests/array/array_diff_1.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ array_diff($a, $b, $c);
1111
echo "OK!";
1212
?>
1313
--EXPECTF--
14-
Warning: array_diff(): Argument #2 is not an array in %s
14+
Warning: array_diff(): Expected parameter 2 to be an array, int given in %s
1515
OK!

‎ext/standard/tests/array/array_diff_assoc_variation1.phpt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,131 +104,131 @@ echo "Done";
104104

105105
-- Iteration 1 --
106106

107-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
107+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d
108108
NULL
109109

110110
-- Iteration 2 --
111111

112-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
112+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d
113113
NULL
114114

115115
-- Iteration 3 --
116116

117-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
117+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d
118118
NULL
119119

120120
-- Iteration 4 --
121121

122-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
122+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d
123123
NULL
124124

125125
-- Iteration 5 --
126126

127-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
127+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d
128128
NULL
129129

130130
-- Iteration 6 --
131131

132-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
132+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d
133133
NULL
134134

135135
-- Iteration 7 --
136136

137-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
137+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d
138138
NULL
139139

140140
-- Iteration 8 --
141141

142-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
142+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d
143143
NULL
144144

145145
-- Iteration 9 --
146146

147-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
147+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d
148148
NULL
149149

150150
-- Iteration 10 --
151151

152-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
152+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d
153153
NULL
154154

155155
-- Iteration 11 --
156156

157-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
157+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d
158158
NULL
159159

160160
-- Iteration 12 --
161161

162-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
162+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d
163163
NULL
164164

165165
-- Iteration 13 --
166166

167-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
167+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d
168168
NULL
169169

170170
-- Iteration 14 --
171171

172-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
172+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d
173173
NULL
174174

175175
-- Iteration 15 --
176176

177-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
177+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d
178178
NULL
179179

180180
-- Iteration 16 --
181181

182-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
182+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
183183
NULL
184184

185185
-- Iteration 17 --
186186

187-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
187+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
188188
NULL
189189

190190
-- Iteration 18 --
191191

192-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
192+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
193193
NULL
194194

195195
-- Iteration 19 --
196196

197-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
197+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
198198
NULL
199199

200200
-- Iteration 20 --
201201

202-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
202+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
203203
NULL
204204

205205
-- Iteration 21 --
206206

207-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
207+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
208208
NULL
209209

210210
-- Iteration 22 --
211211

212-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
212+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d
213213
NULL
214214

215215
-- Iteration 23 --
216216

217-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
217+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, object given in %s on line %d
218218
NULL
219219

220220
-- Iteration 24 --
221221

222-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
222+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d
223223
NULL
224224

225225
-- Iteration 25 --
226226

227-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
227+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d
228228
NULL
229229

230230
-- Iteration 26 --
231231

232-
Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
232+
Warning: array_diff_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d
233233
NULL
234234
Done

0 commit comments

Comments
 (0)