- Added some UEXPECTs

- Fixed some tests

14 files changed, 149 insertions, 10 deletions

diff --git a/ext/calendar/tests/jdtojewish.phpt b/ext/calendar/tests/jdtojewish.phpt
index 484b95749c..a9551047a3 100644
--- a/ext/calendar/tests/jdtojewish.phpt
+++ b/ext/calendar/tests/jdtojewish.phpt
@@ -28,3 +28,15 @@ string(184) "2/22/5763
 á' çùåï ä àìôéí úùñ"â
 á' çùåï ä' àìôéí úùñ"â
 "
+--UEXPECT--
+unicode(184) "2/22/5763
+ëá çùåï äúùñâ
+ëá çùåï ä'úùñâ
+ëá çùåï ä àìôéí úùñâ
+ëá çùåï ä' àìôéí úùñâ
+ë"á çùåï äúùñ"â
+á' çùåï äúùñ"â
+á' çùåï ä'úùñ"â
+á' çùåï ä àìôéí úùñ"â
+á' çùåï ä' àìôéí úùñ"â
+"
diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index 76d127d6be..3924543634 100644
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -69,3 +69,47 @@ string(4) "July"
 string(6) "Tishri"
 string(0) ""
 Done
+--UEXPECTF--	
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(6) "Shevat"
+unicode(0) ""
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(3) "Dec"
+unicode(8) "December"
+unicode(5) "Tevet"
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(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)
+unicode(3) "Dec"
+unicode(8) "December"
+unicode(3) "Jul"
+unicode(4) "July"
+unicode(6) "Tishri"
+unicode(0) ""
+Done
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index 09f47e3007..b7c7de3bf7 100755
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -23,4 +23,6 @@ if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) {
 ===DONE===
 --EXPECTF--
 string(32) "1f34b74bde3744265acfc21e0f30af95"
+--UEXPECTF--
+unicode(32) "1f34b74bde3744265acfc21e0f30af95"
 ===DONE===
diff --git a/ext/dbase/tests/001.phpt b/ext/dbase/tests/001.phpt
index a483f5ff77..60106d5c9f 100644
--- a/ext/dbase/tests/001.phpt
+++ b/ext/dbase/tests/001.phpt
@@ -64,3 +64,22 @@ 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--	
+int(%d)
+unicode(38) "dbase_create(): unknown field type 'E'"
+bool(false)
+unicode(38) "dbase_create(): unknown field type '-'"
+bool(false)
+int(%d)
+unicode(71) "dbase_create(): expected field name as first element of list in field 0"
+bool(false)
+unicode(56) "dbase_create(): Unable to create database without fields"
+bool(false)
+unicode(67) "Argument 2 passed to dbase_create() must be an array, integer given"
+unicode(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+unicode(%d) "unlink(%s001.dbf): No such file or directory"
+unicode(66) "Argument 2 passed to dbase_create() must be an array, string given"
+unicode(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+Done
diff --git a/ext/gettext/tests/gettext_basic.phpt b/ext/gettext/tests/gettext_basic.phpt
index 7099a185c5..5499032fb5 100644
--- a/ext/gettext/tests/gettext_basic.phpt
+++ b/ext/gettext/tests/gettext_basic.phpt
@@ -25,3 +25,7 @@ echo _("Basic test"), "\n";
 --EXPECT--
 Perustesti
 Perustesti
+--UEXPECTF--
+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 c6d6af6626..89c318b474 100644
--- a/ext/gettext/tests/gettext_basic_de.phpt
+++ b/ext/gettext/tests/gettext_basic_de.phpt
@@ -30,7 +30,8 @@ string(14) "Einfacher Test"
 string(14) "Einfacher Test"
 string(8) "messages"
 string(8) "messages"
---UEXPECT--
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 string(14) "Einfacher Test"
 string(14) "Einfacher Test"
 unicode(8) "messages"
diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt
index d21e6fd0f8..1a52f66221 100644
--- a/ext/iconv/tests/bug37773.phpt
+++ b/ext/iconv/tests/bug37773.phpt
@@ -16,3 +16,5 @@ if ($test === false) {
 ?>
 --EXPECT--
 string(1) "x"
+--UEXPECT--
+unicode(1) "x"
diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt
index 70facdcf56..e8a0e909b5 100644
--- a/ext/iconv/tests/iconv_stream_filter.phpt
+++ b/ext/iconv/tests/iconv_stream_filter.phpt
@@ -39,3 +39,15 @@ Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multiby
 string(0) ""
 string(0) ""
 string(0) ""
+--UEXPECTF--
+unicode(20) "1b244224332473244b24"
+unicode(10) "41244f1b28"
+unicode(2) "42"
+unicode(20) "a4b3a4f3a4cba4c1a4cf"
+unicode(10) "69636f6e76"
+unicode(2) "0a"
+
+Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multibyte sequence in %s on line %d
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
diff --git a/ext/iconv/tests/iconv_substr.phpt b/ext/iconv/tests/iconv_substr.phpt
index f4e7ff47bf..ba63693888 100644
--- a/ext/iconv/tests/iconv_substr.phpt
+++ b/ext/iconv/tests/iconv_substr.phpt
@@ -65,15 +65,15 @@ string(10) "¤Á¤Ï ISO-2"
 a6a4a8a4aaa4ab
 a4aba4ada4afa4b1a4b3a4b5a4b7
 bool(false)
-string(0) ""
+unicode(0) ""
+unicode(14) "This is a test"
 unicode(14) "This is a test"
-string(14) "This is a test"
 unicode(3) "est"
-string(3) "est"
+unicode(3) "est"
+unicode(5) "This "
 unicode(5) "This "
-string(5) "This "
 unicode(0) ""
-string(0) ""
 unicode(0) ""
-string(0) ""
-string(10) "¤Á¤Ï ISO-2"
+unicode(0) ""
+unicode(0) ""
+unicode(10) "¤Á¤Ï ISO-2"
diff --git a/ext/json/tests/bug42785.phpt b/ext/json/tests/bug42785.phpt
index 7bdadbed1e..f05b13ae2e 100644
--- a/ext/json/tests/bug42785.phpt
+++ b/ext/json/tests/bug42785.phpt
@@ -24,3 +24,7 @@ var_dump(json_encode($bar1));
 --EXPECT--
 string(13) "[100.1,"bar"]"
 string(21) "{"a":100.1,"b":"foo"}"
+--UEXPECTF--
+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/mysql/tests/mysql_trace_mode.phpt b/ext/mysql/tests/mysql_trace_mode.phpt
index 9f0e571d1b..ba494f178d 100644
--- a/ext/mysql/tests/mysql_trace_mode.phpt
+++ b/ext/mysql/tests/mysql_trace_mode.phpt
@@ -26,9 +26,9 @@ mysql_close($link);
 print "done!\n";
 ?>
 --EXPECTF--
-Deprecated: mysql_db_query(): This function is deprecated; use mysql_query() instead%sin %s on line %d
+Deprecated: mysql_db_query(): use mysql_query() instead in %s on line %d
 
-Deprecated: mysql_escape_string(): This function is deprecated; use mysql_real_escape_string() instead. in %s on line %d
+Deprecated: mysql_escape_string(): use mysql_real_escape_string() instead. in %s on line %d
 I don\'t mind character sets, do I?\n
 Warning: mysql_query(): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BOGUS_SQL' at line 1 in %s on line %d
 done!
diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt
index 00dc91a0fd..f4d650910e 100644
--- a/ext/pcre/tests/locales.phpt
+++ b/ext/pcre/tests/locales.phpt
@@ -25,3 +25,12 @@ var_dump(preg_match('/^\w{6}$/', 'aàáçéè'));
 int(0)
 int(1)
 int(0)
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+int(0)
+
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+int(1)
+
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+int(0)
diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt
index 5e4b000cbe..1001b71435 100644
--- a/ext/pdo_mysql/tests/bug_33689.phpt
+++ b/ext/pdo_mysql/tests/bug_33689.phpt
@@ -51,3 +51,27 @@ Array
     [precision] => 0
     [pdo_type] => 2
 )
+--UEXPECTF--
+object(PDOStatement)#%d (1) {
+  [u"queryString"]=>
+  unicode(18) "SELECT * from test"
+}
+Array
+(
+    [bar] => 1
+    [0] => 1
+)
+Array
+(
+    [native_type] => LONG
+    [flags] => Array
+        (
+            [0] => not_null
+        )
+
+    [table] => test
+    [name] => bar
+    [len] => 11
+    [precision] => 0
+    [pdo_type] => 2
+)
diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt
index 264eb1fbb3..ff57cc54d1 100644
--- a/ext/simplexml/tests/bug36611.phpt
+++ b/ext/simplexml/tests/bug36611.phpt
@@ -28,3 +28,9 @@ echo "Done\n";
 int(1)
 int(1)
 Done
+--UEXPECTF--
+int(1)
+
+Strict Standards: Creating default object from empty value in %s on line %d
+int(1)
+Done