cvs: php-src /ext/bz2/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt /ext/calendar/tests easter_date.phpt jddayofweek.phpt jdtofrench.phpt
jdtogregorian.phpt jdtojewish.phpt jdtojulian.phpt jdtomonthname.phpt jewishtojd.phpt juliantojd.phpt /ext/com_dotnet/tests .cvsignore 27974.phpt
/ext/ctype/tests 001.phpt 002.phpt ctype_alnum_basic.phpt ctype_alnum_error.phpt ctype_alnum_variation1.phpt ctype_alnum_variation2.phpt
ctype_alnum_variation3.phpt ctype_alnum_variation4.phpt ctype_alpha_basic.phpt ctype_alpha_variation1.phpt ctype_alpha_variation2.phpt
ctype_alpha_variation3.phpt ctype_alpha_variation4.phpt ctype_cntrl_basic.phpt ctype_cntrl_variation1.phpt ctype_cntrl_variation2.phpt
ctype_cntrl_variation3.phpt ctype_cntrl_variation4.phpt ctype_digit_basic.phpt ctype_digit_variation1.phpt ctype_digit_variation2.phpt
ctype_digit_variation3.phpt ctype_digit_variation4.phpt ctype_graph_basic.phpt ctype_graph_variation1.phpt ctype_graph_variation2.phpt ctype_graph!
_variation3.phpt ctype_graph_variation4.phpt ctype_lower_basic.phpt ctype_lower_variation1.phpt ctype_lower_variation2.phpt
ctype_lower_variation3.phpt ctype_lower_variation4.phpt ctype_print_basic.phpt ctype_print_variation1.phpt ctype_print_variation2.phpt
ctype_print_variation3.phpt ctype_print_variation4.phpt ctype_punct_basic.phpt ctype_punct_error.phpt ctype_punct_variation1.phpt
ctype_punct_variation2.phpt ctype_punct_variation3.phpt ctype_punct_variation4.phpt ctype_space_basic.phpt ctype_space_error.phpt
ctype_space_variation1.phpt ctype_space_variation2.phpt ctype_space_variation3.phpt ctype_space_variation4.phpt ctype_upper_basic.phpt
ctype_upper_variation1.phpt ctype_upper_variation2.phpt ctype_upper_variation3.phpt ctype_upper_variation4.phpt ctype_xdigit_basic.phpt
ctype_xdigit_variation1.phpt ctype_xdigit_variation2.phpt ctype_xdigit_variation3.phpt ctype_xdigit_variation4.phpt /ext/date/tests 003.phpt 004.phpt
005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 01! 0.phpt 012.phpt 013.phpt 014.phpt bug35143.phpt bug35499.phpt bug37616.phpt bug41523-64bit.phpt
bug41523.phpt bug41964.phpt bug42910.phpt bug43808.phpt date_constants.phpt date_parse_001.phpt date_sun_info_001.phpt oo_001.phpt oo_002.phpt
strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.phpt t

