Skip to content

Commit b3935ed

Browse files
guilliamxaviernikic
authored andcommitted
Fix tests bareword fallback with error suppression
(cherry picked from commit aad3987) (cherry picked from commit 76f8a90)
1 parent 515c519 commit b3935ed

18 files changed

+258
-278
lines changed

ext/standard/tests/array/array_chunk_variation1.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ $values = array(
5959
/*20*/ new stdclass(),
6060

6161
// undefined data
62-
/*21*/ @undefined_var,
62+
/*21*/ @$undefined_var,
6363

6464
// unset data
65-
/*22*/ @unset_var
65+
/*22*/ @$unset_var
6666

6767
);
6868

@@ -303,23 +303,23 @@ NULL
303303

304304
-- Iteration 21 --
305305

306-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
306+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
307307
NULL
308308

309-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
309+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
310310
NULL
311311

312-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
312+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
313313
NULL
314314

315315
-- Iteration 22 --
316316

317-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
317+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
318318
NULL
319319

320-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
320+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
321321
NULL
322322

323-
Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
323+
Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
324324
NULL
325325
Done

ext/standard/tests/array/array_chunk_variation2.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ $values = array (
6262
/*21*/ new stdclass(),
6363

6464
// undefined data
65-
/*22*/ @undefined_var,
65+
/*22*/ @$undefined_var,
6666

6767
// unset data
68-
/*23*/ @unset_var
68+
/*23*/ @$unset_var
6969

7070
);
7171

@@ -407,23 +407,23 @@ NULL
407407

408408
-- Iteration 22 --
409409

410-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
410+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
411411
NULL
412412

413-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
413+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
414414
NULL
415415

416-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
416+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
417417
NULL
418418

419419
-- Iteration 23 --
420420

421-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
421+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
422422
NULL
423423

424-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
424+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
425425
NULL
426426

427-
Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
427+
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
428428
NULL
429429
Done

ext/standard/tests/array/array_chunk_variation3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ $values = array(
5353
/*16*/ new stdclass(),
5454

5555
// undefined data
56-
/*17*/ @undefined_var,
56+
/*17*/ @$undefined_var,
5757

5858
// unset data
59-
/*18*/ @unset_var
59+
/*18*/ @$unset_var
6060

6161
);
6262

0 commit comments

Comments
 (0)