cvs: php-src /ext/filter/tests 008.phpt 009.phpt

bjori Fri Oct 20 15:03:22 2006 UTC Modified files: /php-src/ext/filter/tests 008.phpt 009.phpt Log: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/008.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/filter/tests/008.phpt diff -u php-src/ext/filter/tests/008.phpt:1.4 php-src/ext/filter/tests/008.phpt:1.5 --- php-src/ext/filter/tests/008.phpt:1.4 Tue Oct 17 15:26:42 2006 +++ php-src/ext/filter/tests/008.phpt Fri Oct 20 15:03:22 2006 @@ -47,13 +47,7 @@ [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 http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/009.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/filter/tests/009.phpt diff -u php-src/ext/filter/tests/009.phpt:1.5 php-src/ext/filter/tests/009.phpt:1.6 --- php-src/ext/filter/tests/009.phpt:1.5 Tue Oct 17 15:26:42 2006 +++ php-src/ext/filter/tests/009.phpt Fri Oct 20 15:03:22 2006 @@ -19,18 +19,13 @@ 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(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