sfox Tue May 27 18:16:07 2008 UTC Added files: /php-src/ext/com_dotnet/tests .cvsignore Modified files: /php-src/ext/bz2/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt /php-src/ext/calendar/tests easter_date.phpt jddayofweek.phpt jdtofrench.phpt jdtogregorian.phpt jdtojewish.phpt jdtojulian.phpt jdtomonthname.phpt jewishtojd.phpt juliantojd.phpt /php-src/ext/com_dotnet/tests 27974.phpt /php-src/ext/ctype/tests 001.phpt 002.phpt ctype_alnum_basic.phpt ctype_alnum_error.phpt ctype_alnum_variation1.phpt ctype_alnum_variation2.phpt ctype_alnum_variation3.phpt ctype_alnum_variation4.phpt ctype_alpha_basic.phpt ctype_alpha_variation1.phpt ctype_alpha_variation2.phpt ctype_alpha_variation3.phpt ctype_alpha_variation4.phpt ctype_cntrl_basic.phpt ctype_cntrl_variation1.phpt ctype_cntrl_variation2.phpt ctype_cntrl_variation3.phpt ctype_cntrl_variation4.phpt ctype_digit_basic.phpt ctype_digit_variation1.phpt ctype_digit_variation2.phpt ctype_digit_variation3.phpt ctype_digit_variation4.phpt ctype_graph_basic.phpt ctype_graph_variation1.phpt ctype_graph_variation2.phpt ctype_graph_variation3.phpt ctype_graph_variation4.phpt ctype_lower_basic.phpt ctype_lower_variation1.phpt ctype_lower_variation2.phpt ctype_lower_variation3.phpt ctype_lower_variation4.phpt ctype_print_basic.phpt ctype_print_variation1.phpt ctype_print_variation2.phpt ctype_print_variation3.phpt ctype_print_variation4.phpt ctype_punct_basic.phpt ctype_punct_error.phpt ctype_punct_variation1.phpt ctype_punct_variation2.phpt ctype_punct_variation3.phpt ctype_punct_variation4.phpt ctype_space_basic.phpt ctype_space_error.phpt ctype_space_variation1.phpt ctype_space_variation2.phpt ctype_space_variation3.phpt ctype_space_variation4.phpt ctype_upper_basic.phpt ctype_upper_variation1.phpt ctype_upper_variation2.phpt ctype_upper_variation3.phpt ctype_upper_variation4.phpt ctype_xdigit_basic.phpt ctype_xdigit_variation1.phpt ctype_xdigit_variation2.phpt ctype_xdigit_variation3.phpt ctype_xdigit_variation4.phpt /php-src/ext/date/tests 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 012.phpt 013.phpt 014.phpt bug35143.phpt bug35499.phpt bug37616.phpt bug41523-64bit.phpt bug41523.phpt bug41964.phpt bug42910.phpt bug43808.phpt date_constants.phpt date_parse_001.phpt date_sun_info_001.phpt oo_001.phpt oo_002.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.phpt timestamp-in-dst.phpt /php-src/ext/dba/tests bug38698.phpt dba001.phpt dba006.phpt dba007.phpt dba_cdb.phpt dba_cdb_make.phpt dba_cdb_read.phpt dba_flatfile.phpt dba_inifile.phpt /php-src/ext/dbase/tests 001.phpt 002.phpt /php-src/ext/dom/tests DOMCharacterData_appendData_basic.phpt DOMComment_appendData_basic.phpt DOMComment_appendData_basic_Sullivan.phpt DOMComment_insertData_basic.phpt DOMComment_insertData_error1.phpt DOMComment_insertData_error2.phpt DOMComment_replaceData_basic.phpt DOMComment_replaceData_error1.phpt DOMComment_replaceData_error2.phpt DOMDocument_createAttribute_basic.phpt DOMDocument_createAttribute_error.phpt DOMDocument_createAttribute_error1.phpt DOMDocument_createAttribute_variation.phpt DOMDocument_loadHTML_basic.phpt DOMDocument_save_basic.phpt DOMDocument_savexml_basic.phpt DOMNode_hasChildNodes.phpt DOMNode_hasChildNodes_basic.phpt DOMNode_insertBefore.phpt DOMNode_normalize_basic.phpt DOMText_appendData_basic.phpt bug28817.phpt bug34276.phpt bug37277.phpt bug37456.phpt bug42082.phpt bug44648.phpt dom002.phpt dom002u.phpt dom003.phpt dom_comment_basic.phpt dom_comment_variation.phpt dom_set_attr_node.phpt domdocument.phpt domxpath.phpt /php-src/ext/ereg/tests ereg_replace_variation_003.phpt ereg_variation_001.phpt ereg_variation_002.phpt eregi_replace_variation_003.phpt eregi_variation_001.phpt eregi_variation_002.phpt split_variation_001.phpt split_variation_002.phpt spliti_variation_001.phpt spliti_variation_002.phpt sql_regcase_variation_001.phpt /php-src/ext/exif/tests exif001.phpt exif005.phpt /php-src/ext/filter/tests 009.phpt /php-src/ext/gd/tests image_type_to_mime_type_basic.phpt imagedashedline_basic.phpt imagefilledpolygon_basic.phpt imagepolygon_basic.phpt /php-src/ext/gettext/tests dcngettext.phpt gettext_basic.phpt gettext_basic_de.phpt /php-src/ext/gmp/tests 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 031.phpt 032.phpt 033.phpt 034.phpt 035.phpt 036.phpt 037.phpt 038.phpt 039.phpt 040.phpt gmp_nextprime.phpt /php-src/ext/hash/tests hash_copy_001.phpt hmac-md5.phpt /php-src/ext/iconv/tests bug37773.phpt iconv001.phpt iconv_stream_filter.phpt /php-src/ext/imap/tests imap_utf8.phpt /php-src/ext/json/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt bug41067.phpt bug41403.phpt bug42090.phpt bug42785.phpt bug43941.phpt fail001.phpt pass001.1.phpt pass001.1_64bit.phpt pass001.phpt pass002.phpt pass003.phpt /php-src/ext/libxml/tests 002.phpt /php-src/ext/mbstring/tests mb_convert_encoding_basic.phpt mb_encode_mimeheader_basic.phpt mb_encode_mimeheader_variation1.phpt mb_encode_mimeheader_variation2.phpt mb_encode_mimeheader_variation3.phpt mb_encode_mimeheader_variation4.phpt mb_encode_mimeheader_variation5.phpt mb_encode_mimeheader_variation6.phpt mb_ereg_basic.phpt mb_ereg_error.phpt mb_ereg_variation1.phpt mb_ereg_variation2.phpt mb_ereg_variation3.phpt mb_ereg_variation4.phpt mb_ereg_variation5.phpt mb_ereg_variation6.phpt mb_ereg_variation7.phpt mb_internal_encoding_basic.phpt mb_internal_encoding_error1.phpt mb_internal_encoding_error2.phpt mb_internal_encoding_variation1.phpt mb_internal_encoding_variation2.phpt mb_regex_encoding_basic.phpt mb_regex_encoding_error1.phpt mb_regex_encoding_error2.phpt mb_regex_encoding_variation1.phpt mb_regex_encoding_variation2.phpt mb_strlen_basic.phpt mb_strlen_error1.phpt mb_strlen_error2.phpt mb_strlen_variation1.phpt mb_strlen_variation2.phpt mb_strlen_variation3.phpt mb_strpos_basic.phpt mb_strpos_error1.phpt mb_strpos_error2.phpt mb_strpos_variation1.phpt mb_strpos_variation2.phpt mb_strpos_variation3.phpt mb_strpos_variation4.phpt mb_strpos_variation5.phpt mb_strrpos_basic.phpt mb_strrpos_error1.phpt mb_strrpos_error2.phpt mb_strrpos_variation1.phpt mb_strrpos_variation2.phpt mb_strrpos_variation3.phpt mb_strrpos_variation4.phpt mb_strrpos_variation5.phpt mb_strrpos_variation6.phpt mb_strtolower_basic.phpt mb_strtolower_error1.phpt mb_strtolower_error2.phpt mb_strtolower_variation1.phpt mb_strtolower_variation2.phpt mb_strtolower_variation3.phpt mb_strtolower_variation4.phpt mb_strtoupper_basic.phpt mb_strtoupper_error1.phpt mb_strtoupper_error2.phpt mb_strtoupper_variation1.phpt mb_strtoupper_variation2.phpt mb_strtoupper_variation3.phpt mb_strtoupper_variation4.phpt mb_substr_basic.phpt mb_substr_count_basic.phpt mb_substr_count_error1.phpt mb_substr_count_error2.phpt mb_substr_count_variation1.phpt mb_substr_count_variation2.phpt mb_substr_count_variation3.phpt mb_substr_count_variation4.phpt mb_substr_error1.phpt mb_substr_error2.phpt mb_substr_variation1.phpt mb_substr_variation2.phpt mb_substr_variation3.phpt mb_substr_variation4.phpt mb_substr_variation5.phpt /php-src/ext/session/tests 003.phpt 004.phpt 005.phpt session_save_path_variation4.phpt session_save_path_variation5.phpt /php-src/ext/simplexml/tests 000.phpt Log: - killed off UEXPECT - com_dotnet gets a .cvsignore - Ulf will take care of mysql extensions, rest complete

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/bz2/tests/001.phpt diff -u php-src/ext/bz2/tests/001.phpt:1.4 php-src/ext/bz2/tests/001.phpt:1.5 --- php-src/ext/bz2/tests/001.phpt:1.4 Sun Oct 8 13:34:20 2006 +++ php-src/ext/bz2/tests/001.phpt Tue May 27 18:15:58 2008 @@ -18,7 +18,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/bz2/tests/002.phpt diff -u php-src/ext/bz2/tests/002.phpt:1.3 php-src/ext/bz2/tests/002.phpt:1.4 --- php-src/ext/bz2/tests/002.phpt:1.3 Mon Sep 18 12:35:59 2006 +++ php-src/ext/bz2/tests/002.phpt Tue May 27 18:15:58 2008 @@ -73,7 +73,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/bz2/tests/003.phpt diff -u php-src/ext/bz2/tests/003.phpt:1.2 php-src/ext/bz2/tests/003.phpt:1.3 --- php-src/ext/bz2/tests/003.phpt:1.2 Mon Jun 26 22:20:55 2006 +++ php-src/ext/bz2/tests/003.phpt Tue May 27 18:15:58 2008 @@ -16,7 +16,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/bz2/tests/004.phpt diff -u php-src/ext/bz2/tests/004.phpt:1.4 php-src/ext/bz2/tests/004.phpt:1.5 --- php-src/ext/bz2/tests/004.phpt:1.4 Thu Oct 5 21:28:19 2006 +++ php-src/ext/bz2/tests/004.phpt Tue May 27 18:15:58 2008 @@ -43,73 +43,7 @@ echo "Done\n"; ?> ---EXPECTF-- -array(2) { - ["errno"]=> - int(0) - ["errstr"]=> - string(2) "OK" -} -string(2) "OK" -int(0) -array(2) { - ["errno"]=> - int(0) - ["errstr"]=> - string(2) "OK" -} -string(2) "OK" -int(0) -string(0) "" -array(2) { - ["errno"]=> - int(-5) - ["errstr"]=> - string(16) "DATA_ERROR_MAGIC" -} -string(16) "DATA_ERROR_MAGIC" -int(-5) -string(0) "" -array(2) { - ["errno"]=> - int(-4) - ["errstr"]=> - string(10) "DATA_ERROR" -} -string(10) "DATA_ERROR" -int(-4) -string(0) "" -array(2) { - ["errno"]=> - int(-5) - ["errstr"]=> - string(16) "DATA_ERROR_MAGIC" -} -string(16) "DATA_ERROR_MAGIC" -int(-5) -string(0) "" -array(2) { - ["errno"]=> - int(-4) - ["errstr"]=> - string(10) "DATA_ERROR" -} -string(10) "DATA_ERROR" -int(-4) - -Warning: bzread(): %d is not a valid stream resource in %s on line %d -bool(false) - -Warning: bzerror(): %d is not a valid stream resource in %s on line %d -bool(false) - -Warning: bzerrstr(): %d is not a valid stream resource in %s on line %d -bool(false) - -Warning: bzerrno(): %d is not a valid stream resource in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- array(2) { [u"errno"]=> int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/005.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/bz2/tests/005.phpt diff -u php-src/ext/bz2/tests/005.phpt:1.5 php-src/ext/bz2/tests/005.phpt:1.6 --- php-src/ext/bz2/tests/005.phpt:1.5 Fri Sep 14 15:36:29 2007 +++ php-src/ext/bz2/tests/005.phpt Tue May 27 18:15:58 2008 @@ -41,38 +41,6 @@ --EXPECTF-- Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d NULL -string(%d) "BZ%a" -int(-2) -int(-2) -int(-2) -int(-2) - -Warning: bzdecompress() expects at least 1 parameter, 0 given in %s on line %d -bool(false) - -Warning: bzdecompress() expects at most 2 parameters, 3 given in %s on line %d -bool(false) -int(-5) -int(-5) -int(-5) -bool(false) -string(110) "Life it seems, will fade away -Drifting further everyday -Getting lost within myself -Nothing matters no one else" -bool(false) -string(110) "Life it seems, will fade away -Drifting further everyday -Getting lost within myself -Nothing matters no one else" -string(110) "Life it seems, will fade away -Drifting further everyday -Getting lost within myself -Nothing matters no one else" -Done ---UEXPECTF-- -Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d -NULL unicode(%d) "BZ%a" int(-2) int(-2) http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/easter_date.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/calendar/tests/easter_date.phpt diff -u php-src/ext/calendar/tests/easter_date.phpt:1.5 php-src/ext/calendar/tests/easter_date.phpt:1.6 --- php-src/ext/calendar/tests/easter_date.phpt:1.5 Mon Dec 4 18:30:05 2006 +++ php-src/ext/calendar/tests/easter_date.phpt Tue May 27 18:15:58 2008 @@ -6,9 +6,9 @@ <?php include 'skipif.inc'; ?> --FILE-- <?php -echo date("Y-m-d", easter_date(2000))."\n"; -echo date("Y-m-d", easter_date(2001))."\n"; -echo date("Y-m-d", easter_date(2002))."\n"; +echo date("Y-m-d", easter_date(2000))."\n"; +echo date("Y-m-d", easter_date(2001))."\n"; +echo date("Y-m-d", easter_date(2002))."\n"; echo date("Y-m-d", easter_date(1492))."\n"; ?> --EXPECTF-- http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jddayofweek.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/calendar/tests/jddayofweek.phpt diff -u php-src/ext/calendar/tests/jddayofweek.phpt:1.2 php-src/ext/calendar/tests/jddayofweek.phpt:1.3 --- php-src/ext/calendar/tests/jddayofweek.phpt:1.2 Sun Jul 9 22:42:05 2006 +++ php-src/ext/calendar/tests/jddayofweek.phpt Tue May 27 18:15:58 2008 @@ -127,4 +127,3 @@ Sun Mon Tue - http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtofrench.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/calendar/tests/jdtofrench.phpt diff -u php-src/ext/calendar/tests/jdtofrench.phpt:1.1 php-src/ext/calendar/tests/jdtofrench.phpt:1.2 --- php-src/ext/calendar/tests/jdtofrench.phpt:1.1 Sun Jul 9 16:30:02 2006 +++ php-src/ext/calendar/tests/jdtofrench.phpt Tue May 27 18:15:58 2008 @@ -17,4 +17,4 @@ 1/11/1 4/11/1 5/21/2 -0/0/0 \ No newline at end of file +0/0/0 http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtogregorian.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/calendar/tests/jdtogregorian.phpt diff -u php-src/ext/calendar/tests/jdtogregorian.phpt:1.1 php-src/ext/calendar/tests/jdtogregorian.phpt:1.2 --- php-src/ext/calendar/tests/jdtogregorian.phpt:1.1 Sun Jul 9 16:30:02 2006 +++ php-src/ext/calendar/tests/jdtogregorian.phpt Tue May 27 18:15:58 2008 @@ -15,4 +15,4 @@ 1/1/1582 10/5/1582 1/1/1970 -1/1/2999 \ No newline at end of file +1/1/2999 http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtojewish.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/calendar/tests/jdtojewish.phpt diff -u php-src/ext/calendar/tests/jdtojewish.phpt:1.4 php-src/ext/calendar/tests/jdtojewish.phpt:1.5 --- php-src/ext/calendar/tests/jdtojewish.phpt:1.4 Sat Mar 22 14:58:29 2008 +++ php-src/ext/calendar/tests/jdtojewish.phpt Tue May 27 18:15:58 2008 @@ -2,6 +2,8 @@ jdtojewish() function --SKIPIF-- <?php include 'skipif.inc'; ?> +--INI-- +unicode.output_encoding=ISO-8859-8 --FILE-- <?php @@ -17,18 +19,6 @@ jdtojewish(gregoriantojd(10,8,2002),true, CAL_JEWISH_ADD_GERESHAYIM+CAL_JEWISH_ADD_ALAFIM+CAL_JEWISH_ADD_ALAFIM_GERESH)."\r\n"); ?> --EXPECT-- -string(184) "2/22/5763 -ëá çùåï äúùñâ -ëá çùåï ä'úùñâ -ëá çùåï ä àìôéí úùñâ -ëá çùåï ä' àìôéí úùñâ -ë"á çùåï äúùñ"â -á' çùåï äúùñ"â -á' çùåï ä'úùñ"â -á' çùåï ä àìôéí úùñ"â -á' çùåï ä' àìôéí úùñ"â -" ---UEXPECT-- unicode(184) "2/22/5763 ëá çùåï äúùñâ ëá çùåï ä'úùñâ http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtojulian.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/calendar/tests/jdtojulian.phpt diff -u php-src/ext/calendar/tests/jdtojulian.phpt:1.1 php-src/ext/calendar/tests/jdtojulian.phpt:1.2 --- php-src/ext/calendar/tests/jdtojulian.phpt:1.1 Sun Jul 9 16:30:02 2006 +++ php-src/ext/calendar/tests/jdtojulian.phpt Tue May 27 18:15:58 2008 @@ -15,4 +15,4 @@ 12/22/1581 9/25/1582 12/19/1969 -12/12/2998 \ No newline at end of file +12/12/2998 http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtomonthname.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/calendar/tests/jdtomonthname.phpt diff -u php-src/ext/calendar/tests/jdtomonthname.phpt:1.3 php-src/ext/calendar/tests/jdtomonthname.phpt:1.4 --- php-src/ext/calendar/tests/jdtomonthname.phpt:1.3 Sat Mar 22 14:58:29 2008 +++ php-src/ext/calendar/tests/jdtomonthname.phpt Tue May 27 18:15:58 2008 @@ -25,51 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(3) "Jan" -string(7) "January" -string(3) "Jan" -string(7) "January" -string(6) "Shevat" -string(0) "" -string(3) "Jan" -string(7) "January" -string(3) "Dec" -string(8) "December" -string(5) "Tevet" -string(0) "" -string(0) "" -string(0) "" -string(0) "" -string(0) "" -string(0) "" -string(0) "" - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d -bool(false) -string(3) "Dec" -string(8) "December" -string(3) "Jul" -string(4) "July" -string(6) "Tishri" -string(0) "" -Done ---UEXPECTF-- +--EXPECTF-- unicode(3) "Jan" unicode(7) "January" unicode(3) "Jan" http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jewishtojd.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/calendar/tests/jewishtojd.phpt diff -u php-src/ext/calendar/tests/jewishtojd.phpt:1.1 php-src/ext/calendar/tests/jewishtojd.phpt:1.2 --- php-src/ext/calendar/tests/jewishtojd.phpt:1.1 Sun Jul 9 16:30:02 2006 +++ php-src/ext/calendar/tests/jewishtojd.phpt Tue May 27 18:15:58 2008 @@ -13,4 +13,4 @@ 0 0 347998 -2452576 \ No newline at end of file +2452576 http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/juliantojd.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/calendar/tests/juliantojd.phpt diff -u php-src/ext/calendar/tests/juliantojd.phpt:1.1 php-src/ext/calendar/tests/juliantojd.phpt:1.2 --- php-src/ext/calendar/tests/juliantojd.phpt:1.1 Sun Jul 9 16:30:02 2006 +++ php-src/ext/calendar/tests/juliantojd.phpt Tue May 27 18:15:58 2008 @@ -15,4 +15,4 @@ 2298884 2299161 2440601 -2816443 \ No newline at end of file +2816443 http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/27974.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/com_dotnet/tests/27974.phpt diff -u php-src/ext/com_dotnet/tests/27974.phpt:1.3 php-src/ext/com_dotnet/tests/27974.phpt:1.4 --- php-src/ext/com_dotnet/tests/27974.phpt:1.3 Sat Feb 4 10:59:18 2006 +++ php-src/ext/com_dotnet/tests/27974.phpt Tue May 27 18:15:58 2008 @@ -4,7 +4,7 @@ <?php # vim:ft=php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --FILE-- -<?php // $Id: 27974.phpt,v 1.3 2006/02/04 10:59:18 rrichards Exp $ +<?php // $Id: 27974.phpt,v 1.4 2008/05/27 18:15:58 sfox Exp $ error_reporting(E_ALL); try { @@ -36,8 +36,8 @@ 123 456 789 -string(3) "123" -string(5) "hello" -string(3) "789" +unicode(3) "123" +unicode(5) "hello" +unicode(3) "789" Got BADINDEX exception OK! OK! http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/001.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/ctype/tests/001.phpt diff -u php-src/ext/ctype/tests/001.phpt:1.6 php-src/ext/ctype/tests/001.phpt:1.7 --- php-src/ext/ctype/tests/001.phpt:1.6 Sat Feb 23 19:01:10 2008 +++ php-src/ext/ctype/tests/001.phpt Tue May 27 18:15:58 2008 @@ -25,19 +25,7 @@ ctype_test_001("ctype_space"); ctype_test_001("ctype_xdigit"); ?> ---EXPECT-- -ctype_lower 26 -ctype_upper 26 -ctype_alpha 52 -ctype_digit 10 -ctype_alnum 62 -ctype_cntrl 33 -ctype_graph 94 -ctype_print 95 -ctype_punct 32 -ctype_space 6 -ctype_xdigit 22 ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s001.php on line %d ctype_lower 26 ctype_upper 26 http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/002.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/ctype/tests/002.phpt diff -u php-src/ext/ctype/tests/002.phpt:1.8 php-src/ext/ctype/tests/002.phpt:1.9 --- php-src/ext/ctype/tests/002.phpt:1.8 Sat Feb 23 19:01:10 2008 +++ php-src/ext/ctype/tests/002.phpt Tue May 27 18:15:58 2008 @@ -34,19 +34,6 @@ ?> --EXPECTF-- -LOCALE is '%s' -ctype_lower 26 26 0 -ctype_upper 26 26 0 -ctype_alpha 52 52 0 -ctype_digit 10 10 0 -ctype_alnum 62 62 0 -ctype_cntrl 33 33 0 -ctype_graph 94 94 94 -ctype_print 95 95 95 -ctype_punct 32 32 0 -ctype_space 6 6 0 -ctype_xdigit 22 22 0 ---UEXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s002.php on line %d Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s002.php on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_basic.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_basic.phpt Tue May 27 18:15:58 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_alnum() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_basic.php on line %d bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_basic.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_error.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_error.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_error.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_error.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_error.phpt Tue May 27 18:15:58 2008 @@ -37,13 +37,17 @@ --EXPECTF-- *** Testing ctype_alnum() : error conditions *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_error.php on line %d + -- Testing ctype_alnum() function with Zero arguments -- -Warning: ctype_alnum() expects exactly 1 parameter, 0 given in %s on line %d +Warning: ctype_alnum() expects exactly 1 parameter, 0 given in %sctype_alnum_error.php on line 17 NULL -- Testing ctype_alnum() function with more than expected no. of arguments -- -Warning: ctype_alnum() expects exactly 1 parameter, 2 given in %s on line %d +Warning: ctype_alnum() expects exactly 1 parameter, 2 given in %sctype_alnum_error.php on line 23 NULL + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_error.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_variation1.phpt Tue May 27 18:15:58 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_alnum() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_variation2.phpt Tue May 27 18:15:58 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_alnum() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation2.php on line 14 character code 48 is alpha numeric character code 49 is alpha numeric character code 50 is alpha numeric @@ -160,4 +162,6 @@ character code 253 is alpha numeric character code 254 is alpha numeric character code 255 is alpha numeric + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_variation3.phpt Tue May 27 18:15:59 2008 @@ -62,6 +62,8 @@ --EXPECTF-- *** Testing ctype_alnum() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -130,4 +132,6 @@ -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alnum_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alnum_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_alnum_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_alnum_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alnum_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alnum_variation4.phpt Tue May 27 18:15:59 2008 @@ -46,6 +46,8 @@ --EXPECTF-- *** Testing ctype_alnum() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -65,4 +67,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation4.php on line 34 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alpha_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alpha_basic.phpt diff -u php-src/ext/ctype/tests/ctype_alpha_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_alpha_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alpha_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alpha_basic.phpt Tue May 27 18:15:59 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_alpha() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alpha_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alpha_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_alpha_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_alpha_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alpha_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alpha_variation1.phpt Tue May 27 18:15:59 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_alpha() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alpha_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alpha_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_alpha_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_alpha_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alpha_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alpha_variation2.phpt Tue May 27 18:15:59 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_alpha() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation2.php on line 14 character code 65 is alphabetic character code 66 is alphabetic character code 67 is alphabetic @@ -150,4 +152,6 @@ character code 253 is alphabetic character code 254 is alphabetic character code 255 is alphabetic + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alpha_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alpha_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_alpha_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_alpha_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alpha_variation3.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_alpha_variation3.phpt Tue May 27 18:15:59 2008 @@ -63,6 +63,8 @@ --EXPECTF-- *** Testing ctype_alpha() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -131,4 +133,6 @@ -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_alpha_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_alpha_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_alpha_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_alpha_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_alpha_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_alpha_variation4.phpt Tue May 27 18:15:59 2008 @@ -46,6 +46,8 @@ --EXPECTF-- *** Testing ctype_alpha() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -65,4 +67,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation4.php on line 34 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_cntrl_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_cntrl_basic.phpt diff -u php-src/ext/ctype/tests/ctype_cntrl_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_cntrl_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_cntrl_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_cntrl_basic.phpt Tue May 27 18:15:59 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_cntrl() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_cntrl_variation1.phpt Tue May 27 18:15:59 2008 @@ -107,6 +107,8 @@ --EXPECTF-- *** Testing ctype_cntrl() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation1.php on line %d + -- Iteration 1 -- bool(true) @@ -181,4 +183,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_cntrl_variation2.phpt Tue May 27 18:15:59 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_cntrl() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation2.php on line 14 character code 0 is control character character code 1 is control character character code 2 is control character @@ -99,4 +101,6 @@ character code 158 is control character character code 159 is control character character code 173 is control character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_cntrl_variation3.phpt Tue May 27 18:16:00 2008 @@ -70,6 +70,8 @@ --EXPECTF-- *** Testing ctype_cntrl() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -159,4 +161,6 @@ -- Iteration 30 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_cntrl_variation4.phpt Tue May 27 18:16:00 2008 @@ -45,6 +45,8 @@ --EXPECTF-- *** Testing ctype_cntrl() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -64,4 +66,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation4.php on line 33 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_digit_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_digit_basic.phpt diff -u php-src/ext/ctype/tests/ctype_digit_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_digit_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_digit_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_digit_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_digit() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_digit_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_digit_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_digit_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_digit_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_digit_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_digit_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_digit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_digit_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_digit_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_digit_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_digit_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_digit_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_digit_variation2.phpt Tue May 27 18:16:00 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_digit() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation2.php on line 14 character code 48 is a numeric digit character code 49 is a numeric digit character code 50 is a numeric digit @@ -43,4 +45,6 @@ character code 55 is a numeric digit character code 56 is a numeric digit character code 57 is a numeric digit + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_digit_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_digit_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_digit_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_digit_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_digit_variation3.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_digit_variation3.phpt Tue May 27 18:16:00 2008 @@ -69,6 +69,8 @@ --EXPECTF-- *** Testing ctype_digit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -161,4 +163,6 @@ -- Iteration 31 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_digit_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_digit_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_digit_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_digit_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_digit_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_digit_variation4.phpt Tue May 27 18:16:00 2008 @@ -46,6 +46,8 @@ --EXPECTF-- *** Testing ctype_digit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -65,4 +67,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation4.php on line 34 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_graph_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_graph_basic.phpt diff -u php-src/ext/ctype/tests/ctype_graph_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_graph_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_graph_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_graph_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_graph() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_graph_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_graph_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_graph_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_graph_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_graph_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_graph_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_graph() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_graph_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_graph_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_graph_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_graph_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_graph_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_graph_variation2.phpt Tue May 27 18:16:00 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_graph() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation2.php on line 14 character code 33 is a printable character character code 34 is a printable character character code 35 is a printable character @@ -221,4 +223,6 @@ character code 253 is a printable character character code 254 is a printable character character code 255 is a printable character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_graph_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_graph_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_graph_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_graph_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_graph_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_graph_variation3.phpt Tue May 27 18:16:00 2008 @@ -66,6 +66,8 @@ --EXPECTF-- *** Testing ctype_graph() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -149,4 +151,6 @@ -- Iteration 28 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_graph_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_graph_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_graph_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_graph_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_graph_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_graph_variation4.phpt Tue May 27 18:16:00 2008 @@ -46,6 +46,8 @@ --EXPECTF-- *** Testing ctype_graph() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -65,4 +67,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation4.php on line 34 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_lower_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_lower_basic.phpt diff -u php-src/ext/ctype/tests/ctype_lower_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_lower_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_lower_basic.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_lower_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_lower() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_lower_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_lower_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_lower_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_lower_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_lower_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_lower_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_lower() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_lower_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_lower_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_lower_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_lower_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_lower_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_lower_variation2.phpt Tue May 27 18:16:00 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_lower() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation2.php on line 14 character code 97 is a lower case character character code 98 is a lower case character character code 99 is a lower case character @@ -94,4 +96,6 @@ character code 253 is a lower case character character code 254 is a lower case character character code 255 is a lower case character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_lower_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_lower_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_lower_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_lower_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_lower_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_lower_variation3.phpt Tue May 27 18:16:00 2008 @@ -64,6 +64,8 @@ --EXPECTF-- *** Testing ctype_lower() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -141,4 +143,6 @@ -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_lower_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_lower_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_lower_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_lower_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_lower_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_lower_variation4.phpt Tue May 27 18:16:00 2008 @@ -46,6 +46,8 @@ --EXPECTF-- *** Testing ctype_lower() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -65,4 +67,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation4.php on line 34 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_print_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_print_basic.phpt diff -u php-src/ext/ctype/tests/ctype_print_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_print_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_print_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_print_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_print() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_print_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_print_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_print_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_print_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_print_variation1.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_print_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_print() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_print_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_print_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_print_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_print_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_print_variation2.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_print_variation2.phpt Tue May 27 18:16:00 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_print() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation2.php on line 14 character code 32 is a printable character character code 33 is a printable character character code 34 is a printable character @@ -223,4 +225,6 @@ character code 253 is a printable character character code 254 is a printable character character code 255 is a printable character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_print_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_print_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_print_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_print_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_print_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_print_variation3.phpt Tue May 27 18:16:00 2008 @@ -61,6 +61,8 @@ --EXPECTF-- *** Testing ctype_print() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation3.php on line %d + -- Iteration 1 -- bool(true) @@ -129,4 +131,6 @@ -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_print_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_print_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_print_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_print_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_print_variation4.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_print_variation4.phpt Tue May 27 18:16:00 2008 @@ -45,6 +45,8 @@ --EXPECTF-- *** Testing ctype_print() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -64,4 +66,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation4.php on line 33 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_basic.phpt diff -u php-src/ext/ctype/tests/ctype_punct_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_punct_basic.phpt Tue May 27 18:16:00 2008 @@ -29,6 +29,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_punct() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_basic.php on line %d bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_basic.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_error.phpt diff -u php-src/ext/ctype/tests/ctype_punct_error.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_error.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_error.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_punct_error.phpt Tue May 27 18:16:00 2008 @@ -38,13 +38,17 @@ --EXPECTF-- *** Testing ctype_punct() : error conditions *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_error.php on line 14 + -- Testing ctype_punct() function with Zero arguments -- -Warning: ctype_punct() expects exactly 1 parameter, 0 given in %s on line %d +Warning: ctype_punct() expects exactly 1 parameter, 0 given in %sctype_punct_error.php on line 18 NULL -- Testing ctype_punct() function with more than expected no. of arguments -- -Warning: ctype_punct() expects exactly 1 parameter, 2 given in %s on line %d +Warning: ctype_punct() expects exactly 1 parameter, 2 given in %sctype_punct_error.php on line 24 NULL + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_error.php on line 26 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_punct_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_variation1.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_punct_variation1.phpt Tue May 27 18:16:00 2008 @@ -107,6 +107,8 @@ --EXPECTF-- *** Testing ctype_punct() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -181,4 +183,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_punct_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_punct_variation2.phpt Tue May 27 18:16:00 2008 @@ -34,6 +34,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_punct() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation2.php on line 15 character code 33 is punctuation character code 34 is punctuation character code 35 is punctuation @@ -62,4 +64,6 @@ character code 183 is punctuation character code 187 is punctuation character code 191 is punctuation + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation2.php on line 23 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_punct_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_punct_variation3.phpt Tue May 27 18:16:00 2008 @@ -64,6 +64,8 @@ --EXPECTF-- *** Testing ctype_punct() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -141,4 +143,6 @@ -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_punct_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_punct_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_punct_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_punct_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_punct_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_punct_variation4.phpt Tue May 27 18:16:00 2008 @@ -47,6 +47,8 @@ --EXPECTF-- *** Testing ctype_punct() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation4.php on line 14 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -66,4 +68,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation4.php on line 35 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_basic.phpt diff -u php-src/ext/ctype/tests/ctype_space_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_space_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_space_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_space() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_error.phpt diff -u php-src/ext/ctype/tests/ctype_space_error.phpt:1.2 php-src/ext/ctype/tests/ctype_space_error.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_error.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_space_error.phpt Tue May 27 18:16:00 2008 @@ -37,13 +37,17 @@ --EXPECTF-- *** Testing ctype_space() : error conditions *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_error.php on line 13 + -- Testing ctype_space() function with Zero arguments -- -Warning: ctype_space() expects exactly 1 parameter, 0 given in %s on line %d +Warning: ctype_space() expects exactly 1 parameter, 0 given in %sctype_space_error.php on line 17 NULL -- Testing ctype_space() function with more than expected no. of arguments -- -Warning: ctype_space() expects exactly 1 parameter, 2 given in %s on line %d +Warning: ctype_space() expects exactly 1 parameter, 2 given in %sctype_space_error.php on line 23 NULL + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_error.php on line 25 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_space_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_space_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_space_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_space() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_space_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_space_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_variation2.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_space_variation2.phpt Tue May 27 18:16:00 2008 @@ -32,6 +32,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_space() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation2.php on line 14 character code 9 is a space character character code 10 is a space character character code 11 is a space character @@ -44,4 +46,6 @@ character code 32 is a space character character code 133 is a space character character code 160 is a space character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation2.php on line 21 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_space_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_space_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_space_variation3.phpt Tue May 27 18:16:00 2008 @@ -64,6 +64,8 @@ --EXPECTF-- *** Testing ctype_space() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -141,4 +143,6 @@ -- Iteration 26 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_space_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_space_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_space_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_space_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_space_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_space_variation4.phpt Tue May 27 18:16:00 2008 @@ -45,6 +45,8 @@ --EXPECTF-- *** Testing ctype_space() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation4.php on line 13 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -72,4 +74,6 @@ bool(true) -- Iteration 6 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation4.php on line 33 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_upper_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_upper_basic.phpt diff -u php-src/ext/ctype/tests/ctype_upper_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_upper_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_upper_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_upper_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_upper() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_basic.php on line 9 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_basic.php on line 17 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_upper_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_upper_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_upper_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_upper_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_upper_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_upper_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_upper() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_upper_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_upper_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_upper_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_upper_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_upper_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_upper_variation2.phpt Tue May 27 18:16:00 2008 @@ -32,6 +32,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_upper() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation2.php on line 13 character code 65 is a uppercase character character code 66 is a uppercase character character code 67 is a uppercase character @@ -88,4 +90,6 @@ character code 220 is a uppercase character character code 221 is a uppercase character character code 222 is a uppercase character + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation2.php on line 21 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_upper_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_upper_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_upper_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_upper_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_upper_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_upper_variation3.phpt Tue May 27 18:16:00 2008 @@ -63,6 +63,8 @@ --EXPECTF-- *** Testing ctype_upper() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -140,4 +142,6 @@ -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_upper_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_upper_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_upper_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_upper_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_upper_variation4.phpt:1.2 Mon Mar 17 09:54:35 2008 +++ php-src/ext/ctype/tests/ctype_upper_variation4.phpt Tue May 27 18:16:00 2008 @@ -45,6 +45,8 @@ --EXPECTF-- *** Testing ctype_upper() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation4.php on line 12 + -- Octal Values -- -- Iteration 1 -- bool(true) @@ -64,4 +66,6 @@ bool(true) -- Iteration 4 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation4.php on line 33 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_xdigit_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_xdigit_basic.phpt diff -u php-src/ext/ctype/tests/ctype_xdigit_basic.phpt:1.2 php-src/ext/ctype/tests/ctype_xdigit_basic.phpt:1.3 --- php-src/ext/ctype/tests/ctype_xdigit_basic.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_xdigit_basic.phpt Tue May 27 18:16:00 2008 @@ -27,6 +27,10 @@ ===DONE=== --EXPECTF-- *** Testing ctype_xdigit() : basic functionality *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_basic.php on line 8 bool(true) bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_basic.php on line 16 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt diff -u php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt:1.2 php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt:1.3 --- php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_xdigit_variation1.phpt Tue May 27 18:16:00 2008 @@ -106,6 +106,8 @@ --EXPECTF-- *** Testing ctype_xdigit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation1.php on line %d + -- Iteration 1 -- bool(false) @@ -180,4 +182,6 @@ -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation1.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt diff -u php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt:1.2 php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt:1.3 --- php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_xdigit_variation2.phpt Tue May 27 18:16:00 2008 @@ -33,6 +33,8 @@ ===DONE=== --EXPECTF-- *** Testing ctype_xdigit() : usage variations *** + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation2.php on line 14 character code 48 is a hexadecimal 'digit' character code 49 is a hexadecimal 'digit' character code 50 is a hexadecimal 'digit' @@ -55,4 +57,6 @@ character code 100 is a hexadecimal 'digit' character code 101 is a hexadecimal 'digit' character code 102 is a hexadecimal 'digit' + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation2.php on line 22 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt diff -u php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt:1.2 php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt:1.3 --- php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_xdigit_variation3.phpt Tue May 27 18:16:00 2008 @@ -64,6 +64,8 @@ --EXPECTF-- *** Testing ctype_xdigit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation3.php on line %d + -- Iteration 1 -- bool(false) @@ -141,4 +143,6 @@ -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation3.php on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt diff -u php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt:1.2 php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt:1.3 --- php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt:1.2 Mon Mar 17 09:54:36 2008 +++ php-src/ext/ctype/tests/ctype_xdigit_variation4.phpt Tue May 27 18:16:00 2008 @@ -61,6 +61,8 @@ --EXPECTF-- *** Testing ctype_xdigit() : usage variations *** +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation4.php on line 16 + -- Octal values -- 'Incorrect' Integers: bool(false) @@ -84,4 +86,6 @@ bool(true) bool(true) bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation4.php on line 49 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/003.phpt diff -u php-src/ext/date/tests/003.phpt:1.1 php-src/ext/date/tests/003.phpt:1.2 --- php-src/ext/date/tests/003.phpt:1.1 Tue Jun 27 15:07:50 2006 +++ php-src/ext/date/tests/003.phpt Tue May 27 18:16:00 2008 @@ -11,41 +11,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(4) "31st" -string(3) "1st" -string(3) "2nd" -string(3) "3rd" -string(3) "4th" -string(3) "5th" -string(3) "6th" -string(3) "7th" -string(3) "8th" -string(3) "9th" -string(4) "10th" -string(4) "11th" -string(4) "12th" -string(4) "13th" -string(4) "14th" -string(4) "15th" -string(4) "16th" -string(4) "17th" -string(4) "18th" -string(4) "19th" -string(4) "20th" -string(4) "21st" -string(4) "22nd" -string(4) "23rd" -string(4) "24th" -string(4) "25th" -string(4) "26th" -string(4) "27th" -string(4) "28th" -string(4) "29th" -string(4) "30th" -string(4) "31st" -Done ---UEXPECTF-- +--EXPECTF-- unicode(4) "31st" unicode(3) "1st" unicode(3) "2nd" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/004.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/004.phpt diff -u php-src/ext/date/tests/004.phpt:1.1 php-src/ext/date/tests/004.phpt:1.2 --- php-src/ext/date/tests/004.phpt:1.1 Tue Jun 27 15:07:50 2006 +++ php-src/ext/date/tests/004.phpt Tue May 27 18:16:00 2008 @@ -25,53 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "2" -string(3) "177" -string(1) "6" -string(2) "30" -string(1) "0" -string(2) "am" -string(3) "041" -string(2) "12" -string(1) "0" -string(1) "0" -string(10) "1151366400" -string(1) "2" -string(3) "177" -string(1) "6" -string(2) "30" -string(1) "0" -string(2) "am" -string(3) "041" -string(1) "3" -string(1) "3" -string(5) "10800" -string(10) "1151366400" -string(1) "1" -string(3) "176" -string(1) "6" -string(2) "30" -string(1) "0" -string(2) "pm" -string(3) "041" -string(1) "7" -string(2) "19" -string(6) "-18000" -string(10) "1151366400" -string(1) "2" -string(3) "177" -string(1) "6" -string(2) "30" -string(1) "0" -string(2) "am" -string(3) "041" -string(1) "1" -string(1) "1" -string(4) "3600" -string(10) "1151366400" -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "2" unicode(3) "177" unicode(1) "6" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/005.phpt diff -u php-src/ext/date/tests/005.phpt:1.2 php-src/ext/date/tests/005.phpt:1.3 --- php-src/ext/date/tests/005.phpt:1.2 Sun Oct 8 13:34:21 2006 +++ php-src/ext/date/tests/005.phpt Tue May 27 18:16:00 2008 @@ -20,7 +20,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: idate() expects at least 1 parameter, 0 given in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/006.phpt diff -u php-src/ext/date/tests/006.phpt:1.1 php-src/ext/date/tests/006.phpt:1.2 --- php-src/ext/date/tests/006.phpt:1.1 Tue Jun 27 15:54:36 2006 +++ php-src/ext/date/tests/006.phpt Tue May 27 18:16:00 2008 @@ -19,7 +19,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d bool(false) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/007.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/007.phpt diff -u php-src/ext/date/tests/007.phpt:1.1 php-src/ext/date/tests/007.phpt:1.2 --- php-src/ext/date/tests/007.phpt:1.1 Tue Jun 27 15:54:36 2006 +++ php-src/ext/date/tests/007.phpt Tue May 27 18:16:00 2008 @@ -15,91 +15,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d -bool(false) -array(9) { - [0]=> - int(%d) - [1]=> - int(%d) - [2]=> - int(%d) - [3]=> - int(%d) - [4]=> - int(%d) - [5]=> - int(%d) - [6]=> - int(%d) - [7]=> - int(%d) - [8]=> - int(%d) -} -array(9) { - [0]=> - int(0) - [1]=> - int(0) - [2]=> - int(0) - [3]=> - int(27) - [4]=> - int(5) - [5]=> - int(106) - [6]=> - int(2) - [7]=> - int(177) - [8]=> - int(0) -} -array(9) { - ["tm_sec"]=> - int(0) - ["tm_min"]=> - int(0) - ["tm_hour"]=> - int(0) - ["tm_mday"]=> - int(27) - ["tm_mon"]=> - int(5) - ["tm_year"]=> - int(106) - ["tm_wday"]=> - int(2) - ["tm_yday"]=> - int(177) - ["tm_isdst"]=> - int(0) -} -array(9) { - [0]=> - int(0) - [1]=> - int(0) - [2]=> - int(0) - [3]=> - int(27) - [4]=> - int(5) - [5]=> - int(106) - [6]=> - int(2) - [7]=> - int(177) - [8]=> - int(0) -} -Done ---UEXPECTF-- +--EXPECTF-- Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d bool(false) array(9) { http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/008.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/008.phpt diff -u php-src/ext/date/tests/008.phpt:1.1 php-src/ext/date/tests/008.phpt:1.2 --- php-src/ext/date/tests/008.phpt:1.1 Tue Jun 27 15:54:36 2006 +++ php-src/ext/date/tests/008.phpt Tue May 27 18:16:00 2008 @@ -13,59 +13,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: getdate() expects at most 1 parameter, 2 given in %s on line %d -bool(false) -array(11) { - ["seconds"]=> - int(0) - ["minutes"]=> - int(0) - ["hours"]=> - int(0) - ["mday"]=> - int(27) - ["wday"]=> - int(2) - ["mon"]=> - int(6) - ["year"]=> - int(2006) - ["yday"]=> - int(177) - ["weekday"]=> - string(7) "Tuesday" - ["month"]=> - string(4) "June" - [0]=> - int(1151366400) -} -array(11) { - ["seconds"]=> - int(%d) - ["minutes"]=> - int(%d) - ["hours"]=> - int(%d) - ["mday"]=> - int(%d) - ["wday"]=> - int(%d) - ["mon"]=> - int(%d) - ["year"]=> - int(%d) - ["yday"]=> - int(%d) - ["weekday"]=> - string(%d) "%s" - ["month"]=> - string(%d) "%s" - [0]=> - int(%d) -} -Done ---UEXPECTF-- +--EXPECTF-- Warning: getdate() expects at most 1 parameter, 2 given in %s on line %d bool(false) array(11) { http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/009.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/date/tests/009.phpt diff -u php-src/ext/date/tests/009.phpt:1.4 php-src/ext/date/tests/009.phpt:1.5 --- php-src/ext/date/tests/009.phpt:1.4 Thu Jun 29 22:47:34 2006 +++ php-src/ext/date/tests/009.phpt Tue May 27 18:16:00 2008 @@ -25,26 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) -bool(false) -string(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s -%s %" -string(5) "%q %a" -string(%d) "%s" -string(4) "blah" - -Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) -bool(false) -string(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s -%s %" -string(5) "%q %a" -string(%d) "%s" -string(4) "blah" -Done ---UEXPECTF-- +--EXPECTF-- Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/010.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/date/tests/010.phpt diff -u php-src/ext/date/tests/010.phpt:1.3 php-src/ext/date/tests/010.phpt:1.4 --- php-src/ext/date/tests/010.phpt:1.3 Fri Jul 13 15:22:34 2007 +++ php-src/ext/date/tests/010.phpt Tue May 27 18:16:00 2008 @@ -12,649 +12,6 @@ array(71) { [0]=> array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(16) "America/New_York" - } - [1]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Antigua" - } - [2]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(16) "America/Atikokan" - } - [3]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(21) "America/Cambridge_Bay" - } - [4]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "America/Cancun" - } - [5]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "America/Cayman" - } - [6]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Chicago" - } - [7]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(21) "America/Coral_Harbour" - } - [8]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Detroit" - } - [9]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(18) "America/Fort_Wayne" - } - [10]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(18) "America/Grand_Turk" - } - [11]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(28) "America/Indiana/Indianapolis" - } - [12]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(20) "America/Indiana/Knox" - } - [13]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(23) "America/Indiana/Marengo" - } - [14]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(26) "America/Indiana/Petersburg" - } - [15]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(21) "America/Indiana/Vevay" - } - [16]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(25) "America/Indiana/Vincennes" - } - [17]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(23) "America/Indiana/Winamac" - } - [18]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(20) "America/Indianapolis" - } - [19]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Iqaluit" - } - [20]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Jamaica" - } - [21]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(27) "America/Kentucky/Louisville" - } - [22]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(27) "America/Kentucky/Monticello" - } - [23]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Knox_IN" - } - [24]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(18) "America/Louisville" - } - [25]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Managua" - } - [26]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(17) "America/Menominee" - } - [27]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "America/Merida" - } - [28]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(16) "America/Montreal" - } - [29]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "America/Nassau" - } - [30]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Nipigon" - } - [31]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "America/Panama" - } - [32]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(19) "America/Pangnirtung" - } - [33]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(22) "America/Port-au-Prince" - } - [34]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(20) "America/Rankin_Inlet" - } - [35]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(21) "America/Santo_Domingo" - } - [36]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(19) "America/Thunder_Bay" - } - [37]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "America/Toronto" - } - [38]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(14) "Canada/Eastern" - } - [39]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(3) "EST" - } - [40]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(7) "EST5EDT" - } - [41]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(7) "Jamaica" - } - [42]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(10) "US/Central" - } - [43]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(15) "US/East-Indiana" - } - [44]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(10) "US/Eastern" - } - [45]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(17) "US/Indiana-Starke" - } - [46]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(-18000) - ["timezone_id"]=> - string(11) "US/Michigan" - } - [47]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(13) "Australia/ACT" - } - [48]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(18) "Australia/Brisbane" - } - [49]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(18) "Australia/Canberra" - } - [50]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(16) "Australia/Currie" - } - [51]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(16) "Australia/Hobart" - } - [52]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(18) "Australia/Lindeman" - } - [53]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(19) "Australia/Melbourne" - } - [54]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(13) "Australia/NSW" - } - [55]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(20) "Australia/Queensland" - } - [56]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(16) "Australia/Sydney" - } - [57]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(18) "Australia/Tasmania" - } - [58]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(36000) - ["timezone_id"]=> - string(18) "Australia/Victoria" - } - [59]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(19) "Australia/Melbourne" - } - [60]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(13) "Australia/ACT" - } - [61]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(18) "Australia/Brisbane" - } - [62]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(18) "Australia/Canberra" - } - [63]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(16) "Australia/Currie" - } - [64]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(16) "Australia/Hobart" - } - [65]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(18) "Australia/Lindeman" - } - [66]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(13) "Australia/NSW" - } - [67]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(20) "Australia/Queensland" - } - [68]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(16) "Australia/Sydney" - } - [69]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(18) "Australia/Tasmania" - } - [70]=> - array(3) { - ["dst"]=> - bool(true) - ["offset"]=> - int(39600) - ["timezone_id"]=> - string(18) "Australia/Victoria" - } -} -Done ---UEXPECTF-- -array(71) { - [0]=> - array(3) { [u"dst"]=> bool(false) [u"offset"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/012.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/012.phpt diff -u php-src/ext/date/tests/012.phpt:1.1 php-src/ext/date/tests/012.phpt:1.2 --- php-src/ext/date/tests/012.phpt:1.1 Fri Dec 22 13:07:26 2006 +++ php-src/ext/date/tests/012.phpt Tue May 27 18:16:00 2008 @@ -21,22 +21,6 @@ ?> --EXPECTF-- NULL -string(19) "2006/01/23 00:00:00" - -Warning: date_isodate_set() expects at least 3 parameters, 2 given in %s on line %d -bool(false) -string(19) "2006/01/23 00:00:00" -NULL -string(19) "2006/01/30 00:00:00" -NULL -string(19) "2007/12/10 00:00:00" - -Warning: date_isodate_set() expects at most 4 parameters, 5 given in %s on line %d -bool(false) -string(19) "2007/12/10 00:00:00" -Done ---UEXPECTF-- -NULL unicode(19) "2006/01/23 00:00:00" Warning: date_isodate_set() expects at least 3 parameters, 2 given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/013.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/013.phpt diff -u php-src/ext/date/tests/013.phpt:1.2 php-src/ext/date/tests/013.phpt:1.3 --- php-src/ext/date/tests/013.phpt:1.2 Mon Apr 7 17:41:48 2008 +++ php-src/ext/date/tests/013.phpt Tue May 27 18:16:00 2008 @@ -21,29 +21,6 @@ ?> --EXPECTF-- object(DateTime)#%d (3) { - ["date"]=> - string(19) "2006-12-12 00:00:00" - ["timezone_type"]=> - int(3) - ["timezone"]=> - string(3) "UTC" -} -string(19) "2006.12.12 00:00:00" - -Warning: date_date_set() expects exactly 4 parameters, 0 given in %s on line %d -bool(false) -string(19) "2006.12.12 00:00:00" - -Warning: date_date_set() expects exactly 4 parameters, 3 given in %s on line %d -bool(false) -string(19) "2006.12.12 00:00:00" -NULL -string(19) "2006.02.15 00:00:00" -NULL -string(19) "2008.01.29 00:00:00" -Done ---UEXPECTF-- -object(DateTime)#%d (3) { [u"date"]=> unicode(19) "2006-12-12 00:00:00" [u"timezone_type"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/014.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/014.phpt diff -u php-src/ext/date/tests/014.phpt:1.2 php-src/ext/date/tests/014.phpt:1.3 --- php-src/ext/date/tests/014.phpt:1.2 Mon Apr 7 17:41:48 2008 +++ php-src/ext/date/tests/014.phpt Tue May 27 18:16:00 2008 @@ -18,26 +18,7 @@ echo "Done\n"; ?> ---EXPECTF-- -object(DateTime)#%d (3) { - ["date"]=> - string(19) "2006-12-12 00:00:00" - ["timezone_type"]=> - int(3) - ["timezone"]=> - string(3) "UTC" -} -object(DateTimeZone)#%d (0) { -} - -Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d -bool(false) -int(0) - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- object(DateTime)#%d (3) { [u"date"]=> unicode(19) "2006-12-12 00:00:00" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug35143.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/date/tests/bug35143.phpt diff -u php-src/ext/date/tests/bug35143.phpt:1.3 php-src/ext/date/tests/bug35143.phpt:1.4 --- php-src/ext/date/tests/bug35143.phpt:1.3 Tue Jan 17 12:18:52 2006 +++ php-src/ext/date/tests/bug35143.phpt Tue May 27 18:16:00 2008 @@ -8,18 +8,6 @@ var_dump(gettimeofday()); ?> --EXPECTF-- -string(3) "UTC" -array(4) { - ["sec"]=> - int(%d) - ["usec"]=> - int(%d) - ["minuteswest"]=> - int(0) - ["dsttime"]=> - int(0) -} ---UEXPECTF-- unicode(3) "UTC" array(4) { [u"sec"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug35499.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/date/tests/bug35499.phpt diff -u php-src/ext/date/tests/bug35499.phpt:1.6 php-src/ext/date/tests/bug35499.phpt:1.7 --- php-src/ext/date/tests/bug35499.phpt:1.6 Fri Jul 13 15:22:34 2007 +++ php-src/ext/date/tests/bug35499.phpt Tue May 27 18:16:00 2008 @@ -13,73 +13,6 @@ 2005-11-20T08:00:00+0000 2005-11-20T08:00:00+0000 array(16) { - ["year"]=> - bool(false) - ["month"]=> - bool(false) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(true) - ["zone_type"]=> - int(2) - ["zone"]=> - int(-60) - ["is_dst"]=> - bool(false) - ["tz_abbr"]=> - string(1) "A" -} -array(12) { - ["year"]=> - bool(false) - ["month"]=> - bool(false) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} ---UEXPECT-- -2005-11-20T08:00:00+0000 -2005-11-20T08:00:00+0000 -array(16) { [u"year"]=> bool(false) [u"month"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug37616.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/date/tests/bug37616.phpt diff -u php-src/ext/date/tests/bug37616.phpt:1.3 php-src/ext/date/tests/bug37616.phpt:1.4 --- php-src/ext/date/tests/bug37616.phpt:1.3 Fri Jun 2 22:22:40 2006 +++ php-src/ext/date/tests/bug37616.phpt Tue May 27 18:16:00 2008 @@ -6,6 +6,4 @@ var_dump(date(DATE_RFC822, strtotime("1 Jul 06 14:27:30 +0200"))); ?> --EXPECT-- -string(29) "Sat, 01 Jul 06 14:27:30 +0200" ---UEXPECT-- unicode(29) "Sat, 01 Jul 06 14:27:30 +0200" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523-64bit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/bug41523-64bit.phpt diff -u php-src/ext/date/tests/bug41523-64bit.phpt:1.2 php-src/ext/date/tests/bug41523-64bit.phpt:1.3 --- php-src/ext/date/tests/bug41523-64bit.phpt:1.2 Mon Apr 7 17:41:48 2008 +++ php-src/ext/date/tests/bug41523-64bit.phpt Tue May 27 18:16:00 2008 @@ -14,45 +14,6 @@ ?> --EXPECT-- array(12) { - ["year"]=> - int(0) - ["month"]=> - int(0) - ["day"]=> - int(0) - ["hour"]=> - int(0) - ["minute"]=> - int(0) - ["second"]=> - int(0) - ["fraction"]=> - float(0) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -int(-62169984000) -object(DateTime)#1 (3) { - ["date"]=> - string(20) "-0001-11-30 00:00:00" - ["timezone_type"]=> - int(3) - ["timezone"]=> - string(3) "UTC" -} --0001-11-30T00:00:00+0000 ---UEXPECT-- -array(12) { [u"year"]=> int(0) [u"month"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/date/tests/bug41523.phpt diff -u php-src/ext/date/tests/bug41523.phpt:1.4 php-src/ext/date/tests/bug41523.phpt:1.5 --- php-src/ext/date/tests/bug41523.phpt:1.4 Tue Apr 8 11:58:03 2008 +++ php-src/ext/date/tests/bug41523.phpt Tue May 27 18:16:00 2008 @@ -14,45 +14,6 @@ ?> --EXPECT-- array(12) { - ["year"]=> - int(0) - ["month"]=> - int(0) - ["day"]=> - int(0) - ["hour"]=> - int(0) - ["minute"]=> - int(0) - ["second"]=> - int(0) - ["fraction"]=> - float(0) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -bool(false) -object(DateTime)#1 (3) { - ["date"]=> - string(20) "-0001-11-30 00:00:00" - ["timezone_type"]=> - int(3) - ["timezone"]=> - string(3) "UTC" -} --0001-11-30T00:00:00+0000 ---UEXPECT-- -array(12) { [u"year"]=> int(0) [u"month"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41964.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/bug41964.phpt diff -u php-src/ext/date/tests/bug41964.phpt:1.2 php-src/ext/date/tests/bug41964.phpt:1.3 --- php-src/ext/date/tests/bug41964.phpt:1.2 Fri Jul 13 15:22:34 2007 +++ php-src/ext/date/tests/bug41964.phpt Tue May 27 18:16:00 2008 @@ -41,27 +41,6 @@ NULL int(-60) -string(1) "A" - -int(-60) -string(1) "A" - -int(-60) -string(1) "A" - -int(-60) -string(1) "A" - -int(-60) -string(1) "A" - -int(-60) -string(1) "A" ---UEXPECT-- -NULL -NULL - -int(-60) unicode(1) "A" int(-60) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug42910.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/bug42910.phpt diff -u php-src/ext/date/tests/bug42910.phpt:1.1 php-src/ext/date/tests/bug42910.phpt:1.2 --- php-src/ext/date/tests/bug42910.phpt:1.1 Thu Jan 17 18:48:44 2008 +++ php-src/ext/date/tests/bug42910.phpt Tue May 27 18:16:00 2008 @@ -27,10 +27,4 @@ 2007-03-11T00:00:00-0800 - -08:00 - 1173600000 2007-03-12T00:00:00-0700 - America/Los_Angeles - 1173682800 2007-03-12T00:00:00-0800 - -08:00 - 1173686400 -string(12) "+0200 +02:00" ---UEXPECT-- -2007-03-11T00:00:00-0800 - America/Los_Angeles - 1173600000 -2007-03-11T00:00:00-0800 - -08:00 - 1173600000 -2007-03-12T00:00:00-0700 - America/Los_Angeles - 1173682800 -2007-03-12T00:00:00-0800 - -08:00 - 1173686400 unicode(12) "+0200 +02:00" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43808.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/bug43808.phpt diff -u php-src/ext/date/tests/bug43808.phpt:1.1 php-src/ext/date/tests/bug43808.phpt:1.2 --- php-src/ext/date/tests/bug43808.phpt:1.1 Thu Jan 17 20:34:17 2008 +++ php-src/ext/date/tests/bug43808.phpt Tue May 27 18:16:00 2008 @@ -15,40 +15,6 @@ --EXPECT-- bool(false) array(4) { - ["warning_count"]=> - int(1) - ["warnings"]=> - array(1) { - [6]=> - string(29) "Double timezone specification" - } - ["error_count"]=> - int(1) - ["errors"]=> - array(1) { - [0]=> - string(47) "The timezone could not be found in the database" - } -} -array(4) { - ["warning_count"]=> - int(1) - ["warnings"]=> - array(1) { - [6]=> - string(29) "Double timezone specification" - } - ["error_count"]=> - int(1) - ["errors"]=> - array(1) { - [0]=> - string(47) "The timezone could not be found in the database" - } -} ---UEXPECT-- -bool(false) -array(4) { [u"warning_count"]=> int(1) [u"warnings"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_constants.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/date/tests/date_constants.phpt diff -u php-src/ext/date/tests/date_constants.phpt:1.7 php-src/ext/date/tests/date_constants.phpt:1.8 --- php-src/ext/date/tests/date_constants.phpt:1.7 Mon Aug 7 21:42:27 2006 +++ php-src/ext/date/tests/date_constants.phpt Tue May 27 18:16:00 2008 @@ -39,41 +39,6 @@ ); ?> --EXPECT-- -string(25) "2006-07-01T14:27:30+02:00" -string(25) "2006-05-30T14:32:13+02:00" -string(33) "Saturday, 01-Jul-06 14:27:30 CEST" -string(32) "Tuesday, 30-May-06 14:32:13 CEST" -string(24) "2006-07-01T14:27:30+0200" -string(24) "2006-05-30T14:32:13+0200" -string(29) "Sat, 01 Jul 06 14:27:30 +0200" -string(29) "Tue, 30 May 06 14:32:13 +0200" -string(33) "Saturday, 01-Jul-06 14:27:30 CEST" -string(32) "Tuesday, 30-May-06 14:32:13 CEST" -string(29) "Sat, 01 Jul 06 14:27:30 +0200" -string(29) "Tue, 30 May 06 14:32:13 +0200" -string(31) "Sat, 01 Jul 2006 14:27:30 +0200" -string(31) "Tue, 30 May 2006 14:32:13 +0200" -string(31) "Sat, 01 Jul 2006 14:27:30 +0200" -string(31) "Tue, 30 May 2006 14:32:13 +0200" -string(25) "2006-07-01T14:27:30+02:00" -string(25) "2006-05-30T14:32:13+02:00" -string(31) "Sat, 01 Jul 2006 14:27:30 +0200" -string(31) "Tue, 30 May 2006 14:32:13 +0200" -string(25) "2006-07-01T14:27:30+02:00" -string(25) "2006-05-30T14:32:13+02:00" - -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) ---UEXPECT-- unicode(25) "2006-07-01T14:27:30+02:00" unicode(25) "2006-05-30T14:32:13+02:00" unicode(33) "Saturday, 01-Jul-06 14:27:30 CEST" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_parse_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/date_parse_001.phpt diff -u php-src/ext/date/tests/date_parse_001.phpt:1.2 php-src/ext/date/tests/date_parse_001.phpt:1.3 --- php-src/ext/date/tests/date_parse_001.phpt:1.2 Fri Apr 20 20:57:57 2007 +++ php-src/ext/date/tests/date_parse_001.phpt Tue May 27 18:16:00 2008 @@ -16,292 +16,7 @@ var_dump(date_parse(array())); echo "Done\n"; ?> ---EXPECTF-- -array(12) { - ["year"]=> - int(2006) - ["month"]=> - int(12) - ["day"]=> - int(12) - ["hour"]=> - int(10) - ["minute"]=> - int(0) - ["second"]=> - int(0) - ["fraction"]=> - float(0.5) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -array(12) { - ["year"]=> - int(2006) - ["month"]=> - int(12) - ["day"]=> - int(12) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -array(15) { - ["year"]=> - int(2006) - ["month"]=> - int(12) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(1) - ["errors"]=> - array(1) { - [7]=> - string(20) "Unexpected character" - } - ["is_localtime"]=> - bool(true) - ["zone_type"]=> - int(1) - ["zone"]=> - int(720) - ["is_dst"]=> - bool(false) -} -array(12) { - ["year"]=> - int(2006) - ["month"]=> - int(2) - ["day"]=> - int(30) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -array(12) { - ["year"]=> - int(2006) - ["month"]=> - int(3) - ["day"]=> - int(4) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -array(12) { - ["year"]=> - int(2006) - ["month"]=> - int(3) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(0) - ["errors"]=> - array(0) { - } - ["is_localtime"]=> - bool(false) -} -array(15) { - ["year"]=> - bool(false) - ["month"]=> - bool(false) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(2) - ["errors"]=> - array(2) { - [0]=> - string(20) "Unexpected character" - [1]=> - string(20) "Unexpected character" - } - ["is_localtime"]=> - bool(true) - ["zone_type"]=> - int(1) - ["zone"]=> - int(180) - ["is_dst"]=> - bool(false) -} -array(15) { - ["year"]=> - bool(false) - ["month"]=> - bool(false) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(1) - ["errors"]=> - array(1) { - [0]=> - string(20) "Unexpected character" - } - ["is_localtime"]=> - bool(true) - ["zone_type"]=> - int(1) - ["zone"]=> - int(0) - ["is_dst"]=> - bool(false) -} -array(12) { - ["year"]=> - bool(false) - ["month"]=> - bool(false) - ["day"]=> - bool(false) - ["hour"]=> - bool(false) - ["minute"]=> - bool(false) - ["second"]=> - bool(false) - ["fraction"]=> - bool(false) - ["warning_count"]=> - int(0) - ["warnings"]=> - array(0) { - } - ["error_count"]=> - int(1) - ["errors"]=> - array(1) { - [0]=> - string(12) "Empty string" - } - ["is_localtime"]=> - bool(false) -} - -Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- array(12) { [u"year"]=> int(2006) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/date/tests/date_sun_info_001.phpt diff -u php-src/ext/date/tests/date_sun_info_001.phpt:1.3 php-src/ext/date/tests/date_sun_info_001.phpt:1.4 --- php-src/ext/date/tests/date_sun_info_001.phpt:1.3 Fri Apr 20 20:57:57 2007 +++ php-src/ext/date/tests/date_sun_info_001.phpt Tue May 27 18:16:00 2008 @@ -8,29 +8,7 @@ var_dump($sun_info); echo "Done\n"; ?> ---EXPECTF-- -array(9) { - ["sunrise"]=> - int(1165897782) - ["sunset"]=> - int(1165934168) - ["transit"]=> - int(1165915975) - ["civil_twilight_begin"]=> - int(1165896176) - ["civil_twilight_end"]=> - int(1165935773) - ["nautical_twilight_begin"]=> - int(1165894353) - ["nautical_twilight_end"]=> - int(1165937597) - ["astronomical_twilight_begin"]=> - int(1165892570) - ["astronomical_twilight_end"]=> - int(1165939380) -} -Done ---UEXPECTF-- +--EXPECT-- array(9) { [u"sunrise"]=> int(1165897782) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/date/tests/oo_001.phpt diff -u php-src/ext/date/tests/oo_001.phpt:1.5 php-src/ext/date/tests/oo_001.phpt:1.6 --- php-src/ext/date/tests/oo_001.phpt:1.5 Wed Sep 27 18:32:24 2006 +++ php-src/ext/date/tests/oo_001.phpt Tue May 27 18:16:00 2008 @@ -40,18 +40,6 @@ echo "DONE\n"; ?> --EXPECTF-- -string(19) "%d-%d-%d %d:%d:%d" - -Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %soo_001.php on line %d -bool(false) -DateTime::__construct(): Failed to parse time string (1am todax) at position 4 (t): The timezone could not be found in the database -string(3) "UTC" - -Warning: DateTimeZone::getName(): The DateTimeZone object has not been correctly initialized by its constructor in %soo_001.php on line %d -bool(false) -DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) -DONE ---UEXPECTF-- unicode(19) "%d-%d-%d %d:%d:%d" Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %soo_001.php on line %d @@ -63,4 +51,3 @@ bool(false) DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) DONE - http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/date/tests/oo_002.phpt diff -u php-src/ext/date/tests/oo_002.phpt:1.9 php-src/ext/date/tests/oo_002.phpt:1.10 --- php-src/ext/date/tests/oo_002.phpt:1.9 Sun Feb 3 14:37:00 2008 +++ php-src/ext/date/tests/oo_002.phpt Tue May 27 18:16:00 2008 @@ -20,13 +20,6 @@ var_dump($c->getName()); ?> --EXPECT-- -string(29) "Wed, 01 Aug 07 13:00:00 +0000" -string(29) "Wed, 01 Aug 07 13:00:00 +0000" -string(29) "Wed, 01 Aug 07 14:00:00 +0000" -string(29) "Wed, 01 Aug 07 12:59:59 +0000" -string(10) "Asia/Tokyo" -string(10) "Asia/Tokyo" ---UEXPECT-- unicode(29) "Wed, 01 Aug 07 13:00:00 +0000" unicode(29) "Wed, 01 Aug 07 13:00:00 +0000" unicode(29) "Wed, 01 Aug 07 14:00:00 +0000" http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime-mysql-64bit.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/strtotime-mysql-64bit.phpt diff -u php-src/ext/date/tests/strtotime-mysql-64bit.phpt:1.1 php-src/ext/date/tests/strtotime-mysql-64bit.phpt:1.2 --- php-src/ext/date/tests/strtotime-mysql-64bit.phpt:1.1 Mon Feb 25 22:32:26 2008 +++ php-src/ext/date/tests/strtotime-mysql-64bit.phpt Tue May 27 18:16:00 2008 @@ -22,12 +22,6 @@ } ?> --EXPECT-- -string(31) "Fri, 23 May 1997 09:15:28 +0000" -string(31) "Sun, 31 Dec 2000 18:58:59 +0000" -string(31) "Wed, 10 Apr 2080 10:10:10 +0000" - ---UEXPECT-- unicode(31) "Fri, 23 May 1997 09:15:28 +0000" unicode(31) "Sun, 31 Dec 2000 18:58:59 +0000" unicode(31) "Wed, 10 Apr 2080 10:10:10 +0000" - http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime-mysql.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/date/tests/strtotime-mysql.phpt diff -u php-src/ext/date/tests/strtotime-mysql.phpt:1.4 php-src/ext/date/tests/strtotime-mysql.phpt:1.5 --- php-src/ext/date/tests/strtotime-mysql.phpt:1.4 Mon Feb 25 22:32:26 2008 +++ php-src/ext/date/tests/strtotime-mysql.phpt Tue May 27 18:16:00 2008 @@ -22,10 +22,6 @@ } ?> --EXPECT-- -string(31) "Fri, 23 May 1997 09:15:28 +0000" -string(31) "Sun, 31 Dec 2000 18:58:59 +0000" -bool(false) ---UEXPECT-- unicode(31) "Fri, 23 May 1997 09:15:28 +0000" unicode(31) "Sun, 31 Dec 2000 18:58:59 +0000" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime3-64bit.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/strtotime3-64bit.phpt diff -u php-src/ext/date/tests/strtotime3-64bit.phpt:1.1 php-src/ext/date/tests/strtotime3-64bit.phpt:1.2 --- php-src/ext/date/tests/strtotime3-64bit.phpt:1.1 Mon Feb 25 22:32:26 2008 +++ php-src/ext/date/tests/strtotime3-64bit.phpt Tue May 27 18:16:00 2008 @@ -47,31 +47,6 @@ --EXPECT-- bool(false) bool(false) -string(31) "Thu, 15 Jun 2006 00:00:00 +0100" -string(31) "Fri, 16 Jun 2006 22:49:12 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 23:49:12 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 02:22:00 +0100" -string(31) "Mon, 16 Jun 0222 02:22:00 -0036" -string(31) "Fri, 16 Jun 2006 02:22:33 +0100" -bool(false) -string(31) "Tue, 02 Mar 2004 00:00:00 +0000" -string(31) "Tue, 02 Mar 2004 00:00:00 +0000" -string(31) "Sun, 12 Feb 2006 23:12:23 +0000" -bool(false) -string(31) "Fri, 16 Jun 2006 00:00:00 +0100" -string(31) "Sun, 15 Jan 2006 00:00:00 +0000" -string(31) "Sun, 15 Jan 2006 00:00:00 +0000" -string(31) "Tue, 10 Oct 2000 13:55:36 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 20:06:00 +0100" -string(31) "Mon, 16 Jun 1986 22:51:59 +0100" -string(31) "Mon, 16 Jan 2006 00:00:00 +0000" -string(31) "Mon, 16 Jan 2006 00:00:00 +0000" ---UEXPECT-- -bool(false) -bool(false) unicode(31) "Thu, 15 Jun 2006 00:00:00 +0100" unicode(31) "Fri, 16 Jun 2006 22:49:12 +0100" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/date/tests/strtotime3.phpt diff -u php-src/ext/date/tests/strtotime3.phpt:1.5 php-src/ext/date/tests/strtotime3.phpt:1.6 --- php-src/ext/date/tests/strtotime3.phpt:1.5 Mon Feb 25 22:32:26 2008 +++ php-src/ext/date/tests/strtotime3.phpt Tue May 27 18:16:00 2008 @@ -47,31 +47,6 @@ --EXPECT-- bool(false) bool(false) -string(31) "Thu, 15 Jun 2006 00:00:00 +0100" -string(31) "Fri, 16 Jun 2006 22:49:12 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 23:49:12 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 02:22:00 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 02:22:33 +0100" -bool(false) -string(31) "Tue, 02 Mar 2004 00:00:00 +0000" -string(31) "Tue, 02 Mar 2004 00:00:00 +0000" -string(31) "Sun, 12 Feb 2006 23:12:23 +0000" -bool(false) -string(31) "Fri, 16 Jun 2006 00:00:00 +0100" -string(31) "Sun, 15 Jan 2006 00:00:00 +0000" -string(31) "Sun, 15 Jan 2006 00:00:00 +0000" -string(31) "Tue, 10 Oct 2000 13:55:36 +0100" -bool(false) -string(31) "Fri, 16 Jun 2006 20:06:00 +0100" -string(31) "Mon, 16 Jun 1986 22:51:59 +0100" -string(31) "Mon, 16 Jan 2006 00:00:00 +0000" -string(31) "Mon, 16 Jan 2006 00:00:00 +0000" ---UEXPECT-- -bool(false) -bool(false) unicode(31) "Thu, 15 Jun 2006 00:00:00 +0100" unicode(31) "Fri, 16 Jun 2006 22:49:12 +0100" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/timestamp-in-dst.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/timestamp-in-dst.phpt diff -u php-src/ext/date/tests/timestamp-in-dst.phpt:1.1 php-src/ext/date/tests/timestamp-in-dst.phpt:1.2 --- php-src/ext/date/tests/timestamp-in-dst.phpt:1.1 Mon Mar 31 09:10:54 2008 +++ php-src/ext/date/tests/timestamp-in-dst.phpt Tue May 27 18:16:00 2008 @@ -8,6 +8,4 @@ var_dump( date_create( '@1202996091' )->format( 'c' ) ); ?> --EXPECT-- -string(25) "2008-02-14T13:34:51+00:00" ---UEXPECT-- unicode(25) "2008-02-14T13:34:51+00:00" http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/bug38698.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dba/tests/bug38698.phpt diff -u php-src/ext/dba/tests/bug38698.phpt:1.2 php-src/ext/dba/tests/bug38698.phpt:1.3 --- php-src/ext/dba/tests/bug38698.phpt:1.2 Sat Mar 22 14:58:29 2008 +++ php-src/ext/dba/tests/bug38698.phpt Tue May 27 18:16:00 2008 @@ -21,8 +21,6 @@ } ?> ===DONE=== ---EXPECTF-- -string(32) "1f34b74bde3744265acfc21e0f30af95" ---UEXPECTF-- +--EXPECT-- unicode(32) "1f34b74bde3744265acfc21e0f30af95" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/dba/tests/dba001.phpt diff -u php-src/ext/dba/tests/dba001.phpt:1.3 php-src/ext/dba/tests/dba001.phpt:1.4 --- php-src/ext/dba/tests/dba001.phpt:1.3 Fri Nov 15 15:58:09 2002 +++ php-src/ext/dba/tests/dba001.phpt Tue May 27 18:16:00 2008 @@ -18,4 +18,4 @@ ?> --EXPECTF-- database handler: %s -database file created \ No newline at end of file +database file created http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba006.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/dba/tests/dba006.phpt diff -u php-src/ext/dba/tests/dba006.phpt:1.3 php-src/ext/dba/tests/dba006.phpt:1.4 --- php-src/ext/dba/tests/dba006.phpt:1.3 Fri Nov 15 15:58:09 2002 +++ php-src/ext/dba/tests/dba006.phpt Tue May 27 18:16:00 2008 @@ -34,4 +34,4 @@ ?> --EXPECTF-- database handler: %s -3NYNYY \ No newline at end of file +3NYNYY http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba007.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dba/tests/dba007.phpt diff -u php-src/ext/dba/tests/dba007.phpt:1.4 php-src/ext/dba/tests/dba007.phpt:1.5 --- php-src/ext/dba/tests/dba007.phpt:1.4 Thu Jun 19 15:48:06 2003 +++ php-src/ext/dba/tests/dba007.phpt Tue May 27 18:16:00 2008 @@ -42,4 +42,4 @@ string(%d) "%s/dba/tests/test1.dbm" [%d]=> string(%d) "%s/dba/tests/test2.dbm" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba_cdb.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/dba/tests/dba_cdb.phpt diff -u php-src/ext/dba/tests/dba_cdb.phpt:1.9 php-src/ext/dba/tests/dba_cdb.phpt:1.10 --- php-src/ext/dba/tests/dba_cdb.phpt:1.9 Sun Jun 11 00:16:04 2006 +++ php-src/ext/dba/tests/dba_cdb.phpt Tue May 27 18:16:00 2008 @@ -18,38 +18,6 @@ 5YYYYY Content String 2 array(5) { - ["key1"]=> - string(16) "Content String 1" - ["key2"]=> - string(16) "Content String 2" - ["key3"]=> - string(20) "Third Content String" - ["key4"]=> - string(22) "Another Content String" - ["key5"]=> - string(23) "The last content string" -} ---NO-LOCK-- -5YYYYY -Content String 2 -array(5) { - ["key1"]=> - string(16) "Content String 1" - ["key2"]=> - string(16) "Content String 2" - ["key3"]=> - string(20) "Third Content String" - ["key4"]=> - string(22) "Another Content String" - ["key5"]=> - string(23) "The last content string" -} -===DONE=== ---UEXPECT-- -database handler: cdb -5YYYYY -Content String 2 -array(5) { [u"key1"]=> string(16) "Content String 1" [u"key2"]=> @@ -77,4 +45,3 @@ string(23) "The last content string" } ===DONE=== - http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba_cdb_make.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/dba/tests/dba_cdb_make.phpt diff -u php-src/ext/dba/tests/dba_cdb_make.phpt:1.6 php-src/ext/dba/tests/dba_cdb_make.phpt:1.7 --- php-src/ext/dba/tests/dba_cdb_make.phpt:1.6 Sun Jun 11 00:16:04 2006 +++ php-src/ext/dba/tests/dba_cdb_make.phpt Tue May 27 18:16:00 2008 @@ -32,10 +32,5 @@ ?> --EXPECT-- database handler: cdb_make -string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" -string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" ---UEXPECT-- -database handler: cdb_make unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" - http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba_cdb_read.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/dba/tests/dba_cdb_read.phpt diff -u php-src/ext/dba/tests/dba_cdb_read.phpt:1.5 php-src/ext/dba/tests/dba_cdb_read.phpt:1.6 --- php-src/ext/dba/tests/dba_cdb_read.phpt:1.5 Tue Mar 4 20:31:42 2003 +++ php-src/ext/dba/tests/dba_cdb_read.phpt Tue May 27 18:16:00 2008 @@ -62,4 +62,4 @@ #1122 ?1212314 #1212314 -=1231324 \ No newline at end of file +=1231324 http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba_flatfile.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/dba/tests/dba_flatfile.phpt diff -u php-src/ext/dba/tests/dba_flatfile.phpt:1.6 php-src/ext/dba/tests/dba_flatfile.phpt:1.7 --- php-src/ext/dba/tests/dba_flatfile.phpt:1.6 Sun Jun 11 00:16:04 2006 +++ php-src/ext/dba/tests/dba_flatfile.phpt Tue May 27 18:16:00 2008 @@ -21,38 +21,6 @@ Content 2 replaced 2nd time The 6th value array(3) { - ["key number 6"]=> - string(13) "The 6th value" - ["key2"]=> - string(27) "Content 2 replaced 2nd time" - ["key5"]=> - string(23) "The last content string" -} ---NO-LOCK-- -3NYNYY -Content String 2 -Content 2 replaced -Read during write: not allowed -Content 2 replaced 2nd time -The 6th value -array(3) { - ["key number 6"]=> - string(13) "The 6th value" - ["key2"]=> - string(27) "Content 2 replaced 2nd time" - ["key5"]=> - string(23) "The last content string" -} -===DONE=== ---UEXPECT-- -database handler: flatfile -3NYNYY -Content String 2 -Content 2 replaced -Read during write: not allowed -Content 2 replaced 2nd time -The 6th value -array(3) { [u"key number 6"]=> string(13) "The 6th value" [u"key2"]=> @@ -76,4 +44,3 @@ string(23) "The last content string" } ===DONE=== - http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/dba_inifile.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dba/tests/dba_inifile.phpt diff -u php-src/ext/dba/tests/dba_inifile.phpt:1.4 php-src/ext/dba/tests/dba_inifile.phpt:1.5 --- php-src/ext/dba/tests/dba_inifile.phpt:1.4 Sun Jun 11 00:16:04 2006 +++ php-src/ext/dba/tests/dba_inifile.phpt Tue May 27 18:16:00 2008 @@ -21,38 +21,6 @@ Content 2 replaced 2nd time The 6th value array(3) { - ["key number 6"]=> - string(13) "The 6th value" - ["key2"]=> - string(27) "Content 2 replaced 2nd time" - ["key5"]=> - string(23) "The last content string" -} ---NO-LOCK-- -3NYNYY -Content String 2 -Content 2 replaced -Read during write: not allowed -Content 2 replaced 2nd time -The 6th value -array(3) { - ["key number 6"]=> - string(13) "The 6th value" - ["key2"]=> - string(27) "Content 2 replaced 2nd time" - ["key5"]=> - string(23) "The last content string" -} -===DONE=== ---UEXPECT-- -database handler: inifile -3NYNYY -Content String 2 -Content 2 replaced -Read during write: not allowed -Content 2 replaced 2nd time -The 6th value -array(3) { [u"key number 6"]=> string(13) "The 6th value" [u"key2"]=> @@ -76,4 +44,3 @@ string(23) "The last content string" } ===DONE=== - http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/tests/001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dbase/tests/001.phpt diff -u php-src/ext/dbase/tests/001.phpt:1.4 php-src/ext/dbase/tests/001.phpt:1.5 --- php-src/ext/dbase/tests/001.phpt:1.4 Sat Mar 22 14:58:29 2008 +++ php-src/ext/dbase/tests/001.phpt Tue May 27 18:16:00 2008 @@ -45,26 +45,7 @@ echo "Done\n"; ?> ---EXPECTF-- -int(%d) -string(38) "dbase_create(): unknown field type 'E'" -bool(false) -string(38) "dbase_create(): unknown field type '-'" -bool(false) -int(%d) -string(71) "dbase_create(): expected field name as first element of list in field 0" -bool(false) -string(56) "dbase_create(): Unable to create database without fields" -bool(false) -string(67) "Argument 2 passed to dbase_create() must be an array, integer given" -string(50) "dbase_create(): Expected array as second parameter" -bool(false) -string(%d) "unlink(%s001.dbf): No such file or directory" -string(66) "Argument 2 passed to dbase_create() must be an array, string given" -string(50) "dbase_create(): Expected array as second parameter" -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- int(%d) unicode(38) "dbase_create(): unknown field type 'E'" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/tests/002.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/dbase/tests/002.phpt diff -u php-src/ext/dbase/tests/002.phpt:1.5 php-src/ext/dbase/tests/002.phpt:1.6 --- php-src/ext/dbase/tests/002.phpt:1.5 Sun Feb 25 23:16:32 2007 +++ php-src/ext/dbase/tests/002.phpt Tue May 27 18:16:00 2008 @@ -34,7 +34,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: dbase_open(): Invalid access mode -1 in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt diff -u php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.2 php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.2 Wed May 21 15:04:13 2008 +++ php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt Tue May 27 18:16:00 2008 @@ -32,4 +32,4 @@ CDATA Content: data><&" <?xml version="1.0"?> -<root><cdata><![CDATA[data><&"]]></cdata></root> \ No newline at end of file +<root><cdata><![CDATA[data><&"]]></cdata></root> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_appendData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.2 php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.2 Mon May 19 12:49:54 2008 +++ php-src/ext/dom/tests/DOMComment_appendData_basic.phpt Tue May 27 18:16:00 2008 @@ -16,6 +16,6 @@ echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> -<!--test-comment-more-data--> \ No newline at end of file +<!--test-comment-more-data--> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt diff -u php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.2 php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.2 Wed May 21 15:04:13 2008 +++ php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt Tue May 27 18:16:00 2008 @@ -33,4 +33,4 @@ Comment Content: data><&" <?xml version="1.0"?> -<root><comment><!--data><&"--></comment></root> \ No newline at end of file +<root><comment><!--data><&"--></comment></root> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_insertData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.2 php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.2 Mon May 19 12:57:28 2008 +++ php-src/ext/dom/tests/DOMComment_insertData_basic.phpt Tue May 27 18:16:00 2008 @@ -16,6 +16,6 @@ echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--test-inserted-comment--> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_insertData_error1.phpt diff -u php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.2 php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.2 Mon May 19 12:57:28 2008 +++ php-src/ext/dom/tests/DOMComment_insertData_error1.phpt Tue May 27 18:16:00 2008 @@ -20,5 +20,5 @@ } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offset http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_insertData_error2.phpt diff -u php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.2 php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.2 Mon May 19 12:57:27 2008 +++ php-src/ext/dom/tests/DOMComment_insertData_error2.phpt Tue May 27 18:16:00 2008 @@ -20,5 +20,5 @@ } ?> ---EXPECTF-- -Throws DOMException for offset too large \ No newline at end of file +--EXPECT-- +Throws DOMException for offset too large http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.2 php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.2 Sat May 17 13:26:51 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Tue May 27 18:16:00 2008 @@ -22,7 +22,7 @@ echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--testreplacedcomment--> <?xml version="1.0"?> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.2 php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.2 Sat May 17 13:26:51 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt Tue May 27 18:16:00 2008 @@ -20,5 +20,5 @@ } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offest http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.2 php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.3 --- php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.2 Sat May 17 13:26:51 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt Tue May 27 18:16:00 2008 @@ -20,5 +20,5 @@ } ?> ---EXPECTF-- -Throws DOMException for offest too large \ No newline at end of file +--EXPECT-- +Throws DOMException for offest too large http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.2 php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.2 Sat May 24 15:13:08 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt Tue May 27 18:16:00 2008 @@ -21,4 +21,3 @@ --EXPECT-- <?xml version="1.0"?> <para hahaha=""/> - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.1 php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.2 --- php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.1 Thu May 15 12:50:28 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt Tue May 27 18:16:00 2008 @@ -21,5 +21,5 @@ } ?> ---EXPECTF-- +--EXPECT-- PASS http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.2 php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.3 --- php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.2 Sat May 24 15:13:08 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt Tue May 27 18:16:00 2008 @@ -24,4 +24,3 @@ ?> --EXPECT-- Test failed! - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.1 php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.2 --- php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.1 Thu May 15 12:50:28 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt Tue May 27 18:16:00 2008 @@ -8,5 +8,5 @@ echo get_class($attr); ?> ---EXPECTF-- +--EXPECT-- DOMAttr http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.2 php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.2 Fri May 16 17:14:57 2008 +++ php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt Tue May 27 18:16:00 2008 @@ -13,6 +13,6 @@ $doc->loadHTML("<html><body><p>Test<br></p></body></html>"); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html><body><p>Test<br></p></body></html> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_save_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_save_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.2 php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.2 Fri May 16 17:14:57 2008 +++ php-src/ext/dom/tests/DOMDocument_save_basic.phpt Tue May 27 18:16:00 2008 @@ -28,6 +28,5 @@ $temp_filename = dirname(__FILE__)."/DomDocument_save_basic.tmp"; unlink($temp_filename); ?> ---EXPECTF-- +--EXPECT-- Wrote: 72 bytes - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.1 php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.2 --- php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.1 Tue May 27 10:21:16 2008 +++ php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt Tue May 27 18:16:00 2008 @@ -34,6 +34,6 @@ unlink($filename); ---EXPECTF-- +--EXPECT-- int(151) -bool(true) \ No newline at end of file +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt diff -u php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt:1.1 php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt:1.2 --- php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt:1.1 Tue May 27 10:21:16 2008 +++ php-src/ext/dom/tests/DOMNode_hasChildNodes.phpt Tue May 27 18:16:00 2008 @@ -31,7 +31,7 @@ var_dump($dom->documentElement->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Document has child nodes http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt diff -u php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.3 php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.4 --- php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.3 Sat May 24 15:13:08 2008 +++ php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt Tue May 27 18:16:00 2008 @@ -37,7 +37,7 @@ var_dump($text->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- Root has child nodes: bool(true) Title has child nodes: bool(true) -Text has child nodes: bool(false) \ No newline at end of file +Text has child nodes: bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_insertBefore.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMNode_insertBefore.phpt diff -u php-src/ext/dom/tests/DOMNode_insertBefore.phpt:1.1 php-src/ext/dom/tests/DOMNode_insertBefore.phpt:1.2 --- php-src/ext/dom/tests/DOMNode_insertBefore.phpt:1.1 Tue May 27 10:21:16 2008 +++ php-src/ext/dom/tests/DOMNode_insertBefore.phpt Tue May 27 18:16:00 2008 @@ -21,7 +21,7 @@ echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Add new node B http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_normalize_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/DOMNode_normalize_basic.phpt diff -u php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.1 php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2 --- php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.1 Tue May 27 10:21:16 2008 +++ php-src/ext/dom/tests/DOMNode_normalize_basic.phpt Tue May 27 18:16:00 2008 @@ -57,8 +57,8 @@ var_dump($title->childNodes->length); ?> ---EXPECTF-- +--EXPECT-- Number of child nodes of title = int(1) Number of child nodes of title after adding second title = int(2) Number of child nodes of title after normalizing author = int(2) -Number of child nodes of title after normalizing title = int(1) \ No newline at end of file +Number of child nodes of title after normalizing title = int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMText_appendData_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/DOMText_appendData_basic.phpt diff -u php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.2 php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.2 Wed May 21 15:04:13 2008 +++ php-src/ext/dom/tests/DOMText_appendData_basic.phpt Tue May 27 18:16:00 2008 @@ -32,4 +32,4 @@ Text Content: data><&" <?xml version="1.0"?> -<root><text>data&gt;&lt;&amp;"</text></root> \ No newline at end of file +<root><text>data&gt;&lt;&amp;"</text></root> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug28817.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/bug28817.phpt diff -u php-src/ext/dom/tests/bug28817.phpt:1.2 php-src/ext/dom/tests/bug28817.phpt:1.3 --- php-src/ext/dom/tests/bug28817.phpt:1.2 Tue Aug 16 15:09:42 2005 +++ php-src/ext/dom/tests/bug28817.phpt Tue May 27 18:16:00 2008 @@ -27,18 +27,6 @@ --EXPECTF-- array(4) { [0]=> - string(5) "bonus" - [1]=> - string(3) "vir" - [2]=> - string(6) "semper" - [3]=> - string(4) "tiro" -} -string(30) "Cessante causa cessat effectus" ---UEXPECTF-- -array(4) { - [0]=> unicode(5) "bonus" [1]=> unicode(3) "vir" http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/dom/tests/bug34276.phpt diff -u php-src/ext/dom/tests/bug34276.phpt:1.5 php-src/ext/dom/tests/bug34276.phpt:1.6 --- php-src/ext/dom/tests/bug34276.phpt:1.5 Wed May 14 13:05:55 2008 +++ php-src/ext/dom/tests/bug34276.phpt Tue May 27 18:16:00 2008 @@ -35,14 +35,6 @@ ?> --EXPECT-- bool(false) -string(0) "" -string(8) "attranew" -string(8) "attrbnew" -string(5) "attrc" -<?xml version="1.0" encoding="ISO-8859-1"?> -<foo xmlns="http://www.example.com/ns/foo" xmlns:fubar="http://www.example.com/ns/fubar" xmlns:default="http://www.example.com/ns/foo" attra="attra" default:attra="attranew" fubar:attrb="attrbnew" default:attrc="attrc"/> ---UEXPECT-- -bool(false) unicode(0) "" unicode(8) "attranew" unicode(8) "attrbnew" http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug37277.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/bug37277.phpt diff -u php-src/ext/dom/tests/bug37277.phpt:1.2 php-src/ext/dom/tests/bug37277.phpt:1.3 --- php-src/ext/dom/tests/bug37277.phpt:1.2 Sat Aug 5 12:35:35 2006 +++ php-src/ext/dom/tests/bug37277.phpt Tue May 27 18:16:00 2008 @@ -22,4 +22,3 @@ <?xml version="1.0" encoding="UTF-8"?> <foo/> - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug37456.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/bug37456.phpt diff -u php-src/ext/dom/tests/bug37456.phpt:1.1 php-src/ext/dom/tests/bug37456.phpt:1.2 --- php-src/ext/dom/tests/bug37456.phpt:1.1 Wed May 17 16:32:35 2006 +++ php-src/ext/dom/tests/bug37456.phpt Tue May 27 18:16:00 2008 @@ -19,4 +19,3 @@ --EXPECT-- newval - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug42082.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/bug42082.phpt diff -u php-src/ext/dom/tests/bug42082.phpt:1.2 php-src/ext/dom/tests/bug42082.phpt:1.3 --- php-src/ext/dom/tests/bug42082.phpt:1.2 Sat May 3 20:39:07 2008 +++ php-src/ext/dom/tests/bug42082.phpt Tue May 27 18:16:00 2008 @@ -20,17 +20,6 @@ int(0) bool(true) bool(true) -string(0) "" -bool(true) -bool(true) -bool(false) -bool(false) ---UEXPECTF-- -object(DOMNodeList)#%d (0) { -} -int(0) -bool(true) -bool(true) unicode(0) "" bool(true) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug44648.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/bug44648.phpt diff -u php-src/ext/dom/tests/bug44648.phpt:1.1 php-src/ext/dom/tests/bug44648.phpt:1.2 --- php-src/ext/dom/tests/bug44648.phpt:1.1 Thu Apr 17 20:19:53 2008 +++ php-src/ext/dom/tests/bug44648.phpt Tue May 27 18:16:00 2008 @@ -42,4 +42,4 @@ Invalid Character Error Invalid Character Error Namespace Error -<root/> \ No newline at end of file +<root/> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/dom002.phpt diff -u php-src/ext/dom/tests/dom002.phpt:1.4 php-src/ext/dom/tests/dom002.phpt:1.5 --- php-src/ext/dom/tests/dom002.phpt:1.4 Sat Aug 5 12:35:35 2006 +++ php-src/ext/dom/tests/dom002.phpt Tue May 27 18:16:00 2008 @@ -31,31 +31,6 @@ dump($doc->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); ?> --EXPECT-- -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" ---UEXPECT-- unicode(3) "bar" unicode(5) "test1" unicode(3) "bar" http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002u.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/dom002u.phpt diff -u php-src/ext/dom/tests/dom002u.phpt:1.1 php-src/ext/dom/tests/dom002u.phpt:1.2 --- php-src/ext/dom/tests/dom002u.phpt:1.1 Fri Jun 29 13:58:34 2007 +++ php-src/ext/dom/tests/dom002u.phpt Tue May 27 18:16:00 2008 @@ -31,31 +31,6 @@ dump($doc->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); ?> --EXPECT-- -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" ---UEXPECT-- unicode(3) "bar" unicode(5) "test1" unicode(3) "bar" http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom003.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/dom/tests/dom003.phpt diff -u php-src/ext/dom/tests/dom003.phpt:1.12 php-src/ext/dom/tests/dom003.phpt:1.13 --- php-src/ext/dom/tests/dom003.phpt:1.12 Thu Aug 18 11:47:03 2005 +++ php-src/ext/dom/tests/dom003.phpt Tue May 27 18:16:00 2008 @@ -22,49 +22,6 @@ --EXPECTF-- --- Catch exception with try/catch object(DOMException)#%d (6) { - ["message":protected]=> - string(23) "Hierarchy Request Error" - ["string":"Exception":private]=> - string(0) "" - ["file":protected]=> - string(%d) "%sdom003.php" - ["line":protected]=> - int(8) - ["trace":"Exception":private]=> - array(1) { - [0]=> - array(6) { - ["file"]=> - string(%d) "%sdom003.php" - ["line"]=> - int(8) - ["function"]=> - string(11) "appendChild" - ["class"]=> - string(7) "DOMNode" - ["type"]=> - string(2) "->" - ["args"]=> - array(1) { - [0]=> - object(DOMElement)#%d (0) { - } - } - } - } - ["code"]=> - int(3) -} ---- Don't catch exception with try/catch - -Fatal error: Uncaught exception 'DOMException' with message 'Hierarchy Request Error' in %sdom003.php:%d -Stack trace: -#0 %sdom003.php(13): DOMNode->appendChild(Object(DOMElement)) -#1 {main} - thrown in %sdom003.php on line %d ---UEXPECTF-- ---- Catch exception with try/catch -object(DOMException)#%d (6) { [u"message":protected]=> unicode(23) "Hierarchy Request Error" [u"string":u"Exception":private]=> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_comment_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/dom_comment_basic.phpt diff -u php-src/ext/dom/tests/dom_comment_basic.phpt:1.1 php-src/ext/dom/tests/dom_comment_basic.phpt:1.2 --- php-src/ext/dom/tests/dom_comment_basic.phpt:1.1 Tue May 27 12:44:51 2008 +++ php-src/ext/dom/tests/dom_comment_basic.phpt Tue May 27 18:16:00 2008 @@ -32,22 +32,6 @@ --- child 0 --- object(DOMText)#%d (0) { } -string(2) " - " ---- child 1 --- -object(DOMComment)#%d (0) { -} -string(14) " Hello World! " ---- child 2 --- -object(DOMText)#%d (0) { -} -string(1) " -" ---UEXPECTF-- -bool(true) ---- child 0 --- -object(DOMText)#%d (0) { -} unicode(2) " " --- child 1 --- @@ -59,4 +43,3 @@ } unicode(1) " " - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_comment_variation.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/dom_comment_variation.phpt diff -u php-src/ext/dom/tests/dom_comment_variation.phpt:1.1 php-src/ext/dom/tests/dom_comment_variation.phpt:1.2 --- php-src/ext/dom/tests/dom_comment_variation.phpt:1.1 Tue May 27 12:44:51 2008 +++ php-src/ext/dom/tests/dom_comment_variation.phpt Tue May 27 18:16:00 2008 @@ -29,11 +29,4 @@ --- child 0 --- object(DOMComment)#%d (0) { } -string(14) " Hello World! " ---UEXPECTF-- -bool(true) ---- child 0 --- -object(DOMComment)#%d (0) { -} unicode(14) " Hello World! " - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_set_attr_node.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/dom_set_attr_node.phpt diff -u php-src/ext/dom/tests/dom_set_attr_node.phpt:1.4 php-src/ext/dom/tests/dom_set_attr_node.phpt:1.5 --- php-src/ext/dom/tests/dom_set_attr_node.phpt:1.4 Sat Aug 5 12:35:35 2006 +++ php-src/ext/dom/tests/dom_set_attr_node.phpt Tue May 27 18:16:00 2008 @@ -32,41 +32,6 @@ ?> --EXPECTF-- object(DOMException)#%d (6) { - ["message":protected]=> - string(20) "Wrong Document Error" - ["string":"Exception":private]=> - string(0) "" - ["file":protected]=> - string(%d) "%sdom_set_attr_node.php" - ["line":protected]=> - int(%d) - ["trace":"Exception":private]=> - array(1) { - [0]=> - array(6) { - ["file"]=> - string(%d) "%sdom_set_attr_node.php" - ["line"]=> - int(%d) - ["function"]=> - string(16) "setAttributeNode" - ["class"]=> - string(10) "DOMElement" - ["type"]=> - string(2) "->" - ["args"]=> - array(1) { - [0]=> - object(DOMAttr)#%d (0) { - } - } - } - } - ["code"]=> - int(4) -} ---UEXPECTF-- -object(DOMException)#%d (6) { [u"message":protected]=> unicode(20) "Wrong Document Error" [u"string":u"Exception":private]=> http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/domdocument.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/dom/tests/domdocument.phpt diff -u php-src/ext/dom/tests/domdocument.phpt:1.1 php-src/ext/dom/tests/domdocument.phpt:1.2 --- php-src/ext/dom/tests/domdocument.phpt:1.1 Thu Oct 5 11:59:43 2006 +++ php-src/ext/dom/tests/domdocument.phpt Tue May 27 18:16:00 2008 @@ -96,4 +96,3 @@ <root xmlns:foo="urn::foo"><child1 imported="1"><?php echo 'Hello World'; ?></child1></root> Output is identical - http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/domxpath.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/dom/tests/domxpath.phpt diff -u php-src/ext/dom/tests/domxpath.phpt:1.2 php-src/ext/dom/tests/domxpath.phpt:1.3 --- php-src/ext/dom/tests/domxpath.phpt:1.2 Thu Dec 14 16:24:00 2006 +++ php-src/ext/dom/tests/domxpath.phpt Tue May 27 18:16:00 2008 @@ -55,4 +55,4 @@ myval float(1) bool(true) -float(4) \ No newline at end of file +float(4) http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_replace_variation_003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/ereg_replace_variation_003.phpt diff -u php-src/ext/ereg/tests/ereg_replace_variation_003.phpt:1.1 php-src/ext/ereg/tests/ereg_replace_variation_003.phpt:1.2 --- php-src/ext/ereg/tests/ereg_replace_variation_003.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/ereg_replace_variation_003.phpt Tue May 27 18:16:00 2008 @@ -162,99 +162,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -string(6) "Object" - -Arg value -string(0) "" - -Arg value -string(0) "" -Done ---UEXPECTF-- -*** Testing ereg_replace() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -string(1) "0" - -Arg value 1 -string(9) "new value" - -Arg value 12345 -string(13) "new value2345" - -Arg value -2345 -string(5) "-2345" - -Arg value 10.5 -string(12) "new value0.5" - -Arg value -10.5 -string(13) "-new value0.5" - -Arg value 101234567000 -string(28) "new value0new value234567000" - -Arg value 1.07654321E-9 -string(29) "new value.0765432new valueE-9" - -Arg value 0.5 -string(3) "0.5" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value 1 -string(9) "new value" - -Arg value -string(0) "" - -Arg value 1 -string(9) "new value" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value -string(0) "" -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) string(6) "Object" http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/ereg_variation_001.phpt diff -u php-src/ext/ereg/tests/ereg_variation_001.phpt:1.1 php-src/ext/ereg/tests/ereg_variation_001.phpt:1.2 --- php-src/ext/ereg/tests/ereg_variation_001.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/ereg_variation_001.phpt Tue May 27 18:16:00 2008 @@ -169,107 +169,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(74) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(75) -Error: 8 - Object of class stdClass to string conversion, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) -Done ---UEXPECTF-- -*** Testing ereg() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(65) -Error: 8 - Undefined variable: unset_var, %s(68) - -Arg value 0 -bool(false) - -Arg value 1 -int(1) - -Arg value 12345 -bool(false) - -Arg value -2345 -bool(false) - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value 1 -int(1) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value 1 -int(1) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - ereg(): REG_EMPTY, %s(75) -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(75) Error: 8 - Object of class stdClass to string conversion, %s(75) bool(false) @@ -281,4 +180,4 @@ Arg value Error: 2 - ereg(): REG_EMPTY, %s(75) bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_variation_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/ereg_variation_002.phpt diff -u php-src/ext/ereg/tests/ereg_variation_002.phpt:1.1 php-src/ext/ereg/tests/ereg_variation_002.phpt:1.2 --- php-src/ext/ereg/tests/ereg_variation_002.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/ereg_variation_002.phpt Tue May 27 18:16:00 2008 @@ -162,99 +162,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Done ---UEXPECTF-- -*** Testing ereg() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -bool(false) - -Arg value 1 -int(1) - -Arg value 12345 -int(1) - -Arg value -2345 -bool(false) - -Arg value 10.5 -int(1) - -Arg value -10.5 -int(1) - -Arg value 101234567000 -int(1) - -Arg value 1.07654321E-9 -int(1) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -int(1) - -Arg value -bool(false) - -Arg value 1 -int(1) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) bool(false) @@ -264,4 +171,4 @@ Arg value bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/eregi_replace_variation_003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/eregi_replace_variation_003.phpt diff -u php-src/ext/ereg/tests/eregi_replace_variation_003.phpt:1.1 php-src/ext/ereg/tests/eregi_replace_variation_003.phpt:1.2 --- php-src/ext/ereg/tests/eregi_replace_variation_003.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/eregi_replace_variation_003.phpt Tue May 27 18:16:00 2008 @@ -162,99 +162,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -string(6) "Object" - -Arg value -string(0) "" - -Arg value -string(0) "" -Done ---UEXPECTF-- -*** Testing eregi_replace() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -string(1) "0" - -Arg value 1 -string(9) "new value" - -Arg value 12345 -string(13) "new value2345" - -Arg value -2345 -string(5) "-2345" - -Arg value 10.5 -string(12) "new value0.5" - -Arg value -10.5 -string(13) "-new value0.5" - -Arg value 101234567000 -string(28) "new value0new value234567000" - -Arg value 1.07654321E-9 -string(29) "new value.0765432new valueE-9" - -Arg value 0.5 -string(3) "0.5" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -string(5) "Array" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value 1 -string(9) "new value" - -Arg value -string(0) "" - -Arg value 1 -string(9) "new value" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value -string(0) "" -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) string(6) "Object" @@ -264,4 +171,4 @@ Arg value string(0) "" -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/eregi_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/eregi_variation_001.phpt diff -u php-src/ext/ereg/tests/eregi_variation_001.phpt:1.1 php-src/ext/ereg/tests/eregi_variation_001.phpt:1.2 --- php-src/ext/ereg/tests/eregi_variation_001.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/eregi_variation_001.phpt Tue May 27 18:16:00 2008 @@ -169,107 +169,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(74) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(75) -Error: 8 - Object of class stdClass to string conversion, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) -Done ---UEXPECTF-- -*** Testing eregi() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(65) -Error: 8 - Undefined variable: unset_var, %s(68) - -Arg value 0 -bool(false) - -Arg value 1 -int(1) - -Arg value 12345 -bool(false) - -Arg value -2345 -bool(false) - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) -Error: 8 - Array to string conversion, %s(74) - -Arg value Array -Error: 8 - Array to string conversion, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value 1 -int(1) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value 1 -int(1) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) - -Arg value -Error: 2 - eregi(): REG_EMPTY, %s(75) -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(75) Error: 8 - Object of class stdClass to string conversion, %s(75) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/eregi_variation_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/eregi_variation_002.phpt diff -u php-src/ext/ereg/tests/eregi_variation_002.phpt:1.1 php-src/ext/ereg/tests/eregi_variation_002.phpt:1.2 --- php-src/ext/ereg/tests/eregi_variation_002.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/eregi_variation_002.phpt Tue May 27 18:16:00 2008 @@ -162,99 +162,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Done ---UEXPECTF-- -*** Testing eregi() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -bool(false) - -Arg value 1 -int(1) - -Arg value 12345 -int(1) - -Arg value -2345 -bool(false) - -Arg value 10.5 -int(1) - -Arg value -10.5 -int(1) - -Arg value 101234567000 -int(1) - -Arg value 1.07654321E-9 -int(1) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -int(1) - -Arg value -bool(false) - -Arg value 1 -int(1) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/split_variation_001.phpt diff -u php-src/ext/ereg/tests/split_variation_001.phpt:1.1 php-src/ext/ereg/tests/split_variation_001.phpt:1.2 --- php-src/ext/ereg/tests/split_variation_001.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/split_variation_001.phpt Tue May 27 18:16:00 2008 @@ -244,186 +244,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) -Done ---UEXPECTF-- -*** Testing split() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value 12345 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -2345 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 10.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -10.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 101234567000 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 1.07654321E-9 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 0.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - split(): REG_EMPTY, %s(74) -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) array(1) { @@ -438,4 +258,4 @@ Arg value Error: 2 - split(): REG_EMPTY, %s(74) bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/split_variation_002.phpt diff -u php-src/ext/ereg/tests/split_variation_002.phpt:1.1 php-src/ext/ereg/tests/split_variation_002.phpt:1.2 --- php-src/ext/ereg/tests/split_variation_002.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/split_variation_002.phpt Tue May 27 18:16:00 2008 @@ -250,198 +250,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -array(2) { - [0]=> - string(2) "Ob" - [1]=> - string(3) "ect" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} -Done ---UEXPECTF-- -*** Testing split() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -array(1) { - [0]=> - string(1) "0" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value 12345 -array(1) { - [0]=> - string(5) "12345" -} - -Arg value -2345 -array(1) { - [0]=> - string(5) "-2345" -} - -Arg value 10.5 -array(1) { - [0]=> - string(4) "10.5" -} - -Arg value -10.5 -array(1) { - [0]=> - string(5) "-10.5" -} - -Arg value 101234567000 -array(1) { - [0]=> - string(12) "101234567000" -} - -Arg value 1.07654321E-9 -array(2) { - [0]=> - string(10) "1.07654321" - [1]=> - string(2) "-9" -} - -Arg value 0.5 -array(1) { - [0]=> - string(3) "0.5" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/spliti_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/spliti_variation_001.phpt diff -u php-src/ext/ereg/tests/spliti_variation_001.phpt:1.1 php-src/ext/ereg/tests/spliti_variation_001.phpt:1.2 --- php-src/ext/ereg/tests/spliti_variation_001.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/spliti_variation_001.phpt Tue May 27 18:16:00 2008 @@ -244,186 +244,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) -Done ---UEXPECTF-- -*** Testing spliti() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value 12345 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -2345 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 10.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value -10.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 101234567000 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 1.07654321E-9 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} - -Arg value 0.5 -array(1) { - [0]=> - string(16) "1 a 1 Array 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(2) { - [0]=> - string(6) "1 a 1 " - [1]=> - string(5) " 1 c " -} - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value 1 -array(4) { - [0]=> - string(0) "" - [1]=> - string(3) " a " - [2]=> - string(7) " Array " - [3]=> - string(3) " c " -} - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) - -Arg value -Error: 2 - spliti(): REG_EMPTY, %s(74) -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) array(1) { http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/spliti_variation_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/spliti_variation_002.phpt diff -u php-src/ext/ereg/tests/spliti_variation_002.phpt:1.1 php-src/ext/ereg/tests/spliti_variation_002.phpt:1.2 --- php-src/ext/ereg/tests/spliti_variation_002.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/spliti_variation_002.phpt Tue May 27 18:16:00 2008 @@ -250,200 +250,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(73) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(74) -Error: 8 - Object of class stdClass to string conversion, %s(74) -array(3) { - [0]=> - string(2) "Ob" - [1]=> - string(0) "" - [2]=> - string(2) "ct" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} -Done ---UEXPECTF-- -*** Testing spliti() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(64) -Error: 8 - Undefined variable: unset_var, %s(67) - -Arg value 0 -array(1) { - [0]=> - string(1) "0" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value 12345 -array(1) { - [0]=> - string(5) "12345" -} - -Arg value -2345 -array(1) { - [0]=> - string(5) "-2345" -} - -Arg value 10.5 -array(1) { - [0]=> - string(4) "10.5" -} - -Arg value -10.5 -array(1) { - [0]=> - string(5) "-10.5" -} - -Arg value 101234567000 -array(1) { - [0]=> - string(12) "101234567000" -} - -Arg value 1.07654321E-9 -array(2) { - [0]=> - string(10) "1.07654321" - [1]=> - string(2) "-9" -} - -Arg value 0.5 -array(1) { - [0]=> - string(3) "0.5" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} -Error: 8 - Array to string conversion, %s(73) - -Arg value Array -Error: 8 - Array to string conversion, %s(74) -array(3) { - [0]=> - string(1) "A" - [1]=> - string(0) "" - [2]=> - string(2) "ay" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value 1 -array(1) { - [0]=> - string(1) "1" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} - -Arg value -array(1) { - [0]=> - string(0) "" -} -Error: 4096 - Object of class stdClass could not be converted to string, %s(73) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74) Error: 8 - Object of class stdClass to string conversion, %s(74) array(3) { http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/sql_regcase_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ereg/tests/sql_regcase_variation_001.phpt diff -u php-src/ext/ereg/tests/sql_regcase_variation_001.phpt:1.1 php-src/ext/ereg/tests/sql_regcase_variation_001.phpt:1.2 --- php-src/ext/ereg/tests/sql_regcase_variation_001.phpt:1.1 Fri Apr 11 08:57:06 2008 +++ php-src/ext/ereg/tests/sql_regcase_variation_001.phpt Tue May 27 18:16:00 2008 @@ -160,99 +160,6 @@ Error: 4096 - Object of class stdClass could not be converted to string, %s(71) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(72) -Error: 8 - Object of class stdClass to string conversion, %s(72) -string(24) "[Oo][Bb][Jj][Ee][Cc][Tt]" - -Arg value -string(0) "" - -Arg value -string(0) "" -Done ---UEXPECTF-- -*** Testing sql_regcase() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(62) -Error: 8 - Undefined variable: unset_var, %s(65) - -Arg value 0 -string(1) "0" - -Arg value 1 -string(1) "1" - -Arg value 12345 -string(5) "12345" - -Arg value -2345 -string(5) "-2345" - -Arg value 10.5 -string(4) "10.5" - -Arg value -10.5 -string(5) "-10.5" - -Arg value 101234567000 -string(12) "101234567000" - -Arg value 1.07654321E-9 -string(16) "1.07654321[Ee]-9" - -Arg value 0.5 -string(3) "0.5" -Error: 8 - Array to string conversion, %s(71) - -Arg value Array -Error: 8 - Array to string conversion, %s(72) -string(20) "[Aa][Rr][Rr][Aa][Yy]" -Error: 8 - Array to string conversion, %s(71) - -Arg value Array -Error: 8 - Array to string conversion, %s(72) -string(20) "[Aa][Rr][Rr][Aa][Yy]" -Error: 8 - Array to string conversion, %s(71) - -Arg value Array -Error: 8 - Array to string conversion, %s(72) -string(20) "[Aa][Rr][Rr][Aa][Yy]" -Error: 8 - Array to string conversion, %s(71) - -Arg value Array -Error: 8 - Array to string conversion, %s(72) -string(20) "[Aa][Rr][Rr][Aa][Yy]" -Error: 8 - Array to string conversion, %s(71) - -Arg value Array -Error: 8 - Array to string conversion, %s(72) -string(20) "[Aa][Rr][Rr][Aa][Yy]" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value 1 -string(1) "1" - -Arg value -string(0) "" - -Arg value 1 -string(1) "1" - -Arg value -string(0) "" - -Arg value -string(0) "" - -Arg value -string(0) "" -Error: 4096 - Object of class stdClass could not be converted to string, %s(71) - -Arg value Error: 4096 - Object of class stdClass could not be converted to binary string, %s(72) Error: 8 - Object of class stdClass to string conversion, %s(72) string(24) "[Oo][Bb][Jj][Ee][Cc][Tt]" @@ -262,4 +169,4 @@ Arg value string(0) "" -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/exif/tests/exif001.phpt diff -u php-src/ext/exif/tests/exif001.phpt:1.5 php-src/ext/exif/tests/exif001.phpt:1.6 --- php-src/ext/exif/tests/exif001.phpt:1.5 Tue Aug 8 17:48:26 2006 +++ php-src/ext/exif/tests/exif001.phpt Tue May 27 18:16:00 2008 @@ -16,74 +16,6 @@ ?> --EXPECTF-- array(5) { - ["FILE"]=> - array(6) { - ["FileName"]=> - string(9) "test2.jpg" - ["FileDateTime"]=> - int(%d) - ["FileSize"]=> - int(1240) - ["FileType"]=> - int(2) - ["MimeType"]=> - string(10) "image/jpeg" - ["SectionsFound"]=> - string(33) "ANY_TAG, IFD0, THUMBNAIL, COMMENT" - } - ["COMPUTED"]=> - array(12) { - ["html"]=> - string(20) "width="1" height="1"" - ["Height"]=> - int(1) - ["Width"]=> - int(1) - ["IsColor"]=> - int(1) - ["ByteOrderMotorola"]=> - int(1) - ["UserComment"]=> - string(16) "Exif test image." - ["UserCommentEncoding"]=> - string(5) "ASCII" - ["Copyright"]=> - string(41) "Photo (c) M.Boerger, Edited by M.Boerger." - ["Copyright.Photographer"]=> - string(19) "Photo (c) M.Boerger" - ["Copyright.Editor"]=> - string(20) "Edited by M.Boerger." - ["Thumbnail.FileType"]=> - int(2) - ["Thumbnail.MimeType"]=> - string(10) "image/jpeg" - } - ["IFD0"]=> - array(2) { - ["Copyright"]=> - string(19) "Photo (c) M.Boerger" - ["UserComment"]=> - string(5) "ASCII" - } - ["THUMBNAIL"]=> - array(2) { - ["JPEGInterchangeFormat"]=> - int(134) - ["JPEGInterchangeFormatLength"]=> - int(523) - } - ["COMMENT"]=> - array(3) { - [0]=> - string(11) "Comment #1." - [1]=> - string(11) "Comment #2." - [2]=> - string(13) "Comment #3end" - } -} ---UEXPECTF-- -array(5) { [u"FILE"]=> array(6) { [u"FileName"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif005.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/exif/tests/exif005.phpt diff -u php-src/ext/exif/tests/exif005.phpt:1.7 php-src/ext/exif/tests/exif005.phpt:1.8 --- php-src/ext/exif/tests/exif005.phpt:1.7 Fri Jun 2 22:22:42 2006 +++ php-src/ext/exif/tests/exif005.phpt Tue May 27 18:16:00 2008 @@ -15,13 +15,6 @@ ?> --EXPECT-- array(2) { - ["ImageDescription"]=> - string(11) "Ifd00000009" - ["DateTime"]=> - string(19) "2002:10:18 20:06:00" -} ---UEXPECTF-- -array(2) { [u"ImageDescription"]=> string(11) "Ifd00000009" [u"DateTime"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/009.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/filter/tests/009.phpt diff -u php-src/ext/filter/tests/009.phpt:1.8 php-src/ext/filter/tests/009.phpt:1.9 --- php-src/ext/filter/tests/009.phpt:1.8 Tue Dec 19 14:16:07 2006 +++ php-src/ext/filter/tests/009.phpt Tue May 27 18:16:01 2008 @@ -16,21 +16,7 @@ echo "Done\n"; ?> ---EXPECTF-- -int(513) -int(513) -int(518) -int(257) -bool(false) - -Warning: filter_id() expects parameter 1 to be string, array given in %s on line %d -NULL -bool(false) - -Warning: filter_id() expects exactly 1 parameter, 3 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- int(513) int(513) int(518) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt diff -u php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1 php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.2 --- php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt:1.1 Fri Feb 1 16:32:37 2008 +++ php-src/ext/gd/tests/image_type_to_mime_type_basic.phpt Tue May 27 18:16:01 2008 @@ -44,27 +44,6 @@ --EXPECT-- Starting image_type_to_mime_type() test -string(9) "image/gif" -string(10) "image/jpeg" -string(9) "image/png" -string(29) "application/x-shockwave-flash" -string(9) "image/psd" -string(9) "image/bmp" -string(10) "image/tiff" -string(10) "image/tiff" -string(24) "application/octet-stream" -string(9) "image/jp2" -string(24) "application/octet-stream" -string(24) "application/octet-stream" -string(9) "image/iff" -string(18) "image/vnd.wap.wbmp" -string(24) "application/octet-stream" -string(9) "image/xbm" - -Done image_type_to_mime_type() test ---UEXPECT-- -Starting image_type_to_mime_type() test - unicode(9) "image/gif" unicode(10) "image/jpeg" unicode(9) "image/png" @@ -82,4 +61,4 @@ unicode(24) "application/octet-stream" unicode(9) "image/xbm" -Done image_type_to_mime_type() test \ No newline at end of file +Done image_type_to_mime_type() test http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagedashedline_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/imagedashedline_basic.phpt diff -u php-src/ext/gd/tests/imagedashedline_basic.phpt:1.1 php-src/ext/gd/tests/imagedashedline_basic.phpt:1.2 --- php-src/ext/gd/tests/imagedashedline_basic.phpt:1.1 Fri Feb 1 16:32:37 2008 +++ php-src/ext/gd/tests/imagedashedline_basic.phpt Tue May 27 18:16:01 2008 @@ -56,29 +56,6 @@ --EXPECT-- Simple test of imagedashedline() function array(4) { - ["red"]=> - int(255) - ["green"]=> - int(0) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -array(4) { - ["red"]=> - int(0) - ["green"]=> - int(0) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -Done ---UEXPECT-- -Simple test of imagedashedline() function -array(4) { [u"red"]=> int(255) [u"green"]=> @@ -98,4 +75,4 @@ [u"alpha"]=> int(0) } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagefilledpolygon_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/imagefilledpolygon_basic.phpt diff -u php-src/ext/gd/tests/imagefilledpolygon_basic.phpt:1.1 php-src/ext/gd/tests/imagefilledpolygon_basic.phpt:1.2 --- php-src/ext/gd/tests/imagefilledpolygon_basic.phpt:1.1 Fri Feb 1 16:32:37 2008 +++ php-src/ext/gd/tests/imagefilledpolygon_basic.phpt Tue May 27 18:16:01 2008 @@ -70,39 +70,6 @@ --EXPECT-- Simple test of imagefilledpolygon() function array(4) { - ["red"]=> - int(0) - ["green"]=> - int(255) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -array(4) { - ["red"]=> - int(0) - ["green"]=> - int(255) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -array(4) { - ["red"]=> - int(0) - ["green"]=> - int(0) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -Done ---UEXPECT-- -Simple test of imagefilledpolygon() function -array(4) { [u"red"]=> int(0) [u"green"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagepolygon_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/imagepolygon_basic.phpt diff -u php-src/ext/gd/tests/imagepolygon_basic.phpt:1.1 php-src/ext/gd/tests/imagepolygon_basic.phpt:1.2 --- php-src/ext/gd/tests/imagepolygon_basic.phpt:1.1 Fri Feb 1 16:32:37 2008 +++ php-src/ext/gd/tests/imagepolygon_basic.phpt Tue May 27 18:16:01 2008 @@ -58,29 +58,6 @@ --EXPECT-- Simple test of imagepolygon() function array(4) { - ["red"]=> - int(255) - ["green"]=> - int(0) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -array(4) { - ["red"]=> - int(0) - ["green"]=> - int(0) - ["blue"]=> - int(0) - ["alpha"]=> - int(0) -} -Done ---UEXPECT-- -Simple test of imagepolygon() function -array(4) { [u"red"]=> int(255) [u"green"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/dcngettext.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gettext/tests/dcngettext.phpt diff -u php-src/ext/gettext/tests/dcngettext.phpt:1.2 php-src/ext/gettext/tests/dcngettext.phpt:1.3 --- php-src/ext/gettext/tests/dcngettext.phpt:1.2 Wed Nov 15 17:14:50 2006 +++ php-src/ext/gettext/tests/dcngettext.phpt Tue May 27 18:16:01 2008 @@ -18,7 +18,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: dcngettext() expects exactly 5 parameters, 4 given in %s on line %d bool(false) string(1) "1" http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/gettext_basic.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/gettext/tests/gettext_basic.phpt diff -u php-src/ext/gettext/tests/gettext_basic.phpt:1.4 php-src/ext/gettext/tests/gettext_basic.phpt:1.5 --- php-src/ext/gettext/tests/gettext_basic.phpt:1.4 Sat Mar 22 14:58:29 2008 +++ php-src/ext/gettext/tests/gettext_basic.phpt Tue May 27 18:16:01 2008 @@ -11,7 +11,7 @@ } ?> --FILE-- -<?php // $Id: gettext_basic.phpt,v 1.4 2008/03/22 14:58:29 felipe Exp $ +<?php // $Id: gettext_basic.phpt,v 1.5 2008/05/27 18:16:01 sfox Exp $ chdir(dirname(__FILE__)); putenv("LANGUAGE=fi"); @@ -22,10 +22,7 @@ echo _("Basic test"), "\n"; ?> ---EXPECT-- -Perustesti -Perustesti ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d Perustesti Perustesti http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/gettext_basic_de.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gettext/tests/gettext_basic_de.phpt diff -u php-src/ext/gettext/tests/gettext_basic_de.phpt:1.2 php-src/ext/gettext/tests/gettext_basic_de.phpt:1.3 --- php-src/ext/gettext/tests/gettext_basic_de.phpt:1.2 Sat Mar 22 14:58:29 2008 +++ php-src/ext/gettext/tests/gettext_basic_de.phpt Tue May 27 18:16:01 2008 @@ -25,12 +25,7 @@ var_dump(textdomain("")); ?> ---EXPECT-- -string(14) "Einfacher Test" -string(14) "Einfacher Test" -string(8) "messages" -string(8) "messages" ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d string(14) "Einfacher Test" string(14) "Einfacher Test" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gmp/tests/004.phpt diff -u php-src/ext/gmp/tests/004.phpt:1.2 php-src/ext/gmp/tests/004.phpt:1.3 --- php-src/ext/gmp/tests/004.phpt:1.2 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/004.phpt Tue May 27 18:16:01 2008 @@ -24,7 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d NULL int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/005.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/005.phpt diff -u php-src/ext/gmp/tests/005.phpt:1.3 php-src/ext/gmp/tests/005.phpt:1.4 --- php-src/ext/gmp/tests/005.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/005.phpt Tue May 27 18:16:01 2008 @@ -31,46 +31,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d -NULL -bool(false) - -Warning: gmp_strval() expects parameter 2 to be long, string given in %s on line %d -NULL - -Warning: gmp_strval(): Bad base for conversion: -1 in %s on line %d -bool(false) - -Warning: gmp_strval() expects parameter 2 to be long, string given in %s on line %d -NULL - -Warning: gmp_strval(): supplied resource is not a valid GMP integer resource in %s on line %d -bool(false) -string(7) "9765456" - -Warning: gmp_strval(): Bad base for conversion: -1 in %s on line %d -bool(false) - -Warning: gmp_strval(): Bad base for conversion: 100000 in %s on line %d -bool(false) -string(7) "9765456" -string(8) "-3373333" - -Warning: gmp_strval(): Bad base for conversion: -1 in %s on line %d -bool(false) - -Warning: gmp_strval(): Bad base for conversion: 100000 in %s on line %d -bool(false) -string(8) "-3373333" - -Warning: gmp_strval() expects parameter 2 to be long, array given in %s on line %d -NULL - -Warning: gmp_strval() expects parameter 2 to be long, object given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d NULL bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/006.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/006.phpt diff -u php-src/ext/gmp/tests/006.phpt:1.3 php-src/ext/gmp/tests/006.phpt:1.4 --- php-src/ext/gmp/tests/006.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/006.phpt Tue May 27 18:16:01 2008 @@ -22,33 +22,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_sub() expects exactly 2 parameters, 1 given in %s on line %d -NULL -bool(false) - -Warning: gmp_sub() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -resource(%d) of type (GMP integer) -string(2) "-1" -resource(%d) of type (GMP integer) -string(5) "10001" - -Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -string(1) "0" - -Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -string(1) "0" -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/007.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/007.phpt diff -u php-src/ext/gmp/tests/007.phpt:1.3 php-src/ext/gmp/tests/007.phpt:1.4 --- php-src/ext/gmp/tests/007.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/007.phpt Tue May 27 18:16:01 2008 @@ -44,94 +44,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_qr() expects at least 2 parameters, 1 given in %s on line %d -NULL -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(1) "0" -string(1) "0" - -Warning: gmp_div_qr(): Zero operand not allowed in %s on line %d -bool(false) -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(1) "0" -string(5) "12653" -NULL - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9131" -string(2) "10" -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9132" -string(4) "-113" -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9131" -string(2) "10" -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9131" -string(2) "10" -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9132" -string(4) "-113" -array(2) { - [0]=> - resource(%d) of type (GMP integer) - [1]=> - resource(%d) of type (GMP integer) -} -string(4) "9131" -string(2) "10" - -Warning: gmp_div_qr(): supplied resource is not a valid GMP integer resource in %s on line %d -bool(false) - -Warning: gmp_div_qr(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/008.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/008.phpt diff -u php-src/ext/gmp/tests/008.phpt:1.3 php-src/ext/gmp/tests/008.phpt:1.4 --- php-src/ext/gmp/tests/008.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/008.phpt Tue May 27 18:16:01 2008 @@ -35,43 +35,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_r() expects at least 2 parameters, 1 given in %s on line %d -NULL -int(0) -string(1) "0" - -Warning: gmp_div_r(): Zero operand not allowed in %s on line %d -bool(false) -int(12653) -string(5) "12653" -NULL - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -int(10) -string(2) "10" -int(113) -string(3) "113" -int(10) -string(2) "10" -int(10) -string(2) "10" -int(113) -string(3) "113" -int(10) -string(2) "10" - -Warning: gmp_div_r(): supplied resource is not a valid GMP integer resource in %s on line %d -bool(false) - -Warning: gmp_div_r(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/009.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/009.phpt diff -u php-src/ext/gmp/tests/009.phpt:1.3 php-src/ext/gmp/tests/009.phpt:1.4 --- php-src/ext/gmp/tests/009.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/009.phpt Tue May 27 18:16:01 2008 @@ -35,43 +35,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_q() expects at least 2 parameters, 1 given in %s on line %d -NULL -resource(%d) of type (GMP integer) -string(1) "0" - -Warning: gmp_div_q(): Zero operand not allowed in %s on line %d -bool(false) -resource(%d) of type (GMP integer) -string(1) "0" -NULL - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -resource(%d) of type (GMP integer) -string(4) "9131" -resource(%d) of type (GMP integer) -string(4) "9132" -resource(%d) of type (GMP integer) -string(4) "9131" -resource(%d) of type (GMP integer) -string(4) "9131" -resource(%d) of type (GMP integer) -string(4) "9132" -resource(%d) of type (GMP integer) -string(4) "9131" - -Warning: gmp_div_q(): supplied resource is not a valid GMP integer resource in %s on line %d -bool(false) - -Warning: gmp_div_q(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/010.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gmp/tests/010.phpt diff -u php-src/ext/gmp/tests/010.phpt:1.2 php-src/ext/gmp/tests/010.phpt:1.3 --- php-src/ext/gmp/tests/010.phpt:1.2 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/010.phpt Tue May 27 18:16:01 2008 @@ -21,7 +21,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/011.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/gmp/tests/011.phpt diff -u php-src/ext/gmp/tests/011.phpt:1.5 php-src/ext/gmp/tests/011.phpt:1.6 --- php-src/ext/gmp/tests/011.phpt:1.5 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/011.phpt Tue May 27 18:16:01 2008 @@ -38,23 +38,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_divexact() expects exactly 2 parameters, 0 given in %s on line %d -NULL -string(1) "0" - -Warning: gmp_divexact(): Zero operand not allowed in %s on line %d -string(1) "0" -string(2) "10" -string(3) "512" -string(19) "5000000000000000000" -string(18) "200000000000000000" -string(9) "-10000000" -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/012.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/gmp/tests/012.phpt diff -u php-src/ext/gmp/tests/012.phpt:1.4 php-src/ext/gmp/tests/012.phpt:1.5 --- php-src/ext/gmp/tests/012.phpt:1.4 Mon May 19 15:17:08 2008 +++ php-src/ext/gmp/tests/012.phpt Tue May 27 18:16:01 2008 @@ -23,26 +23,7 @@ echo "Done\n"; ?> ---EXPECTF-- -int(0) -int(-1) -int(1) -int(1) -int(0) -int(0) -int(0) -string(21) "-12345678901234567890" - -Warning: gmp_neg() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_neg() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_neg(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- int(0) int(-1) int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/013.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/013.phpt diff -u php-src/ext/gmp/tests/013.phpt:1.3 php-src/ext/gmp/tests/013.phpt:1.4 --- php-src/ext/gmp/tests/013.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/013.phpt Tue May 27 18:16:02 2008 @@ -21,29 +21,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "0" -string(1) "0" -string(1) "0" - -Warning: gmp_abs(): Unable to convert variable to GMP - wrong type in %s on line %d -string(1) "0" -string(21) "111111111111111111111" -string(21) "111111111111111111111" -string(1) "0" -string(1) "0" -string(1) "0" - -Warning: gmp_abs() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_abs() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_abs(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "0" unicode(1) "0" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/014.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/014.phpt diff -u php-src/ext/gmp/tests/014.phpt:1.3 php-src/ext/gmp/tests/014.phpt:1.4 --- php-src/ext/gmp/tests/014.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/014.phpt Tue May 27 18:16:02 2008 @@ -28,35 +28,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "1" -string(1) "1" -string(1) "1" - -Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" - -Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" -string(1) "1" -string(19) "2432902008176640000" -string(65) "30414093201713378043612608166064768844377641568960512000000000000" -string(7) "3628800" -string(1) "1" -string(11) "87178291200" - -Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" - -Warning: gmp_fact() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_fact() expects exactly 1 parameter, 2 given in %s on line %d -NULL -resource(%d) of type (GMP integer) -string(1) "1" -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "1" unicode(1) "1" unicode(1) "1" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/015.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/015.phpt diff -u php-src/ext/gmp/tests/015.phpt:1.3 php-src/ext/gmp/tests/015.phpt:1.4 --- php-src/ext/gmp/tests/015.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/015.phpt Tue May 27 18:16:02 2008 @@ -30,43 +30,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(4) "1024" -string(4) "1024" -string(5) "-2048" -string(4) "1024" -string(1) "1" - -Warning: gmp_pow(): Negative exponent not supported in %s on line %d -string(1) "0" -string(4) "1024" -string(14) "10240000000000" -string(17) "97656250000000000" - -Warning: gmp_pow(): Negative exponent not supported in %s on line %d -string(1) "0" -string(14) "10240000000000" -string(14) "10240000000000" - -Warning: gmp_pow() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_pow() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_pow() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d -NULL - -Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d -NULL - -Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(4) "1024" unicode(4) "1024" unicode(5) "-2048" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/016.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/gmp/tests/016.phpt diff -u php-src/ext/gmp/tests/016.phpt:1.4 php-src/ext/gmp/tests/016.phpt:1.5 --- php-src/ext/gmp/tests/016.phpt:1.4 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/016.phpt Tue May 27 18:16:02 2008 @@ -35,43 +35,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "0" -string(1) "5" -string(1) "5" -string(1) "5" -string(1) "5" -string(3) "533" -string(3) "331" -string(3) "171" -string(3) "371" - -Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_powm() expects exactly 3 parameters, 2 given in %s on line %d -NULL - -Warning: gmp_powm() expects exactly 3 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_powm() expects exactly 3 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_powm(): Second parameter cannot be less than 0 in %s on line %d -bool(false) -resource(%d) of type (GMP integer) -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "0" unicode(1) "5" unicode(1) "5" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/017.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/017.phpt diff -u php-src/ext/gmp/tests/017.phpt:1.3 php-src/ext/gmp/tests/017.phpt:1.4 --- php-src/ext/gmp/tests/017.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/017.phpt Tue May 27 18:16:02 2008 @@ -24,31 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" - -Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" -string(1) "0" -string(1) "1" -string(2) "12" -string(1) "0" - -Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d -string(1) "0" -string(2) "27" - -Warning: gmp_sqrt() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_sqrt() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_sqrt(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/018.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/018.phpt diff -u php-src/ext/gmp/tests/018.phpt:1.3 php-src/ext/gmp/tests/018.phpt:1.4 --- php-src/ext/gmp/tests/018.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/018.phpt Tue May 27 18:16:02 2008 @@ -57,48 +57,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_sqrtrem(): Number has to be greater than or equal to 0 in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -string(1) "0" -string(1) "0" -string(1) "1" -string(1) "1" -string(1) "3" -string(1) "1" -string(1) "2" -string(1) "3" -string(1) "1" -string(1) "2" -string(3) "316" -string(3) "144" -string(4) "1000" -string(1) "0" -string(4) "1000" -string(1) "1" - -Warning: gmp_sqrtrem(): Number has to be greater than or equal to 0 in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -string(4) "1000" -string(1) "1" - -Warning: gmp_sqrtrem(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_sqrtrem() expects exactly 1 parameter, 0 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_sqrtrem(): Number has to be greater than or equal to 0 in %s on line %d Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/019.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/019.phpt diff -u php-src/ext/gmp/tests/019.phpt:1.3 php-src/ext/gmp/tests/019.phpt:1.4 --- php-src/ext/gmp/tests/019.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/019.phpt Tue May 27 18:16:02 2008 @@ -26,7 +26,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/020.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/020.phpt diff -u php-src/ext/gmp/tests/020.phpt:1.3 php-src/ext/gmp/tests/020.phpt:1.4 --- php-src/ext/gmp/tests/020.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/020.phpt Tue May 27 18:16:02 2008 @@ -33,7 +33,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(2) int(2) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/021.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/021.phpt diff -u php-src/ext/gmp/tests/021.phpt:1.3 php-src/ext/gmp/tests/021.phpt:1.4 --- php-src/ext/gmp/tests/021.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/021.phpt Tue May 27 18:16:02 2008 @@ -27,29 +27,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "3" -string(5) "12387" -string(3) "224" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "2" -string(1) "1" -string(10) "8127346234" -string(10) "8127346234" - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "3" unicode(5) "12387" unicode(3) "224" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/022.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/gmp/tests/022.phpt diff -u php-src/ext/gmp/tests/022.phpt:1.4 php-src/ext/gmp/tests/022.phpt:1.5 --- php-src/ext/gmp/tests/022.phpt:1.4 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/022.phpt Tue May 27 18:16:02 2008 @@ -36,54 +36,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "3" -string(2) "-4" -string(2) "11" -string(1) "1" -string(4) "-805" -string(3) "359" -string(1) "3" -string(2) "32" -string(5) "-2257" -string(4) "3003" -string(3) "-10" -string(2) "19" -string(1) "2" -string(2) "67" -string(2) "-3" -string(2) "15" -string(7) "-601519" -string(1) "6" -string(3) "345" -string(1) "1" -string(1) "0" -string(1) "1" -string(5) "84319" -string(9) "-84241831" -string(1) "1" -string(13) "-156252240050" -string(14) "16689072773537" -string(3) "195" -string(11) "46994884483" -string(9) "-68772552" - -Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_gcdext() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcdext() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_gcdext() expects exactly 2 parameters, 0 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "3" unicode(2) "-4" unicode(2) "11" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/023.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/023.phpt diff -u php-src/ext/gmp/tests/023.phpt:1.3 php-src/ext/gmp/tests/023.phpt:1.4 --- php-src/ext/gmp/tests/023.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/023.phpt Tue May 27 18:16:02 2008 @@ -27,33 +27,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(7) "2293131" -string(1) "0" -string(4) "5827" -string(1) "0" -string(1) "0" -string(1) "0" -string(1) "0" -string(22) "3498273496234234523441" -string(1) "1" - -Warning: gmp_invert() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_invert() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_invert(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_invert(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_invert(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(7) "2293131" unicode(1) "0" unicode(4) "5827" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/024.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/024.phpt diff -u php-src/ext/gmp/tests/024.phpt:1.3 php-src/ext/gmp/tests/024.phpt:1.4 --- php-src/ext/gmp/tests/024.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/024.phpt Tue May 27 18:16:02 2008 @@ -30,44 +30,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(2) "-1" - -Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_jacobi() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_jacobi() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_jacobi() expects exactly 2 parameters, 0 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "0" unicode(2) "-1" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/025.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/025.phpt diff -u php-src/ext/gmp/tests/025.phpt:1.3 php-src/ext/gmp/tests/025.phpt:1.4 --- php-src/ext/gmp/tests/025.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/025.phpt Tue May 27 18:16:02 2008 @@ -30,44 +30,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(2) "-1" -string(1) "0" -string(1) "0" -string(2) "-1" -string(1) "0" -string(2) "-1" - -Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_legendre() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_legendre() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_legendre() expects exactly 2 parameters, 0 given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "0" unicode(2) "-1" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/026.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/gmp/tests/026.phpt diff -u php-src/ext/gmp/tests/026.phpt:1.4 php-src/ext/gmp/tests/026.phpt:1.5 --- php-src/ext/gmp/tests/026.phpt:1.4 Thu Dec 27 16:05:58 2007 +++ php-src/ext/gmp/tests/026.phpt Tue May 27 18:16:02 2008 @@ -24,7 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2) int(0) int(-1) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/027.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/027.phpt diff -u php-src/ext/gmp/tests/027.phpt:1.3 php-src/ext/gmp/tests/027.phpt:1.4 --- php-src/ext/gmp/tests/027.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/027.phpt Tue May 27 18:16:02 2008 @@ -19,7 +19,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(1) int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/028.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/028.phpt diff -u php-src/ext/gmp/tests/028.phpt:1.3 php-src/ext/gmp/tests/028.phpt:1.4 --- php-src/ext/gmp/tests/028.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/028.phpt Tue May 27 18:16:02 2008 @@ -19,27 +19,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(%d) "%d" -string(%d) "%d" -string(1) "0" -string(%d) "%d" -string(%d) "%d" -string(%d) "%d" - -Warning: gmp_random() expects parameter 1 to be long, array given in %s on line %d -NULL - -Warning: gmp_random() expects at most 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_random() expects parameter 1 to be long, string given in %s on line %d -NULL - -Warning: gmp_random() expects parameter 1 to be long, string given in %s on line %d -NULL -Done ---UEXPECTF-- +--EXPECTF-- unicode(%d) "%d" unicode(%d) "%d" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/029.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/029.phpt diff -u php-src/ext/gmp/tests/029.phpt:1.3 php-src/ext/gmp/tests/029.phpt:1.4 --- php-src/ext/gmp/tests/029.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/029.phpt Tue May 27 18:16:02 2008 @@ -25,32 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(6) "106502" -string(5) "40994" -string(3) "515" -string(4) "3333" -string(4) "4544" -string(1) "0" -string(4) "1536" -string(15) "424703623692768" - -Warning: gmp_and() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_and() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(6) "106502" unicode(5) "40994" unicode(3) "515" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/030.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/030.phpt diff -u php-src/ext/gmp/tests/030.phpt:1.3 php-src/ext/gmp/tests/030.phpt:1.4 --- php-src/ext/gmp/tests/030.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/030.phpt Tue May 27 18:16:02 2008 @@ -25,32 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(7) "2226831" -string(6) "517363" -string(10) "2342341163" -string(2) "-1" -string(3) "-19" -string(1) "0" -string(15) "987657876576252" -string(21) "987658441719689394144" - -Warning: gmp_or() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_or() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_or(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_or(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_or(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(7) "2226831" unicode(6) "517363" unicode(10) "2342341163" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/031.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/031.phpt diff -u php-src/ext/gmp/tests/031.phpt:1.3 php-src/ext/gmp/tests/031.phpt:1.4 --- php-src/ext/gmp/tests/031.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/031.phpt Tue May 27 18:16:02 2008 @@ -23,26 +23,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(2) "-1" -string(2) "-1" -string(1) "0" -string(14) "-2394876545679" -string(3) "110" -string(7) "-874654" -string(4) "9875" -string(9) "-98765468" -string(12) "-98765463338" - -Warning: gmp_com(): Unable to convert variable to GMP - wrong type in %s on line %d -string(1) "0" - -Warning: gmp_com() expects exactly 1 parameter, 0 given in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(2) "-1" unicode(2) "-1" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/032.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/032.phpt diff -u php-src/ext/gmp/tests/032.phpt:1.3 php-src/ext/gmp/tests/032.phpt:1.4 --- php-src/ext/gmp/tests/032.phpt:1.3 Tue Nov 6 14:31:07 2007 +++ php-src/ext/gmp/tests/032.phpt Tue May 27 18:16:02 2008 @@ -25,32 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(7) "2120329" -string(6) "476369" -string(10) "2342340648" -string(5) "-3334" -string(5) "-4563" -string(1) "0" -string(15) "987657876574716" -string(21) "987658017016065701376" - -Warning: gmp_xor() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_xor() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_xor(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_xor(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_xor(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) -Done ---UEXPECTF-- +--EXPECTF-- unicode(7) "2120329" unicode(6) "476369" unicode(10) "2342340648" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/033.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/033.phpt diff -u php-src/ext/gmp/tests/033.phpt:1.3 php-src/ext/gmp/tests/033.phpt:1.4 --- php-src/ext/gmp/tests/033.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/033.phpt Tue May 27 18:16:02 2008 @@ -41,28 +41,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(2) "-1" - -Warning: gmp_setbit(): Index must be greater than or equal to zero in %s on line %d -string(1) "5" -string(1) "1" -string(1) "7" -string(12) "100008388608" -string(12) "100000000000" -string(12) "100000000008" - -Warning: gmp_setbit(): supplied argument is not a valid GMP integer resource in %s on line %d - -Warning: gmp_setbit() expects at least 2 parameters, 1 given in %s on line %d - -Warning: gmp_setbit() expects at most 3 parameters, 4 given in %s on line %d - -Warning: gmp_setbit() expects parameter 2 to be long, array given in %s on line %d - -Warning: gmp_setbit() expects parameter 2 to be long, array given in %s on line %d -Done ---UEXPECTF-- +--EXPECTF-- unicode(2) "-1" Warning: gmp_setbit(): Index must be greater than or equal to zero in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/034.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/034.phpt diff -u php-src/ext/gmp/tests/034.phpt:1.3 php-src/ext/gmp/tests/034.phpt:1.4 --- php-src/ext/gmp/tests/034.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/034.phpt Tue May 27 18:16:02 2008 @@ -35,26 +35,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(1) "0" - -Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line %d -string(2) "-1" - -Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line %d -string(7) "1000000" -string(7) "1000000" -string(30) "238462734628347239571822592658" - -Warning: gmp_clrbit(): supplied argument is not a valid GMP integer resource in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 3 given in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 1 given in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 0 given in %s on line %d -Done ---UEXPECTF-- +--EXPECTF-- unicode(1) "0" Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/035.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/035.phpt diff -u php-src/ext/gmp/tests/035.phpt:1.3 php-src/ext/gmp/tests/035.phpt:1.4 --- php-src/ext/gmp/tests/035.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/035.phpt Tue May 27 18:16:02 2008 @@ -17,7 +17,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(0) int(10) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/036.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/036.phpt diff -u php-src/ext/gmp/tests/036.phpt:1.3 php-src/ext/gmp/tests/036.phpt:1.4 --- php-src/ext/gmp/tests/036.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/036.phpt Tue May 27 18:16:02 2008 @@ -24,7 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(13) int(-1) int(36) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/037.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/037.phpt diff -u php-src/ext/gmp/tests/037.phpt:1.3 php-src/ext/gmp/tests/037.phpt:1.4 --- php-src/ext/gmp/tests/037.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/037.phpt Tue May 27 18:16:02 2008 @@ -20,7 +20,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_scan0(): Starting index must be greater than or equal to zero in %s on line %d bool(false) int(2) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/038.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/038.phpt diff -u php-src/ext/gmp/tests/038.phpt:1.3 php-src/ext/gmp/tests/038.phpt:1.4 --- php-src/ext/gmp/tests/038.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/038.phpt Tue May 27 18:16:02 2008 @@ -20,7 +20,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_scan1(): Starting index must be greater than or equal to zero in %s on line %d bool(false) int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/039.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gmp/tests/039.phpt diff -u php-src/ext/gmp/tests/039.phpt:1.2 php-src/ext/gmp/tests/039.phpt:1.3 --- php-src/ext/gmp/tests/039.phpt:1.2 Sun May 27 15:12:22 2007 +++ php-src/ext/gmp/tests/039.phpt Tue May 27 18:16:02 2008 @@ -37,28 +37,7 @@ echo "Done\n"; ?> ---EXPECTF-- -Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on line %d -bool(false) -bool(false) -bool(false) -bool(false) -bool(true) - -Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on line %d -bool(false) -bool(false) -bool(true) -string(7) "1000002" -bool(true) -string(7) "1000034" -bool(false) -bool(true) -string(30) "238462734628347239571823641266" -bool(false) -string(30) "238462734628347239571823641234" -Done ---UEXPECTF-- +--EXPECTF-- Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on line %d bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/040.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/gmp/tests/040.phpt diff -u php-src/ext/gmp/tests/040.phpt:1.3 php-src/ext/gmp/tests/040.phpt:1.4 --- php-src/ext/gmp/tests/040.phpt:1.3 Tue Nov 6 14:31:08 2007 +++ php-src/ext/gmp/tests/040.phpt Tue May 27 18:16:02 2008 @@ -17,28 +17,7 @@ echo "Done\n"; ?> ---EXPECTF-- -resource(%d) of type (GMP integer) -string(8) "98765678" - -Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_init() expects at most 2 parameters, 4 given in %s on line %d -NULL - -Warning: gmp_init(): Bad base for conversion: -1 (should be between 2 and 36) in %s on line %d -bool(false) -bool(false) -bool(false) -string(1) "0" -Done ---UEXPECTF-- +--EXPECTF-- resource(%d) of type (GMP integer) unicode(8) "98765678" http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/gmp_nextprime.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gmp/tests/gmp_nextprime.phpt diff -u php-src/ext/gmp/tests/gmp_nextprime.phpt:1.2 php-src/ext/gmp/tests/gmp_nextprime.phpt:1.3 --- php-src/ext/gmp/tests/gmp_nextprime.phpt:1.2 Mon Oct 9 20:42:35 2006 +++ php-src/ext/gmp/tests/gmp_nextprime.phpt Tue May 27 18:16:02 2008 @@ -24,7 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- %s(1) "2" %s(1) "2" %s(4) "-997" http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/hash/tests/hash_copy_001.phpt diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.1 php-src/ext/hash/tests/hash_copy_001.phpt:1.2 --- php-src/ext/hash/tests/hash_copy_001.phpt:1.1 Mon Apr 21 15:37:07 2008 +++ php-src/ext/hash/tests/hash_copy_001.phpt Tue May 27 18:16:02 2008 @@ -26,161 +26,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" -string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" -string(32) "302c45586b53a984bd3a1237cb81c15f" -string(32) "302c45586b53a984bd3a1237cb81c15f" -string(32) "e35759f6ea35db254e415b5332269435" -string(32) "e35759f6ea35db254e415b5332269435" -string(40) "29f62a228f726cd728efa7a0ac6a2aba318baf15" -string(40) "29f62a228f726cd728efa7a0ac6a2aba318baf15" -string(64) "d3a13cf52af8e9390caed78b77b6b1e06e102204e3555d111dfd149bc5d54dba" -string(64) "d3a13cf52af8e9390caed78b77b6b1e06e102204e3555d111dfd149bc5d54dba" -string(96) "6950d861ace4102b803ab8b3779d2f471968233010d2608974ab89804cef6f76162b4433d6e554e11e40a7cdcf510ea3" -string(96) "6950d861ace4102b803ab8b3779d2f471968233010d2608974ab89804cef6f76162b4433d6e554e11e40a7cdcf510ea3" -string(128) "caced3db8e9e3a5543d5b933bcbe9e7834e6667545c3f5d4087b58ec8d78b4c8a4a5500c9b88f65f7368810ba9905e51f1cff3b25a5dccf76634108fb4e7ce13" -string(128) "caced3db8e9e3a5543d5b933bcbe9e7834e6667545c3f5d4087b58ec8d78b4c8a4a5500c9b88f65f7368810ba9905e51f1cff3b25a5dccf76634108fb4e7ce13" -string(32) "5f1bc5f5aeaf747574dd34a6535cd94a" -string(32) "5f1bc5f5aeaf747574dd34a6535cd94a" -string(40) "02a2a535ee10404c6b5cf9acb178a04fbed67269" -string(40) "02a2a535ee10404c6b5cf9acb178a04fbed67269" -string(64) "547d2ed85ca0a0e3208b5ecf4fc6a7fc1e64db8ff13493e4beaf11e4d71648e2" -string(64) "547d2ed85ca0a0e3208b5ecf4fc6a7fc1e64db8ff13493e4beaf11e4d71648e2" -string(80) "785a7df56858f550966cddfd59ce14b13bf4b18e7892c4c1ad91bf23bf67639bd2c96749ba29cfa6" -string(80) "785a7df56858f550966cddfd59ce14b13bf4b18e7892c4c1ad91bf23bf67639bd2c96749ba29cfa6" -string(128) "6e60597340640e621e25f975cef2b000b0c4c09a7af7d240a52d193002b0a8426fa7da7acc5b37ed9608016d4f396db834a0ea2f2c35f900461c9ac7e5604082" -string(128) "6e60597340640e621e25f975cef2b000b0c4c09a7af7d240a52d193002b0a8426fa7da7acc5b37ed9608016d4f396db834a0ea2f2c35f900461c9ac7e5604082" -string(32) "a92be6c58be7688dc6cf9585a47aa625" -string(32) "a92be6c58be7688dc6cf9585a47aa625" -string(40) "a92be6c58be7688dc6cf9585a47aa62535fc2482" -string(40) "a92be6c58be7688dc6cf9585a47aa62535fc2482" -string(48) "a92be6c58be7688dc6cf9585a47aa62535fc2482e0e5d12c" -string(48) "a92be6c58be7688dc6cf9585a47aa62535fc2482e0e5d12c" -string(32) "32fb748ef5a36ca222511bcb99b044ee" -string(32) "32fb748ef5a36ca222511bcb99b044ee" -string(40) "32fb748ef5a36ca222511bcb99b044ee1d740bf3" -string(40) "32fb748ef5a36ca222511bcb99b044ee1d740bf3" -string(48) "32fb748ef5a36ca222511bcb99b044ee1d740bf300593703" -string(48) "32fb748ef5a36ca222511bcb99b044ee1d740bf300593703" -string(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26" -string(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26" -string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" -string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" -string(8) "28097c6f" -string(8) "28097c6f" -string(8) "e5cfc160" -string(8) "e5cfc160" -string(8) "4e7a1469" -string(8) "4e7a1469" -string(32) "86362472c8895e68e223ef8b3711d8d9" -string(32) "86362472c8895e68e223ef8b3711d8d9" -string(40) "fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4" -string(40) "fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4" -string(48) "e05d0ff5723028bd5494f32c0c2494cd0b9ccf7540af7b47" -string(48) "e05d0ff5723028bd5494f32c0c2494cd0b9ccf7540af7b47" -string(56) "56b196289d8de8a22296588cf90e5b09cb6fa1b01ce8e92bca40cae2" -string(56) "56b196289d8de8a22296588cf90e5b09cb6fa1b01ce8e92bca40cae2" -string(64) "ff4d7ab0fac2ca437b945461f9b62fd16e71e9103524d5d140445a00e3d49239" -string(64) "ff4d7ab0fac2ca437b945461f9b62fd16e71e9103524d5d140445a00e3d49239" -string(32) "ee44418e0195a0c4a35d112722919a9c" -string(32) "ee44418e0195a0c4a35d112722919a9c" -string(40) "f320cce982d5201a1ccacc1c5ff835a258a97eb1" -string(40) "f320cce982d5201a1ccacc1c5ff835a258a97eb1" -string(48) "a96600107463e8e97a7fe6f260d9bf4f4587a281caafa6db" -string(48) "a96600107463e8e97a7fe6f260d9bf4f4587a281caafa6db" -string(56) "7147c9e1c1e67b942da3229f59a1ab18f121f5d7f5765ca88bc9f200" -string(56) "7147c9e1c1e67b942da3229f59a1ab18f121f5d7f5765ca88bc9f200" -string(64) "82fec42679ed5a77a841962827b88a9cddf7d677736e50bc81f1a14b99f06061" -string(64) "82fec42679ed5a77a841962827b88a9cddf7d677736e50bc81f1a14b99f06061" -string(32) "8d0b157828328ae7d34d60b4b60c1dab" -string(32) "8d0b157828328ae7d34d60b4b60c1dab" -string(40) "54dab5e10dc41503f9b8aa32ffe3bab7cf1da8a3" -string(40) "54dab5e10dc41503f9b8aa32ffe3bab7cf1da8a3" -string(48) "7d91265a1b27698279d8d95a5ee0a20014528070bf6415e7" -string(48) "7d91265a1b27698279d8d95a5ee0a20014528070bf6415e7" -string(56) "7772b2e22f2a3bce917e08cf57ebece46bb33168619a776c6f2f7234" -string(56) "7772b2e22f2a3bce917e08cf57ebece46bb33168619a776c6f2f7234" -string(64) "438a602cb1a761f7bd0a633b7bd8b3ccd0577b524d05174ca1ae1f559b9a2c2a" -string(64) "438a602cb1a761f7bd0a633b7bd8b3ccd0577b524d05174ca1ae1f559b9a2c2a" -string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" -string(32) "5c36f61062d091a8324991132c5e8dbd" -string(32) "302c45586b53a984bd3a1237cb81c15f" -string(32) "1d4196526aada3506efb4c7425651584" -string(32) "e35759f6ea35db254e415b5332269435" -string(32) "f255c114bd6ce94aad092b5141c00d46" -string(40) "29f62a228f726cd728efa7a0ac6a2aba318baf15" -string(40) "a273396f056554dcd491b5dea1e7baa3b89b802b" -string(64) "d3a13cf52af8e9390caed78b77b6b1e06e102204e3555d111dfd149bc5d54dba" -string(64) "268e7f4cf88504a53fd77136c4c4748169f46ff7150b376569ada9c374836944" -string(96) "6950d861ace4102b803ab8b3779d2f471968233010d2608974ab89804cef6f76162b4433d6e554e11e40a7cdcf510ea3" -string(96) "0d44981d04bb11b1ef75d5c2932bd0aa2785e7bc454daac954d77e2ca10047879b58997533fc99650b20049c6cb9a6cc" -string(128) "caced3db8e9e3a5543d5b933bcbe9e7834e6667545c3f5d4087b58ec8d78b4c8a4a5500c9b88f65f7368810ba9905e51f1cff3b25a5dccf76634108fb4e7ce13" -string(128) "28d7c721433782a880f840af0c3f3ea2cad4ef55de2114dda9d504cedeb110e1cf2519c49e4b5da3da4484bb6ba4fd1621ceadc6408f4410b2ebe9d83a4202c2" -string(32) "5f1bc5f5aeaf747574dd34a6535cd94a" -string(32) "f95f5e22b8875ee0c48219ae97f0674b" -string(40) "02a2a535ee10404c6b5cf9acb178a04fbed67269" -string(40) "900d615c1abe714e340f4ecd6a3d65599fd30ff4" -string(64) "547d2ed85ca0a0e3208b5ecf4fc6a7fc1e64db8ff13493e4beaf11e4d71648e2" -string(64) "b9799db40d1af5614118c329169cdcd2c718db6af03bf945ea7f7ba72b8e14f4" -string(80) "785a7df56858f550966cddfd59ce14b13bf4b18e7892c4c1ad91bf23bf67639bd2c96749ba29cfa6" -string(80) "d6d12c1fca7a9c4a59c1be4f40188e92a746a035219e0a6ca1ee53b36a8282527187f7dffaa57ecc" -string(128) "6e60597340640e621e25f975cef2b000b0c4c09a7af7d240a52d193002b0a8426fa7da7acc5b37ed9608016d4f396db834a0ea2f2c35f900461c9ac7e5604082" -string(128) "e8c6a921e7d8eac2fd21d4df6054bb27a02321b2beb5b01b6f88c40706164e64d67ec97519bf76c8af8df896745478b78d42a0159f1a0db16777771fd9d420dc" -string(32) "a92be6c58be7688dc6cf9585a47aa625" -string(32) "dc80d448032c9da9f1e0262985353c0f" -string(40) "a92be6c58be7688dc6cf9585a47aa62535fc2482" -string(40) "dc80d448032c9da9f1e0262985353c0fe37e9551" -string(48) "a92be6c58be7688dc6cf9585a47aa62535fc2482e0e5d12c" -string(48) "dc80d448032c9da9f1e0262985353c0fe37e9551165c82e1" -string(32) "32fb748ef5a36ca222511bcb99b044ee" -string(32) "e5c4212432c0e266e581d4ee6a8e20a9" -string(40) "32fb748ef5a36ca222511bcb99b044ee1d740bf3" -string(40) "e5c4212432c0e266e581d4ee6a8e20a9d0d944e3" -string(48) "32fb748ef5a36ca222511bcb99b044ee1d740bf300593703" -string(48) "e5c4212432c0e266e581d4ee6a8e20a9d0d944e34804b0c4" -string(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26" -string(64) "614ca924864fa0e8fa309aa0944e047d5edbfd4964a35858f4d8ec66a0fb88b0" -string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" -string(64) "a00961e371287c71c527a41c14564f13b6ed12ac7cd9d5f5dfb3542a25e28d3b" -string(8) "28097c6f" -string(8) "471714d9" -string(8) "e5cfc160" -string(8) "59f8d3d2" -string(8) "4e7a1469" -string(8) "9939e63e" -string(32) "86362472c8895e68e223ef8b3711d8d9" -string(32) "ebeeeb05c18af1e53d2d127b561d5e0d" -string(40) "fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4" -string(40) "f1a2c9604fb40899ad502abe0dfcec65115c8a9a" -string(48) "e05d0ff5723028bd5494f32c0c2494cd0b9ccf7540af7b47" -string(48) "d3a7315773a326678208650ed02510ed96cd488d74cd5231" -string(56) "56b196289d8de8a22296588cf90e5b09cb6fa1b01ce8e92bca40cae2" -string(56) "6d7132fabc83c9ab7913748b79ecf10e25409569d3ed144177f46731" -string(64) "ff4d7ab0fac2ca437b945461f9b62fd16e71e9103524d5d140445a00e3d49239" -string(64) "7a469868ad4b92891a3a44524c58a2b8d0f3bebb92b4cf47d19bc6aba973eb95" -string(32) "ee44418e0195a0c4a35d112722919a9c" -string(32) "6ecddb39615f43fd211839287ff38461" -string(40) "f320cce982d5201a1ccacc1c5ff835a258a97eb1" -string(40) "bcd2e7821723ac22e122b8b7cbbd2daaa9a862df" -string(48) "a96600107463e8e97a7fe6f260d9bf4f4587a281caafa6db" -string(48) "ae74619a88dcec1fbecde28e27f009a65ecc12170824d2cd" -string(56) "7147c9e1c1e67b942da3229f59a1ab18f121f5d7f5765ca88bc9f200" -string(56) "fdaba6563f1334d40de24e311f14b324577f97c3b78b9439c408cdca" -string(64) "82fec42679ed5a77a841962827b88a9cddf7d677736e50bc81f1a14b99f06061" -string(64) "289a2ba4820218bdb25a6534fbdf693f9de101362584fdd41e32244c719caa37" -string(32) "8d0b157828328ae7d34d60b4b60c1dab" -string(32) "ffa7993a4e183b245263fb1f63e27343" -string(40) "54dab5e10dc41503f9b8aa32ffe3bab7cf1da8a3" -string(40) "375ee5ab3a9bd07a1dbe5d071e07b2afb3165e3b" -string(48) "7d91265a1b27698279d8d95a5ee0a20014528070bf6415e7" -string(48) "c650585f93c6e041e835caedc621f8c42d8bc6829fb76789" -string(56) "7772b2e22f2a3bce917e08cf57ebece46bb33168619a776c6f2f7234" -string(56) "bc674d465a822817d939f19b38edde083fe5668759836c203c56e3e4" -string(64) "438a602cb1a761f7bd0a633b7bd8b3ccd0577b524d05174ca1ae1f559b9a2c2a" -string(64) "da70ad9bd09ed7c9675329ea2b5279d57761807c7aeac6340d94b5d494809457" -Done ---UEXPECTF-- +--EXPECTF-- unicode(32) "d5ac4ffd08f6a57b9bd402b8068392ff" unicode(32) "d5ac4ffd08f6a57b9bd402b8068392ff" unicode(32) "302c45586b53a984bd3a1237cb81c15f" http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hmac-md5.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/hash/tests/hmac-md5.phpt diff -u php-src/ext/hash/tests/hmac-md5.phpt:1.6 php-src/ext/hash/tests/hmac-md5.phpt:1.7 --- php-src/ext/hash/tests/hmac-md5.phpt:1.6 Wed Apr 18 08:09:02 2007 +++ php-src/ext/hash/tests/hmac-md5.phpt Tue May 27 18:16:02 2008 @@ -16,11 +16,7 @@ echo hash_hmac('md5', str_repeat(chr(0xDD), 50), str_repeat(chr(0xAA), 16)) . "\n"; ?> ---EXPECT-- -9294727a3638bb1c13f48ef8158bfc9d -750c783e6ab0b503eaa86e310a5db738 -56be34521d144c88dbb8c733f0e8b3f6 ---UEXPECTF-- +--EXPECTF-- 9294727a3638bb1c13f48ef8158bfc9d 750c783e6ab0b503eaa86e310a5db738 http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37773.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/iconv/tests/bug37773.phpt diff -u php-src/ext/iconv/tests/bug37773.phpt:1.4 php-src/ext/iconv/tests/bug37773.phpt:1.5 --- php-src/ext/iconv/tests/bug37773.phpt:1.4 Sat Mar 22 14:58:29 2008 +++ php-src/ext/iconv/tests/bug37773.phpt Tue May 27 18:16:02 2008 @@ -15,6 +15,4 @@ var_dump(iconv_substr('x', 0, 1, 'UTF-8')); ?> --EXPECT-- -string(1) "x" ---UEXPECT-- unicode(1) "x" http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv001.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/iconv/tests/iconv001.phpt diff -u php-src/ext/iconv/tests/iconv001.phpt:1.8 php-src/ext/iconv/tests/iconv001.phpt:1.9 --- php-src/ext/iconv/tests/iconv001.phpt:1.8 Tue Aug 8 19:48:46 2006 +++ php-src/ext/iconv/tests/iconv001.phpt Tue May 27 18:16:02 2008 @@ -15,9 +15,5 @@ ?> --EXPECT-- iconv extension is available -string(15) "ISO-8859-1: æøå" -string(13) "UTF-8: æøå" ---UEXPECT-- -iconv extension is available unicode(15) "ISO-8859-1: æøå" unicode(13) "UTF-8: æøå" http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_stream_filter.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/iconv/tests/iconv_stream_filter.phpt diff -u php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.3 php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.4 --- php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.3 Sat Mar 22 14:58:29 2008 +++ php-src/ext/iconv/tests/iconv_stream_filter.phpt Tue May 27 18:16:03 2008 @@ -28,18 +28,6 @@ fclose($fp); ?> --EXPECTF-- -string(20) "1b244224332473244b24" -string(10) "41244f1b28" -string(2) "42" -string(20) "a4b3a4f3a4cba4c1a4cf" -string(10) "69636f6e76" -string(2) "0a" - -Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multibyte sequence in %s on line %d -string(0) "" -string(0) "" -string(0) "" ---UEXPECTF-- unicode(20) "1b244224332473244b24" unicode(10) "41244f1b28" unicode(2) "42" http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_utf8.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/imap/tests/imap_utf8.phpt diff -u php-src/ext/imap/tests/imap_utf8.phpt:1.2 php-src/ext/imap/tests/imap_utf8.phpt:1.3 --- php-src/ext/imap/tests/imap_utf8.phpt:1.2 Sun Nov 26 16:31:57 2006 +++ php-src/ext/imap/tests/imap_utf8.phpt Tue May 27 18:16:03 2008 @@ -12,15 +12,7 @@ echo "Done\n"; ?> ---EXPECTF-- -string(0) "" -string(1) "1" - -Notice: Array to string conversion in %s on line %d -string(5) "Array" -string(4) "test" -Done ---UEXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/json/tests/001.phpt diff -u php-src/ext/json/tests/001.phpt:1.4 php-src/ext/json/tests/001.phpt:1.5 --- php-src/ext/json/tests/001.phpt:1.4 Thu Oct 19 20:17:17 2006 +++ php-src/ext/json/tests/001.phpt Tue May 27 18:16:03 2008 @@ -31,50 +31,6 @@ NULL NULL NULL -string(1) "." -string(1) "." -string(3) "<?>" -string(1) ";" -string(12) "руссиш" -string(4) "blah" -NULL -object(stdClass)#%d (1) { - ["test"]=> - object(stdClass)#%d (1) { - ["foo"]=> - string(3) "bar" - } -} -object(stdClass)#%d (1) { - ["test"]=> - object(stdClass)#%d (1) { - ["foo"]=> - string(0) "" - } -} -object(stdClass)#%d (1) { - ["_empty_"]=> - object(stdClass)#%d (1) { - ["foo"]=> - string(0) "" - } -} -object(stdClass)#%d (1) { - ["_empty_"]=> - object(stdClass)#%d (1) { - ["_empty_"]=> - string(0) "" - } -} -string(16) "{ "": { "": "" }" -string(16) "{ "": "": "" } }" -Done ---UEXPECTF-- -Warning: json_decode() expects at least 1 parameter, 0 given in %s on line %d -NULL -NULL -NULL -NULL unicode(1) "." unicode(1) "." unicode(3) "<?>" http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/json/tests/002.phpt diff -u php-src/ext/json/tests/002.phpt:1.2 php-src/ext/json/tests/002.phpt:1.3 --- php-src/ext/json/tests/002.phpt:1.2 Mon Apr 23 10:48:13 2007 +++ php-src/ext/json/tests/002.phpt Tue May 27 18:16:03 2008 @@ -17,7 +17,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(2) """" string(4) "null" string(4) "true" http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/003.phpt diff -u php-src/ext/json/tests/003.phpt:1.3 php-src/ext/json/tests/003.phpt:1.4 --- php-src/ext/json/tests/003.phpt:1.3 Wed Sep 13 13:26:10 2006 +++ php-src/ext/json/tests/003.phpt Tue May 27 18:16:03 2008 @@ -16,7 +16,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { [0]=> &array(1) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/004.phpt diff -u php-src/ext/json/tests/004.phpt:1.3 php-src/ext/json/tests/004.phpt:1.4 --- php-src/ext/json/tests/004.phpt:1.3 Thu Oct 19 20:17:17 2006 +++ php-src/ext/json/tests/004.phpt Tue May 27 18:16:03 2008 @@ -13,19 +13,7 @@ echo "Done\n"; ?> ---EXPECTF-- -object(stdClass)#%d (1) { - ["prop"]=> - object(stdClass)#%d (1) { - ["prop"]=> - *RECURSION* - } -} - -Warning: json_encode(): recursion detected in %s on line %d -string(22) "{"prop":{"prop":null}}" -Done ---UEXPECTF-- +--EXPECTF-- object(stdClass)#%d (1) { [u"prop"]=> object(stdClass)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/005.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/json/tests/005.phpt diff -u php-src/ext/json/tests/005.phpt:1.4 php-src/ext/json/tests/005.phpt:1.5 --- php-src/ext/json/tests/005.phpt:1.4 Fri Dec 28 13:23:13 2007 +++ php-src/ext/json/tests/005.phpt Tue May 27 18:16:03 2008 @@ -13,7 +13,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(0) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41067.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/json/tests/bug41067.phpt diff -u php-src/ext/json/tests/bug41067.phpt:1.2 php-src/ext/json/tests/bug41067.phpt:1.3 --- php-src/ext/json/tests/bug41067.phpt:1.2 Mon Apr 23 10:48:13 2007 +++ php-src/ext/json/tests/bug41067.phpt Tue May 27 18:16:03 2008 @@ -16,8 +16,5 @@ ?> --EXPECT-- -string(8) "f09d8480" -string(8) "f09d8480" ---UEXPECT-- unicode(8) "f09d8480" unicode(8) "f09d8480" http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41403.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/bug41403.phpt diff -u php-src/ext/json/tests/bug41403.phpt:1.3 php-src/ext/json/tests/bug41403.phpt:1.4 --- php-src/ext/json/tests/bug41403.phpt:1.3 Sat Feb 23 22:30:08 2008 +++ php-src/ext/json/tests/bug41403.phpt Tue May 27 18:16:03 2008 @@ -22,27 +22,7 @@ echo "Done\n"; ?> ---EXPECTF-- -array(1) { - [0]=> - float(2,1) -} -array(1) { - [0]=> - float(0,15) -} -array(1) { - [0]=> - float(123,13452345) -} -array(2) { - [0]=> - int(123) - [1]=> - int(13452345) -} -Done ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d array(1) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug42090.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/json/tests/bug42090.phpt diff -u php-src/ext/json/tests/bug42090.phpt:1.2 php-src/ext/json/tests/bug42090.phpt:1.3 --- php-src/ext/json/tests/bug42090.phpt:1.2 Fri Feb 15 09:20:19 2008 +++ php-src/ext/json/tests/bug42090.phpt Tue May 27 18:16:03 2008 @@ -15,14 +15,6 @@ ); ?> --EXPECT-- -string(0) "" -string(5) "".."." -string(1) """ -string(2) """" -string(4) ""\""" -string(1) """ -string(2) """" ---UEXPECT-- unicode(0) "" unicode(5) "".."." unicode(1) """ http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug42785.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/bug42785.phpt diff -u php-src/ext/json/tests/bug42785.phpt:1.3 php-src/ext/json/tests/bug42785.phpt:1.4 --- php-src/ext/json/tests/bug42785.phpt:1.3 Sat Mar 22 14:58:29 2008 +++ php-src/ext/json/tests/bug42785.phpt Tue May 27 18:16:03 2008 @@ -21,10 +21,7 @@ $bar1->b = "foo"; var_dump(json_encode($bar1)); ?> ---EXPECT-- -string(13) "[100.1,"bar"]" -string(21) "{"a":100.1,"b":"foo"}" ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d unicode(13) "[100.1,"bar"]" unicode(21) "{"a":100.1,"b":"foo"}" http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug43941.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/json/tests/bug43941.phpt diff -u php-src/ext/json/tests/bug43941.phpt:1.2 php-src/ext/json/tests/bug43941.phpt:1.3 --- php-src/ext/json/tests/bug43941.phpt:1.2 Wed Jan 30 03:21:30 2008 +++ php-src/ext/json/tests/bug43941.phpt Tue May 27 18:16:03 2008 @@ -12,10 +12,9 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) ""abc"" string(4) "null" string(4) "null" string(17) "[null,null,"abc"]" Done - http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/fail001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/json/tests/fail001.phpt diff -u php-src/ext/json/tests/fail001.phpt:1.5 php-src/ext/json/tests/fail001.phpt:1.6 --- php-src/ext/json/tests/fail001.phpt:1.5 Tue May 29 11:58:55 2007 +++ php-src/ext/json/tests/fail001.phpt Tue May 27 18:16:03 2008 @@ -45,127 +45,6 @@ --EXPECT-- Testing: "A JSON payload should be an object or array, not a string." AS OBJECT -string(58) "A JSON payload should be an object or array, not a string." -AS ARRAY -string(58) "A JSON payload should be an object or array, not a string." -Testing: ["Unclosed array" -AS OBJECT -string(17) "["Unclosed array"" -AS ARRAY -string(17) "["Unclosed array"" -Testing: {unquoted_key: "keys must be quoted} -AS OBJECT -string(36) "{unquoted_key: "keys must be quoted}" -AS ARRAY -string(36) "{unquoted_key: "keys must be quoted}" -Testing: ["extra comma",] -AS OBJECT -string(16) "["extra comma",]" -AS ARRAY -string(16) "["extra comma",]" -Testing: ["double extra comma",,] -AS OBJECT -string(24) "["double extra comma",,]" -AS ARRAY -string(24) "["double extra comma",,]" -Testing: [ , "<-- missing value"] -AS OBJECT -string(26) "[ , "<-- missing value"]" -AS ARRAY -string(26) "[ , "<-- missing value"]" -Testing: ["Comma after the close"], -AS OBJECT -string(26) "["Comma after the close"]," -AS ARRAY -string(26) "["Comma after the close"]," -Testing: ["Extra close"]] -AS OBJECT -string(16) "["Extra close"]]" -AS ARRAY -string(16) "["Extra close"]]" -Testing: {"Extra comma": true,} -AS OBJECT -string(22) "{"Extra comma": true,}" -AS ARRAY -string(22) "{"Extra comma": true,}" -Testing: {"Extra value after close": true} "misplaced quoted value" -AS OBJECT -string(58) "{"Extra value after close": true} "misplaced quoted value"" -AS ARRAY -string(58) "{"Extra value after close": true} "misplaced quoted value"" -Testing: {"Illegal expression": 1 + 2} -AS OBJECT -string(29) "{"Illegal expression": 1 + 2}" -AS ARRAY -string(29) "{"Illegal expression": 1 + 2}" -Testing: {"Illegal invocation": alert()} -AS OBJECT -string(31) "{"Illegal invocation": alert()}" -AS ARRAY -string(31) "{"Illegal invocation": alert()}" -Testing: {"Numbers cannot have leading zeroes": 013} -AS OBJECT -string(43) "{"Numbers cannot have leading zeroes": 013}" -AS ARRAY -string(43) "{"Numbers cannot have leading zeroes": 013}" -Testing: {"Numbers cannot be hex": 0x14} -AS OBJECT -string(31) "{"Numbers cannot be hex": 0x14}" -AS ARRAY -string(31) "{"Numbers cannot be hex": 0x14}" -Testing: ["Illegal backslash escape: \x15"] -AS OBJECT -string(34) "["Illegal backslash escape: \x15"]" -AS ARRAY -string(34) "["Illegal backslash escape: \x15"]" -Testing: ["Illegal backslash escape: \'"] -AS OBJECT -string(32) "["Illegal backslash escape: \'"]" -AS ARRAY -string(32) "["Illegal backslash escape: \'"]" -Testing: ["Illegal backslash escape: \017"] -AS OBJECT -string(34) "["Illegal backslash escape: \017"]" -AS ARRAY -string(34) "["Illegal backslash escape: \017"]" -Testing: [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] -AS OBJECT -string(266) "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" -AS ARRAY -string(266) "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" -Testing: {"Missing colon" null} -AS OBJECT -string(22) "{"Missing colon" null}" -AS ARRAY -string(22) "{"Missing colon" null}" -Testing: {"Double colon":: null} -AS OBJECT -string(23) "{"Double colon":: null}" -AS ARRAY -string(23) "{"Double colon":: null}" -Testing: {"Comma instead of colon", null} -AS OBJECT -string(32) "{"Comma instead of colon", null}" -AS ARRAY -string(32) "{"Comma instead of colon", null}" -Testing: ["Colon instead of comma": false] -AS OBJECT -string(33) "["Colon instead of comma": false]" -AS ARRAY -string(33) "["Colon instead of comma": false]" -Testing: ["Bad value", truth] -AS OBJECT -string(20) "["Bad value", truth]" -AS ARRAY -string(20) "["Bad value", truth]" -Testing: ['single quote'] -AS OBJECT -string(16) "['single quote']" -AS ARRAY -string(16) "['single quote']" ---UEXPECT-- -Testing: "A JSON payload should be an object or array, not a string." -AS OBJECT unicode(58) "A JSON payload should be an object or array, not a string." AS ARRAY unicode(58) "A JSON payload should be an object or array, not a string." http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.1.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/json/tests/pass001.1.phpt diff -u php-src/ext/json/tests/pass001.1.phpt:1.9 php-src/ext/json/tests/pass001.1.phpt:1.10 --- php-src/ext/json/tests/pass001.1.phpt:1.9 Tue Jul 10 07:51:23 2007 +++ php-src/ext/json/tests/pass001.1.phpt Tue May 27 18:16:03 2008 @@ -171,790 +171,6 @@ DECODE: AS OBJECT array(14) { [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - float(INF) - ["E no ."]=> - float(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["123"]=> - object(stdClass)#%d (1) { - ["456"]=> - object(stdClass)#%d (1) { - ["abc"]=> - object(stdClass)#%d (3) { - ["789"]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - float(INF) - ["E no ."]=> - float(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - [123]=> - array(1) { - [456]=> - array(1) { - ["abc"]=> - array(3) { - [789]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -ENCODE: FROM OBJECT -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},{},[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"_empty_":0,"E no .":4000000000000,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","unicode":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","empty_string":"","true":true,"false":false,"null":null,"array":[],"object":{},"123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}},"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object wit! h 1 member\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -ENCODE: FROM ARRAY -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},[],[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"":0,"E no .":4000000000000,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","unicode":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","empty_string":"","true":true,"false":false,"null":null,"array":[],"object":[],"123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}},"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object with 1 mem! ber\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -DECODE AGAIN: AS OBJECT -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - int(0) - ["E no ."]=> - %s(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["123"]=> - object(stdClass)#%d (1) { - ["456"]=> - object(stdClass)#%d (1) { - ["abc"]=> - object(stdClass)#%d (3) { - ["789"]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE AGAIN: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - int(0) - ["E no ."]=> - %s(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - [123]=> - array(1) { - [456]=> - array(1) { - ["abc"]=> - array(3) { - [789]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} ---UEXPECTF-- -Testing: -[ - "JSON Test Pattern pass1", - {"object with 1 member":["array with 1 element"]}, - {}, - [], - -42, - true, - false, - null, - { - "integer": 1234567890, - "real": -9876.543210, - "e": 0.123456789e-12, - "E": 1.234567890E+34, - "": 23456789012E666, - "E no .": 4E12, - "zero": 0, - "one": 1, - "space": " ", - "quote": "\"", - "backslash": "\\", - "controls": "\b\f\n\r\t", - "slash": "/ & \/", - "alpha": "abcdefghijklmnopqrstuvwyz", - "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ", - "digit": "0123456789", - "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?", - "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A", - "unicode": "\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8", - "プレスキット": "プレスキット", - "empty_string": "", - "true": true, - "false": false, - "null": null, - "array":[ ], - "object":{ }, - "123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}}, - "address": "50 St. James Street", - "url": "http://www.JSON.org/", - "comment": "// /* <!-- --", - "# -- --> */": " ", - " s p a c e d " :[1,2 , 3 - -, - -4 , 5 , 6 ,7 ], - "compact": [1,2,3,4,5,6,7], - "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}", - "quotes": "&#34; \u0022 %22 0x22 034 &#x22;", - "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" -: "A key can be any string" - }, - 0.5 ,98.6 -, -99.44 -, - -1066 - - -,"rosebud"] - -DECODE: AS OBJECT -array(14) { - [0]=> unicode(23) "JSON Test Pattern pass1" [1]=> object(stdClass)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.1_64bit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/json/tests/pass001.1_64bit.phpt diff -u php-src/ext/json/tests/pass001.1_64bit.phpt:1.2 php-src/ext/json/tests/pass001.1_64bit.phpt:1.3 --- php-src/ext/json/tests/pass001.1_64bit.phpt:1.2 Fri Jun 8 09:03:23 2007 +++ php-src/ext/json/tests/pass001.1_64bit.phpt Tue May 27 18:16:04 2008 @@ -171,790 +171,6 @@ DECODE: AS OBJECT array(14) { [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - float(INF) - ["E no ."]=> - float(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["123"]=> - object(stdClass)#%d (1) { - ["456"]=> - object(stdClass)#%d (1) { - ["abc"]=> - object(stdClass)#%d (3) { - ["789"]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - float(INF) - ["E no ."]=> - float(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - [123]=> - array(1) { - [456]=> - array(1) { - ["abc"]=> - array(3) { - [789]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -ENCODE: FROM OBJECT -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},{},[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"_empty_":0,"E no .":4000000000000,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","unicode":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","empty_string":"","true":true,"false":false,"null":null,"array":[],"object":{},"123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}},"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object wit! h 1 member\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -ENCODE: FROM ARRAY -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},[],[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"":0,"E no .":4000000000000,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","unicode":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8":"\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8","empty_string":"","true":true,"false":false,"null":null,"array":[],"object":[],"123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}},"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object with 1 mem! ber\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -DECODE AGAIN: AS OBJECT -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - int(0) - ["E no ."]=> - int(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["123"]=> - object(stdClass)#%d (1) { - ["456"]=> - object(stdClass)#%d (1) { - ["abc"]=> - object(stdClass)#%d (3) { - ["789"]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE AGAIN: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(36) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - int(0) - ["E no ."]=> - int(4000000000000) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["unicode"]=> - string(18) "プレスキット" - ["プレスキット"]=> - string(18) "プレスキット" - ["empty_string"]=> - string(0) "" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - [123]=> - array(1) { - [456]=> - array(1) { - ["abc"]=> - array(3) { - [789]=> - string(3) "def" - ["012"]=> - array(4) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(1) "5" - [3]=> - int(500) - } - ["ghi"]=> - array(5) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - string(4) "five" - [3]=> - int(50) - [4]=> - string(5) "sixty" - } - } - } - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} ---UEXPECTF-- -Testing: -[ - "JSON Test Pattern pass1", - {"object with 1 member":["array with 1 element"]}, - {}, - [], - -42, - true, - false, - null, - { - "integer": 1234567890, - "real": -9876.543210, - "e": 0.123456789e-12, - "E": 1.234567890E+34, - "": 23456789012E666, - "E no .": 4E12, - "zero": 0, - "one": 1, - "space": " ", - "quote": "\"", - "backslash": "\\", - "controls": "\b\f\n\r\t", - "slash": "/ & \/", - "alpha": "abcdefghijklmnopqrstuvwyz", - "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ", - "digit": "0123456789", - "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?", - "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A", - "unicode": "\u30d7\u30ec\u30b9\u30ad\u30c3\u30c8", - "プレスキット": "プレスキット", - "empty_string": "", - "true": true, - "false": false, - "null": null, - "array":[ ], - "object":{ }, - "123":{"456":{"abc":{"789":"def","012":[1,2,"5",500],"ghi":[1,2,"five",50,"sixty"]}}}, - "address": "50 St. James Street", - "url": "http://www.JSON.org/", - "comment": "// /* <!-- --", - "# -- --> */": " ", - " s p a c e d " :[1,2 , 3 - -, - -4 , 5 , 6 ,7 ], - "compact": [1,2,3,4,5,6,7], - "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}", - "quotes": "&#34; \u0022 %22 0x22 034 &#x22;", - "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" -: "A key can be any string" - }, - 0.5 ,98.6 -, -99.44 -, - -1066 - - -,"rosebud"] - -DECODE: AS OBJECT -array(14) { - [0]=> unicode(23) "JSON Test Pattern pass1" [1]=> object(stdClass)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/json/tests/pass001.phpt diff -u php-src/ext/json/tests/pass001.phpt:1.5 php-src/ext/json/tests/pass001.phpt:1.6 --- php-src/ext/json/tests/pass001.phpt:1.5 Fri Jun 8 09:03:23 2007 +++ php-src/ext/json/tests/pass001.phpt Tue May 27 18:16:04 2008 @@ -155,613 +155,6 @@ DECODE: AS OBJECT array(14) { [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (31) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - float(INF) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(31) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - float(INF) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -ENCODE: FROM OBJECT -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},{},[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"_empty_":0,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","true":true,"false":false,"null":null,"array":[],"object":{},"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object with 1 member\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -ENCODE: FROM ARRAY -["JSON Test Pattern pass1",{"object with 1 member":["array with 1 element"]},[],[],-42,true,false,null,{"integer":1234567890,"real":-9876.54321,"e":1.23456789e-13,"E":1.23456789e+34,"":0,"zero":0,"one":1,"space":" ","quote":"\"","backslash":"\\","controls":"\b\f\n\r\t","slash":"\/ & \/","alpha":"abcdefghijklmnopqrstuvwyz","ALPHA":"ABCDEFGHIJKLMNOPQRSTUVWYZ","digit":"0123456789","special":"`1~!@#$%^&*()_+-={':[,]}|;.<\/>?","hex":"\u0123\u4567\u89ab\ucdef\uabcd\uef4a","true":true,"false":false,"null":null,"array":[],"object":[],"address":"50 St. James Street","url":"http:\/\/www.JSON.org\/","comment":"\/\/ \/* <!-- --","# -- --> *\/":" "," s p a c e d ":[1,2,3,4,5,6,7],"compact":[1,2,3,4,5,6,7],"jsontext":"{\"object with 1 member\":[\"array with 1 element\"]}","quotes":"&#34; \" %22 0x22 034 &#x22;","\/\\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',.\/<>?":"A key can be any string"},0.5,98.6,99.44,1066,"rosebud"] -DECODE AGAIN: AS OBJECT -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - object(stdClass)#%d (1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - object(stdClass)#%d (0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - object(stdClass)#%d (31) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - ["_empty_"]=> - int(0) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - object(stdClass)#%d (0) { - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} -DECODE AGAIN: AS ARRAY -array(14) { - [0]=> - string(23) "JSON Test Pattern pass1" - [1]=> - array(1) { - ["object with 1 member"]=> - array(1) { - [0]=> - string(20) "array with 1 element" - } - } - [2]=> - array(0) { - } - [3]=> - array(0) { - } - [4]=> - int(-42) - [5]=> - bool(true) - [6]=> - bool(false) - [7]=> - NULL - [8]=> - array(31) { - ["integer"]=> - int(1234567890) - ["real"]=> - float(-9876.54321) - ["e"]=> - float(1.23456789E-13) - ["E"]=> - float(1.23456789E+34) - [""]=> - int(0) - ["zero"]=> - int(0) - ["one"]=> - int(1) - ["space"]=> - string(1) " " - ["quote"]=> - string(1) """ - ["backslash"]=> - string(1) "\" - ["controls"]=> - string(5) " - " - ["slash"]=> - string(5) "/ & /" - ["alpha"]=> - string(25) "abcdefghijklmnopqrstuvwyz" - ["ALPHA"]=> - string(25) "ABCDEFGHIJKLMNOPQRSTUVWYZ" - ["digit"]=> - string(10) "0123456789" - ["special"]=> - string(31) "`1~!@#$%^&*()_+-={':[,]}|;.</>?" - ["hex"]=> - string(17) "ģ䕧覫췯ꯍ" - ["true"]=> - bool(true) - ["false"]=> - bool(false) - ["null"]=> - NULL - ["array"]=> - array(0) { - } - ["object"]=> - array(0) { - } - ["address"]=> - string(19) "50 St. James Street" - ["url"]=> - string(20) "http://www.JSON.org/" - ["comment"]=> - string(13) "// /* <!-- --" - ["# -- --> */"]=> - string(1) " " - [" s p a c e d "]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["compact"]=> - array(7) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - [6]=> - int(7) - } - ["jsontext"]=> - string(49) "{"object with 1 member":["array with 1 element"]}" - ["quotes"]=> - string(27) "&#34; " %22 0x22 034 &#x22;" - ["/\"쫾몾ꮘﳞ볚 - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> - string(23) "A key can be any string" - } - [9]=> - float(0.5) - [10]=> - float(98.6) - [11]=> - float(99.44) - [12]=> - int(1066) - [13]=> - string(7) "rosebud" -} ---UEXPECTF-- -Testing: -[ - "JSON Test Pattern pass1", - {"object with 1 member":["array with 1 element"]}, - {}, - [], - -42, - true, - false, - null, - { - "integer": 1234567890, - "real": -9876.543210, - "e": 0.123456789e-12, - "E": 1.234567890E+34, - "": 23456789012E666, - "zero": 0, - "one": 1, - "space": " ", - "quote": "\"", - "backslash": "\\", - "controls": "\b\f\n\r\t", - "slash": "/ & \/", - "alpha": "abcdefghijklmnopqrstuvwyz", - "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ", - "digit": "0123456789", - "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?", - "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A", - "true": true, - "false": false, - "null": null, - "array":[ ], - "object":{ }, - "address": "50 St. James Street", - "url": "http://www.JSON.org/", - "comment": "// /* <!-- --", - "# -- --> */": " ", - " s p a c e d " :[1,2 , 3 - -, - -4 , 5 , 6 ,7 ], - "compact": [1,2,3,4,5,6,7], - "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}", - "quotes": "&#34; \u0022 %22 0x22 034 &#x22;", - "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" -: "A key can be any string" - }, - 0.5 ,98.6 -, -99.44 -, - -1066 - - -,"rosebud"] - -DECODE: AS OBJECT -array(14) { - [0]=> unicode(23) "JSON Test Pattern pass1" [1]=> object(stdClass)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/pass002.phpt diff -u php-src/ext/json/tests/pass002.phpt:1.3 php-src/ext/json/tests/pass002.phpt:1.4 --- php-src/ext/json/tests/pass002.phpt:1.3 Thu Oct 19 20:17:17 2006 +++ php-src/ext/json/tests/pass002.phpt Tue May 27 18:16:04 2008 @@ -72,248 +72,6 @@ [0]=> array(1) { [0]=> - string(12) "Not too deep" - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } -} -DECODE: AS ARRAY -array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(12) "Not too deep" - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } -} -ENCODE: FROM OBJECT -[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]] -ENCODE: FROM ARRAY -[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]] -DECODE AGAIN: AS OBJECT -array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(12) "Not too deep" - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } -} -DECODE AGAIN: AS ARRAY -array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(12) "Not too deep" - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } -} ---UEXPECT-- -Testing: [[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]] -DECODE: AS OBJECT -array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> - array(1) { - [0]=> unicode(12) "Not too deep" } } http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/tests/pass003.phpt diff -u php-src/ext/json/tests/pass003.phpt:1.3 php-src/ext/json/tests/pass003.phpt:1.4 --- php-src/ext/json/tests/pass003.phpt:1.3 Thu Oct 19 20:17:17 2006 +++ php-src/ext/json/tests/pass003.phpt Tue May 27 18:16:04 2008 @@ -50,59 +50,6 @@ DECODE: AS OBJECT object(stdClass)#%d (1) { - ["JSON Test Pattern pass3"]=> - object(stdClass)#%d (2) { - ["The outermost value"]=> - string(27) "must be an object or array." - ["In this test"]=> - string(16) "It is an object." - } -} -DECODE: AS ARRAY -array(1) { - ["JSON Test Pattern pass3"]=> - array(2) { - ["The outermost value"]=> - string(27) "must be an object or array." - ["In this test"]=> - string(16) "It is an object." - } -} -ENCODE: FROM OBJECT -{"JSON Test Pattern pass3":{"The outermost value":"must be an object or array.","In this test":"It is an object."}} -ENCODE: FROM ARRAY -{"JSON Test Pattern pass3":{"The outermost value":"must be an object or array.","In this test":"It is an object."}} -DECODE AGAIN: AS OBJECT -object(stdClass)#%d (1) { - ["JSON Test Pattern pass3"]=> - object(stdClass)#%d (2) { - ["The outermost value"]=> - string(27) "must be an object or array." - ["In this test"]=> - string(16) "It is an object." - } -} -DECODE AGAIN: AS ARRAY -array(1) { - ["JSON Test Pattern pass3"]=> - array(2) { - ["The outermost value"]=> - string(27) "must be an object or array." - ["In this test"]=> - string(16) "It is an object." - } -} ---UEXPECTF-- -Testing: -{ - "JSON Test Pattern pass3": { - "The outermost value": "must be an object or array.", - "In this test": "It is an object." - } -} - -DECODE: AS OBJECT -object(stdClass)#%d (1) { [u"JSON Test Pattern pass3"]=> object(stdClass)#%d (2) { [u"The outermost value"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/tests/002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/libxml/tests/002.phpt diff -u php-src/ext/libxml/tests/002.phpt:1.3 php-src/ext/libxml/tests/002.phpt:1.4 --- php-src/ext/libxml/tests/002.phpt:1.3 Tue Sep 19 12:06:49 2006 +++ php-src/ext/libxml/tests/002.phpt Tue May 27 18:16:04 2008 @@ -70,32 +70,6 @@ -------------------------------------------- object(LibXMLError)#%d (6) { - ["level"]=> - int(3) - ["code"]=> - int(76) - ["column"]=> - int(%d) - ["message"]=> - string(57) "Opening and ending tag mismatch: titles line 4 and title -" - ["file"]=> - string(0) "" - ["line"]=> - int(4) -} -Done ---UEXPECTF-- -bool(false) - <titles>PHP: Behind the Parser</title> -%s -Fatal Error 76: Opening and ending tag mismatch: titles line 4 and title - Line: 4 - Column: %d - --------------------------------------------- - -object(LibXMLError)#%d (6) { [u"level"]=> int(3) [u"code"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt diff -u php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt Tue May 27 18:16:04 2008 @@ -58,7 +58,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : basic functionality *** -- Convert to JIS -- @@ -93,38 +93,3 @@ string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" Done ---UEXPECTF-- -*** Testing mb_convert_encoding() : basic functionality *** - --- Convert to JIS -- -JIS encoded string in base64: -string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==" -Converted Strings: -string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==" -string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==" -string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==" - --- Convert to EUC-JP -- -EUC-JP encoded string in base64: -string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==" -Converted Strings: -string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==" -string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==" -string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==" - --- Convert to SJIS -- -SJIS encoded string in base64: -string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==" -Converted Strings: -string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==" -string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==" -string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==" - --- Convert to UTF-8 -- -UTF-8 encoded string in base64: -string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -Converted Strings: -string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt Tue May 27 18:16:04 2008 @@ -37,7 +37,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic *** Language: English @@ -63,29 +63,3 @@ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?= =?UTF-8?Q?=39=2E?=" Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : basic *** - -Language: English --- Base 64: -- -string(37) "This is an English string. 0123456789" --- Quoted-Printable -- -string(37) "This is an English string. 0123456789" - -Language: Japanese --- Base 64: -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" --- Quoted-Printable -- -string(117) "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= - =?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82?=" - -Language: Greek --- Base 64: -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" --- Quoted-Printable -- -string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?= - =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?= - =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?= - =?UTF-8?Q?=39=2E?=" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt Tue May 27 18:16:04 2008 @@ -181,83 +181,6 @@ -- Iteration 24 -- -Warning: mb_encode_mimeheader() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- -string(1) "0" - --- Iteration 2 -- -string(1) "1" - --- Iteration 3 -- -string(5) "12345" - --- Iteration 4 -- -string(5) "-2345" - --- Iteration 5 -- -string(4) "10.5" - --- Iteration 6 -- -string(5) "-10.5" - --- Iteration 7 -- -string(12) "123456789000" - --- Iteration 8 -- -string(13) "1.23456789E-9" - --- Iteration 9 -- -string(3) "0.5" - --- Iteration 10 -- -string(0) "" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(1) "1" - --- Iteration 13 -- -string(0) "" - --- Iteration 14 -- -string(1) "1" - --- Iteration 15 -- -string(0) "" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(6) "string" - --- Iteration 19 -- -string(6) "string" - --- Iteration 20 -- -string(11) "hello world" - --- Iteration 21 -- -string(14) "Class A object" - --- Iteration 22 -- -string(0) "" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - Warning: mb_encode_mimeheader() expects parameter 1 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt Tue May 27 18:16:04 2008 @@ -219,121 +219,6 @@ -- Iteration 24 -- -Warning: mb_encode_mimeheader() expects parameter 2 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 19 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 20 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 21 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 22 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_encode_mimeheader(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_encode_mimeheader() expects parameter 2 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt Tue May 27 18:16:04 2008 @@ -181,83 +181,6 @@ -- Iteration 24 -- -Warning: mb_encode_mimeheader() expects parameter 3 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 2 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 3 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 4 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 5 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 6 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 7 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 8 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 9 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 10 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 11 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 12 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 13 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 14 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 15 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 16 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 17 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 18 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 19 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 20 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 21 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 22 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 23 -- -string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" - --- Iteration 24 -- - Warning: mb_encode_mimeheader() expects parameter 3 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt Tue May 27 18:16:04 2008 @@ -182,83 +182,6 @@ -- Iteration 24 -- -Warning: mb_encode_mimeheader() expects parameter 4 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- -string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=0 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 2 -- -string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 3 -- -string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=12345 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 4 -- -string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=-2345 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 5 -- -string(117) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=10.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 6 -- -string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=-10.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 7 -- -string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=12345678 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 8 -- -string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1.234567 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 9 -- -string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=0.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 10 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 11 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 12 -- -string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 13 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 14 -- -string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 15 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 16 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 17 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 18 -- -string(119) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=string =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 19 -- -string(119) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=string =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 20 -- -string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=hello wo =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 21 -- -string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=Class A =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 22 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 23 -- -string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 24 -- - Warning: mb_encode_mimeheader() expects parameter 4 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt Tue May 27 18:16:04 2008 @@ -172,112 +172,6 @@ -- Iteration 16 -- -Warning: mb_encode_mimeheader() expects parameter 5 to be long, string given in %s on line %d -NULL - --- Iteration 17 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, string given in %s on line %d -NULL - --- Iteration 18 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, string given in %s on line %d -NULL - --- Iteration 19 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, string given in %s on line %d -NULL - --- Iteration 20 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, string given in %s on line %d -NULL - --- Iteration 21 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, object given in %s on line %d -NULL - --- Iteration 22 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 23 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 24 -- - -Warning: mb_encode_mimeheader() expects parameter 5 to be long, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 2 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 3 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 4 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 5 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?= - =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 6 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 7 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 8 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 9 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 10 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 11 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 12 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 13 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 14 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 15 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 16 -- - Warning: mb_encode_mimeheader() expects parameter 5 to be long, Unicode string given in %s on line %d NULL @@ -318,4 +212,4 @@ Warning: mb_encode_mimeheader() expects parameter 5 to be long, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt diff -u php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt:1.2 php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt:1.3 --- php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt Tue May 27 18:16:04 2008 @@ -37,7 +37,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : usage variations *** -- Iteration 1 -- @@ -51,17 +51,3 @@ -- Iteration 3 -- string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=--- =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" Done ---UEXPECTF-- -*** Testing mb_encode_mimeheader() : usage variations *** - --- Iteration 1 -- -string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 2 -- -string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= - =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" - --- Iteration 3 -- -string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=--- =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?=" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_basic.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_basic.phpt Tue May 27 18:16:04 2008 @@ -76,7 +76,7 @@ } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : basic functionality *** Regex encoding set to utf-8 @@ -115,42 +115,3 @@ bool(false) NULL Done ---UEXPECTF-- -*** Testing mb_ereg() : basic functionality *** -Regex encoding set to utf-8 - -**-- ASCII String --** --- Without $regs argument-- -int(1) -int(1) ---With $regs argument -- -int(36) -array(2) { - [0]=> - string(36) "This is an English string. 012345678" - [1]=> - string(17) "This is an Englis" -} -int(17) -array(1) { - [0]=> - string(17) "This is an Englis" -} - -**-- Multibyte String --** --- Without $regs argument -- -int(1) -bool(false) --- With $regs argument -- -int(15) -array(3) { - [0]=> - string(48) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzQ=" - [1]=> - string(12) "5pel5pys6Kqe" - [2]=> - string(8) "MTIzNA==" -} -bool(false) -NULL -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_error.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_error.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_error.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_error.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_error.phpt Tue May 27 18:16:04 2008 @@ -47,17 +47,3 @@ Warning: mb_ereg() expects at least 2 parameters, 1 given in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_ereg() : error conditions *** - --- Testing mb_ereg() function with more than expected no. of arguments -- - -Warning: mb_ereg() expects at most 3 parameters, 4 given in %s on line %d -bool(false) - --- Testing mb_ereg() function with less than expected no. of arguments -- - -Warning: mb_ereg() expects at least 2 parameters, 1 given in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation1.phpt Tue May 27 18:16:04 2008 @@ -106,112 +106,7 @@ echo "Done"; ?> ---EXPECTF-- -*** Testing mb_ereg() : usage variations *** - --- Iteration 1 -- -bool(false) -NULL - --- Iteration 2 -- -bool(false) -NULL - --- Iteration 3 -- -bool(false) -NULL - --- Iteration 4 -- -bool(false) -NULL - --- Iteration 5 -- -bool(false) -NULL - --- Iteration 6 -- -bool(false) -NULL - --- Iteration 7 -- -bool(false) -NULL - --- Iteration 8 -- -bool(false) -NULL - --- Iteration 9 -- -bool(false) -NULL - --- Iteration 10 -- -bool(false) -NULL - --- Iteration 11 -- -bool(false) -NULL - --- Iteration 12 -- -bool(false) -NULL - --- Iteration 13 -- -bool(false) -NULL - --- Iteration 14 -- -bool(false) -NULL - --- Iteration 15 -- -bool(false) -NULL - --- Iteration 16 -- -bool(false) -NULL - --- Iteration 17 -- -bool(false) -NULL - --- Iteration 18 -- -int(6) -array(1) { - [0]=> - string(6) "string" -} - --- Iteration 19 -- -int(6) -array(1) { - [0]=> - string(6) "string" -} - --- Iteration 20 -- -bool(false) -NULL - --- Iteration 21 -- -bool(false) -NULL - --- Iteration 22 -- -bool(false) -NULL - --- Iteration 23 -- -bool(false) -NULL - --- Iteration 24 -- -bool(false) -NULL -Done ---UEXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- @@ -323,4 +218,4 @@ -- Iteration 24 -- bool(false) NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation2.phpt Tue May 27 18:16:04 2008 @@ -210,115 +210,7 @@ -- Iteration 24 -- -Warning: mb_ereg() expects parameter 2 to be string, resource given in %s on line %d -bool(false) -NULL -Done - ---UEXPECTF-- -*** Testing mb_ereg() : usage variations *** - --- Iteration 1 -- -bool(false) -NULL - --- Iteration 2 -- -bool(false) -NULL - --- Iteration 3 -- -bool(false) -NULL - --- Iteration 4 -- -bool(false) -NULL - --- Iteration 5 -- -bool(false) -NULL - --- Iteration 6 -- -bool(false) -NULL - --- Iteration 7 -- -bool(false) -NULL - --- Iteration 8 -- -bool(false) -NULL - --- Iteration 9 -- -bool(false) -NULL - --- Iteration 10 -- -bool(false) -NULL - --- Iteration 11 -- -bool(false) -NULL - --- Iteration 12 -- -bool(false) -NULL - --- Iteration 13 -- -bool(false) -NULL - --- Iteration 14 -- -bool(false) -NULL - --- Iteration 15 -- -bool(false) -NULL - --- Iteration 16 -- -bool(false) -NULL - --- Iteration 17 -- -bool(false) -NULL - --- Iteration 18 -- -int(3) -array(1) { - [0]=> - string(3) "str" -} - --- Iteration 19 -- -int(3) -array(1) { - [0]=> - string(3) "str" -} - --- Iteration 20 -- -bool(false) -NULL - --- Iteration 21 -- -bool(false) -NULL - --- Iteration 22 -- -bool(false) -NULL - --- Iteration 23 -- -bool(false) -NULL - --- Iteration 24 -- - Warning: mb_ereg() expects parameter 2 to be binary string, resource given in %s on line %d bool(false) NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation3.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation3.phpt Tue May 27 18:16:04 2008 @@ -74,7 +74,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : variation *** -- Iteration 1 -- @@ -161,90 +161,3 @@ string(4) "3b5D" } Done ---UEXPECTF-- -*** Testing mb_ereg() : variation *** - --- Iteration 1 -- -int(3) -array(1) { - [0]=> - string(3) "aB1" -} - --- Iteration 2 -- -int(4) -array(1) { - [0]=> - string(4) "aBcD" -} - --- Iteration 3 -- -int(4) -array(1) { - [0]=> - string(4) "ab/=" -} - --- Iteration 4 -- -int(2) -array(1) { - [0]=> - string(2) " " -} - --- Iteration 5 -- -int(3) -array(1) { - [0]=> - string(3) "234" -} - --- Iteration 6 -- -int(9) -array(1) { - [0]=> - string(12) "5pel5pys6Kqe" -} - --- Iteration 7 -- -int(4) -array(1) { - [0]=> - string(4) "fjds" -} - --- Iteration 8 -- -int(10) -array(1) { - [0]=> - string(16) "5pel5pys6KqeCQ==" -} - --- Iteration 9 -- -int(5) -array(1) { - [0]=> - string(5) ".!"*@" -} - --- Iteration 10 -- -int(1) -array(1) { - [0]=> - string(1) " " -} - --- Iteration 11 -- -int(5) -array(1) { - [0]=> - string(5) "IDSJV" -} - --- Iteration 12 -- -int(4) -array(1) { - [0]=> - string(4) "3b5D" -} -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation4.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation4.phpt Tue May 27 18:16:04 2008 @@ -73,7 +73,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- @@ -147,77 +147,3 @@ string(8) "MDEyMzQ=" } Done ---UEXPECTF-- -*** Testing mb_ereg() : usage variations *** - --- Iteration 1 -- -int(47) -array(1) { - [0]=> - string(64) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJk=" -} - --- Iteration 2 -- -int(27) -array(1) { - [0]=> - string(36) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ" -} - --- Iteration 3 -- -int(5) -array(1) { - [0]=> - string(8) "MDEyMzQ=" -} - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -int(20) -array(1) { - [0]=> - string(28) "MDEyMzTvvJXvvJbvvJfvvJjvvJk=" -} - --- Iteration 7 -- -int(50) -array(1) { - [0]=> - string(68) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -} - --- Iteration 8 -- -bool(false) - --- Iteration 9 -- -int(50) -array(1) { - [0]=> - string(68) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -} - --- Iteration 10 -- -int(3) -array(1) { - [0]=> - string(4) "44CC" -} - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- -int(5) -array(1) { - [0]=> - string(8) "MDEyMzQ=" -} -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation5.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation5.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation5.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation5.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation5.phpt Tue May 27 18:16:04 2008 @@ -61,7 +61,7 @@ } } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** ASCII String without $regs arg: int(1) @@ -80,22 +80,3 @@ string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" } Done ---UEXPECTF-- -*** Testing mb_ereg() : usage variations *** - -ASCII String without $regs arg: int(1) -ASCII String with $regs arg: -int(38) -array(1) { - [0]=> - string(38) "This is an English string. 0123456789." -} - -Multibyte String without $regs arg: int(1) -Multubyte String with $regs arg: -int(53) -array(1) { - [0]=> - string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -} -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation6.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation6.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation6.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation6.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation6.phpt Tue May 27 18:16:04 2008 @@ -70,7 +70,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** Regex encoding set to utf-8 @@ -183,116 +183,3 @@ bool(false) } Done ---UEXPECTF-- -*** Testing mb_ereg() : usage variations *** -Regex encoding set to utf-8 - ---** Pattern is: \w+ **-- --- ASCII String: -- -int(4) -array(1) { - [0]=> - string(4) "This" -} --- Multibyte String: -- -int(27) -array(1) { - [0]=> - string(36) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ" -} - ---** Pattern is: \W+ **-- --- ASCII String: -- -int(1) -array(1) { - [0]=> - string(1) " " -} --- Multibyte String: -- -int(3) -array(1) { - [0]=> - string(4) "44CC" -} - ---** Pattern is: \s+ **-- --- ASCII String: -- -int(1) -array(1) { - [0]=> - string(1) " " -} --- Multibyte String: -- -bool(false) -NULL - ---** Pattern is: \S+ **-- --- ASCII String: -- -int(4) -array(1) { - [0]=> - string(4) "This" -} --- Multibyte String: -- -int(53) -array(1) { - [0]=> - string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -} - ---** Pattern is: \d+ **-- --- ASCII String: -- -int(10) -array(1) { - [0]=> - string(10) "0123456789" -} --- Multibyte String: -- -int(20) -array(1) { - [0]=> - string(28) "MDEyMzTvvJXvvJbvvJfvvJjvvJk=" -} - ---** Pattern is: \D+ **-- --- ASCII String: -- -int(27) -array(1) { - [0]=> - string(27) "This is an English string. " -} --- Multibyte String: -- -int(30) -array(1) { - [0]=> - string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC" -} - ---** Pattern is: \b **-- --- ASCII String: -- -int(1) -array(1) { - [0]=> - bool(false) -} --- Multibyte String: -- -int(1) -array(1) { - [0]=> - bool(false) -} - ---** Pattern is: \B **-- --- ASCII String: -- -int(1) -array(1) { - [0]=> - bool(false) -} --- Multibyte String: -- -int(1) -array(1) { - [0]=> - bool(false) -} -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_ereg_variation7.phpt diff -u php-src/ext/mbstring/tests/mb_ereg_variation7.phpt:1.2 php-src/ext/mbstring/tests/mb_ereg_variation7.phpt:1.3 --- php-src/ext/mbstring/tests/mb_ereg_variation7.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_ereg_variation7.phpt Tue May 27 18:16:04 2008 @@ -62,7 +62,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** Regex encoding set to utf-8 int(38) @@ -92,33 +92,3 @@ string(4) "ODk=" } Done ---UEXPECTF-- -*** Testing mb_ereg() : usage variations *** -Regex encoding set to utf-8 -int(38) -array(5) { - [0]=> - string(38) "This is an English string. 0123456789." - [1]=> - string(6) "This i" - [2]=> - string(2) " i" - [3]=> - string(5) "56789" - [4]=> - string(2) "89" -} -int(64) -array(5) { - [0]=> - string(88) "zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==" - [1]=> - string(16) "zrXOr869zrHOuSA=" - [2]=> - string(4) "zr8=" - [3]=> - string(8) "NTY3ODk=" - [4]=> - string(4) "ODk=" -} -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt diff -u php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_internal_encoding_basic.phpt Tue May 27 18:16:04 2008 @@ -34,10 +34,3 @@ bool(true) string(5) "UTF-8" Done - ---UEXPECTF-- -*** Testing mb_internal_encoding() : basic functionality *** -string(%d) "%s" -bool(true) -string(5) "UTF-8" -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt diff -u php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_internal_encoding_error1.phpt Tue May 27 18:16:04 2008 @@ -34,12 +34,3 @@ Warning: mb_internal_encoding() expects at most 1 parameter, 2 given in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_internal_encoding() : error conditions *** - --- Testing mb_internal_encoding() function with more than expected no. of arguments -- - -Warning: mb_internal_encoding() expects at most 1 parameter, 2 given in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt diff -u php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_internal_encoding_error2.phpt Tue May 27 18:16:04 2008 @@ -29,10 +29,3 @@ Warning: mb_internal_encoding(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_internal_encoding() : error conditions *** - -Warning: mb_internal_encoding(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_internal_encoding_variation1.phpt Tue May 27 18:16:04 2008 @@ -212,122 +212,6 @@ -- Iteration 24 -- -Warning: mb_internal_encoding() expects parameter 1 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- - -*** Testing mb_internal_encoding() : usage variations *** - --- Iteration 1 -- - -Warning: mb_internal_encoding(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_internal_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_internal_encoding(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_internal_encoding(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_internal_encoding(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_internal_encoding(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_internal_encoding(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_internal_encoding(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_internal_encoding(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_internal_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_internal_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -bool(true) - --- Iteration 19 -- -bool(true) - --- Iteration 20 -- -bool(true) - --- Iteration 21 -- -bool(true) - --- Iteration 22 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_internal_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_internal_encoding() expects parameter 1 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_internal_encoding_variation2.phpt Tue May 27 18:16:04 2008 @@ -372,287 +372,3 @@ bool(true) string(6) "KOI8-R" Done ---UEXPECTF-- - -*** Testing mb_internal_encoding() : usage variations *** - --- Iteration 1 -- -string(%d) "%s" -bool(true) -string(5) "UCS-4" - --- Iteration 2 -- -string(5) "UCS-4" -bool(true) -string(7) "UCS-4BE" - --- Iteration 3 -- -string(7) "UCS-4BE" -bool(true) -string(7) "UCS-4LE" - --- Iteration 4 -- -string(7) "UCS-4LE" -bool(true) -string(5) "UCS-2" - --- Iteration 5 -- -string(5) "UCS-2" -bool(true) -string(7) "UCS-2BE" - --- Iteration 6 -- -string(7) "UCS-2BE" -bool(true) -string(7) "UCS-2LE" - --- Iteration 7 -- -string(7) "UCS-2LE" -bool(true) -string(6) "UTF-32" - --- Iteration 8 -- -string(6) "UTF-32" -bool(true) -string(8) "UTF-32BE" - --- Iteration 9 -- -string(8) "UTF-32BE" -bool(true) -string(8) "UTF-32LE" - --- Iteration 10 -- -string(8) "UTF-32LE" -bool(true) -string(6) "UTF-16" - --- Iteration 11 -- -string(6) "UTF-16" -bool(true) -string(8) "UTF-16BE" - --- Iteration 12 -- -string(8) "UTF-16BE" -bool(true) -string(8) "UTF-16LE" - --- Iteration 13 -- -string(8) "UTF-16LE" -bool(true) -string(5) "UTF-7" - --- Iteration 14 -- -string(5) "UTF-7" -bool(true) -string(9) "UTF7-IMAP" - --- Iteration 15 -- -string(9) "UTF7-IMAP" -bool(true) -string(5) "UTF-8" - --- Iteration 16 -- -string(5) "UTF-8" -bool(true) -string(5) "ASCII" - --- Iteration 17 -- -string(5) "ASCII" -bool(true) -string(6) "EUC-JP" - --- Iteration 18 -- -string(6) "EUC-JP" -bool(true) -string(4) "SJIS" - --- Iteration 19 -- -string(4) "SJIS" -bool(true) -string(9) "eucJP-win" - --- Iteration 20 -- -string(9) "eucJP-win" -bool(true) -string(8) "SJIS-win" - --- Iteration 21 -- -string(8) "SJIS-win" -bool(true) -string(11) "ISO-2022-JP" - --- Iteration 22 -- -string(11) "ISO-2022-JP" -bool(true) -string(3) "JIS" - --- Iteration 23 -- -string(3) "JIS" -bool(true) -string(10) "ISO-8859-1" - --- Iteration 24 -- -string(10) "ISO-8859-1" -bool(true) -string(10) "ISO-8859-2" - --- Iteration 25 -- -string(10) "ISO-8859-2" -bool(true) -string(10) "ISO-8859-3" - --- Iteration 26 -- -string(10) "ISO-8859-3" -bool(true) -string(10) "ISO-8859-4" - --- Iteration 27 -- -string(10) "ISO-8859-4" -bool(true) -string(10) "ISO-8859-5" - --- Iteration 28 -- -string(10) "ISO-8859-5" -bool(true) -string(10) "ISO-8859-6" - --- Iteration 29 -- -string(10) "ISO-8859-6" -bool(true) -string(10) "ISO-8859-7" - --- Iteration 30 -- -string(10) "ISO-8859-7" -bool(true) -string(10) "ISO-8859-8" - --- Iteration 31 -- -string(10) "ISO-8859-8" -bool(true) -string(10) "ISO-8859-9" - --- Iteration 32 -- -string(10) "ISO-8859-9" -bool(true) -string(11) "ISO-8859-10" - --- Iteration 33 -- -string(11) "ISO-8859-10" -bool(true) -string(11) "ISO-8859-13" - --- Iteration 34 -- -string(11) "ISO-8859-13" -bool(true) -string(11) "ISO-8859-14" - --- Iteration 35 -- -string(11) "ISO-8859-14" -bool(true) -string(11) "ISO-8859-15" - --- Iteration 36 -- -string(11) "ISO-8859-15" -bool(true) -string(7) "byte2be" - --- Iteration 37 -- -string(7) "byte2be" -bool(true) -string(7) "byte2le" - --- Iteration 38 -- -string(7) "byte2le" -bool(true) -string(7) "byte4be" - --- Iteration 39 -- -string(7) "byte4be" -bool(true) -string(7) "byte4le" - --- Iteration 40 -- -string(7) "byte4le" -bool(true) -string(6) "BASE64" - --- Iteration 41 -- -string(6) "BASE64" -bool(true) -string(13) "HTML-ENTITIES" - --- Iteration 42 -- -string(13) "HTML-ENTITIES" -bool(true) -string(4) "7bit" - --- Iteration 43 -- -string(4) "7bit" -bool(true) -string(4) "8bit" - --- Iteration 44 -- -string(4) "8bit" -bool(true) -string(6) "EUC-CN" - --- Iteration 45 -- -string(6) "EUC-CN" -bool(true) -string(5) "CP936" - --- Iteration 46 -- -string(5) "CP936" -bool(true) -string(2) "HZ" - --- Iteration 47 -- -string(2) "HZ" -bool(true) -string(6) "EUC-TW" - --- Iteration 48 -- -string(6) "EUC-TW" -bool(true) -string(5) "BIG-5" - --- Iteration 49 -- -string(5) "BIG-5" -bool(true) -string(5) "BIG-5" - --- Iteration 50 -- -string(5) "BIG-5" -bool(true) -string(6) "EUC-KR" - --- Iteration 51 -- -string(6) "EUC-KR" -bool(true) -string(3) "UHC" - --- Iteration 52 -- -string(3) "UHC" -bool(true) -string(11) "ISO-2022-KR" - --- Iteration 53 -- -string(11) "ISO-2022-KR" -bool(true) -string(12) "Windows-1251" - --- Iteration 54 -- -string(12) "Windows-1251" -bool(true) -string(12) "Windows-1252" - --- Iteration 55 -- -string(12) "Windows-1252" -bool(true) -string(5) "CP866" - --- Iteration 56 -- -string(5) "CP866" -bool(true) -string(6) "KOI8-R" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_basic.phpt Tue May 27 18:16:04 2008 @@ -33,10 +33,3 @@ bool(true) string(5) "UTF-8" Done - ---UEXPECTF-- -*** Testing mb_regex_encoding() : basic functionality *** -string(%d) "%s" -bool(true) -string(5) "UTF-8" -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt Tue May 27 18:16:04 2008 @@ -34,12 +34,3 @@ Warning: Wrong parameter count for mb_regex_encoding() in %s on line %d NULL Done - ---UEXPECTF-- -*** Testing mb_regex_encoding() : error conditions *** - --- Testing mb_regex_encoding() function with more than expected no. of arguments -- - -Warning: Wrong parameter count for mb_regex_encoding() in %s on line %d -NULL -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_error2.phpt Tue May 27 18:16:04 2008 @@ -29,10 +29,3 @@ Warning: mb_regex_encoding(): Unknown encoding "unknown" in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_regex_encoding() : error conditions *** - -Warning: mb_regex_encoding(): Unknown encoding "unknown" in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt Tue May 27 18:16:04 2008 @@ -212,119 +212,4 @@ Warning: mb_regex_encoding(): Unknown encoding "Resource id #%d" in %s on line %d bool(false) -Done ---UEXPECTF-- -*** Testing mb_regex_encoding() : usage variations *** - --- Iteration 1 -- - -Warning: mb_regex_encoding(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_regex_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_regex_encoding(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_regex_encoding(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_regex_encoding(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_regex_encoding(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_regex_encoding(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_regex_encoding(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_regex_encoding(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_regex_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_regex_encoding(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -bool(true) - --- Iteration 19 -- -bool(true) - --- Iteration 20 -- -bool(true) - --- Iteration 21 -- -bool(true) - --- Iteration 22 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_regex_encoding(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: mb_regex_encoding(): Unknown encoding "Resource id #%d" in %s on line %d -bool(false) Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt:1.1 php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt:1.2 --- php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt:1.1 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_variation2.phpt Tue May 27 18:16:04 2008 @@ -192,289 +192,6 @@ -- Iteration 21 -- string(4) "SJIS" -bool(true) -string(4) "ISO-2022-JP" - --- Iteration 22 -- -string(11) "ISO-2022-JP" -bool(true) -string(3) "JIS" - --- Iteration 23 -- -string(3) "JIS" -bool(true) -string(10) "ISO-8859-1" - --- Iteration 24 -- -string(10) "ISO-8859-1" -bool(true) -string(10) "ISO-8859-2" - --- Iteration 25 -- -string(10) "ISO-8859-2" -bool(true) -string(10) "ISO-8859-3" - --- Iteration 26 -- -string(10) "ISO-8859-3" -bool(true) -string(10) "ISO-8859-4" - --- Iteration 27 -- -string(10) "ISO-8859-4" -bool(true) -string(10) "ISO-8859-5" - --- Iteration 28 -- -string(10) "ISO-8859-5" -bool(true) -string(10) "ISO-8859-6" - --- Iteration 29 -- -string(10) "ISO-8859-6" -bool(true) -string(10) "ISO-8859-7" - --- Iteration 30 -- -string(10) "ISO-8859-7" -bool(true) -string(10) "ISO-8859-8" - --- Iteration 31 -- -string(10) "ISO-8859-8" -bool(true) -string(10) "ISO-8859-9" - --- Iteration 32 -- -string(10) "ISO-8859-9" -bool(true) -string(11) "ISO-8859-10" - --- Iteration 33 -- -string(11) "ISO-8859-10" -bool(true) -string(11) "ISO-8859-13" - --- Iteration 34 -- -string(11) "ISO-8859-13" -bool(true) -string(11) "ISO-8859-14" - --- Iteration 35 -- -string(11) "ISO-8859-14" -bool(true) -string(11) "ISO-8859-15" - --- Iteration 36 -- -string(11) "ISO-8859-15" -bool(true) -string(7) "byte2be" - --- Iteration 37 -- -string(7) "byte2be" -bool(true) -string(7) "byte2le" - --- Iteration 38 -- -string(7) "byte2le" -bool(true) -string(7) "byte4be" - --- Iteration 39 -- -string(7) "byte4be" -bool(true) -string(7) "byte4le" - --- Iteration 40 -- -string(7) "byte4le" -bool(true) -string(6) "BASE64" - --- Iteration 41 -- -string(6) "BASE64" -bool(true) -string(13) "HTML-ENTITIES" - --- Iteration 42 -- -string(13) "HTML-ENTITIES" -bool(true) -string(4) "7bit" - --- Iteration 43 -- -string(4) "7bit" -bool(true) -string(4) "8bit" - --- Iteration 44 -- -string(4) "8bit" -bool(true) -string(6) "EUC-CN" - --- Iteration 45 -- -string(6) "EUC-CN" -bool(true) -string(5) "CP936" - --- Iteration 46 -- -string(5) "CP936" -bool(true) -string(2) "HZ" - --- Iteration 47 -- -string(2) "HZ" -bool(true) -string(6) "EUC-TW" - --- Iteration 48 -- -string(6) "EUC-TW" -bool(true) -string(5) "CP950" - --- Iteration 49 -- -string(5) "CP950" -bool(true) -string(5) "BIG5" - --- Iteration 50 -- -string(5) "BIG5" -bool(true) -string(6) "EUC-KR" - --- Iteration 51 -- -string(6) "EUC-KR" -bool(true) -string(3) "UHC" - --- Iteration 52 -- -string(3) "UHC" -bool(true) -string(11) "ISO-2022-KR" - --- Iteration 53 -- -string(11) "ISO-2022-KR" -bool(true) -string(12) "Windows-1251" - --- Iteration 54 -- -string(12) "Windows-1251" -bool(true) -string(12) "Windows-1252" - --- Iteration 55 -- -string(12) "Windows-1252" -bool(true) -string(5) "CP866" - --- Iteration 56 -- -string(5) "CP866" -bool(true) -string(6) "KOI8-R" -Done ---UEXPECTF-- -*** Testing mb_regex_encoding() : usage variations *** - --- Iteration 1 -- -string(%d) "%s" -bool(true) -string(5) "UCS-4" - --- Iteration 2 -- -string(5) "UCS-4" -bool(true) -string(7) "UCS-4BE" - --- Iteration 3 -- -string(7) "UCS-4BE" -bool(true) -string(7) "UCS-4LE" - --- Iteration 4 -- -string(7) "UCS-4LE" -bool(true) -string(5) "UCS-2" - --- Iteration 5 -- -string(5) "UCS-2" -bool(true) -string(7) "UCS-2BE" - --- Iteration 6 -- -string(7) "UCS-2BE" -bool(true) -string(7) "UCS-2LE" - --- Iteration 7 -- -string(7) "UCS-2LE" -bool(true) -string(6) "UTF-32" - --- Iteration 8 -- -string(6) "UTF-32" -bool(true) -string(8) "UTF-32BE" - --- Iteration 9 -- -string(8) "UTF-32BE" -bool(true) -string(8) "UTF-32LE" - --- Iteration 10 -- -string(8) "UTF-32LE" -bool(true) -string(6) "UTF-16" - --- Iteration 11 -- -string(6) "UTF-16" -bool(true) -string(8) "UTF-16BE" - --- Iteration 12 -- -string(8) "UTF-16BE" -bool(true) -string(8) "UTF-16LE" - --- Iteration 13 -- -string(8) "UTF-16LE" -bool(true) -string(5) "UTF-7" - --- Iteration 14 -- -string(5) "UTF-7" -bool(true) -string(9) "UTF7-IMAP" - --- Iteration 15 -- -string(9) "UTF7-IMAP" -bool(true) -string(5) "UTF-8" - --- Iteration 16 -- -string(5) "UTF-8" -bool(true) -string(5) "ASCII" - --- Iteration 17 -- -string(5) "ASCII" -bool(true) -string(6) "EUC-JP" - --- Iteration 18 -- -string(6) "EUC-JP" -bool(true) -string(4) "SJIS" - --- Iteration 19 -- -string(4) "SJIS" -bool(true) -string(6) "EUC-JP" - --- Iteration 20 -- -string(6) "EUC-JP" -bool(true) -string(4) "SJIS" - --- Iteration 21 -- -string(4) "SJIS" Warning: mb_regex_encoding(): Unknown encoding "ISO-2022-JP" in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_basic.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strlen_basic.phpt Tue May 27 18:16:04 2008 @@ -31,18 +31,7 @@ echo "\nDone"; ?> ---EXPECTF-- -*** Testing mb_strlen() : basic functionality*** - --- ASCII String -- -int(7) - --- Multibyte String -- -int(21) - -Done - ---UEXPECTF-- +--EXPECT-- *** Testing mb_strlen() : basic functionality*** -- ASCII String -- http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_error1.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strlen_error1.phpt Tue May 27 18:16:04 2008 @@ -44,17 +44,3 @@ Warning: mb_strlen() expects at most 2 parameters, 3 given in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_strlen() : error conditions *** - --- Testing mb_strlen() function with Zero arguments -- - -Warning: mb_strlen() expects at least 1 parameter, 0 given in %s on line %d -bool(false) - --- Testing mb_strlen() function with more than expected no. of arguments -- - -Warning: mb_strlen() expects at most 2 parameters, 3 given in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_error2.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strlen_error2.phpt Tue May 27 18:16:04 2008 @@ -32,10 +32,3 @@ Warning: mb_strlen(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_strlen() : error *** - -Warning: mb_strlen(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_variation1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strlen_variation1.phpt Tue May 27 18:16:04 2008 @@ -175,83 +175,6 @@ -- Iteration 24 -- -Warning: mb_strlen() expects parameter 1 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strlen() : usage variations *** - --- Iteration 1 -- -int(1) - --- Iteration 2 -- -int(1) - --- Iteration 3 -- -int(5) - --- Iteration 4 -- -int(5) - --- Iteration 5 -- -int(4) - --- Iteration 6 -- -int(5) - --- Iteration 7 -- -int(12) - --- Iteration 8 -- -int(13) - --- Iteration 9 -- -int(3) - --- Iteration 10 -- -int(0) - --- Iteration 11 -- -int(0) - --- Iteration 12 -- -int(1) - --- Iteration 13 -- -int(0) - --- Iteration 14 -- -int(1) - --- Iteration 15 -- -int(0) - --- Iteration 16 -- -int(0) - --- Iteration 17 -- -int(0) - --- Iteration 18 -- -int(6) - --- Iteration 19 -- -int(6) - --- Iteration 20 -- -int(11) - --- Iteration 21 -- -int(14) - --- Iteration 22 -- -int(0) - --- Iteration 23 -- -int(0) - --- Iteration 24 -- - Warning: mb_strlen() expects parameter 1 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strlen_variation2.phpt Tue May 27 18:16:04 2008 @@ -215,121 +215,6 @@ -- Iteration 24 -- -Warning: mb_strlen() expects parameter 2 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strlen() : usage variations *** - --- Iteration 1 -- - -Warning: mb_strlen(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_strlen(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_strlen(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strlen(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_strlen(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_strlen(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strlen(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_strlen(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_strlen(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_strlen(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_strlen(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -int(12) - --- Iteration 19 -- -int(12) - --- Iteration 20 -- -int(12) - --- Iteration 21 -- -int(12) - --- Iteration 22 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_strlen(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_strlen() expects parameter 2 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strlen_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_strlen_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_strlen_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strlen_variation3.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strlen_variation3.phpt Tue May 27 18:16:04 2008 @@ -104,7 +104,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : usage variations *** -- Iteration 1: UCS-4 -- @@ -443,342 +443,3 @@ -- Multibyte String -- Encoding KOI8-R recognised Done ---UEXPECTF-- -*** Testing mb_strlen() : usage variations *** - --- Iteration 1: UCS-4 -- --- ASCII String -- -Encoding UCS-4 recognised --- Multibyte String -- -Encoding UCS-4 recognised - --- Iteration 2: UCS-4BE -- --- ASCII String -- -Encoding UCS-4BE recognised --- Multibyte String -- -Encoding UCS-4BE recognised - --- Iteration 3: UCS-4LE -- --- ASCII String -- -Encoding UCS-4LE recognised --- Multibyte String -- -Encoding UCS-4LE recognised - --- Iteration 4: UCS-2 -- --- ASCII String -- -Encoding UCS-2 recognised --- Multibyte String -- -Encoding UCS-2 recognised - --- Iteration 5: UCS-2BE -- --- ASCII String -- -Encoding UCS-2BE recognised --- Multibyte String -- -Encoding UCS-2BE recognised - --- Iteration 6: UCS-2LE -- --- ASCII String -- -Encoding UCS-2LE recognised --- Multibyte String -- -Encoding UCS-2LE recognised - --- Iteration 7: UTF-32 -- --- ASCII String -- -Encoding UTF-32 recognised --- Multibyte String -- -Encoding UTF-32 recognised - --- Iteration 8: UTF-32BE -- --- ASCII String -- -Encoding UTF-32BE recognised --- Multibyte String -- -Encoding UTF-32BE recognised - --- Iteration 9: UTF-32LE -- --- ASCII String -- -Encoding UTF-32LE recognised --- Multibyte String -- -Encoding UTF-32LE recognised - --- Iteration 10: UTF-16 -- --- ASCII String -- -Encoding UTF-16 recognised --- Multibyte String -- -Encoding UTF-16 recognised - --- Iteration 11: UTF-16BE -- --- ASCII String -- -Encoding UTF-16BE recognised --- Multibyte String -- -Encoding UTF-16BE recognised - --- Iteration 12: UTF-16LE -- --- ASCII String -- -Encoding UTF-16LE recognised --- Multibyte String -- -Encoding UTF-16LE recognised - --- Iteration 13: UTF-7 -- --- ASCII String -- -Encoding UTF-7 recognised --- Multibyte String -- -Encoding UTF-7 recognised - --- Iteration 14: UTF7-IMAP -- --- ASCII String -- -Encoding UTF7-IMAP recognised --- Multibyte String -- -Encoding UTF7-IMAP recognised - --- Iteration 15: UTF-8 -- --- ASCII String -- -Encoding UTF-8 recognised --- Multibyte String -- -Encoding UTF-8 recognised - --- Iteration 16: ASCII -- --- ASCII String -- -Encoding ASCII recognised --- Multibyte String -- -Encoding ASCII recognised - --- Iteration 17: EUC-JP -- --- ASCII String -- -Encoding EUC-JP recognised --- Multibyte String -- -Encoding EUC-JP recognised - --- Iteration 18: SJIS -- --- ASCII String -- -Encoding SJIS recognised --- Multibyte String -- -Encoding SJIS recognised - --- Iteration 19: eucJP-win -- --- ASCII String -- -Encoding eucJP-win recognised --- Multibyte String -- -Encoding eucJP-win recognised - --- Iteration 20: SJIS-win -- --- ASCII String -- -Encoding SJIS-win recognised --- Multibyte String -- -Encoding SJIS-win recognised - --- Iteration 21: ISO-2022-JP -- --- ASCII String -- -Encoding ISO-2022-JP recognised --- Multibyte String -- -Encoding ISO-2022-JP recognised - --- Iteration 22: JIS -- --- ASCII String -- -Encoding JIS recognised --- Multibyte String -- -Encoding JIS recognised - --- Iteration 23: ISO-8859-1 -- --- ASCII String -- -Encoding ISO-8859-1 recognised --- Multibyte String -- -Encoding ISO-8859-1 recognised - --- Iteration 24: ISO-8859-2 -- --- ASCII String -- -Encoding ISO-8859-2 recognised --- Multibyte String -- -Encoding ISO-8859-2 recognised - --- Iteration 25: ISO-8859-3 -- --- ASCII String -- -Encoding ISO-8859-3 recognised --- Multibyte String -- -Encoding ISO-8859-3 recognised - --- Iteration 26: ISO-8859-4 -- --- ASCII String -- -Encoding ISO-8859-4 recognised --- Multibyte String -- -Encoding ISO-8859-4 recognised - --- Iteration 27: ISO-8859-5 -- --- ASCII String -- -Encoding ISO-8859-5 recognised --- Multibyte String -- -Encoding ISO-8859-5 recognised - --- Iteration 28: ISO-8859-6 -- --- ASCII String -- -Encoding ISO-8859-6 recognised --- Multibyte String -- -Encoding ISO-8859-6 recognised - --- Iteration 29: ISO-8859-7 -- --- ASCII String -- -Encoding ISO-8859-7 recognised --- Multibyte String -- -Encoding ISO-8859-7 recognised - --- Iteration 30: ISO-8859-8 -- --- ASCII String -- -Encoding ISO-8859-8 recognised --- Multibyte String -- -Encoding ISO-8859-8 recognised - --- Iteration 31: ISO-8859-9 -- --- ASCII String -- -Encoding ISO-8859-9 recognised --- Multibyte String -- -Encoding ISO-8859-9 recognised - --- Iteration 32: ISO-8859-10 -- --- ASCII String -- -Encoding ISO-8859-10 recognised --- Multibyte String -- -Encoding ISO-8859-10 recognised - --- Iteration 33: ISO-8859-13 -- --- ASCII String -- -Encoding ISO-8859-13 recognised --- Multibyte String -- -Encoding ISO-8859-13 recognised - --- Iteration 34: ISO-8859-14 -- --- ASCII String -- -Encoding ISO-8859-14 recognised --- Multibyte String -- -Encoding ISO-8859-14 recognised - --- Iteration 35: ISO-8859-15 -- --- ASCII String -- -Encoding ISO-8859-15 recognised --- Multibyte String -- -Encoding ISO-8859-15 recognised - --- Iteration 36: byte2be -- --- ASCII String -- -Encoding byte2be recognised --- Multibyte String -- -Encoding byte2be recognised - --- Iteration 37: byte2le -- --- ASCII String -- -Encoding byte2le recognised --- Multibyte String -- -Encoding byte2le recognised - --- Iteration 38: byte4be -- --- ASCII String -- -Encoding byte4be recognised --- Multibyte String -- -Encoding byte4be recognised - --- Iteration 39: byte4le -- --- ASCII String -- -Encoding byte4le recognised --- Multibyte String -- -Encoding byte4le recognised - --- Iteration 40: BASE64 -- --- ASCII String -- -Encoding BASE64 recognised --- Multibyte String -- -Encoding BASE64 recognised - --- Iteration 41: HTML-ENTITIES -- --- ASCII String -- -Encoding HTML-ENTITIES recognised --- Multibyte String -- -Encoding HTML-ENTITIES recognised - --- Iteration 42: 7bit -- --- ASCII String -- -Encoding 7bit recognised --- Multibyte String -- -Encoding 7bit recognised - --- Iteration 43: 8bit -- --- ASCII String -- -Encoding 8bit recognised --- Multibyte String -- -Encoding 8bit recognised - --- Iteration 44: EUC-CN -- --- ASCII String -- -Encoding EUC-CN recognised --- Multibyte String -- -Encoding EUC-CN recognised - --- Iteration 45: CP936 -- --- ASCII String -- -Encoding CP936 recognised --- Multibyte String -- -Encoding CP936 recognised - --- Iteration 46: HZ -- --- ASCII String -- -Encoding HZ recognised --- Multibyte String -- -Encoding HZ recognised - --- Iteration 47: EUC-TW -- --- ASCII String -- -Encoding EUC-TW recognised --- Multibyte String -- -Encoding EUC-TW recognised - --- Iteration 48: CP950 -- --- ASCII String -- -Encoding CP950 recognised --- Multibyte String -- -Encoding CP950 recognised - --- Iteration 49: BIG-5 -- --- ASCII String -- -Encoding BIG-5 recognised --- Multibyte String -- -Encoding BIG-5 recognised - --- Iteration 50: EUC-KR -- --- ASCII String -- -Encoding EUC-KR recognised --- Multibyte String -- -Encoding EUC-KR recognised - --- Iteration 51: UHC -- --- ASCII String -- -Encoding UHC recognised --- Multibyte String -- -Encoding UHC recognised - --- Iteration 52: ISO-2022-KR -- --- ASCII String -- -Encoding ISO-2022-KR recognised --- Multibyte String -- -Encoding ISO-2022-KR recognised - --- Iteration 53: Windows-1251 -- --- ASCII String -- -Encoding Windows-1251 recognised --- Multibyte String -- -Encoding Windows-1251 recognised - --- Iteration 54: Windows-1252 -- --- ASCII String -- -Encoding Windows-1252 recognised --- Multibyte String -- -Encoding Windows-1252 recognised - --- Iteration 55: CP866 -- --- ASCII String -- -Encoding CP866 recognised --- Multibyte String -- -Encoding CP866 recognised - --- Iteration 56: KOI8-R -- --- ASCII String -- -Encoding KOI8-R recognised --- Multibyte String -- -Encoding KOI8-R recognised -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_basic.phpt Tue May 27 18:16:04 2008 @@ -40,7 +40,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strpos() : basic functionality*** -- ASCII string 1 -- @@ -55,18 +55,3 @@ -- Multibyte string 2 -- bool(false) Done ---UEXPECTF-- -*** Testing mb_strpos() : basic functionality*** - --- ASCII string 1 -- -int(4) - --- ASCII string 2 -- -bool(false) - --- Multibyte string 1 -- -int(0) - --- Multibyte string 2 -- -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_error1.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_error1.phpt Tue May 27 18:16:04 2008 @@ -48,17 +48,3 @@ Warning: mb_strpos() expects at least 2 parameters, 1 given in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_strpos() : error conditions *** - --- Testing mb_strpos() function with more than expected no. of arguments -- - -Warning: mb_strpos() expects at most 4 parameters, 5 given in %s on line %d -bool(false) - --- Testing mb_strpos() function with less than expected no. of arguments -- - -Warning: mb_strpos() expects at least 2 parameters, 1 given in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_error2.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_error2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strpos_error2.phpt Tue May 27 18:16:04 2008 @@ -32,10 +32,3 @@ Warning: mb_strpos(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_strpos() : error conditions *** - -Warning: mb_strpos(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_variation1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_variation1.phpt Tue May 27 18:16:04 2008 @@ -177,83 +177,6 @@ -- Iteration 24 -- -Warning: mb_strpos() expects parameter 1 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strpos() : usage variations *** - --- Iteration 1 -- -bool(false) - --- Iteration 2 -- -bool(false) - --- Iteration 3 -- -bool(false) - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- -bool(false) - --- Iteration 9 -- -bool(false) - --- Iteration 10 -- -bool(false) - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- -bool(false) - --- Iteration 14 -- -bool(false) - --- Iteration 15 -- -bool(false) - --- Iteration 16 -- -bool(false) - --- Iteration 17 -- -bool(false) - --- Iteration 18 -- -bool(false) - --- Iteration 19 -- -bool(false) - --- Iteration 20 -- -bool(false) - --- Iteration 21 -- -bool(false) - --- Iteration 22 -- -bool(false) - --- Iteration 23 -- -bool(false) - --- Iteration 24 -- - Warning: mb_strpos() expects parameter 1 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_variation2.phpt Tue May 27 18:16:04 2008 @@ -193,99 +193,6 @@ -- Iteration 24 -- -Warning: mb_strpos() expects parameter 2 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strpos() : usage variations *** - --- Iteration 1 -- -bool(false) - --- Iteration 2 -- -bool(false) - --- Iteration 3 -- -bool(false) - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- -bool(false) - --- Iteration 9 -- -bool(false) - --- Iteration 10 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 14 -- -bool(false) - --- Iteration 15 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 18 -- -int(0) - --- Iteration 19 -- -int(0) - --- Iteration 20 -- -bool(false) - --- Iteration 21 -- -bool(false) - --- Iteration 22 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_strpos(): Empty delimiter. in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_strpos() expects parameter 2 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_variation3.phpt Tue May 27 18:16:04 2008 @@ -161,103 +161,6 @@ -- Iteration 16 -- -Warning: mb_strpos() expects parameter 3 to be long, string given in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_strpos() expects parameter 3 to be long, string given in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: mb_strpos() expects parameter 3 to be long, string given in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: mb_strpos() expects parameter 3 to be long, string given in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: mb_strpos() expects parameter 3 to be long, string given in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: mb_strpos() expects parameter 3 to be long, object given in %s on line %d -bool(false) - --- Iteration 22 -- -int(8) - --- Iteration 23 -- -int(8) - --- Iteration 24 -- - -Warning: mb_strpos() expects parameter 3 to be long, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strpos() : usage variations *** - --- Iteration 1 -- -int(8) - --- Iteration 2 -- -int(8) - --- Iteration 3 -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - --- Iteration 8 -- -int(8) - --- Iteration 9 -- -int(8) - --- Iteration 10 -- -int(8) - --- Iteration 11 -- -int(8) - --- Iteration 12 -- -int(8) - --- Iteration 13 -- -int(8) - --- Iteration 14 -- -int(8) - --- Iteration 15 -- -int(8) - --- Iteration 16 -- - Warning: mb_strpos() expects parameter 3 to be long, Unicode string given in %s on line %d bool(false) @@ -296,4 +199,4 @@ Warning: mb_strpos() expects parameter 3 to be long, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_strpos_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strpos_variation4.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strpos_variation4.phpt Tue May 27 18:16:04 2008 @@ -217,121 +217,6 @@ -- Iteration 24 -- -Warning: mb_strpos() expects parameter 4 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strpos() : usage variations *** - --- Iteration 1 -- - -Warning: mb_strpos(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_strpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_strpos(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strpos(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_strpos(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_strpos(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strpos(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_strpos(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_strpos(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_strpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_strpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -int(7) - --- Iteration 19 -- -int(7) - --- Iteration 20 -- -int(7) - --- Iteration 21 -- -int(7) - --- Iteration 22 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_strpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_strpos() expects parameter 4 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation5.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_strpos_variation5.phpt diff -u php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.1 php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.2 --- php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.1 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strpos_variation5.phpt Tue May 27 18:16:04 2008 @@ -115,74 +115,3 @@ Warning: mb_strpos(): Offset not contained in string. in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_strpos() : usage variations *** - -**-- Offset is: -10 --** --- ASCII String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) ---Multibyte String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - -**-- Offset is: 0 --** --- ASCII String -- -int(9) ---Multibyte String -- -int(9) - -**-- Offset is: 10 --** --- ASCII String -- -int(20) ---Multibyte String -- -int(20) - -**-- Offset is: 20 --** --- ASCII String -- -int(20) ---Multibyte String -- -int(20) - -**-- Offset is: 30 --** --- ASCII String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) ---Multibyte String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - -**-- Offset is: 40 --** --- ASCII String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) ---Multibyte String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - -**-- Offset is: 50 --** --- ASCII String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) ---Multibyte String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) - -**-- Offset is: 60 --** --- ASCII String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) ---Multibyte String -- - -Warning: mb_strpos(): Offset not contained in string. in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_basic.phpt Tue May 27 18:16:04 2008 @@ -40,7 +40,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : basic *** -- ASCII string 1 -- @@ -55,21 +55,3 @@ -- Multibyte string 2 -- bool(false) Done - - ---UEXPECTF-- -*** Testing mb_strrpos() : basic *** - --- ASCII string 1 -- -int(15) - --- ASCII string 2 -- -bool(false) - --- Multibyte string 1 -- -int(20) - --- Multibyte string 2 -- -bool(false) -Done - http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_error1.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_error1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_error1.phpt Tue May 27 18:16:04 2008 @@ -48,16 +48,3 @@ Warning: mb_strrpos() expects at least 2 parameters, 1 given in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_strrpos() : error conditions *** - --- Testing mb_strrpos() function with more than expected no. of arguments -- - -Warning: mb_strrpos() expects at most 4 parameters, 5 given in %s on line %d -bool(false) - --- Testing mb_strrpos() function with less than expected no. of arguments -- - -Warning: mb_strrpos() expects at least 2 parameters, 1 given in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_error2.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_error2.phpt Tue May 27 18:16:04 2008 @@ -33,9 +33,3 @@ Warning: mb_strrpos(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_strrpos() : error conditions *** - -Warning: mb_strrpos(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation1.phpt Tue May 27 18:16:04 2008 @@ -176,83 +176,6 @@ -- Iteration 24 -- -Warning: mb_strrpos() expects parameter 1 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strrpos() : usage variations *** - --- Iteration 1 -- -bool(false) - --- Iteration 2 -- -bool(false) - --- Iteration 3 -- -bool(false) - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- -bool(false) - --- Iteration 9 -- -bool(false) - --- Iteration 10 -- -bool(false) - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- -bool(false) - --- Iteration 14 -- -bool(false) - --- Iteration 15 -- -bool(false) - --- Iteration 16 -- -bool(false) - --- Iteration 17 -- -bool(false) - --- Iteration 18 -- -int(7) - --- Iteration 19 -- -int(7) - --- Iteration 20 -- -int(7) - --- Iteration 21 -- -int(7) - --- Iteration 22 -- -bool(false) - --- Iteration 23 -- -bool(false) - --- Iteration 24 -- - Warning: mb_strrpos() expects parameter 1 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation2.phpt Tue May 27 18:16:04 2008 @@ -178,83 +178,6 @@ -- Iteration 24 -- -Warning: mb_strrpos() expects parameter 2 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strrpos() : usage variations *** - --- Iteration 1 -- -bool(false) - --- Iteration 2 -- -bool(false) - --- Iteration 3 -- -bool(false) - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- -bool(false) - --- Iteration 9 -- -bool(false) - --- Iteration 10 -- -bool(false) - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- -bool(false) - --- Iteration 14 -- -bool(false) - --- Iteration 15 -- -bool(false) - --- Iteration 16 -- -bool(false) - --- Iteration 17 -- -bool(false) - --- Iteration 18 -- -int(7) - --- Iteration 19 -- -int(7) - --- Iteration 20 -- -int(7) - --- Iteration 21 -- -int(7) - --- Iteration 22 -- -bool(false) - --- Iteration 23 -- -bool(false) - --- Iteration 24 -- - Warning: mb_strrpos() expects parameter 2 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt Tue May 27 18:16:04 2008 @@ -145,62 +145,3 @@ -- Iteration 18 -- int(8) Done ---UEXPECTF-- -*** Testing mb_strrpos() : usage variations *** - --- Iteration 1 -- -int(8) - --- Iteration 2 -- -int(8) - --- Iteration 3 -- -bool(false) - --- Iteration 4 -- -bool(false) - --- Iteration 5 -- -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- -int(8) - --- Iteration 9 -- -int(8) - --- Iteration 10 -- -int(8) - --- Iteration 11 -- -int(8) - --- Iteration 12 -- -int(8) - --- Iteration 13 -- -int(8) - --- Iteration 14 -- -int(8) - --- Iteration 15 -- -int(8) - --- Iteration 16 -- - -Notice: Object of class classA could not be converted to int in %s on line %d -int(8) - --- Iteration 17 -- -int(8) - --- Iteration 18 -- -int(8) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation4.phpt Tue May 27 18:16:04 2008 @@ -217,121 +217,6 @@ -- Iteration 24 -- -Warning: mb_strrpos() expects parameter 4 to be string, resource given in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing mb_strrpos() : usage variations *** - --- Iteration 1 -- - -Warning: mb_strrpos(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_strrpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_strrpos(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strrpos(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_strrpos(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_strrpos(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strrpos(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_strrpos(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_strrpos(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_strrpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_strrpos(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -int(7) - --- Iteration 19 -- -int(7) - --- Iteration 20 -- -int(7) - --- Iteration 21 -- -int(7) - --- Iteration 22 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_strrpos(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_strrpos() expects parameter 4 to be binary string, resource given in %s on line %d bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt:1.2 php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation5.phpt Tue May 27 18:16:04 2008 @@ -38,7 +38,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : usage variations *** **-- Offset is: -60 --** @@ -119,84 +119,3 @@ --Multibyte String -- bool(false) Done ---UEXPECTF-- -*** Testing mb_strrpos() : usage variations *** - -**-- Offset is: -60 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: -50 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: -40 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: -30 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: -20 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: -10 --** --- ASCII String -- -int(9) ---Multibyte String -- -int(9) - -**-- Offset is: 0 --** --- ASCII String -- -int(20) ---Multibyte String -- -int(20) - -**-- Offset is: 10 --** --- ASCII String -- -int(20) ---Multibyte String -- -int(20) - -**-- Offset is: 20 --** --- ASCII String -- -int(20) ---Multibyte String -- -int(20) - -**-- Offset is: 30 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: 40 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: 50 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) - -**-- Offset is: 60 --** --- ASCII String -- -bool(false) ---Multibyte String -- -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt diff -u php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt:1.1 php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt:1.2 --- php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt:1.1 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strrpos_variation6.phpt Tue May 27 18:16:04 2008 @@ -38,28 +38,7 @@ echo "Done"; ?> ---EXPECTF-- -*** Testing mb_strrpos() : usage variations *** - --- Double Quoted String -- --- With fourth encoding argument -- -int(20) --- Without fourth encoding argument -- -int(20) - --- Single Quoted String -- --- With fourth encoding argument -- -int(20) --- Without fourth encoding argument -- -int(20) - --- Heredoc -- --- With fourth encoding argument -- -int(20) --- Without fourth encoding argument -- -int(20) -Done ---UEXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : usage variations *** -- Double Quoted String -- @@ -79,4 +58,4 @@ int(20) -- Without fourth encoding argument -- int(50) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_basic.phpt Tue May 27 18:16:04 2008 @@ -45,8 +45,8 @@ echo "Done"; ?> ---EXPECTF-- -*** Testing mb_strtolower() : basic functionality*** +--EXPECT-- +**** Testing mb_strtolower() : basic functionality*** -- ASCII String -- string(26) "abcdefghijklmnopqrstuvwxyz" @@ -56,14 +56,3 @@ string(64) "zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J" Correctly converted Done ---UEXPECTF-- -*** Testing mb_strtolower() : basic functionality*** - --- ASCII String -- -string(26) "abcdefghijklmnopqrstuvwxyz" -Correctly converted - --- Multibyte String -- -string(64) "zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J" -Correctly converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_error1.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_error1.phpt Tue May 27 18:16:04 2008 @@ -44,16 +44,3 @@ Warning: mb_strtolower() expects at least 1 parameter, 0 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing mb_strtolower() : error conditions*** - --- Testing mb_strtolower() function with more than expected no. of arguments -- - -Warning: mb_strtolower() expects at most 2 parameters, 3 given in %s on line %d -NULL - --- Testing mb_strtolower() function with zero arguments -- - -Warning: mb_strtolower() expects at least 1 parameter, 0 given in %s on line %d -NULL -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_error2.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_error2.phpt Tue May 27 18:16:04 2008 @@ -33,11 +33,3 @@ Warning: mb_strtolower(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_strtolower() : error conditions*** - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_variation1.phpt Tue May 27 18:16:04 2008 @@ -175,83 +175,6 @@ -- Iteration 24 -- -Warning: mb_strtolower() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_strtolower() : usage variations *** - --- Iteration 1 -- -string(1) "0" - --- Iteration 2 -- -string(1) "1" - --- Iteration 3 -- -string(5) "12345" - --- Iteration 4 -- -string(5) "-2345" - --- Iteration 5 -- -string(4) "10.5" - --- Iteration 6 -- -string(5) "-10.5" - --- Iteration 7 -- -string(12) "123456789000" - --- Iteration 8 -- -string(13) "1.23456789e-9" - --- Iteration 9 -- -string(3) "0.5" - --- Iteration 10 -- -string(0) "" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(1) "1" - --- Iteration 13 -- -string(0) "" - --- Iteration 14 -- -string(1) "1" - --- Iteration 15 -- -string(0) "" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(6) "string" - --- Iteration 19 -- -string(6) "string" - --- Iteration 20 -- -string(11) "hello world" - --- Iteration 21 -- -string(14) "class a object" - --- Iteration 22 -- -string(0) "" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - Warning: mb_strtolower() expects parameter 1 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt Tue May 27 18:16:04 2008 @@ -228,135 +228,6 @@ -- Iteration 24 -- -Warning: mb_strtolower() expects parameter 2 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_strtolower() : usage variations *** - --- Iteration 1 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- -string(12) "hello, world" - --- Iteration 11 -- -string(12) "hello, world" - --- Iteration 12 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d -string(12) "hello, world" - --- Iteration 14 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d -string(12) "hello, world" - --- Iteration 16 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d -string(12) "hello, world" - --- Iteration 17 -- - -Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d -string(12) "hello, world" - --- Iteration 18 -- -string(12) "hello, world" - --- Iteration 19 -- -string(12) "hello, world" - --- Iteration 20 -- -string(12) "hello, world" - --- Iteration 21 -- -string(12) "hello, world" - --- Iteration 22 -- -string(12) "hello, world" - --- Iteration 23 -- -string(12) "hello, world" - --- Iteration 24 -- - Warning: mb_strtolower() expects parameter 2 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_variation3.phpt Tue May 27 18:16:04 2008 @@ -55,14 +55,3 @@ string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC" Correctly Converted Done ---UEXPECTF-- -*** Testing mb_strtolower() : usage variations *** - --- Mixed string (mulitbyte and ASCII characters) -- -string(80) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCcGhwLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==" -Correctly Converted - --- Multibyte Only String-- -string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC" -Correctly Converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_variation4.phpt Tue May 27 18:16:04 2008 @@ -39,7 +39,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Basic Latin -- @@ -54,18 +54,3 @@ string(24) "0LDQsdCy0LPQtNC10LbQtw==" Correctly Converted Done ---UEXPECTF-- -*** Testing mb_strtolower() : usage variations *** - --- Basic Latin -- -string(36) "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXo=" -Correctly Converted - --- Characters With Accents -- -string(64) "w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg==" -Correctly Converted - --- Russian -- -string(24) "0LDQsdCy0LPQtNC10LbQtw==" -Correctly Converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_basic.phpt Tue May 27 18:16:04 2008 @@ -47,7 +47,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : basic functionality *** -- ASCII String -- @@ -58,14 +58,3 @@ string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p" Correctly converted Done ---UEXPECTF-- -*** Testing mb_strtoupper() : basic functionality *** - --- ASCII String -- -string(26) "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -Correctly converted - --- Multibyte String -- -string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p" -Correctly converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_error1.phpt Tue May 27 18:16:04 2008 @@ -45,16 +45,3 @@ Warning: mb_strtoupper() expects at least 1 parameter, 0 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing mb_strtoupper() : error conditions *** - --- Testing mb_strtoupper() function with more than expected no. of arguments -- - -Warning: mb_strtoupper() expects at most 2 parameters, 3 given in %s on line %d -NULL - --- Testing mb_strtoupper() function with zero arguments -- - -Warning: mb_strtoupper() expects at least 1 parameter, 0 given in %s on line %d -NULL -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_error2.phpt Tue May 27 18:16:04 2008 @@ -34,11 +34,3 @@ Warning: mb_strtoupper(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_strtoupper() : error conditions *** - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_variation1.phpt Tue May 27 18:16:04 2008 @@ -177,83 +177,6 @@ -- Iteration 24 -- -Warning: mb_strtoupper() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_strtoupper() : usage variations *** - --- Iteration 1 -- -string(1) "0" - --- Iteration 2 -- -string(1) "1" - --- Iteration 3 -- -string(5) "12345" - --- Iteration 4 -- -string(5) "-2345" - --- Iteration 5 -- -string(4) "10.5" - --- Iteration 6 -- -string(5) "-10.5" - --- Iteration 7 -- -string(12) "123456789000" - --- Iteration 8 -- -string(13) "1.23456789E-9" - --- Iteration 9 -- -string(3) "0.5" - --- Iteration 10 -- -string(0) "" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(1) "1" - --- Iteration 13 -- -string(0) "" - --- Iteration 14 -- -string(1) "1" - --- Iteration 15 -- -string(0) "" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(6) "STRING" - --- Iteration 19 -- -string(6) "STRING" - --- Iteration 20 -- -string(12) "HELLO, WORLD" - --- Iteration 21 -- -string(14) "CLASS A OBJECT" - --- Iteration 22 -- -string(0) "" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - Warning: mb_strtoupper() expects parameter 1 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_variation2.phpt Tue May 27 18:16:04 2008 @@ -229,135 +229,6 @@ -- Iteration 24 -- -Warning: mb_strtoupper() expects parameter 2 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_strtoupper() : usage variations *** - --- Iteration 1 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- -string(12) "HELLO, WORLD" - --- Iteration 11 -- -string(12) "HELLO, WORLD" - --- Iteration 12 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d -string(12) "HELLO, WORLD" - --- Iteration 14 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d - -Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d -string(12) "HELLO, WORLD" - --- Iteration 16 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d -string(12) "HELLO, WORLD" - --- Iteration 17 -- - -Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d -string(12) "HELLO, WORLD" - --- Iteration 18 -- -string(12) "HELLO, WORLD" - --- Iteration 19 -- -string(12) "HELLO, WORLD" - --- Iteration 20 -- -string(12) "HELLO, WORLD" - --- Iteration 21 -- -string(12) "HELLO, WORLD" - --- Iteration 22 -- -string(12) "HELLO, WORLD" - --- Iteration 23 -- -string(12) "HELLO, WORLD" - --- Iteration 24 -- - Warning: mb_strtoupper() expects parameter 2 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_variation3.phpt Tue May 27 18:16:04 2008 @@ -45,7 +45,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- @@ -56,14 +56,3 @@ string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC" Correctly Converted Done ---UEXPECTF-- -*** Testing mb_strtoupper() : usage variations *** - --- Mixed string (mulitbyte and ASCII characters) -- -string(80) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCUEhQLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==" -Correctly Converted - --- Multibyte Only String-- -string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC" -Correctly Converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_strtoupper_variation4.phpt Tue May 27 18:16:04 2008 @@ -40,7 +40,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Basic Latin -- @@ -55,18 +55,3 @@ string(24) "0JDQkdCS0JPQlNCV0JbQlw==" Correctly Converted Done ---UEXPECTF-- -*** Testing mb_strtoupper() : usage variations *** - --- Basic Latin -- -string(36) "QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVo=" -Correctly Converted - --- Characters With Accents -- -string(64) "w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg==" -Correctly Converted - --- Russian -- -string(24) "0JDQkdCS0JPQlNCV0JbQlw==" -Correctly Converted -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_basic.phpt diff -u php-src/ext/mbstring/tests/mb_substr_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_basic.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_basic.phpt Tue May 27 18:16:04 2008 @@ -38,7 +38,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : basic functionality *** -- ASCII string 1 -- @@ -53,18 +53,3 @@ -- Multibyte string 2 -- string(28) "6Kqe44OG44Kt44K544OI44Gn44GZ" Done ---UEXPECTF-- -*** Testing mb_substr() : basic functionality *** - --- ASCII string 1 -- -string(3) "DEF" - --- ASCII string 2 -- -string(3) "DEF" - --- Multibyte string 1 -- -string(12) "peacrOiqng==" - --- Multibyte string 2 -- -string(28) "6Kqe44OG44Kt44K544OI44Gn44GZ" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_basic.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_basic.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_basic.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_basic.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_basic.phpt Tue May 27 18:16:04 2008 @@ -34,7 +34,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : basic functionality *** -- ASCII String -- @@ -45,14 +45,3 @@ int(2) int(0) Done ---UEXPECTF-- -*** Testing mb_substr_count() : basic functionality *** - --- ASCII String -- -int(3) -int(0) - --- Multibyte String -- -int(2) -int(0) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_error1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_error1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_error1.phpt Tue May 27 18:16:04 2008 @@ -47,16 +47,3 @@ Warning: mb_substr_count() expects at least 2 parameters, 1 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing mb_substr_count() : error conditions *** - --- Testing mb_substr_count() function with more than expected no. of arguments -- - -Warning: mb_substr_count() expects at most 3 parameters, 4 given in %s on line %d -NULL - --- Testing mb_substr_count() function with less than expected no. of arguments -- - -Warning: mb_substr_count() expects at least 2 parameters, 1 given in %s on line %d -NULL -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_error2.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_error2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_error2.phpt Tue May 27 18:16:04 2008 @@ -35,11 +35,3 @@ Warning: mb_substr_count(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_substr_count() : error conditions *** - --- Testing mb_substr_count() function with an unknown encoding -- - -Warning: mb_substr_count(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_variation1.phpt Tue May 27 18:16:04 2008 @@ -178,84 +178,6 @@ -- Iteration 24 -- -Warning: mb_substr_count() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done - ---UEXPECTF-- -*** Testing mb_substr_count() : usage variations *** - --- Iteration 1 -- -int(0) - --- Iteration 2 -- -int(0) - --- Iteration 3 -- -int(0) - --- Iteration 4 -- -int(0) - --- Iteration 5 -- -int(0) - --- Iteration 6 -- -int(0) - --- Iteration 7 -- -int(0) - --- Iteration 8 -- -int(0) - --- Iteration 9 -- -int(0) - --- Iteration 10 -- -int(0) - --- Iteration 11 -- -int(0) - --- Iteration 12 -- -int(0) - --- Iteration 13 -- -int(0) - --- Iteration 14 -- -int(0) - --- Iteration 15 -- -int(0) - --- Iteration 16 -- -int(0) - --- Iteration 17 -- -int(0) - --- Iteration 18 -- -int(1) - --- Iteration 19 -- -int(1) - --- Iteration 20 -- -int(1) - --- Iteration 21 -- -int(1) - --- Iteration 22 -- -int(0) - --- Iteration 23 -- -int(0) - --- Iteration 24 -- - Warning: mb_substr_count() expects parameter 1 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_variation2.phpt Tue May 27 18:16:04 2008 @@ -192,99 +192,6 @@ -- Iteration 24 -- -Warning: mb_substr_count() expects parameter 2 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_substr_count() : usage variations *** - --- Iteration 1 -- -int(0) - --- Iteration 2 -- -int(0) - --- Iteration 3 -- -int(0) - --- Iteration 4 -- -int(0) - --- Iteration 5 -- -int(0) - --- Iteration 6 -- -int(0) - --- Iteration 7 -- -int(0) - --- Iteration 8 -- -int(0) - --- Iteration 9 -- -int(0) - --- Iteration 10 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 12 -- -int(0) - --- Iteration 13 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 14 -- -int(0) - --- Iteration 15 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 18 -- -int(1) - --- Iteration 19 -- -int(1) - --- Iteration 20 -- -int(1) - --- Iteration 21 -- -int(1) - --- Iteration 22 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_substr_count(): Empty substring. in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_substr_count() expects parameter 2 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_variation3.phpt Tue May 27 18:16:04 2008 @@ -215,121 +215,6 @@ -- Iteration 24 -- -Warning: mb_substr_count() expects parameter 3 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing mb_substr_count() : usage variations *** - --- Iteration 1 -- - -Warning: mb_substr_count(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_substr_count(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_substr_count(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_substr_count(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_substr_count(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_substr_count(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_substr_count(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_substr_count(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_substr_count(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_substr_count(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_substr_count(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -int(1) - --- Iteration 19 -- -int(1) - --- Iteration 20 -- -int(1) - --- Iteration 21 -- -int(1) - --- Iteration 22 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_substr_count(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: mb_substr_count() expects parameter 3 to be binary string, resource given in %s on line %d NULL -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt:1.1 php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt:1.2 --- php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt:1.1 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_count_variation4.phpt Tue May 27 18:16:04 2008 @@ -33,7 +33,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : usage variations *** -- ASCII String -- @@ -42,12 +42,3 @@ -- Multibyte String -- int(1) Done ---UEXPECTF-- -*** Testing mb_substr_count() : usage variations *** - --- ASCII String -- -int(1) - --- Multibyte String -- -int(1) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_error1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_error1.phpt Tue May 27 18:16:04 2008 @@ -47,17 +47,3 @@ Warning: Wrong parameter count for mb_substr() in %s on line %d NULL Done - ---UEXPECTF-- -*** Testing mb_substr() : error conditions *** - --- Testing mb_substr() function with more than expected no. of arguments -- - -Warning: Wrong parameter count for mb_substr() in %s on line %d -NULL - --- Testing mb_substr() function with less than expected no. of arguments -- - -Warning: Wrong parameter count for mb_substr() in %s on line %d -NULL -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_error2.phpt diff -u php-src/ext/mbstring/tests/mb_substr_error2.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_error2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_error2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_error2.phpt Tue May 27 18:16:04 2008 @@ -33,10 +33,3 @@ Warning: mb_substr(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) Done - ---UEXPECTF-- -*** Testing mb_substr() : error conditions *** - -Warning: mb_substr(): Unknown encoding "unknown-encoding" in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation1.phpt Tue May 27 18:16:04 2008 @@ -177,78 +177,3 @@ -- Iteration 24 -- string(5) "Resou" Done ---UEXPECTF-- -*** Testing mb_substr() : usage variations *** - --- Iteration 1 -- -string(1) "0" - --- Iteration 2 -- -string(1) "1" - --- Iteration 3 -- -string(5) "12345" - --- Iteration 4 -- -string(5) "-2345" - --- Iteration 5 -- -string(4) "10.5" - --- Iteration 6 -- -string(5) "-10.5" - --- Iteration 7 -- -string(5) "12345" - --- Iteration 8 -- -string(5) "1.234" - --- Iteration 9 -- -string(3) "0.5" - --- Iteration 10 -- -string(0) "" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(1) "1" - --- Iteration 13 -- -string(0) "" - --- Iteration 14 -- -string(1) "1" - --- Iteration 15 -- -string(0) "" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(5) "strin" - --- Iteration 19 -- -string(5) "strin" - --- Iteration 20 -- -string(5) "hello" - --- Iteration 21 -- -string(5) "Class" - --- Iteration 22 -- -string(0) "" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- -string(5) "Resou" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation2.phpt Tue May 27 18:16:04 2008 @@ -218,118 +218,3 @@ Warning: mb_substr(): Unknown encoding "Resource id #%d" in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing mb_substr() : usage variations *** - --- Iteration 1 -- - -Warning: mb_substr(): Unknown encoding "0" in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: mb_substr(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: mb_substr(): Unknown encoding "12345" in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: mb_substr(): Unknown encoding "-2345" in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: mb_substr(): Unknown encoding "10.5" in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: mb_substr(): Unknown encoding "-10.5" in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: mb_substr(): Unknown encoding "123456789000" in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: mb_substr(): Unknown encoding "1.23456789E-9" in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: mb_substr(): Unknown encoding "0.5" in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: mb_substr(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: mb_substr(): Unknown encoding "1" in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 18 -- -string(5) "tring" - --- Iteration 19 -- -string(5) "tring" - --- Iteration 20 -- -string(5) "tring" - --- Iteration 21 -- -string(5) "tring" - --- Iteration 22 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: mb_substr(): Unknown encoding "" in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: mb_substr(): Unknown encoding "Resource id #%d" in %s on line %d -bool(false) -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation3.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation3.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_variation3.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_variation3.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation3.phpt Tue May 27 18:16:04 2008 @@ -104,7 +104,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** -- Iteration 1: UCS-4 -- @@ -443,342 +443,3 @@ -- Multibyte String -- Encoding KOI8-R recognised Done ---UEXPECTF-- -*** Testing mb_substr() : usage variations *** - --- Iteration 1: UCS-4 -- --- ASCII String -- -Encoding UCS-4 recognised --- Multibyte String -- -Encoding UCS-4 recognised - --- Iteration 1: UCS-4BE -- --- ASCII String -- -Encoding UCS-4BE recognised --- Multibyte String -- -Encoding UCS-4BE recognised - --- Iteration 1: UCS-4LE -- --- ASCII String -- -Encoding UCS-4LE recognised --- Multibyte String -- -Encoding UCS-4LE recognised - --- Iteration 1: UCS-2 -- --- ASCII String -- -Encoding UCS-2 recognised --- Multibyte String -- -Encoding UCS-2 recognised - --- Iteration 1: UCS-2BE -- --- ASCII String -- -Encoding UCS-2BE recognised --- Multibyte String -- -Encoding UCS-2BE recognised - --- Iteration 1: UCS-2LE -- --- ASCII String -- -Encoding UCS-2LE recognised --- Multibyte String -- -Encoding UCS-2LE recognised - --- Iteration 1: UTF-32 -- --- ASCII String -- -Encoding UTF-32 recognised --- Multibyte String -- -Encoding UTF-32 recognised - --- Iteration 1: UTF-32BE -- --- ASCII String -- -Encoding UTF-32BE recognised --- Multibyte String -- -Encoding UTF-32BE recognised - --- Iteration 1: UTF-32LE -- --- ASCII String -- -Encoding UTF-32LE recognised --- Multibyte String -- -Encoding UTF-32LE recognised - --- Iteration 1: UTF-16 -- --- ASCII String -- -Encoding UTF-16 recognised --- Multibyte String -- -Encoding UTF-16 recognised - --- Iteration 1: UTF-16BE -- --- ASCII String -- -Encoding UTF-16BE recognised --- Multibyte String -- -Encoding UTF-16BE recognised - --- Iteration 1: UTF-16LE -- --- ASCII String -- -Encoding UTF-16LE recognised --- Multibyte String -- -Encoding UTF-16LE recognised - --- Iteration 1: UTF-7 -- --- ASCII String -- -Encoding UTF-7 recognised --- Multibyte String -- -Encoding UTF-7 recognised - --- Iteration 1: UTF7-IMAP -- --- ASCII String -- -Encoding UTF7-IMAP recognised --- Multibyte String -- -Encoding UTF7-IMAP recognised - --- Iteration 1: UTF-8 -- --- ASCII String -- -Encoding UTF-8 recognised --- Multibyte String -- -Encoding UTF-8 recognised - --- Iteration 1: ASCII -- --- ASCII String -- -Encoding ASCII recognised --- Multibyte String -- -Encoding ASCII recognised - --- Iteration 1: EUC-JP -- --- ASCII String -- -Encoding EUC-JP recognised --- Multibyte String -- -Encoding EUC-JP recognised - --- Iteration 1: SJIS -- --- ASCII String -- -Encoding SJIS recognised --- Multibyte String -- -Encoding SJIS recognised - --- Iteration 1: eucJP-win -- --- ASCII String -- -Encoding eucJP-win recognised --- Multibyte String -- -Encoding eucJP-win recognised - --- Iteration 1: SJIS-win -- --- ASCII String -- -Encoding SJIS-win recognised --- Multibyte String -- -Encoding SJIS-win recognised - --- Iteration 1: ISO-2022-JP -- --- ASCII String -- -Encoding ISO-2022-JP recognised --- Multibyte String -- -Encoding ISO-2022-JP recognised - --- Iteration 1: JIS -- --- ASCII String -- -Encoding JIS recognised --- Multibyte String -- -Encoding JIS recognised - --- Iteration 1: ISO-8859-1 -- --- ASCII String -- -Encoding ISO-8859-1 recognised --- Multibyte String -- -Encoding ISO-8859-1 recognised - --- Iteration 1: ISO-8859-2 -- --- ASCII String -- -Encoding ISO-8859-2 recognised --- Multibyte String -- -Encoding ISO-8859-2 recognised - --- Iteration 1: ISO-8859-3 -- --- ASCII String -- -Encoding ISO-8859-3 recognised --- Multibyte String -- -Encoding ISO-8859-3 recognised - --- Iteration 1: ISO-8859-4 -- --- ASCII String -- -Encoding ISO-8859-4 recognised --- Multibyte String -- -Encoding ISO-8859-4 recognised - --- Iteration 1: ISO-8859-5 -- --- ASCII String -- -Encoding ISO-8859-5 recognised --- Multibyte String -- -Encoding ISO-8859-5 recognised - --- Iteration 1: ISO-8859-6 -- --- ASCII String -- -Encoding ISO-8859-6 recognised --- Multibyte String -- -Encoding ISO-8859-6 recognised - --- Iteration 1: ISO-8859-7 -- --- ASCII String -- -Encoding ISO-8859-7 recognised --- Multibyte String -- -Encoding ISO-8859-7 recognised - --- Iteration 1: ISO-8859-8 -- --- ASCII String -- -Encoding ISO-8859-8 recognised --- Multibyte String -- -Encoding ISO-8859-8 recognised - --- Iteration 1: ISO-8859-9 -- --- ASCII String -- -Encoding ISO-8859-9 recognised --- Multibyte String -- -Encoding ISO-8859-9 recognised - --- Iteration 1: ISO-8859-10 -- --- ASCII String -- -Encoding ISO-8859-10 recognised --- Multibyte String -- -Encoding ISO-8859-10 recognised - --- Iteration 1: ISO-8859-13 -- --- ASCII String -- -Encoding ISO-8859-13 recognised --- Multibyte String -- -Encoding ISO-8859-13 recognised - --- Iteration 1: ISO-8859-14 -- --- ASCII String -- -Encoding ISO-8859-14 recognised --- Multibyte String -- -Encoding ISO-8859-14 recognised - --- Iteration 1: ISO-8859-15 -- --- ASCII String -- -Encoding ISO-8859-15 recognised --- Multibyte String -- -Encoding ISO-8859-15 recognised - --- Iteration 1: byte2be -- --- ASCII String -- -Encoding byte2be recognised --- Multibyte String -- -Encoding byte2be recognised - --- Iteration 1: byte2le -- --- ASCII String -- -Encoding byte2le recognised --- Multibyte String -- -Encoding byte2le recognised - --- Iteration 1: byte4be -- --- ASCII String -- -Encoding byte4be recognised --- Multibyte String -- -Encoding byte4be recognised - --- Iteration 1: byte4le -- --- ASCII String -- -Encoding byte4le recognised --- Multibyte String -- -Encoding byte4le recognised - --- Iteration 1: BASE64 -- --- ASCII String -- -Encoding BASE64 recognised --- Multibyte String -- -Encoding BASE64 recognised - --- Iteration 1: HTML-ENTITIES -- --- ASCII String -- -Encoding HTML-ENTITIES recognised --- Multibyte String -- -Encoding HTML-ENTITIES recognised - --- Iteration 1: 7bit -- --- ASCII String -- -Encoding 7bit recognised --- Multibyte String -- -Encoding 7bit recognised - --- Iteration 1: 8bit -- --- ASCII String -- -Encoding 8bit recognised --- Multibyte String -- -Encoding 8bit recognised - --- Iteration 1: EUC-CN -- --- ASCII String -- -Encoding EUC-CN recognised --- Multibyte String -- -Encoding EUC-CN recognised - --- Iteration 1: CP936 -- --- ASCII String -- -Encoding CP936 recognised --- Multibyte String -- -Encoding CP936 recognised - --- Iteration 1: HZ -- --- ASCII String -- -Encoding HZ recognised --- Multibyte String -- -Encoding HZ recognised - --- Iteration 1: EUC-TW -- --- ASCII String -- -Encoding EUC-TW recognised --- Multibyte String -- -Encoding EUC-TW recognised - --- Iteration 1: CP950 -- --- ASCII String -- -Encoding CP950 recognised --- Multibyte String -- -Encoding CP950 recognised - --- Iteration 1: BIG-5 -- --- ASCII String -- -Encoding BIG-5 recognised --- Multibyte String -- -Encoding BIG-5 recognised - --- Iteration 1: EUC-KR -- --- ASCII String -- -Encoding EUC-KR recognised --- Multibyte String -- -Encoding EUC-KR recognised - --- Iteration 1: UHC -- --- ASCII String -- -Encoding UHC recognised --- Multibyte String -- -Encoding UHC recognised - --- Iteration 1: ISO-2022-KR -- --- ASCII String -- -Encoding ISO-2022-KR recognised --- Multibyte String -- -Encoding ISO-2022-KR recognised - --- Iteration 1: Windows-1251 -- --- ASCII String -- -Encoding Windows-1251 recognised --- Multibyte String -- -Encoding Windows-1251 recognised - --- Iteration 1: Windows-1252 -- --- ASCII String -- -Encoding Windows-1252 recognised --- Multibyte String -- -Encoding Windows-1252 recognised - --- Iteration 1: CP866 -- --- ASCII String -- -Encoding CP866 recognised --- Multibyte String -- -Encoding CP866 recognised - --- Iteration 1: KOI8-R -- --- ASCII String -- -Encoding KOI8-R recognised --- Multibyte String -- -Encoding KOI8-R recognised -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation4.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation4.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_variation4.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_variation4.phpt:1.2 Fri Feb 1 15:40:23 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation4.phpt Tue May 27 18:16:04 2008 @@ -48,7 +48,7 @@ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** **-- Offset is: -60 --** @@ -129,84 +129,3 @@ --Multibyte String -- string(0) "" Done ---UEXPECTF-- -*** Testing mb_substr() : usage variations *** - -**-- Offset is: -60 --** --- ASCII String -- -string(4) "+Is " ---Multibyte String -- -string(16) "5pel5pys6Kqe44OG" - -**-- Offset is: -50 --** --- ASCII String -- -string(4) "+Is " ---Multibyte String -- -string(16) "5pel5pys6Kqe44OG" - -**-- Offset is: -40 --** --- ASCII String -- -string(4) "+Is " ---Multibyte String -- -string(16) "5pel5pys6Kqe44OG" - -**-- Offset is: -30 --** --- ASCII String -- -string(4) "+Is " ---Multibyte String -- -string(16) "5pel5pys6Kqe44OG" - -**-- Offset is: -20 --** --- ASCII String -- -string(4) "Is a" ---Multibyte String -- -string(16) "5pys6Kqe44OG44Kt" - -**-- Offset is: -10 --** --- ASCII String -- -string(4) "ish " ---Multibyte String -- -string(8) "MTIzNA==" - -**-- Offset is: 0 --** --- ASCII String -- -string(4) "+Is " ---Multibyte String -- -string(16) "5pel5pys6Kqe44OG" - -**-- Offset is: 10 --** --- ASCII String -- -string(4) "lish" ---Multibyte String -- -string(8) "MDEyMw==" - -**-- Offset is: 20 --** --- ASCII String -- -string(1) "g" ---Multibyte String -- -string(4) "44CC" - -**-- Offset is: 30 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: 40 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: 50 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: 60 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" -Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation5.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation5.phpt:1.2 php-src/ext/mbstring/tests/mb_substr_variation5.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substr_variation5.phpt:1.2 Fri Feb 1 15:40:22 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation5.phpt Tue May 27 18:16:04 2008 @@ -51,88 +51,7 @@ echo "Done"; ?> ---EXPECTF-- -*** Testing mb_substr() : usage variations *** - -**-- Offset is: -60 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: -50 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: -40 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: -30 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: -20 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: -10 --** --- ASCII String -- -string(10) "Is an Engl" ---Multibyte String -- -string(40) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMA==" - -**-- Offset is: 0 --** --- ASCII String -- -string(0) "" ---Multibyte String -- -string(0) "" - -**-- Offset is: 10 --** --- ASCII String -- -string(10) "Is an Engl" ---Multibyte String -- -string(40) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMA==" - -**-- Offset is: 20 --** --- ASCII String -- -string(20) "Is an English string" ---Multibyte String -- -string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" - -**-- Offset is: 30 --** --- ASCII String -- -string(20) "Is an English string" ---Multibyte String -- -string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" - -**-- Offset is: 40 --** --- ASCII String -- -string(20) "Is an English string" ---Multibyte String -- -string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" - -**-- Offset is: 50 --** --- ASCII String -- -string(20) "Is an English string" ---Multibyte String -- -string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" - -**-- Offset is: 60 --** --- ASCII String -- -string(20) "Is an English string" ---Multibyte String -- -string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -Done ---UEXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** **-- Offset is: -60 --** http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/003.phpt?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/session/tests/003.phpt diff -u php-src/ext/session/tests/003.phpt:1.18 php-src/ext/session/tests/003.phpt:1.19 --- php-src/ext/session/tests/003.phpt:1.18 Tue May 27 12:17:39 2008 +++ php-src/ext/session/tests/003.phpt Tue May 27 18:16:04 2008 @@ -18,11 +18,8 @@ session_id("abtest"); session_start(); -if (ini_get("unicode.semantics")) { - session_decode('baz|O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";i:1;}}'); -} else { - session_decode('baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'); -} +session_decode('baz|O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";i:1;}}'); + $baz = $_SESSION['baz']; $arr = $_SESSION['arr']; http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/004.phpt?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/session/tests/004.phpt diff -u php-src/ext/session/tests/004.phpt:1.20 php-src/ext/session/tests/004.phpt:1.21 --- php-src/ext/session/tests/004.phpt:1.20 Tue May 27 12:17:39 2008 +++ php-src/ext/session/tests/004.phpt Tue May 27 18:16:04 2008 @@ -46,10 +46,8 @@ function __construct() { - if (ini_get("unicode.semantics")) { - /* Setup proper deserialization data for unicode.semantics mode */ - $this->data = str_replace('s:', 'U:', $this->data); - } + /* Setup proper deserialization data for unicode.semantics mode */ + $this->data = str_replace('s:', 'U:', $this->data); } } http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/005.phpt?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/session/tests/005.phpt diff -u php-src/ext/session/tests/005.phpt:1.18 php-src/ext/session/tests/005.phpt:1.19 --- php-src/ext/session/tests/005.phpt:1.18 Tue May 27 12:17:39 2008 +++ php-src/ext/session/tests/005.phpt Tue May 27 18:16:04 2008 @@ -48,9 +48,7 @@ function __construct() { - if (ini_get("unicode.semantics")) { - $this->data = str_replace('s:', 'U:', $this->data); - } + $this->data = str_replace('s:', 'U:', $this->data); } } http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation4.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/session/tests/session_save_path_variation4.phpt diff -u php-src/ext/session/tests/session_save_path_variation4.phpt:1.5 php-src/ext/session/tests/session_save_path_variation4.phpt:1.6 --- php-src/ext/session/tests/session_save_path_variation4.phpt:1.5 Tue May 27 12:17:39 2008 +++ php-src/ext/session/tests/session_save_path_variation4.phpt Tue May 27 18:16:04 2008 @@ -46,9 +46,11 @@ ob_end_flush(); ?> --CLEAN-- +<?php $directory = dirname(__FILE__); $sessions = ($directory."/sessions"); var_dump(rmdir($sessions)); +?> --EXPECTF-- *** Testing session_save_path() : variation *** bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation5.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/session/tests/session_save_path_variation5.phpt diff -u php-src/ext/session/tests/session_save_path_variation5.phpt:1.5 php-src/ext/session/tests/session_save_path_variation5.phpt:1.6 --- php-src/ext/session/tests/session_save_path_variation5.phpt:1.5 Tue May 27 12:17:39 2008 +++ php-src/ext/session/tests/session_save_path_variation5.phpt Tue May 27 18:16:04 2008 @@ -46,9 +46,11 @@ ob_end_flush(); ?> --CLEAN-- +<?php $directory = dirname(__FILE__); $sessions = ($directory."/sessions"); var_dump(rmdir($sessions)); +?> --EXPECTF-- *** Testing session_save_path() : variation *** bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/000.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/simplexml/tests/000.phpt diff -u php-src/ext/simplexml/tests/000.phpt:1.7 php-src/ext/simplexml/tests/000.phpt:1.8 --- php-src/ext/simplexml/tests/000.phpt:1.7 Tue May 27 12:17:39 2008 +++ php-src/ext/simplexml/tests/000.phpt Tue May 27 18:16:04 2008 @@ -22,7 +22,6 @@ test('sxe->elem1[0]'); test('sxe->elem1[0]->elem2'); test('sxe->elem1[0]->elem2->bla'); -if (!ini_get("unicode.semantics")) test('sxe->elem1[0]["attr1"]'); test('sxe->elem1[0]->attr1'); test('sxe->elem1[1]'); test('sxe->elem1[2]'); http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/.cvsignore?view=markup&rev=1.1 Index: php-src/ext/com_dotnet/tests/.cvsignore +++ php-src/ext/com_dotnet/tests/.cvsignore phpt.* *.mem *.diff *.log *.exp *.out *.php *.gcda *.gcno