diff options
| author | Steph Fox <sfox@php.net> | 2008-05-27 18:16:04 +0000 |
|---|---|---|
| committer | Steph Fox <sfox@php.net> | 2008-05-27 18:16:04 +0000 |
| commit | 4be7f4aecd5b9c4c442adcf954e5f158c52be5d5 (patch) | |
| tree | 440e2b1f2f5142fcf2fb8b30ef3e9a922f674cba | |
| parent | 6c06a591f2a9cc70fd276ce02b0e7fc513444383 (diff) | |
| download | php-git-4be7f4aecd5b9c4c442adcf954e5f158c52be5d5.tar.gz | |
- killed off UEXPECT
- com_dotnet gets a .cvsignore
- Ulf will take care of mysql extensions, rest complete
317 files changed, 422 insertions, 12664 deletions
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt index a8a9815165..d3a09fd4fb 100644 --- a/ext/bz2/tests/001.phpt +++ b/ext/bz2/tests/001.phpt @@ -18,7 +18,7 @@ var_dump(bzopen($fp, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt index 7b9673275c..0145b584ad 100644 --- a/ext/bz2/tests/002.phpt +++ b/ext/bz2/tests/002.phpt @@ -73,7 +73,7 @@ var_dump(bzopen($fp, "w")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt index 1432600087..23b005ac11 100644 --- a/ext/bz2/tests/003.phpt +++ b/ext/bz2/tests/003.phpt @@ -16,7 +16,7 @@ var_dump(bzread($fd, 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt index e78d3b9cff..b64675833b 100644 --- a/ext/bz2/tests/004.phpt +++ b/ext/bz2/tests/004.phpt @@ -43,73 +43,7 @@ var_dump(bzerrno($fd2)); 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) diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt index d10f8765e7..cb7f7147e3 100644 --- a/ext/bz2/tests/005.phpt +++ b/ext/bz2/tests/005.phpt @@ -41,38 +41,6 @@ echo "Done\n"; --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) diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt index 1adff69293..2f0ec225cb 100644 --- a/ext/calendar/tests/easter_date.phpt +++ b/ext/calendar/tests/easter_date.phpt @@ -6,9 +6,9 @@ date.timezone=UTC <?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-- diff --git a/ext/calendar/tests/jddayofweek.phpt b/ext/calendar/tests/jddayofweek.phpt index c33d59892d..ae21f32a8e 100644 --- a/ext/calendar/tests/jddayofweek.phpt +++ b/ext/calendar/tests/jddayofweek.phpt @@ -127,4 +127,3 @@ Sat Sun Mon Tue - diff --git a/ext/calendar/tests/jdtofrench.phpt b/ext/calendar/tests/jdtofrench.phpt index 27944091e3..2601d14a07 100644 --- a/ext/calendar/tests/jdtofrench.phpt +++ b/ext/calendar/tests/jdtofrench.phpt @@ -17,4 +17,4 @@ echo jdtofrench(2385940). "\n"; 1/11/1 4/11/1 5/21/2 -0/0/0
\ No newline at end of file +0/0/0 diff --git a/ext/calendar/tests/jdtogregorian.phpt b/ext/calendar/tests/jdtogregorian.phpt index 6b1956f477..9d682e4b03 100644 --- a/ext/calendar/tests/jdtogregorian.phpt +++ b/ext/calendar/tests/jdtogregorian.phpt @@ -15,4 +15,4 @@ echo jdtogregorian(2816423). "\n"; 1/1/1582 10/5/1582 1/1/1970 -1/1/2999
\ No newline at end of file +1/1/2999 diff --git a/ext/calendar/tests/jdtojewish.phpt b/ext/calendar/tests/jdtojewish.phpt index a9551047a3..785af75808 100644 --- a/ext/calendar/tests/jdtojewish.phpt +++ b/ext/calendar/tests/jdtojewish.phpt @@ -2,6 +2,8 @@ jdtojewish() function --SKIPIF-- <?php include 'skipif.inc'; ?> +--INI-- +unicode.output_encoding=ISO-8859-8 --FILE-- <?php @@ -17,18 +19,6 @@ var_dump(jdtojewish(gregoriantojd(10,28,2002))."\r\n". 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 ëá çùåï äúùñâ ëá çùåï ä'úùñâ diff --git a/ext/calendar/tests/jdtojulian.phpt b/ext/calendar/tests/jdtojulian.phpt index 6c87aa7e54..0d3c058b0c 100644 --- a/ext/calendar/tests/jdtojulian.phpt +++ b/ext/calendar/tests/jdtojulian.phpt @@ -15,4 +15,4 @@ echo jdtojulian(2816423). "\n"; 12/22/1581 9/25/1582 12/19/1969 -12/12/2998
\ No newline at end of file +12/12/2998 diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt index 3924543634..2e862a3671 100644 --- a/ext/calendar/tests/jdtomonthname.phpt +++ b/ext/calendar/tests/jdtomonthname.phpt @@ -25,51 +25,7 @@ foreach ($jd_days as $jd_day) { 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" diff --git a/ext/calendar/tests/jewishtojd.phpt b/ext/calendar/tests/jewishtojd.phpt index a9a2ff0e3d..2dd0381619 100644 --- a/ext/calendar/tests/jewishtojd.phpt +++ b/ext/calendar/tests/jewishtojd.phpt @@ -13,4 +13,4 @@ echo jewishtojd(2,22,5763). "\n"; 0 0 347998 -2452576
\ No newline at end of file +2452576 diff --git a/ext/calendar/tests/juliantojd.phpt b/ext/calendar/tests/juliantojd.phpt index 9563e041a1..b9d7f706e3 100644 --- a/ext/calendar/tests/juliantojd.phpt +++ b/ext/calendar/tests/juliantojd.phpt @@ -15,4 +15,4 @@ echo juliantojd( 1, 1, 2999). "\n"; 2298884 2299161 2440601 -2816443
\ No newline at end of file +2816443 diff --git a/ext/com_dotnet/tests/27974.phpt b/ext/com_dotnet/tests/27974.phpt index 30c42b6cf6..2ebdef97f8 100755 --- a/ext/com_dotnet/tests/27974.phpt +++ b/ext/com_dotnet/tests/27974.phpt @@ -36,8 +36,8 @@ object(variant)#1 (0) { 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! diff --git a/ext/ctype/tests/001.phpt b/ext/ctype/tests/001.phpt index d16d89ae49..59e82d3667 100644 --- a/ext/ctype/tests/001.phpt +++ b/ext/ctype/tests/001.phpt @@ -25,19 +25,7 @@ ctype_test_001("ctype_punct"); 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 diff --git a/ext/ctype/tests/002.phpt b/ext/ctype/tests/002.phpt index b3002364cf..41d28e562a 100644 --- a/ext/ctype/tests/002.phpt +++ b/ext/ctype/tests/002.phpt @@ -34,19 +34,6 @@ ctype_test_002("ctype_xdigit"); ?> --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 diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt index 739b65e44d..19c1680a1d 100644 --- a/ext/ctype/tests/ctype_alnum_basic.phpt +++ b/ext/ctype/tests/ctype_alnum_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_alnum_error.phpt b/ext/ctype/tests/ctype_alnum_error.phpt index 2c552a0d26..87e18363cc 100644 --- a/ext/ctype/tests/ctype_alnum_error.phpt +++ b/ext/ctype/tests/ctype_alnum_error.phpt @@ -37,13 +37,17 @@ setlocale(LC_CTYPE, $orig); --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=== diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt index 2dc45313b9..1a260702af 100644 --- a/ext/ctype/tests/ctype_alnum_variation1.phpt +++ b/ext/ctype/tests/ctype_alnum_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt index e0a95c0c66..b4ede6c8af 100644 --- a/ext/ctype/tests/ctype_alnum_variation2.phpt +++ b/ext/ctype/tests/ctype_alnum_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 252 is alpha numeric 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=== diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt index 57d82a13f2..2370570aff 100644 --- a/ext/ctype/tests/ctype_alnum_variation3.phpt +++ b/ext/ctype/tests/ctype_alnum_variation3.phpt @@ -62,6 +62,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alnum_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt index e40eae3d90..ce13eae9c9 100644 --- a/ext/ctype/tests/ctype_alnum_variation4.phpt +++ b/ext/ctype/tests/ctype_alnum_variation4.phpt @@ -46,6 +46,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt index fbeaae8169..f689de64c1 100644 --- a/ext/ctype/tests/ctype_alpha_basic.phpt +++ b/ext/ctype/tests/ctype_alpha_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt index 9bc157d542..b796a47d3c 100644 --- a/ext/ctype/tests/ctype_alpha_variation1.phpt +++ b/ext/ctype/tests/ctype_alpha_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt index 785f33c3dd..f7012aaeae 100644 --- a/ext/ctype/tests/ctype_alpha_variation2.phpt +++ b/ext/ctype/tests/ctype_alpha_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 252 is alphabetic 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=== diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt index 842ab20058..65c961d3ca 100644 --- a/ext/ctype/tests/ctype_alpha_variation3.phpt +++ b/ext/ctype/tests/ctype_alpha_variation3.phpt @@ -63,6 +63,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_alpha_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt index f4348df815..8bea42cac8 100644 --- a/ext/ctype/tests/ctype_alpha_variation4.phpt +++ b/ext/ctype/tests/ctype_alpha_variation4.phpt @@ -46,6 +46,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt index 34aa97725b..7bcc5a182d 100644 --- a/ext/ctype/tests/ctype_cntrl_basic.phpt +++ b/ext/ctype/tests/ctype_cntrl_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt index a708abd1ac..9b007857bc 100644 --- a/ext/ctype/tests/ctype_cntrl_variation1.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt @@ -107,6 +107,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt index 109dff5868..925d189d42 100644 --- a/ext/ctype/tests/ctype_cntrl_variation2.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 157 is control character 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=== diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt index 91d2b7098e..d2c9fe9397 100644 --- a/ext/ctype/tests/ctype_cntrl_variation3.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt @@ -70,6 +70,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 30 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_cntrl_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt index f306e0c2e5..782e7b4a38 100644 --- a/ext/ctype/tests/ctype_cntrl_variation4.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt @@ -45,6 +45,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt index 093fc31a99..dc1a4eb18d 100644 --- a/ext/ctype/tests/ctype_digit_basic.phpt +++ b/ext/ctype/tests/ctype_digit_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt index 26c8050367..a1eeeeaf43 100644 --- a/ext/ctype/tests/ctype_digit_variation1.phpt +++ b/ext/ctype/tests/ctype_digit_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt index d4bf0f75c1..3589f2fa83 100644 --- a/ext/ctype/tests/ctype_digit_variation2.phpt +++ b/ext/ctype/tests/ctype_digit_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 54 is a numeric digit 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=== diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt index e1575420ec..b5a01eb857 100644 --- a/ext/ctype/tests/ctype_digit_variation3.phpt +++ b/ext/ctype/tests/ctype_digit_variation3.phpt @@ -69,6 +69,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 31 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_digit_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt index 48bbaf7d64..e426a4481e 100644 --- a/ext/ctype/tests/ctype_digit_variation4.phpt +++ b/ext/ctype/tests/ctype_digit_variation4.phpt @@ -46,6 +46,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt index 767e926109..a2db4073f4 100644 --- a/ext/ctype/tests/ctype_graph_basic.phpt +++ b/ext/ctype/tests/ctype_graph_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt index cc9edd02f8..00d0868b7e 100644 --- a/ext/ctype/tests/ctype_graph_variation1.phpt +++ b/ext/ctype/tests/ctype_graph_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation2.phpt b/ext/ctype/tests/ctype_graph_variation2.phpt index 724a855623..e93a21559d 100644 --- a/ext/ctype/tests/ctype_graph_variation2.phpt +++ b/ext/ctype/tests/ctype_graph_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 252 is a printable character 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=== diff --git a/ext/ctype/tests/ctype_graph_variation3.phpt b/ext/ctype/tests/ctype_graph_variation3.phpt index fbfdc77d7d..619272132b 100644 --- a/ext/ctype/tests/ctype_graph_variation3.phpt +++ b/ext/ctype/tests/ctype_graph_variation3.phpt @@ -66,6 +66,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 28 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_graph_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation4.phpt b/ext/ctype/tests/ctype_graph_variation4.phpt index 1b5ec01707..612e382589 100644 --- a/ext/ctype/tests/ctype_graph_variation4.phpt +++ b/ext/ctype/tests/ctype_graph_variation4.phpt @@ -46,6 +46,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt index cde8732e3c..54a179be79 100644 --- a/ext/ctype/tests/ctype_lower_basic.phpt +++ b/ext/ctype/tests/ctype_lower_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt index f8ccc79aea..633328f0df 100644 --- a/ext/ctype/tests/ctype_lower_variation1.phpt +++ b/ext/ctype/tests/ctype_lower_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt index a381275aad..ac0d4f28bf 100644 --- a/ext/ctype/tests/ctype_lower_variation2.phpt +++ b/ext/ctype/tests/ctype_lower_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 252 is a lower case character 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=== diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt index 7689ed183e..9e2f6723d9 100644 --- a/ext/ctype/tests/ctype_lower_variation3.phpt +++ b/ext/ctype/tests/ctype_lower_variation3.phpt @@ -64,6 +64,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_lower_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt index a8a61e5c3b..6186fd05b6 100644 --- a/ext/ctype/tests/ctype_lower_variation4.phpt +++ b/ext/ctype/tests/ctype_lower_variation4.phpt @@ -46,6 +46,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt index 57329e2a59..d6047eee7a 100644 --- a/ext/ctype/tests/ctype_print_basic.phpt +++ b/ext/ctype/tests/ctype_print_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt index dd75e98acd..77a6f9d655 100644 --- a/ext/ctype/tests/ctype_print_variation1.phpt +++ b/ext/ctype/tests/ctype_print_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt index 21e76170e0..14ce35ff47 100644 --- a/ext/ctype/tests/ctype_print_variation2.phpt +++ b/ext/ctype/tests/ctype_print_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 252 is a printable character 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=== diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt index 3b14c0d6c2..6c0ed13ee5 100644 --- a/ext/ctype/tests/ctype_print_variation3.phpt +++ b/ext/ctype/tests/ctype_print_variation3.phpt @@ -61,6 +61,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(true) -- Iteration 23 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_print_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt index 47dd8bb503..7631e256b3 100644 --- a/ext/ctype/tests/ctype_print_variation4.phpt +++ b/ext/ctype/tests/ctype_print_variation4.phpt @@ -45,6 +45,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt index 596402bb19..855ec81683 100644 --- a/ext/ctype/tests/ctype_punct_basic.phpt +++ b/ext/ctype/tests/ctype_punct_basic.phpt @@ -29,6 +29,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_punct_error.phpt b/ext/ctype/tests/ctype_punct_error.phpt index 29c7c597fb..19ec9386f3 100644 --- a/ext/ctype/tests/ctype_punct_error.phpt +++ b/ext/ctype/tests/ctype_punct_error.phpt @@ -38,13 +38,17 @@ setlocale(LC_CTYPE, $orig); --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=== diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt index acee9c9f5c..412087da06 100644 --- a/ext/ctype/tests/ctype_punct_variation1.phpt +++ b/ext/ctype/tests/ctype_punct_variation1.phpt @@ -107,6 +107,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt index 4096f58141..8612ddf363 100644 --- a/ext/ctype/tests/ctype_punct_variation2.phpt +++ b/ext/ctype/tests/ctype_punct_variation2.phpt @@ -34,6 +34,8 @@ setlocale(LC_CTYPE, $orig); ===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 171 is punctuation 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=== diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt index c09d4fae2d..ba0a33cf5c 100644 --- a/ext/ctype/tests/ctype_punct_variation3.phpt +++ b/ext/ctype/tests/ctype_punct_variation3.phpt @@ -64,6 +64,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(true) -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_punct_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt index f1404e8c11..f5769d4aa3 100644 --- a/ext/ctype/tests/ctype_punct_variation4.phpt +++ b/ext/ctype/tests/ctype_punct_variation4.phpt @@ -47,6 +47,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt index 9f2233e484..3ec245db37 100644 --- a/ext/ctype/tests/ctype_space_basic.phpt +++ b/ext/ctype/tests/ctype_space_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_space_error.phpt b/ext/ctype/tests/ctype_space_error.phpt index cd2886ef16..63f6ad3c62 100644 --- a/ext/ctype/tests/ctype_space_error.phpt +++ b/ext/ctype/tests/ctype_space_error.phpt @@ -37,13 +37,17 @@ setlocale(LC_CTYPE, $orig); --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=== diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt index c4160929cb..66970c9bbb 100644 --- a/ext/ctype/tests/ctype_space_variation1.phpt +++ b/ext/ctype/tests/ctype_space_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation2.phpt b/ext/ctype/tests/ctype_space_variation2.phpt index c46f531a80..3b3f06f291 100644 --- a/ext/ctype/tests/ctype_space_variation2.phpt +++ b/ext/ctype/tests/ctype_space_variation2.phpt @@ -32,6 +32,8 @@ setlocale(LC_CTYPE, $orig); ===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 31 is a space character 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=== diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt index 55d1496f65..1b2552aa68 100644 --- a/ext/ctype/tests/ctype_space_variation3.phpt +++ b/ext/ctype/tests/ctype_space_variation3.phpt @@ -64,6 +64,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(true) -- Iteration 26 -- bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_space_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation4.phpt b/ext/ctype/tests/ctype_space_variation4.phpt index 82df3f490e..e5d5bfc98e 100644 --- a/ext/ctype/tests/ctype_space_variation4.phpt +++ b/ext/ctype/tests/ctype_space_variation4.phpt @@ -45,6 +45,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt index 88028a5dc2..95ec55ae10 100644 --- a/ext/ctype/tests/ctype_upper_basic.phpt +++ b/ext/ctype/tests/ctype_upper_basic.phpt @@ -28,6 +28,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt index 73b75c0b25..c74377a9fc 100644 --- a/ext/ctype/tests/ctype_upper_variation1.phpt +++ b/ext/ctype/tests/ctype_upper_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt index 8d037d4f2c..5f751e3b10 100644 --- a/ext/ctype/tests/ctype_upper_variation2.phpt +++ b/ext/ctype/tests/ctype_upper_variation2.phpt @@ -32,6 +32,8 @@ setlocale(LC_CTYPE, $orig); ===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 219 is a uppercase character 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=== diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt index 93a5cb912b..7f92a910a5 100644 --- a/ext/ctype/tests/ctype_upper_variation3.phpt +++ b/ext/ctype/tests/ctype_upper_variation3.phpt @@ -63,6 +63,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_upper_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt index d3d464af9d..35a2a4c355 100644 --- a/ext/ctype/tests/ctype_upper_variation4.phpt +++ b/ext/ctype/tests/ctype_upper_variation4.phpt @@ -45,6 +45,8 @@ setlocale(LC_CTYPE, $orig); --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) 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=== diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt index fa46223328..b59b5775af 100644 --- a/ext/ctype/tests/ctype_xdigit_basic.phpt +++ b/ext/ctype/tests/ctype_xdigit_basic.phpt @@ -27,6 +27,10 @@ setlocale(LC_CTYPE, $orig); ===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=== diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt index f3cebe3665..241d86f1a2 100644 --- a/ext/ctype/tests/ctype_xdigit_variation1.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt @@ -106,6 +106,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 25 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation1.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt index dfb229e00b..d00d5e297f 100644 --- a/ext/ctype/tests/ctype_xdigit_variation2.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt @@ -33,6 +33,8 @@ setlocale(LC_CTYPE, $orig); ===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 99 is a hexadecimal 'digit' 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=== diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt index 698acfe66a..e9ae3a815f 100644 --- a/ext/ctype/tests/ctype_xdigit_variation3.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt @@ -64,6 +64,8 @@ setlocale(LC_CTYPE, $orig); --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 @@ bool(false) -- Iteration 26 -- bool(false) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation3.php on line %d ===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt index 7bccfe2a0e..d74f15fde3 100644 --- a/ext/ctype/tests/ctype_xdigit_variation4.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt @@ -61,6 +61,8 @@ setlocale(LC_CTYPE, $orig); --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) bool(true) + +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %sctype_xdigit_variation4.php on line 49 ===DONE=== diff --git a/ext/date/tests/003.phpt b/ext/date/tests/003.phpt index 0d2cfa275b..66499fd2aa 100644 --- a/ext/date/tests/003.phpt +++ b/ext/date/tests/003.phpt @@ -11,41 +11,7 @@ for ($i = 0; $i < 32; $i++) { 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" diff --git a/ext/date/tests/004.phpt b/ext/date/tests/004.phpt index 55317f7a76..8224dde015 100644 --- a/ext/date/tests/004.phpt +++ b/ext/date/tests/004.phpt @@ -25,53 +25,7 @@ foreach ($tz as $zone) { 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" diff --git a/ext/date/tests/005.phpt b/ext/date/tests/005.phpt index 7485214d48..04051e44ae 100644 --- a/ext/date/tests/005.phpt +++ b/ext/date/tests/005.phpt @@ -20,7 +20,7 @@ var_dump(idate("'")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: idate() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/date/tests/006.phpt b/ext/date/tests/006.phpt index 407242b161..d1399026a6 100644 --- a/ext/date/tests/006.phpt +++ b/ext/date/tests/006.phpt @@ -19,7 +19,7 @@ var_dump(checkdate(1,1,-1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d bool(false) bool(true) diff --git a/ext/date/tests/007.phpt b/ext/date/tests/007.phpt index e33e0e853e..db46a1ffbf 100644 --- a/ext/date/tests/007.phpt +++ b/ext/date/tests/007.phpt @@ -15,91 +15,7 @@ var_dump(localtime($t, false)); 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) { diff --git a/ext/date/tests/008.phpt b/ext/date/tests/008.phpt index 9abdd447f7..700366f7a8 100644 --- a/ext/date/tests/008.phpt +++ b/ext/date/tests/008.phpt @@ -13,59 +13,7 @@ var_dump(getdate()); 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) { diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt index 4d569ae177..eb5b459154 100644 --- a/ext/date/tests/009.phpt +++ b/ext/date/tests/009.phpt @@ -25,26 +25,7 @@ var_dump(gmstrftime("blah", $t)); 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) diff --git a/ext/date/tests/010.phpt b/ext/date/tests/010.phpt index e83cebda91..a0f2805b4c 100644 --- a/ext/date/tests/010.phpt +++ b/ext/date/tests/010.phpt @@ -12,649 +12,6 @@ date.timezone=UTC 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"]=> diff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt index bfba6d182b..8b96509b45 100644 --- a/ext/date/tests/012.phpt +++ b/ext/date/tests/012.phpt @@ -21,22 +21,6 @@ echo "Done\n"; ?> --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 diff --git a/ext/date/tests/013.phpt b/ext/date/tests/013.phpt index a0943613ac..1b64716214 100644 --- a/ext/date/tests/013.phpt +++ b/ext/date/tests/013.phpt @@ -21,29 +21,6 @@ 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" -} -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"]=> diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index d83947cf1a..84ab56f44e 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -18,26 +18,7 @@ var_dump(timezone_offset_get($dto, $dtz)); 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" diff --git a/ext/date/tests/bug35143.phpt b/ext/date/tests/bug35143.phpt index 8aac915fb1..c258b950c1 100644 --- a/ext/date/tests/bug35143.phpt +++ b/ext/date/tests/bug35143.phpt @@ -8,18 +8,6 @@ var_dump(date_default_timezone_get()); 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"]=> diff --git a/ext/date/tests/bug35499.phpt b/ext/date/tests/bug35499.phpt index 9e21466d55..c5983e2528 100644 --- a/ext/date/tests/bug35499.phpt +++ b/ext/date/tests/bug35499.phpt @@ -13,73 +13,6 @@ var_dump(date_parse(" \n ")); 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"]=> diff --git a/ext/date/tests/bug37616.phpt b/ext/date/tests/bug37616.phpt index 6572d42601..368d77b015 100644 --- a/ext/date/tests/bug37616.phpt +++ b/ext/date/tests/bug37616.phpt @@ -6,6 +6,4 @@ Bug #37616 (DATE_RFC822 does not product RFC 822 dates) 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" diff --git a/ext/date/tests/bug41523-64bit.phpt b/ext/date/tests/bug41523-64bit.phpt index ee9c750b40..7204646d3d 100644 --- a/ext/date/tests/bug41523-64bit.phpt +++ b/ext/date/tests/bug41523-64bit.phpt @@ -14,45 +14,6 @@ echo $dt->format( DateTime::ISO8601 ), "\n"; ?> --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"]=> diff --git a/ext/date/tests/bug41523.phpt b/ext/date/tests/bug41523.phpt index 90148ccbc7..df6189b69b 100644 --- a/ext/date/tests/bug41523.phpt +++ b/ext/date/tests/bug41523.phpt @@ -14,45 +14,6 @@ echo $dt->format( DateTime::ISO8601 ), "\n"; ?> --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"]=> diff --git a/ext/date/tests/bug41964.phpt b/ext/date/tests/bug41964.phpt index ae4ab3b671..03eb873722 100644 --- a/ext/date/tests/bug41964.phpt +++ b/ext/date/tests/bug41964.phpt @@ -41,27 +41,6 @@ NULL 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) diff --git a/ext/date/tests/bug42910.phpt b/ext/date/tests/bug42910.phpt index 1173408234..d31912ec8a 100644 --- a/ext/date/tests/bug42910.phpt +++ b/ext/date/tests/bug42910.phpt @@ -27,10 +27,4 @@ Bug #42910 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZo 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" diff --git a/ext/date/tests/bug43808.phpt b/ext/date/tests/bug43808.phpt index 8311fb9bc3..29a8bee6a9 100644 --- a/ext/date/tests/bug43808.phpt +++ b/ext/date/tests/bug43808.phpt @@ -15,40 +15,6 @@ var_dump( date_get_last_errors() ); --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"]=> diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt index 1bf0025372..b7959d398f 100644 --- a/ext/date/tests/date_constants.phpt +++ b/ext/date/tests/date_constants.phpt @@ -39,41 +39,6 @@ Date constants ); ?> --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" diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt index e29f51ed60..6d29c43f4b 100644 --- a/ext/date/tests/date_parse_001.phpt +++ b/ext/date/tests/date_parse_001.phpt @@ -16,292 +16,7 @@ date.timezone=UTC 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) diff --git a/ext/date/tests/date_sun_info_001.phpt b/ext/date/tests/date_sun_info_001.phpt index c995a5ca95..1c3cdb432c 100644 --- a/ext/date/tests/date_sun_info_001.phpt +++ b/ext/date/tests/date_sun_info_001.phpt @@ -8,29 +8,7 @@ $sun_info = date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333); 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) diff --git a/ext/date/tests/oo_001.phpt b/ext/date/tests/oo_001.phpt index 9cb366315b..da565234f2 100644 --- a/ext/date/tests/oo_001.phpt +++ b/ext/date/tests/oo_001.phpt @@ -40,18 +40,6 @@ try { 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 @@ Warning: DateTimeZone::getName(): The DateTimeZone object has not been correctly bool(false) DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) DONE - diff --git a/ext/date/tests/oo_002.phpt b/ext/date/tests/oo_002.phpt index 7bd0a7d72f..891af7b4f8 100644 --- a/ext/date/tests/oo_002.phpt +++ b/ext/date/tests/oo_002.phpt @@ -20,13 +20,6 @@ $c = clone $t; 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" diff --git a/ext/date/tests/strtotime-mysql-64bit.phpt b/ext/date/tests/strtotime-mysql-64bit.phpt index ff4da8996b..d3c43b4793 100644 --- a/ext/date/tests/strtotime-mysql-64bit.phpt +++ b/ext/date/tests/strtotime-mysql-64bit.phpt @@ -22,12 +22,6 @@ foreach($d as $date) { } ?> --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" - diff --git a/ext/date/tests/strtotime-mysql.phpt b/ext/date/tests/strtotime-mysql.phpt index f69de8abe7..c560418954 100755 --- a/ext/date/tests/strtotime-mysql.phpt +++ b/ext/date/tests/strtotime-mysql.phpt @@ -22,10 +22,6 @@ foreach($d as $date) { } ?> --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) diff --git a/ext/date/tests/strtotime3-64bit.phpt b/ext/date/tests/strtotime3-64bit.phpt index 44b7cf7882..e67ca423ab 100644 --- a/ext/date/tests/strtotime3-64bit.phpt +++ b/ext/date/tests/strtotime3-64bit.phpt @@ -47,31 +47,6 @@ foreach ($strs as $str) { --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) diff --git a/ext/date/tests/strtotime3.phpt b/ext/date/tests/strtotime3.phpt index fa9373d823..099a53890e 100644 --- a/ext/date/tests/strtotime3.phpt +++ b/ext/date/tests/strtotime3.phpt @@ -47,31 +47,6 @@ foreach ($strs as $str) { --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) diff --git a/ext/date/tests/timestamp-in-dst.phpt b/ext/date/tests/timestamp-in-dst.phpt index 232bd7fece..24d1dddeb6 100644 --- a/ext/date/tests/timestamp-in-dst.phpt +++ b/ext/date/tests/timestamp-in-dst.phpt @@ -8,6 +8,4 @@ error_reporting(E_ALL & ~E_STRICT); // hide e_strict warning about timezones 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" diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt index b7c7de3bf7..1af979a113 100755 --- a/ext/dba/tests/bug38698.phpt +++ b/ext/dba/tests/bug38698.phpt @@ -21,8 +21,6 @@ if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) { } ?> ===DONE=== ---EXPECTF-- -string(32) "1f34b74bde3744265acfc21e0f30af95" ---UEXPECTF-- +--EXPECT-- unicode(32) "1f34b74bde3744265acfc21e0f30af95" ===DONE=== diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt index 3d617fb2c2..33f889ca40 100644 --- a/ext/dba/tests/dba001.phpt +++ b/ext/dba/tests/dba001.phpt @@ -18,4 +18,4 @@ DBA File Creation Test ?> --EXPECTF-- database handler: %s -database file created
\ No newline at end of file +database file created diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt index efa36a5d07..a9f32ed76f 100644 --- a/ext/dba/tests/dba006.phpt +++ b/ext/dba/tests/dba006.phpt @@ -34,4 +34,4 @@ DBA FirstKey/NextKey with 2 deletes ?> --EXPECTF-- database handler: %s -3NYNYY
\ No newline at end of file +3NYNYY diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt index 577dacc68c..a0a2c57c8e 100644 --- a/ext/dba/tests/dba007.phpt +++ b/ext/dba/tests/dba007.phpt @@ -42,4 +42,4 @@ array(3) { string(%d) "%s/dba/tests/test1.dbm" [%d]=> string(%d) "%s/dba/tests/test2.dbm" -}
\ No newline at end of file +} diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt index 47d66a9898..fc54822b55 100644 --- a/ext/dba/tests/dba_cdb.phpt +++ b/ext/dba/tests/dba_cdb.phpt @@ -18,38 +18,6 @@ database handler: cdb 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 @@ array(5) { string(23) "The last content string" } ===DONE=== - diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt index 49c8bd28c3..03e5900c31 100644 --- a/ext/dba/tests/dba_cdb_make.phpt +++ b/ext/dba/tests/dba_cdb_make.phpt @@ -32,10 +32,5 @@ DBA CDB_MAKE handler test ?> --EXPECT-- database handler: cdb_make -string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" -string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" ---UEXPECT-- -database handler: cdb_make unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" - diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt index a0fbe7bcca..ef6acac600 100644 --- a/ext/dba/tests/dba_cdb_read.phpt +++ b/ext/dba/tests/dba_cdb_read.phpt @@ -62,4 +62,4 @@ database handler: cdb #1122 ?1212314 #1212314 -=1231324
\ No newline at end of file +=1231324 diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt index ed1f737302..7d53157f5c 100644 --- a/ext/dba/tests/dba_flatfile.phpt +++ b/ext/dba/tests/dba_flatfile.phpt @@ -21,38 +21,6 @@ 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" -} ---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 @@ array(3) { string(23) "The last content string" } ===DONE=== - diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt index c043210c96..8d7c09ff16 100644 --- a/ext/dba/tests/dba_inifile.phpt +++ b/ext/dba/tests/dba_inifile.phpt @@ -21,38 +21,6 @@ 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" -} ---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 @@ array(3) { string(23) "The last content string" } ===DONE=== - diff --git a/ext/dbase/tests/001.phpt b/ext/dbase/tests/001.phpt index 60106d5c9f..8d9c007ff0 100644 --- a/ext/dbase/tests/001.phpt +++ b/ext/dbase/tests/001.phpt @@ -45,26 +45,7 @@ var_dump(dbase_create("", "")); 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) diff --git a/ext/dbase/tests/002.phpt b/ext/dbase/tests/002.phpt index d5dd5c9e02..38909781cb 100644 --- a/ext/dbase/tests/002.phpt +++ b/ext/dbase/tests/002.phpt @@ -34,7 +34,7 @@ var_dump(dbase_open($file, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: dbase_open(): Invalid access mode -1 in %s on line %d bool(false) diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt index ee590de80c..3612b2f016 100644 --- a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt +++ b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt @@ -32,4 +32,4 @@ CDATA Length (two appends): 8 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> diff --git a/ext/dom/tests/DOMComment_appendData_basic.phpt b/ext/dom/tests/DOMComment_appendData_basic.phpt index c756f1665a..a5c21f0ad3 100644 --- a/ext/dom/tests/DOMComment_appendData_basic.phpt +++ b/ext/dom/tests/DOMComment_appendData_basic.phpt @@ -16,6 +16,6 @@ $dom->saveXML(); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> -<!--test-comment-more-data-->
\ No newline at end of file +<!--test-comment-more-data--> diff --git a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt index 89480f24ce..50b8a99f53 100644 --- a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt +++ b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt @@ -33,4 +33,4 @@ Comment Length (two appends): 8 Comment Content: data><&" <?xml version="1.0"?> -<root><comment><!--data><&"--></comment></root>
\ No newline at end of file +<root><comment><!--data><&"--></comment></root> diff --git a/ext/dom/tests/DOMComment_insertData_basic.phpt b/ext/dom/tests/DOMComment_insertData_basic.phpt index 5a4857d677..16fa55e40d 100644 --- a/ext/dom/tests/DOMComment_insertData_basic.phpt +++ b/ext/dom/tests/DOMComment_insertData_basic.phpt @@ -16,6 +16,6 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--test-inserted-comment--> diff --git a/ext/dom/tests/DOMComment_insertData_error1.phpt b/ext/dom/tests/DOMComment_insertData_error1.phpt index 56922ac518..bd72642e33 100644 --- a/ext/dom/tests/DOMComment_insertData_error1.phpt +++ b/ext/dom/tests/DOMComment_insertData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offset diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt index d2affa89e7..73911cc368 100644 --- a/ext/dom/tests/DOMComment_insertData_error2.phpt +++ b/ext/dom/tests/DOMComment_insertData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- -Throws DOMException for offset too large
\ No newline at end of file +--EXPECT-- +Throws DOMException for offset too large diff --git a/ext/dom/tests/DOMComment_replaceData_basic.phpt b/ext/dom/tests/DOMComment_replaceData_basic.phpt index 10bf677ff3..e58d24b6f5 100644 --- a/ext/dom/tests/DOMComment_replaceData_basic.phpt +++ b/ext/dom/tests/DOMComment_replaceData_basic.phpt @@ -22,7 +22,7 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--testreplacedcomment--> <?xml version="1.0"?> diff --git a/ext/dom/tests/DOMComment_replaceData_error1.phpt b/ext/dom/tests/DOMComment_replaceData_error1.phpt index 4ae4cb61da..16ea993e34 100644 --- a/ext/dom/tests/DOMComment_replaceData_error1.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offest diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt index 89614f9756..fbf59d76dc 100644 --- a/ext/dom/tests/DOMComment_replaceData_error2.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- -Throws DOMException for offest too large
\ No newline at end of file +--EXPECT-- +Throws DOMException for offest too large diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt index 5205a3e30f..d5044471e1 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt @@ -21,4 +21,3 @@ echo $doc->saveXML(); --EXPECT-- <?xml version="1.0"?> <para hahaha=""/> - diff --git a/ext/dom/tests/DOMDocument_createAttribute_error.phpt b/ext/dom/tests/DOMDocument_createAttribute_error.phpt index 3b318d40d2..736e2f71f2 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error.phpt @@ -21,5 +21,5 @@ catch(Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- PASS diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt index 153b18b5a2..8f612fab3d 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt @@ -24,4 +24,3 @@ catch (DOMException $e) { ?> --EXPECT-- Test failed! - diff --git a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt index f00493455c..d9631d8a4a 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt @@ -8,5 +8,5 @@ $attr = $dom->createAttribute('string'); echo get_class($attr); ?> ---EXPECTF-- +--EXPECT-- DOMAttr diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt index 616d1d8371..839bd0f923 100644 --- a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt @@ -13,6 +13,6 @@ $doc = new DOMDocument(); $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> diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt index c7d1ead24b..bcad72dce5 100644 --- a/ext/dom/tests/DOMDocument_save_basic.phpt +++ b/ext/dom/tests/DOMDocument_save_basic.phpt @@ -28,6 +28,5 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes $temp_filename = dirname(__FILE__)."/DomDocument_save_basic.tmp"; unlink($temp_filename); ?> ---EXPECTF-- +--EXPECT-- Wrote: 72 bytes - diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt index 34dfcc365e..e03460248b 100644 --- a/ext/dom/tests/DOMDocument_savexml_basic.phpt +++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt @@ -34,6 +34,6 @@ var_dump($result == $dom->saveXML()); unlink($filename); ---EXPECTF-- +--EXPECT-- int(151) -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/dom/tests/DOMNode_hasChildNodes.phpt b/ext/dom/tests/DOMNode_hasChildNodes.phpt index 406f8d14ce..e5c88b2dce 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes.phpt @@ -31,7 +31,7 @@ $dom->loadXML('<root><a/><b/></root>'); var_dump($dom->documentElement->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Document has child nodes diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 3a6f6b4218..e303110bef 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -37,7 +37,7 @@ echo "Text has child nodes: "; 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) diff --git a/ext/dom/tests/DOMNode_insertBefore.phpt b/ext/dom/tests/DOMNode_insertBefore.phpt index 85cd502b26..eb5db6fb16 100644 --- a/ext/dom/tests/DOMNode_insertBefore.phpt +++ b/ext/dom/tests/DOMNode_insertBefore.phpt @@ -21,7 +21,7 @@ $e2->parentNode->insertBefore($e1, $e2); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Add new node B diff --git a/ext/dom/tests/DOMNode_normalize_basic.phpt b/ext/dom/tests/DOMNode_normalize_basic.phpt index 8ab9080f69..fce6b289bd 100644 --- a/ext/dom/tests/DOMNode_normalize_basic.phpt +++ b/ext/dom/tests/DOMNode_normalize_basic.phpt @@ -57,8 +57,8 @@ echo "Number of child nodes of title after normalizing title = "; 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) diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt index 6a28a9ae45..b066b8c5e2 100644 --- a/ext/dom/tests/DOMText_appendData_basic.phpt +++ b/ext/dom/tests/DOMText_appendData_basic.phpt @@ -32,4 +32,4 @@ Text Length (two appends): 8 Text Content: data><&" <?xml version="1.0"?> -<root><text>data><&"</text></root>
\ No newline at end of file +<root><text>data><&"</text></root> diff --git a/ext/dom/tests/bug28817.phpt b/ext/dom/tests/bug28817.phpt index 1d04ff3f1c..e211350093 100644 --- a/ext/dom/tests/bug28817.phpt +++ b/ext/dom/tests/bug28817.phpt @@ -27,18 +27,6 @@ var_dump($z->p_variable); --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" diff --git a/ext/dom/tests/bug34276.phpt b/ext/dom/tests/bug34276.phpt index 712ae436da..6cdfa8cefc 100644 --- a/ext/dom/tests/bug34276.phpt +++ b/ext/dom/tests/bug34276.phpt @@ -35,14 +35,6 @@ print $dom->saveXML(); ?> --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" diff --git a/ext/dom/tests/bug37277.phpt b/ext/dom/tests/bug37277.phpt index 4c3b907196..fdae6dc789 100644 --- a/ext/dom/tests/bug37277.phpt +++ b/ext/dom/tests/bug37277.phpt @@ -22,4 +22,3 @@ print $dom2->saveXML(); <?xml version="1.0" encoding="UTF-8"?> <foo/> - diff --git a/ext/dom/tests/bug37456.phpt b/ext/dom/tests/bug37456.phpt index 904712f4b1..017416e0d8 100644 --- a/ext/dom/tests/bug37456.phpt +++ b/ext/dom/tests/bug37456.phpt @@ -19,4 +19,3 @@ print $attr->nodeValue; --EXPECT-- newval - diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt index a48a9906f0..8afd8d70a0 100644 --- a/ext/dom/tests/bug42082.phpt +++ b/ext/dom/tests/bug42082.phpt @@ -20,17 +20,6 @@ object(DOMNodeList)#%d (0) { 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) diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt index d04f590aca..6e61a817a6 100644 --- a/ext/dom/tests/bug44648.phpt +++ b/ext/dom/tests/bug44648.phpt @@ -42,4 +42,4 @@ Invalid Character Error Invalid Character Error Invalid Character Error Namespace Error -<root/>
\ No newline at end of file +<root/> diff --git a/ext/dom/tests/dom002.phpt b/ext/dom/tests/dom002.phpt index 3c6819ce03..d2706621d4 100644 --- a/ext/dom/tests/dom002.phpt +++ b/ext/dom/tests/dom002.phpt @@ -31,31 +31,6 @@ dump($dom->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); 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" diff --git a/ext/dom/tests/dom002u.phpt b/ext/dom/tests/dom002u.phpt index c6576b69bd..ec5317bd29 100755 --- a/ext/dom/tests/dom002u.phpt +++ b/ext/dom/tests/dom002u.phpt @@ -31,31 +31,6 @@ dump($dom->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); 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" diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt index c1f4d22082..4ad7232623 100644 --- a/ext/dom/tests/dom003.phpt +++ b/ext/dom/tests/dom003.phpt @@ -22,49 +22,6 @@ $rootNode->appendChild($rootNode); --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]=> diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt index adb43fd0e5..292e429214 100644 --- a/ext/dom/tests/dom_comment_basic.phpt +++ b/ext/dom/tests/dom_comment_basic.phpt @@ -32,22 +32,6 @@ bool(true) --- 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 @@ object(DOMText)#%d (0) { } unicode(1) " " - diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt index cd15aebcd1..2bc23a3719 100644 --- a/ext/dom/tests/dom_comment_variation.phpt +++ b/ext/dom/tests/dom_comment_variation.phpt @@ -29,11 +29,4 @@ bool(true) --- child 0 --- object(DOMComment)#%d (0) { } -string(14) " Hello World! " ---UEXPECTF-- -bool(true) ---- child 0 --- -object(DOMComment)#%d (0) { -} unicode(14) " Hello World! " - diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt index 0d24892ea4..3aad57145b 100644 --- a/ext/dom/tests/dom_set_attr_node.phpt +++ b/ext/dom/tests/dom_set_attr_node.phpt @@ -32,41 +32,6 @@ try { ?> --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]=> diff --git a/ext/dom/tests/domdocument.phpt b/ext/dom/tests/domdocument.phpt index fb643cfcee..d13952e449 100644 --- a/ext/dom/tests/domdocument.phpt +++ b/ext/dom/tests/domdocument.phpt @@ -96,4 +96,3 @@ string(85) "<foo:child xmlns:foo="urn::foo" foo:bar="2" xml:id="id2">data & <root xmlns:foo="urn::foo"><child1 imported="1"><?php echo 'Hello World'; ?></child1></root> Output is identical - diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt index 82396b5218..dc2186e66d 100644 --- a/ext/dom/tests/domxpath.phpt +++ b/ext/dom/tests/domxpath.phpt @@ -55,4 +55,4 @@ var_dump($avg); myval float(1) bool(true) -float(4)
\ No newline at end of file +float(4) diff --git a/ext/ereg/tests/ereg_replace_variation_003.phpt b/ext/ereg/tests/ereg_replace_variation_003.phpt index b15e3d0cd1..563e07a6ef 100644 --- a/ext/ereg/tests/ereg_replace_variation_003.phpt +++ b/ext/ereg/tests/ereg_replace_variation_003.phpt @@ -162,99 +162,6 @@ 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 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" diff --git a/ext/ereg/tests/ereg_variation_001.phpt b/ext/ereg/tests/ereg_variation_001.phpt index ee8bbb706b..e6baa6dd87 100644 --- a/ext/ereg/tests/ereg_variation_001.phpt +++ b/ext/ereg/tests/ereg_variation_001.phpt @@ -169,107 +169,6 @@ 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 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 @@ bool(false) Arg value Error: 2 - ereg(): REG_EMPTY, %s(75) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/ereg/tests/ereg_variation_002.phpt b/ext/ereg/tests/ereg_variation_002.phpt index 737df62ef0..91364f12bd 100644 --- a/ext/ereg/tests/ereg_variation_002.phpt +++ b/ext/ereg/tests/ereg_variation_002.phpt @@ -162,99 +162,6 @@ 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 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 @@ bool(false) Arg value bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/ereg/tests/eregi_replace_variation_003.phpt b/ext/ereg/tests/eregi_replace_variation_003.phpt index 8272804c96..0431959334 100644 --- a/ext/ereg/tests/eregi_replace_variation_003.phpt +++ b/ext/ereg/tests/eregi_replace_variation_003.phpt @@ -162,99 +162,6 @@ 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 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 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/ereg/tests/eregi_variation_001.phpt b/ext/ereg/tests/eregi_variation_001.phpt index e201667520..977e5b447c 100644 --- a/ext/ereg/tests/eregi_variation_001.phpt +++ b/ext/ereg/tests/eregi_variation_001.phpt @@ -169,107 +169,6 @@ 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 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) diff --git a/ext/ereg/tests/eregi_variation_002.phpt b/ext/ereg/tests/eregi_variation_002.phpt index 88f9c7dfed..0dc38259ad 100644 --- a/ext/ereg/tests/eregi_variation_002.phpt +++ b/ext/ereg/tests/eregi_variation_002.phpt @@ -162,99 +162,6 @@ 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 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) diff --git a/ext/ereg/tests/split_variation_001.phpt b/ext/ereg/tests/split_variation_001.phpt index 39c54fe680..397da8724c 100644 --- a/ext/ereg/tests/split_variation_001.phpt +++ b/ext/ereg/tests/split_variation_001.phpt @@ -244,186 +244,6 @@ 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 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 @@ bool(false) Arg value Error: 2 - split(): REG_EMPTY, %s(74) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/ereg/tests/split_variation_002.phpt b/ext/ereg/tests/split_variation_002.phpt index 7a4e8e71de..b40d58354d 100644 --- a/ext/ereg/tests/split_variation_002.phpt +++ b/ext/ereg/tests/split_variation_002.phpt @@ -250,198 +250,6 @@ array(1) { 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) { diff --git a/ext/ereg/tests/spliti_variation_001.phpt b/ext/ereg/tests/spliti_variation_001.phpt index a811e144bd..a2d43f5836 100644 --- a/ext/ereg/tests/spliti_variation_001.phpt +++ b/ext/ereg/tests/spliti_variation_001.phpt @@ -244,186 +244,6 @@ 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 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) { diff --git a/ext/ereg/tests/spliti_variation_002.phpt b/ext/ereg/tests/spliti_variation_002.phpt index 6b311dfc70..82316164d9 100644 --- a/ext/ereg/tests/spliti_variation_002.phpt +++ b/ext/ereg/tests/spliti_variation_002.phpt @@ -250,200 +250,6 @@ array(1) { 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) { diff --git a/ext/ereg/tests/sql_regcase_variation_001.phpt b/ext/ereg/tests/sql_regcase_variation_001.phpt index 7746098b1f..3d275356cd 100644 --- a/ext/ereg/tests/sql_regcase_variation_001.phpt +++ b/ext/ereg/tests/sql_regcase_variation_001.phpt @@ -160,99 +160,6 @@ 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 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 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt index 15588306d4..92a36b3312 100644 --- a/ext/exif/tests/exif001.phpt +++ b/ext/exif/tests/exif001.phpt @@ -16,74 +16,6 @@ var_dump(exif_read_data(dirname(__FILE__).'/test2.jpg','',true,false)); ?> --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"]=> diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt index 9edba0a618..4b5e7c9e27 100644 --- a/ext/exif/tests/exif005.phpt +++ b/ext/exif/tests/exif005.phpt @@ -15,13 +15,6 @@ var_dump($image['IFD0']); ?> --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"]=> diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt index a071c7e8bc..fee185a92d 100644 --- a/ext/filter/tests/009.phpt +++ b/ext/filter/tests/009.phpt @@ -16,21 +16,7 @@ var_dump(filter_id(0,0,0)); 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) diff --git a/ext/gd/tests/image_type_to_mime_type_basic.phpt b/ext/gd/tests/image_type_to_mime_type_basic.phpt index d6c654d22a..e24a947e72 100644 --- a/ext/gd/tests/image_type_to_mime_type_basic.phpt +++ b/ext/gd/tests/image_type_to_mime_type_basic.phpt @@ -44,27 +44,6 @@ echo "\nDone image_type_to_mime_type() test\n"; --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(18) "image/vnd.wap.wbmp" 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 diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt index afa602987d..09da72d550 100644 --- a/ext/gd/tests/imagedashedline_basic.phpt +++ b/ext/gd/tests/imagedashedline_basic.phpt @@ -56,29 +56,6 @@ echo "Done\n"; --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 @@ array(4) { [u"alpha"]=> int(0) } -Done
\ No newline at end of file +Done diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt index b12119b6dd..7493582b2f 100644 --- a/ext/gd/tests/imagefilledpolygon_basic.phpt +++ b/ext/gd/tests/imagefilledpolygon_basic.phpt @@ -70,39 +70,6 @@ echo "Done\n"; --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"]=> diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt index 9197e07e4e..a60896080c 100644 --- a/ext/gd/tests/imagepolygon_basic.phpt +++ b/ext/gd/tests/imagepolygon_basic.phpt @@ -58,29 +58,6 @@ echo "Done\n"; --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"]=> diff --git a/ext/gettext/tests/dcngettext.phpt b/ext/gettext/tests/dcngettext.phpt index 2b8e2b196d..bd58661221 100644 --- a/ext/gettext/tests/dcngettext.phpt +++ b/ext/gettext/tests/dcngettext.phpt @@ -18,7 +18,7 @@ var_dump(dcngettext("","","",0,0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: dcngettext() expects exactly 5 parameters, 4 given in %s on line %d bool(false) string(1) "1" diff --git a/ext/gettext/tests/gettext_basic.phpt b/ext/gettext/tests/gettext_basic.phpt index 5499032fb5..d08edd99f0 100644 --- a/ext/gettext/tests/gettext_basic.phpt +++ b/ext/gettext/tests/gettext_basic.phpt @@ -22,10 +22,7 @@ echo gettext("Basic test"), "\n"; 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 diff --git a/ext/gettext/tests/gettext_basic_de.phpt b/ext/gettext/tests/gettext_basic_de.phpt index 89c318b474..4633174f96 100644 --- a/ext/gettext/tests/gettext_basic_de.phpt +++ b/ext/gettext/tests/gettext_basic_de.phpt @@ -25,12 +25,7 @@ var_dump(textdomain(0)); 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" diff --git a/ext/gmp/tests/004.phpt b/ext/gmp/tests/004.phpt index a0fa1cd133..c7f13216de 100644 --- a/ext/gmp/tests/004.phpt +++ b/ext/gmp/tests/004.phpt @@ -24,7 +24,7 @@ var_dump(gmp_intval($g)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d NULL int(0) diff --git a/ext/gmp/tests/005.phpt b/ext/gmp/tests/005.phpt index 0417197b0d..839a889a29 100644 --- a/ext/gmp/tests/005.phpt +++ b/ext/gmp/tests/005.phpt @@ -31,46 +31,7 @@ var_dump(gmp_strval(new stdclass, new stdclass)); 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) diff --git a/ext/gmp/tests/006.phpt b/ext/gmp/tests/006.phpt index a685caede3..783314038b 100644 --- a/ext/gmp/tests/006.phpt +++ b/ext/gmp/tests/006.phpt @@ -22,33 +22,7 @@ var_dump(gmp_strval($g)); 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 diff --git a/ext/gmp/tests/007.phpt b/ext/gmp/tests/007.phpt index ea99e56780..58b9602999 100644 --- a/ext/gmp/tests/007.phpt +++ b/ext/gmp/tests/007.phpt @@ -44,94 +44,7 @@ var_dump(gmp_div_qr(array(), array())); 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 diff --git a/ext/gmp/tests/008.phpt b/ext/gmp/tests/008.phpt index b6a74fabe7..7d96e6f7a5 100644 --- a/ext/gmp/tests/008.phpt +++ b/ext/gmp/tests/008.phpt @@ -35,43 +35,7 @@ var_dump(gmp_div_r(array(), array())); 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 diff --git a/ext/gmp/tests/009.phpt b/ext/gmp/tests/009.phpt index 81087a80a1..b425095f0b 100644 --- a/ext/gmp/tests/009.phpt +++ b/ext/gmp/tests/009.phpt @@ -35,43 +35,7 @@ var_dump(gmp_div_q(array(), array())); 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 diff --git a/ext/gmp/tests/010.phpt b/ext/gmp/tests/010.phpt index 293a2a0bf2..3bc20a1faf 100644 --- a/ext/gmp/tests/010.phpt +++ b/ext/gmp/tests/010.phpt @@ -21,7 +21,7 @@ var_dump(gmp_mod($a, $b)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/011.phpt b/ext/gmp/tests/011.phpt index e47df03be2..90249189e9 100644 --- a/ext/gmp/tests/011.phpt +++ b/ext/gmp/tests/011.phpt @@ -38,23 +38,7 @@ var_dump(gmp_strval($r)); 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 diff --git a/ext/gmp/tests/012.phpt b/ext/gmp/tests/012.phpt index f0d41d42ce..53f7b8c348 100644 --- a/ext/gmp/tests/012.phpt +++ b/ext/gmp/tests/012.phpt @@ -23,26 +23,7 @@ var_dump(gmp_neg(array())); 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) diff --git a/ext/gmp/tests/013.phpt b/ext/gmp/tests/013.phpt index 2bfdbb4c61..0e09a01ab5 100644 --- a/ext/gmp/tests/013.phpt +++ b/ext/gmp/tests/013.phpt @@ -21,29 +21,7 @@ var_dump(gmp_abs(array())); 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" diff --git a/ext/gmp/tests/014.phpt b/ext/gmp/tests/014.phpt index cf883ad2bd..e019bf478c 100644 --- a/ext/gmp/tests/014.phpt +++ b/ext/gmp/tests/014.phpt @@ -28,35 +28,7 @@ var_dump(gmp_strval(gmp_fact(array()))); 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" diff --git a/ext/gmp/tests/015.phpt b/ext/gmp/tests/015.phpt index 39327f0d1c..3ec718fe4c 100644 --- a/ext/gmp/tests/015.phpt +++ b/ext/gmp/tests/015.phpt @@ -30,43 +30,7 @@ var_dump(gmp_pow(array(),10)); 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" diff --git a/ext/gmp/tests/016.phpt b/ext/gmp/tests/016.phpt index 0f5271a0cb..ee9412bdac 100644 --- a/ext/gmp/tests/016.phpt +++ b/ext/gmp/tests/016.phpt @@ -35,43 +35,7 @@ var_dump(gmp_powm(10, $n, 10)); 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" diff --git a/ext/gmp/tests/017.phpt b/ext/gmp/tests/017.phpt index 5204622d61..e4f3333886 100644 --- a/ext/gmp/tests/017.phpt +++ b/ext/gmp/tests/017.phpt @@ -24,31 +24,7 @@ var_dump(gmp_sqrt(array())); 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" diff --git a/ext/gmp/tests/018.phpt b/ext/gmp/tests/018.phpt index 72f1304e1e..aacffa47bb 100644 --- a/ext/gmp/tests/018.phpt +++ b/ext/gmp/tests/018.phpt @@ -57,48 +57,7 @@ var_dump(gmp_sqrtrem()); 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 diff --git a/ext/gmp/tests/019.phpt b/ext/gmp/tests/019.phpt index aa596ba9cd..0f519c7b79 100644 --- a/ext/gmp/tests/019.phpt +++ b/ext/gmp/tests/019.phpt @@ -26,7 +26,7 @@ var_dump(gmp_perfect_square(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(false) diff --git a/ext/gmp/tests/020.phpt b/ext/gmp/tests/020.phpt index f8f3e6921c..99735bd7c0 100644 --- a/ext/gmp/tests/020.phpt +++ b/ext/gmp/tests/020.phpt @@ -33,7 +33,7 @@ var_dump(gmp_prob_prime(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(2) int(2) diff --git a/ext/gmp/tests/021.phpt b/ext/gmp/tests/021.phpt index 72ff573f63..8b6212d8d7 100644 --- a/ext/gmp/tests/021.phpt +++ b/ext/gmp/tests/021.phpt @@ -27,29 +27,7 @@ var_dump(gmp_gcd(array(),$n,1)); 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" diff --git a/ext/gmp/tests/022.phpt b/ext/gmp/tests/022.phpt index 3cf4447345..7b8443f6e7 100644 --- a/ext/gmp/tests/022.phpt +++ b/ext/gmp/tests/022.phpt @@ -36,54 +36,7 @@ var_dump(gmp_gcdext()); 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" diff --git a/ext/gmp/tests/023.phpt b/ext/gmp/tests/023.phpt index e26739de38..e6f94abb39 100644 --- a/ext/gmp/tests/023.phpt +++ b/ext/gmp/tests/023.phpt @@ -27,33 +27,7 @@ var_dump(gmp_invert(array(), array())); 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" diff --git a/ext/gmp/tests/024.phpt b/ext/gmp/tests/024.phpt index 9f718c10dd..df3b7faa7c 100644 --- a/ext/gmp/tests/024.phpt +++ b/ext/gmp/tests/024.phpt @@ -30,44 +30,7 @@ var_dump(gmp_jacobi()); 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" diff --git a/ext/gmp/tests/025.phpt b/ext/gmp/tests/025.phpt index 747121aee1..be1b4211c3 100644 --- a/ext/gmp/tests/025.phpt +++ b/ext/gmp/tests/025.phpt @@ -30,44 +30,7 @@ var_dump(gmp_legendre()); 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" diff --git a/ext/gmp/tests/026.phpt b/ext/gmp/tests/026.phpt index 83e7910d1e..2e48d3b83b 100644 --- a/ext/gmp/tests/026.phpt +++ b/ext/gmp/tests/026.phpt @@ -24,7 +24,7 @@ var_dump(gmp_cmp()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2) int(0) int(-1) diff --git a/ext/gmp/tests/027.phpt b/ext/gmp/tests/027.phpt index 71204db98b..0aa6e87652 100644 --- a/ext/gmp/tests/027.phpt +++ b/ext/gmp/tests/027.phpt @@ -19,7 +19,7 @@ var_dump(gmp_sign()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(1) int(0) diff --git a/ext/gmp/tests/028.phpt b/ext/gmp/tests/028.phpt index ba4e0a9bdd..4bbfb3e1e5 100644 --- a/ext/gmp/tests/028.phpt +++ b/ext/gmp/tests/028.phpt @@ -19,27 +19,7 @@ var_dump(gmp_random("test")); 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" diff --git a/ext/gmp/tests/029.phpt b/ext/gmp/tests/029.phpt index 3a4260c4e0..ce3dcfa4de 100644 --- a/ext/gmp/tests/029.phpt +++ b/ext/gmp/tests/029.phpt @@ -25,32 +25,7 @@ var_dump(gmp_and(array(), array())); 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" diff --git a/ext/gmp/tests/030.phpt b/ext/gmp/tests/030.phpt index 0944a34add..98d3470f66 100644 --- a/ext/gmp/tests/030.phpt +++ b/ext/gmp/tests/030.phpt @@ -25,32 +25,7 @@ var_dump(gmp_or(array(), array())); 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" diff --git a/ext/gmp/tests/031.phpt b/ext/gmp/tests/031.phpt index dda6ced6c6..3247eabe91 100644 --- a/ext/gmp/tests/031.phpt +++ b/ext/gmp/tests/031.phpt @@ -23,26 +23,7 @@ var_dump(gmp_strval(gmp_com())); 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" diff --git a/ext/gmp/tests/032.phpt b/ext/gmp/tests/032.phpt index ea9ed3277a..c770e7673f 100644 --- a/ext/gmp/tests/032.phpt +++ b/ext/gmp/tests/032.phpt @@ -25,32 +25,7 @@ var_dump(gmp_xor(array(), array())); 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" diff --git a/ext/gmp/tests/033.phpt b/ext/gmp/tests/033.phpt index e696e23c58..261d0f98fc 100644 --- a/ext/gmp/tests/033.phpt +++ b/ext/gmp/tests/033.phpt @@ -41,28 +41,7 @@ gmp_setbit($a,array()); 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 diff --git a/ext/gmp/tests/034.phpt b/ext/gmp/tests/034.phpt index 509aaed70e..d53a174d8c 100644 --- a/ext/gmp/tests/034.phpt +++ b/ext/gmp/tests/034.phpt @@ -35,26 +35,7 @@ gmp_clrbit(); 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 diff --git a/ext/gmp/tests/035.phpt b/ext/gmp/tests/035.phpt index 4b45a04481..26a7b5af8d 100644 --- a/ext/gmp/tests/035.phpt +++ b/ext/gmp/tests/035.phpt @@ -17,7 +17,7 @@ var_dump(gmp_popcount()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(0) int(10) diff --git a/ext/gmp/tests/036.phpt b/ext/gmp/tests/036.phpt index c21e03ccb2..60ef89f84d 100644 --- a/ext/gmp/tests/036.phpt +++ b/ext/gmp/tests/036.phpt @@ -24,7 +24,7 @@ var_dump(gmp_hamdist()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(13) int(-1) int(36) diff --git a/ext/gmp/tests/037.phpt b/ext/gmp/tests/037.phpt index 2a87a968a2..fb70cf8b25 100644 --- a/ext/gmp/tests/037.phpt +++ b/ext/gmp/tests/037.phpt @@ -20,7 +20,7 @@ var_dump(gmp_scan0()); 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) diff --git a/ext/gmp/tests/038.phpt b/ext/gmp/tests/038.phpt index 7ebce9be7d..a89a9195b0 100644 --- a/ext/gmp/tests/038.phpt +++ b/ext/gmp/tests/038.phpt @@ -20,7 +20,7 @@ var_dump(gmp_scan1()); 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) diff --git a/ext/gmp/tests/039.phpt b/ext/gmp/tests/039.phpt index 8bc2a7deb3..265f593395 100644 --- a/ext/gmp/tests/039.phpt +++ b/ext/gmp/tests/039.phpt @@ -37,28 +37,7 @@ var_dump(gmp_strval($n)); 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) diff --git a/ext/gmp/tests/040.phpt b/ext/gmp/tests/040.phpt index 4ea6b15ef3..184f97278c 100644 --- a/ext/gmp/tests/040.phpt +++ b/ext/gmp/tests/040.phpt @@ -17,28 +17,7 @@ var_dump(gmp_strval(gmp_init("993247326237679187178",3))); 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" diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt index ce15ccac75..1ab31087c1 100644 --- a/ext/gmp/tests/gmp_nextprime.phpt +++ b/ext/gmp/tests/gmp_nextprime.phpt @@ -24,7 +24,7 @@ var_dump(gmp_strval($n)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- %s(1) "2" %s(1) "2" %s(4) "-997" diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt index 34b6bb3a43..4f182518a3 100644 --- a/ext/hash/tests/hash_copy_001.phpt +++ b/ext/hash/tests/hash_copy_001.phpt @@ -26,161 +26,7 @@ foreach ($algos as $algo) { 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" diff --git a/ext/hash/tests/hmac-md5.phpt b/ext/hash/tests/hmac-md5.phpt index 84ba703e20..eda2950043 100644 --- a/ext/hash/tests/hmac-md5.phpt +++ b/ext/hash/tests/hmac-md5.phpt @@ -16,11 +16,7 @@ echo hash_final($ctx) . "\n"; echo hash_hmac('md5', str_repeat(chr(0xDD), 50), str_repeat(chr(0xAA), 16)) . "\n"; ?> ---EXPECT-- -9294727a3638bb1c13f48ef8158bfc9d -750c783e6ab0b503eaa86e310a5db738 -56be34521d144c88dbb8c733f0e8b3f6 ---UEXPECTF-- +--EXPECTF-- 9294727a3638bb1c13f48ef8158bfc9d 750c783e6ab0b503eaa86e310a5db738 diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt index 1a52f66221..1c5f283ef5 100644 --- a/ext/iconv/tests/bug37773.phpt +++ b/ext/iconv/tests/bug37773.phpt @@ -15,6 +15,4 @@ if ($test === false) { var_dump(iconv_substr('x', 0, 1, 'UTF-8')); ?> --EXPECT-- -string(1) "x" ---UEXPECT-- unicode(1) "x" diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt index 641678dfcb..29fc4f99d0 100644 --- a/ext/iconv/tests/iconv001.phpt +++ b/ext/iconv/tests/iconv001.phpt @@ -15,9 +15,5 @@ var_dump("UTF-8: ".iconv( "ISO-8859-1", "UTF-8", $test ) ); ?> --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: æøå" diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt index e8a0e909b5..4917e4bd9d 100644 --- a/ext/iconv/tests/iconv_stream_filter.phpt +++ b/ext/iconv/tests/iconv_stream_filter.phpt @@ -28,18 +28,6 @@ var_dump(bin2hex(fread($fp, 1))); 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" diff --git a/ext/imap/tests/imap_utf8.phpt b/ext/imap/tests/imap_utf8.phpt index d62769ee02..9293c39e47 100644 --- a/ext/imap/tests/imap_utf8.phpt +++ b/ext/imap/tests/imap_utf8.phpt @@ -12,15 +12,7 @@ var_dump(imap_utf8("test")); 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" diff --git a/ext/json/tests/001.phpt b/ext/json/tests/001.phpt index c210b8dec7..a106e89f85 100644 --- a/ext/json/tests/001.phpt +++ b/ext/json/tests/001.phpt @@ -31,50 +31,6 @@ NULL 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) "<?>" diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt index 87f57421f3..c995f9e455 100644 --- a/ext/json/tests/002.phpt +++ b/ext/json/tests/002.phpt @@ -17,7 +17,7 @@ var_dump(json_encode("руÑÑиш")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(2) """" string(4) "null" string(4) "true" diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt index f10baa9d12..3cac99aa5e 100644 --- a/ext/json/tests/003.phpt +++ b/ext/json/tests/003.phpt @@ -16,7 +16,7 @@ unset($a[0]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { [0]=> &array(1) { diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt index 348d1c735e..6248b42982 100644 --- a/ext/json/tests/004.phpt +++ b/ext/json/tests/004.phpt @@ -13,19 +13,7 @@ var_dump(json_encode($a)); 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) { diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt index 01a307f4a3..48c4b38830 100644 --- a/ext/json/tests/005.phpt +++ b/ext/json/tests/005.phpt @@ -13,7 +13,7 @@ var_dump(json_encode($a)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(0) { diff --git a/ext/json/tests/bug41067.phpt b/ext/json/tests/bug41067.phpt index e3bcb76f7f..4f651f2735 100644 --- a/ext/json/tests/bug41067.phpt +++ b/ext/json/tests/bug41067.phpt @@ -16,8 +16,5 @@ var_dump(bin2hex((binary)$json_decoded[0])); ?> --EXPECT-- -string(8) "f09d8480" -string(8) "f09d8480" ---UEXPECT-- unicode(8) "f09d8480" unicode(8) "f09d8480" diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt index 86f47be740..6672b148e4 100644 --- a/ext/json/tests/bug41403.phpt +++ b/ext/json/tests/bug41403.phpt @@ -22,27 +22,7 @@ var_dump(json_decode('[123,13452345]')); 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]=> diff --git a/ext/json/tests/bug42090.phpt b/ext/json/tests/bug42090.phpt index 1b341ab758..f8f370c834 100644 --- a/ext/json/tests/bug42090.phpt +++ b/ext/json/tests/bug42090.phpt @@ -15,14 +15,6 @@ var_dump( ); ?> --EXPECT-- -string(0) "" -string(5) "".."." -string(1) """ -string(2) """" -string(4) ""\""" -string(1) """ -string(2) """" ---UEXPECT-- unicode(0) "" unicode(5) "".."." unicode(1) """ diff --git a/ext/json/tests/bug42785.phpt b/ext/json/tests/bug42785.phpt index f05b13ae2e..b3df2fbb28 100644 --- a/ext/json/tests/bug42785.phpt +++ b/ext/json/tests/bug42785.phpt @@ -21,10 +21,7 @@ $bar1->a = 100.10; $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"}" diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt index 0f86d1dfad..7cabdaf4a9 100644 --- a/ext/json/tests/bug43941.phpt +++ b/ext/json/tests/bug43941.phpt @@ -12,10 +12,9 @@ var_dump(json_encode(array("ab\xE0", "ab\xE0c", "abc"))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) ""abc"" string(4) "null" string(4) "null" string(17) "[null,null,"abc"]" Done - diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt index 494ab2af3e..59dc06d3f4 100644 --- a/ext/json/tests/fail001.phpt +++ b/ext/json/tests/fail001.phpt @@ -45,127 +45,6 @@ foreach ($tests as $test) --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." diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt index ff91bc80c9..7deba30b6e 100644 --- a/ext/json/tests/pass001.1.phpt +++ b/ext/json/tests/pass001.1.phpt @@ -171,798 +171,6 @@ Testing: 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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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 with 1 member\":[\"array with 1 element\"]}","quotes":"" \" %22 0x22 034 "","\/\\\"\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 member\":[\"array with 1 element\"]}","quotes":"" \" %22 0x22 034 "","\/\\\"\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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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": "" \u0022 %22 0x22 034 "", - "\/\\\"\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) { diff --git a/ext/json/tests/pass001.1_64bit.phpt b/ext/json/tests/pass001.1_64bit.phpt index 5a342233a9..d1682a7ea9 100644 --- a/ext/json/tests/pass001.1_64bit.phpt +++ b/ext/json/tests/pass001.1_64bit.phpt @@ -171,798 +171,6 @@ Testing: 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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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 with 1 member\":[\"array with 1 element\"]}","quotes":"" \" %22 0x22 034 "","\/\\\"\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 member\":[\"array with 1 element\"]}","quotes":"" \" %22 0x22 034 "","\/\\\"\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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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": "" \u0022 %22 0x22 034 "", - "\/\\\"\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) { diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt index 15ee7705a4..51d1e96a17 100644 --- a/ext/json/tests/pass001.phpt +++ b/ext/json/tests/pass001.phpt @@ -155,621 +155,6 @@ Testing: 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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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":"" \" %22 0x22 034 "","\/\\\"\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":"" \" %22 0x22 034 "","\/\\\"\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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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) "" " %22 0x22 034 "" - ["/\"쫾몾ꮘﳞ볚 - - `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": "" \u0022 %22 0x22 034 "", - "\/\\\"\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) { diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt index 8a6542ef5a..7d5989abde 100644 --- a/ext/json/tests/pass002.phpt +++ b/ext/json/tests/pass002.phpt @@ -72,248 +72,6 @@ array(1) { [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" } } diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt index 066621e204..8badc81d92 100644 --- a/ext/json/tests/pass003.phpt +++ b/ext/json/tests/pass003.phpt @@ -50,59 +50,6 @@ Testing: 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"]=> diff --git a/ext/libxml/tests/002.phpt b/ext/libxml/tests/002.phpt index bd4ec14cd3..463b06bb11 100644 --- a/ext/libxml/tests/002.phpt +++ b/ext/libxml/tests/002.phpt @@ -70,32 +70,6 @@ Fatal Error 76: Opening and ending tag mismatch: titles line 4 and title -------------------------------------------- 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"]=> diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt index fec10540fb..19626795eb 100644 --- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt @@ -58,7 +58,7 @@ var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-JP'))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : basic functionality *** -- Convert to JIS -- @@ -93,38 +93,3 @@ string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnj 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index d24526ddd6..5871cbff87 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -37,7 +37,7 @@ foreach ($inputs as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic *** Language: English @@ -63,29 +63,3 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9 =?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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt index e52aca7f7d..b7a4ba6f18 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt @@ -181,83 +181,6 @@ string(0) "" -- 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt index f363e7b82d..cb9918164d 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt @@ -219,121 +219,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt index 7c880c1c63..cf7b96a4af 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt @@ -181,83 +181,6 @@ string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=" -- 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt index c5f206723b..c8d596364a 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt @@ -182,83 +182,6 @@ string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr -- 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt index 74eb603731..ad4b957c6b 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt @@ -172,112 +172,6 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr -- 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 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr 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 diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index f840155301..de2a848172 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -37,7 +37,7 @@ foreach ($linefeeds as $linefeed) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : usage variations *** -- Iteration 1 -- @@ -51,17 +51,3 @@ string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr -- 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 diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index a1ca7c79ee..c9af72f6a8 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -76,7 +76,7 @@ function base64_encode_var_dump($regs) { } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : basic functionality *** Regex encoding set to utf-8 @@ -115,42 +115,3 @@ array(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 diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt index a0cc35fb67..21216257cd 100644 --- a/ext/mbstring/tests/mb_ereg_error.phpt +++ b/ext/mbstring/tests/mb_ereg_error.phpt @@ -47,17 +47,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index dabfcf82fe..14913f40f1 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -106,112 +106,7 @@ fclose($fp); 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 @@ NULL -- Iteration 24 -- bool(false) NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt index 5922da2851..340cbed321 100644 --- a/ext/mbstring/tests/mb_ereg_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_variation2.phpt @@ -210,115 +210,7 @@ NULL -- 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 diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index b390c65bc7..c0cf1de8f7 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -74,7 +74,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : variation *** -- Iteration 1 -- @@ -161,90 +161,3 @@ array(1) { 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 diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index ca73a2f20c..66b31da81b 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -73,7 +73,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- @@ -147,77 +147,3 @@ array(1) { 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 diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index 122165dc57..61c8dbcd60 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -61,7 +61,7 @@ function base64_encode_var_dump($regs) { } } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** ASCII String without $regs arg: int(1) @@ -80,22 +80,3 @@ array(1) { 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 diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 42bbbaf8cc..abfc73f3dd 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -70,7 +70,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** Regex encoding set to utf-8 @@ -183,116 +183,3 @@ array(1) { 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 diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index 7363cd1806..408d9078b7 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -62,7 +62,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** Regex encoding set to utf-8 int(38) @@ -92,33 +92,3 @@ array(5) { 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 diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt index cfcaf774e2..a289dcf8de 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt @@ -34,10 +34,3 @@ string(%d) "%s" bool(true) string(5) "UTF-8" Done - ---UEXPECTF-- -*** Testing mb_internal_encoding() : basic functionality *** -string(%d) "%s" -bool(true) -string(5) "UTF-8" -Done diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt index a1cdfbb5f2..61f133a44a 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt @@ -34,12 +34,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt index bf350c7598..d0a1653ebe 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt @@ -29,10 +29,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt index cb31f76029..481d8a4bab 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt @@ -212,122 +212,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt index 41682b7573..3d2c547313 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt @@ -372,287 +372,3 @@ string(5) "CP866" 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 diff --git a/ext/mbstring/tests/mb_regex_encoding_basic.phpt b/ext/mbstring/tests/mb_regex_encoding_basic.phpt index 7e8f1ceab3..a0a41e9677 100644 --- a/ext/mbstring/tests/mb_regex_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_basic.phpt @@ -33,10 +33,3 @@ string(%d) "%s" bool(true) string(5) "UTF-8" Done - ---UEXPECTF-- -*** Testing mb_regex_encoding() : basic functionality *** -string(%d) "%s" -bool(true) -string(5) "UTF-8" -Done diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt index e584b345f5..6fe19aa9de 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt @@ -34,12 +34,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_regex_encoding_error2.phpt b/ext/mbstring/tests/mb_regex_encoding_error2.phpt index 30bfd9ff44..c752609daf 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error2.phpt @@ -29,10 +29,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt index d11e79b20b..0d2ff99ac4 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt @@ -212,119 +212,4 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt index aa0f5f1f07..704c5e5f37 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt @@ -192,289 +192,6 @@ string(4) "SJIS" -- 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) diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index b4f31d7d8b..0e62b881b4 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -31,18 +31,7 @@ var_dump(mb_strlen($string_mb, 'UTF-8')); 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 -- diff --git a/ext/mbstring/tests/mb_strlen_error1.phpt b/ext/mbstring/tests/mb_strlen_error1.phpt index 1eb6094568..8fcd87ec3a 100644 --- a/ext/mbstring/tests/mb_strlen_error1.phpt +++ b/ext/mbstring/tests/mb_strlen_error1.phpt @@ -44,17 +44,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt index e425925522..a530a84417 100644 --- a/ext/mbstring/tests/mb_strlen_error2.phpt +++ b/ext/mbstring/tests/mb_strlen_error2.phpt @@ -32,10 +32,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt index 1627e3a2ee..6e518a3172 100644 --- a/ext/mbstring/tests/mb_strlen_variation1.phpt +++ b/ext/mbstring/tests/mb_strlen_variation1.phpt @@ -175,83 +175,6 @@ int(0) -- 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 diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt index 148bcb5bab..d6fd857343 100644 --- a/ext/mbstring/tests/mb_strlen_variation2.phpt +++ b/ext/mbstring/tests/mb_strlen_variation2.phpt @@ -215,121 +215,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt index 3055d90117..b254cbc712 100644 --- a/ext/mbstring/tests/mb_strlen_variation3.phpt +++ b/ext/mbstring/tests/mb_strlen_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : usage variations *** -- Iteration 1: UCS-4 -- @@ -443,342 +443,3 @@ Encoding KOI8-R recognised -- 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 diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt index 475a7150f2..ade1598501 100644 --- a/ext/mbstring/tests/mb_strpos_basic.phpt +++ b/ext/mbstring/tests/mb_strpos_basic.phpt @@ -40,7 +40,7 @@ var_dump(mb_strpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strpos() : basic functionality*** -- ASCII string 1 -- @@ -55,18 +55,3 @@ int(0) -- 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 diff --git a/ext/mbstring/tests/mb_strpos_error1.phpt b/ext/mbstring/tests/mb_strpos_error1.phpt index 7b3f4ccd36..8f5ba85423 100644 --- a/ext/mbstring/tests/mb_strpos_error1.phpt +++ b/ext/mbstring/tests/mb_strpos_error1.phpt @@ -48,17 +48,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt index 0f0c7cbb47..f75390f2c5 100644 --- a/ext/mbstring/tests/mb_strpos_error2.phpt +++ b/ext/mbstring/tests/mb_strpos_error2.phpt @@ -32,10 +32,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt index aa410ff61a..9dce8f3761 100644 --- a/ext/mbstring/tests/mb_strpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strpos_variation1.phpt @@ -177,83 +177,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt index e2e5dc6c46..93fb90cd59 100644 --- a/ext/mbstring/tests/mb_strpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strpos_variation2.phpt @@ -193,99 +193,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt index 44b7010249..b88e63d5e1 100644 --- a/ext/mbstring/tests/mb_strpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strpos_variation3.phpt @@ -161,103 +161,6 @@ int(8) -- 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 @@ int(8) 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 diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index e96f8ea4b2..b3dde0ccc5 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -217,121 +217,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt index 395f08b9b9..594b2363b5 100644 --- a/ext/mbstring/tests/mb_strpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strpos_variation5.phpt @@ -115,74 +115,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index c155eb50b0..622b55dbf7 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -40,7 +40,7 @@ var_dump(mb_strrpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : basic *** -- ASCII string 1 -- @@ -55,21 +55,3 @@ int(20) -- 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 - diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt index b34e4348cf..15228fec81 100644 --- a/ext/mbstring/tests/mb_strrpos_error1.phpt +++ b/ext/mbstring/tests/mb_strrpos_error1.phpt @@ -48,16 +48,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt index 89f62f9e64..fa3719509c 100644 --- a/ext/mbstring/tests/mb_strrpos_error2.phpt +++ b/ext/mbstring/tests/mb_strrpos_error2.phpt @@ -33,9 +33,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index 11ccd4ec5a..0b77503373 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -176,83 +176,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt index 50405a8e46..915a9b2856 100644 --- a/ext/mbstring/tests/mb_strrpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt @@ -178,83 +178,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt index 34079270da..97e3b25a99 100644 --- a/ext/mbstring/tests/mb_strrpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt @@ -145,62 +145,3 @@ int(8) -- 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 diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index e6b66c2a85..321129b621 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -217,121 +217,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt index 82de3a8eda..44c1661036 100644 --- a/ext/mbstring/tests/mb_strrpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt @@ -38,7 +38,7 @@ for ($i = -60; $i <= 60; $i += 10) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : usage variations *** **-- Offset is: -60 --** @@ -119,84 +119,3 @@ bool(false) --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 diff --git a/ext/mbstring/tests/mb_strrpos_variation6.phpt b/ext/mbstring/tests/mb_strrpos_variation6.phpt index 200fe0b7b4..302c190393 100644 --- a/ext/mbstring/tests/mb_strrpos_variation6.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation6.phpt @@ -38,28 +38,7 @@ foreach ($inputs as $type => $input) { 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(50) int(20) -- Without fourth encoding argument -- int(50) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt index 21d346eb4a..8881247885 100644 --- a/ext/mbstring/tests/mb_strtolower_basic.phpt +++ b/ext/mbstring/tests/mb_strtolower_basic.phpt @@ -45,8 +45,8 @@ if ($mb == $greek_lower) { echo "Done"; ?> ---EXPECTF-- -*** Testing mb_strtolower() : basic functionality*** +--EXPECT-- +**** Testing mb_strtolower() : basic functionality*** -- ASCII String -- string(26) "abcdefghijklmnopqrstuvwxyz" @@ -56,14 +56,3 @@ Correctly converted 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 diff --git a/ext/mbstring/tests/mb_strtolower_error1.phpt b/ext/mbstring/tests/mb_strtolower_error1.phpt index 059ffd3600..20200aae8e 100644 --- a/ext/mbstring/tests/mb_strtolower_error1.phpt +++ b/ext/mbstring/tests/mb_strtolower_error1.phpt @@ -44,16 +44,3 @@ NULL 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 diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt index 5b86a36d01..dcf47a168c 100644 --- a/ext/mbstring/tests/mb_strtolower_error2.phpt +++ b/ext/mbstring/tests/mb_strtolower_error2.phpt @@ -33,11 +33,3 @@ 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 ---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 diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt index 23618cd703..f904fc1f11 100644 --- a/ext/mbstring/tests/mb_strtolower_variation1.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt @@ -175,83 +175,6 @@ string(0) "" -- 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 diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt index 69315552ba..9e33d948ef 100644 --- a/ext/mbstring/tests/mb_strtolower_variation2.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt @@ -228,135 +228,6 @@ string(12) "hello, world" -- 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 diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt index 17f56051cf..08b3467853 100644 --- a/ext/mbstring/tests/mb_strtolower_variation3.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt @@ -55,14 +55,3 @@ Correctly Converted 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 diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index aa133ea873..93a2e0a23f 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -39,7 +39,7 @@ foreach ($uppers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Basic Latin -- @@ -54,18 +54,3 @@ Correctly Converted 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 diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt index 78712b383f..744afcc897 100644 --- a/ext/mbstring/tests/mb_strtoupper_basic.phpt +++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt @@ -47,7 +47,7 @@ if ($mb == $greek_upper) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : basic functionality *** -- ASCII String -- @@ -58,14 +58,3 @@ Correctly converted 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 diff --git a/ext/mbstring/tests/mb_strtoupper_error1.phpt b/ext/mbstring/tests/mb_strtoupper_error1.phpt index 4f01976c66..c14d2f1b5c 100644 --- a/ext/mbstring/tests/mb_strtoupper_error1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_error1.phpt @@ -45,16 +45,3 @@ NULL 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 diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt index 981ae987d3..0f5d9c26db 100644 --- a/ext/mbstring/tests/mb_strtoupper_error2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt @@ -34,11 +34,3 @@ 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 ---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 diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt index cb850fb018..f2d11dba1e 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt @@ -177,83 +177,6 @@ string(0) "" -- 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 diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index 574d2b6374..6113705709 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -229,135 +229,6 @@ string(12) "HELLO, WORLD" -- 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 diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt index 13bf9d758b..4da5c0c7cd 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt @@ -45,7 +45,7 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- @@ -56,14 +56,3 @@ Correctly Converted 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 diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index c91ef01ad7..1acae3be57 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -40,7 +40,7 @@ foreach ($lowers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Basic Latin -- @@ -55,18 +55,3 @@ Correctly Converted 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 diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt index 74685b9fa5..41cc65b1d8 100644 --- a/ext/mbstring/tests/mb_substr_basic.phpt +++ b/ext/mbstring/tests/mb_substr_basic.phpt @@ -38,7 +38,7 @@ var_dump(base64_encode($result_2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : basic functionality *** -- ASCII string 1 -- @@ -53,18 +53,3 @@ string(12) "peacrOiqng==" -- 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 diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt index 3941bb85e9..13cd4a7f25 100644 --- a/ext/mbstring/tests/mb_substr_count_basic.phpt +++ b/ext/mbstring/tests/mb_substr_count_basic.phpt @@ -34,7 +34,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : basic functionality *** -- ASCII String -- @@ -45,14 +45,3 @@ int(0) 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 diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt index f0d5df7b6d..881ca0c22e 100644 --- a/ext/mbstring/tests/mb_substr_count_error1.phpt +++ b/ext/mbstring/tests/mb_substr_count_error1.phpt @@ -47,16 +47,3 @@ NULL 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 diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt index 74d6ab99ec..aefb2c05c8 100644 --- a/ext/mbstring/tests/mb_substr_count_error2.phpt +++ b/ext/mbstring/tests/mb_substr_count_error2.phpt @@ -35,11 +35,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt index 041ddb431e..9db4afd1ef 100644 --- a/ext/mbstring/tests/mb_substr_count_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt @@ -178,84 +178,6 @@ int(0) -- 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 diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt index 4b331150f3..13abe42131 100644 --- a/ext/mbstring/tests/mb_substr_count_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt @@ -192,99 +192,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index 0fa99522da..75d485fdee 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -215,121 +215,6 @@ bool(false) -- 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 diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 9b280b5fa1..e2a3fa7e60 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -33,7 +33,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb, 'utf-8')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : usage variations *** -- ASCII String -- @@ -42,12 +42,3 @@ int(1) -- 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 diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt index c96e389cfc..c2007c93b6 100644 --- a/ext/mbstring/tests/mb_substr_error1.phpt +++ b/ext/mbstring/tests/mb_substr_error1.phpt @@ -47,17 +47,3 @@ NULL 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 diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt index 10328ae27a..72be974ed0 100644 --- a/ext/mbstring/tests/mb_substr_error2.phpt +++ b/ext/mbstring/tests/mb_substr_error2.phpt @@ -33,10 +33,3 @@ echo "Done"; 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 diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt index 2e21af39bb..cc517b9bf2 100644 --- a/ext/mbstring/tests/mb_substr_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_variation1.phpt @@ -177,78 +177,3 @@ string(0) "" -- 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 diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 20eaf4e16f..900afc01fe 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -218,118 +218,3 @@ bool(false) 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 diff --git a/ext/mbstring/tests/mb_substr_variation3.phpt b/ext/mbstring/tests/mb_substr_variation3.phpt index 8471e81c4c..702bdda147 100644 --- a/ext/mbstring/tests/mb_substr_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** -- Iteration 1: UCS-4 -- @@ -443,342 +443,3 @@ Encoding KOI8-R recognised -- 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 diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index 55846c5ad5..6eadc49171 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -48,7 +48,7 @@ for ($i = -60; $i <= 60; $i += 10) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** **-- Offset is: -60 --** @@ -129,84 +129,3 @@ string(0) "" --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 diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index c4b5ad2b6e..9748c7ef0c 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -51,88 +51,7 @@ for ($i = -60; $i <= 60; $i += 10) { 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 --** diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt index d1e9de9572..62b6f0abee 100644 --- a/ext/session/tests/003.phpt +++ b/ext/session/tests/003.phpt @@ -18,11 +18,8 @@ class foo { 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']; diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 49a6964e79..bbea3f2218 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -46,10 +46,8 @@ class handler { 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); } } diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index 31c5364843..d6e043c80e 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -48,9 +48,7 @@ class handler { function __construct() { - if (ini_get("unicode.semantics")) { - $this->data = str_replace('s:', 'U:', $this->data); - } + $this->data = str_replace('s:', 'U:', $this->data); } } diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt index 933653e0f7..899c923af1 100644 --- a/ext/session/tests/session_save_path_variation4.phpt +++ b/ext/session/tests/session_save_path_variation4.phpt @@ -46,9 +46,11 @@ echo "Done"; ob_end_flush(); ?> --CLEAN-- +<?php $directory = dirname(__FILE__); $sessions = ($directory."/sessions"); var_dump(rmdir($sessions)); +?> --EXPECTF-- *** Testing session_save_path() : variation *** bool(true) diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index 6bddc9cf37..c196244e1f 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -46,9 +46,11 @@ echo "Done"; ob_end_flush(); ?> --CLEAN-- +<?php $directory = dirname(__FILE__); $sessions = ($directory."/sessions"); var_dump(rmdir($sessions)); +?> --EXPECTF-- *** Testing session_save_path() : variation *** bool(true) diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt index af11cbdebd..add2ef3397 100755 --- a/ext/simplexml/tests/000.phpt +++ b/ext/simplexml/tests/000.phpt @@ -22,7 +22,6 @@ test('sxe->elem1'); 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]'); |