From 9967c1c30697fac347167e00db49e5677baf1fa4 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Fri, 20 Oct 2006 15:03:22 +0000 Subject: [PATCH] Fix tests --- ext/filter/tests/008.phpt | 8 +------- ext/filter/tests/009.phpt | 19 +++++-------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt index 9130c09481..914c4388a2 100644 --- a/ext/filter/tests/008.phpt +++ b/ext/filter/tests/008.phpt @@ -47,13 +47,7 @@ array(18) { [17]=> string(8) "callback" } -<<<<<<< 008.phpt -Warning: Wrong parameter count for filter_list() in /home4/php_dev/php52/ext/filter/tests/008.php on line 4 +Warning: Wrong parameter count for filter_list() in %s008.php on line 4 NULL -======= - -Warning: Wrong parameter count for filter_list() in %s on line %d -NULL ->>>>>>> 1.3 Done diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt index 80057d63aa..6423ce2b9c 100644 --- a/ext/filter/tests/009.phpt +++ b/ext/filter/tests/009.phpt @@ -19,18 +19,13 @@ int(513) int(513) int(518) int(257) -<<<<<<< 009.phpt bool(false) -Warning: filter_id() expects parameter 1 to be string, array given in %s on line %d +Warning: filter_id() expects parameter 1 to be string, array given in %s009.php on line %d NULL bool(false) -======= -bool(false) ->>>>>>> 1.4 -<<<<<<< 009.phpt -Warning: filter_id() expects exactly 1 parameter, 3 given in %s on line %d +Warning: filter_id() expects exactly 1 parameter, 3 given in %s009.php on line %d NULL Done --UEXPECTF-- @@ -38,16 +33,12 @@ int(513) int(513) int(518) int(257) -NULL +bool(false) -Warning: input_name_to_filter() expects parameter 1 to be binary string, array given in %s on line %d -NULL -======= -Warning: filter_id() expects parameter 1 to be string, array given in %s on line %d ->>>>>>> 1.4 +Warning: filter_id() expects parameter 1 to be binary string, array given in %s009.php on line %d NULL bool(false) -Warning: filter_id() expects exactly 1 parameter, 3 given in %s on line %d +Warning: filter_id() expects exactly 1 parameter, 3 given in %s009.php on line %d NULL Done -- 2.50.1