diff options
Diffstat (limited to 'ext/mysqli')
91 files changed, 1581 insertions, 1581 deletions
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index 522c99e800..aaece46faf 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -78,8 +78,8 @@ array(11) { [8]=> NULL [9]=> - %unicode|string%(4) "foo1" + string(4) "foo1" [10]=> - %unicode|string%(4) "1000" + string(4) "1000" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index 9374763862..63d5b43cfc 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -86,18 +86,18 @@ mysqli_close($link); --EXPECTF-- array(7) { [0]=> - %unicode|string%(10) "2002-01-02" + string(10) "2002-01-02" [1]=> - %unicode|string%(8) "12:49:00" + string(8) "12:49:00" [2]=> - %unicode|string%(19) "2002-01-02 17:46:59" + string(19) "2002-01-02 17:46:59" [3]=> int(2010) [4]=> - %unicode|string%(19) "2010-07-10 00:00:00" + string(19) "2010-07-10 00:00:00" [5]=> - %unicode|string%(19) "0000-00-00 00:00:00" + string(19) "0000-00-00 00:00:00" [6]=> - %unicode|string%(19) "1999-12-29 00:00:00" + string(19) "1999-12-29 00:00:00" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 010d6e1960..4896a786a8 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -64,26 +64,26 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "1234567890" + string(10) "1234567890" [1]=> - %unicode|string%(15) "this is a test0" + string(15) "this is a test0" } array(2) { [0]=> - %unicode|string%(10) "1234567891" + string(10) "1234567891" [1]=> - %unicode|string%(15) "this is a test1" + string(15) "this is a test1" } array(2) { [0]=> - %unicode|string%(10) "1234567892" + string(10) "1234567892" [1]=> - %unicode|string%(15) "this is a test2" + string(15) "this is a test2" } array(2) { [0]=> - %unicode|string%(10) "1234567893" + string(10) "1234567893" [1]=> - %unicode|string%(15) "this is a test3" + string(15) "this is a test3" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index 07292a1f3e..e433351e01 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -54,8 +54,8 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "1234567890" + string(10) "1234567890" [1]=> - %unicode|string%(13) "32K String ok" + string(13) "32K String ok" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index 30d42c39a6..e82ca65859 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -101,7 +101,7 @@ array(8) { [2]=> int(4) [3]=> - %unicode|string%(14) "33333333333333" + string(14) "33333333333333" [4]=> int(0) [5]=> diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index b14516ff78..3b93b0a207 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -73,6 +73,6 @@ array(8) { [6]=> string(6) "foobar" [7]=> - %unicode|string%(11) "mysql rulez" + string(11) "mysql rulez" } done! diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index 91abae4850..ebf8d76daf 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -72,6 +72,6 @@ array(8) { [6]=> string(3) "206" [7]=> - %unicode|string%(3) "6.7" + string(3) "6.7" } done! diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index da6a0052cc..30044dc4fb 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -84,14 +84,14 @@ mysqli autocommit/commit/rollback Num_of_rows=1 array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(6) "foobar" + string(6) "foobar" } array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(4) "egon" + string(4) "egon" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index c671ad68ff..227a142d6a 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -81,14 +81,14 @@ mysqli autocommit/commit/rollback with innodb --EXPECTF-- array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(6) "foobar" + string(6) "foobar" } array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(4) "egon" + string(4) "egon" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 8e1ffe6200..143143c8f5 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -%unicode|string%(6) "foobar" +string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index 082202f528..ee2713672d 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -36,8 +36,8 @@ array(3) { [0]=> string(32) "37b51d194a7513e45b56f6524f2d51f2" [1]=> - %unicode|string%(%d) "%s" + string(%d) "%s" [2]=> - %unicode|string%(3) "foo" + string(3) "foo" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 5e6aac0f0b..3c5530c03a 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -87,8 +87,8 @@ array(11) { [8]=> NULL [9]=> - %unicode|string%(3) "foo" + string(3) "foo" [10]=> - %unicode|string%(6) "foobar" + string(6) "foobar" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 5ff58c0348..6076529959 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -52,8 +52,8 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "1234567890" + string(10) "1234567890" [1]=> - %unicode|string%(14) "this is a test" + string(14) "this is a test" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index 9cb71c0ea1..81450d2845 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -57,7 +57,7 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "1234567890" + string(10) "1234567890" [1]=> %s(13) "32K String ok" } diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 47d763a7c3..997dee6517 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -58,8 +58,8 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "Hello Worl" + string(10) "Hello Worl" [1]=> - %unicode|string%(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence." + string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence." } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index af453dde01..67e54d632c 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -20,5 +20,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -%unicode|string%(%d) "%s" +string(%d) "%s" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index 9b8c720d3e..9360b4f3d4 100644 --- a/ext/mysqli/tests/031.phpt +++ b/ext/mysqli/tests/031.phpt @@ -25,6 +25,6 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -%unicode|string%(0) "" -%unicode|string%(%d) "%s" +string(0) "" +string(%d) "%s" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index 5fcd5484d2..d773defb26 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -38,5 +38,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) mysqli_close($link); ?> --EXPECTF-- -%unicode|string%(38) "Records: 3 Duplicates: 0 Warnings: 0" +string(38) "Records: 3 Duplicates: 0 Warnings: 0" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index b499bd71a6..7ed9ba7523 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -21,5 +21,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -%unicode|string%(%d) "%s via %s" +string(%d) "%s via %s" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index 31f38f7651..2a324f7e40 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -61,19 +61,19 @@ mysqli_close($link); ?> --EXPECTF-- object(stdClass)#%d (7) { - [%u|b%"c1"]=> - %unicode|string%(1) "0" - [%u|b%"c2"]=> - %unicode|string%(5) "35999" - [%u|b%"c3"]=> + ["c1"]=> + string(1) "0" + ["c2"]=> + string(5) "35999" + ["c3"]=> NULL - [%u|b%"c4"]=> - %unicode|string%(4) "-500" - [%u|b%"c5"]=> - %unicode|string%(6) "-32768" - [%u|b%"c6"]=> - %unicode|string%(1) "0" - [%u|b%"c7"]=> - %unicode|string%(1) "0" + ["c4"]=> + string(4) "-500" + ["c5"]=> + string(6) "-32768" + ["c6"]=> + string(1) "0" + ["c7"]=> + string(1) "0" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index 945483626e..5eff0b03bc 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -41,8 +41,8 @@ mysqli_stmt_bind_result (SHOW) --EXPECTF-- array(2) { [0]=> - %unicode|string%(4) "port" + string(4) "port" [1]=> - %unicode|string%(%d) "%s" + string(%d) "%s" } done! diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index 178a1aeba8..064bb42bb3 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -61,177 +61,177 @@ mysqli_close($link); array(2) { [0]=> object(stdClass)#5 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "foo" - [%u|b%"orgname"]=> - %unicode|string%(3) "foo" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "foo" + ["orgname"]=> + string(3) "foo" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(32768) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } [1]=> object(stdClass)#6 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "bar" - [%u|b%"orgname"]=> - %unicode|string%(3) "bar" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "bar" + ["orgname"]=> + string(3) "bar" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(253) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } } === fetch_field_direct === object(stdClass)#6 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "foo" - [%u|b%"orgname"]=> - %unicode|string%(3) "foo" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "foo" + ["orgname"]=> + string(3) "foo" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(32768) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#6 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "bar" - [%u|b%"orgname"]=> - %unicode|string%(3) "bar" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "bar" + ["orgname"]=> + string(3) "bar" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(253) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } === fetch_field === object(stdClass)#6 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "foo" - [%u|b%"orgname"]=> - %unicode|string%(3) "foo" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "foo" + ["orgname"]=> + string(3) "foo" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(32768) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#5 (13) { - [%u|b%"name"]=> - %unicode|string%(3) "bar" - [%u|b%"orgname"]=> - %unicode|string%(3) "bar" - [%u|b%"table"]=> - %unicode|string%(13) "test_affected" - [%u|b%"orgtable"]=> - %unicode|string%(13) "test_affected" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "bar" + ["orgname"]=> + string(3) "bar" + ["table"]=> + string(13) "test_affected" + ["orgtable"]=> + string(13) "test_affected" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(253) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index afc0923577..bd2625ad61 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -72,8 +72,8 @@ array(11) { [8]=> NULL [9]=> - %unicode|string%(4) "foo1" + string(4) "foo1" [10]=> - %unicode|string%(4) "1000" + string(4) "1000" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index c87f369487..e91d8c26ef 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -28,6 +28,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [0]=> - %unicode|string%(%d) "%s" + string(%d) "%s" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 7c7e2b7568..ed445f22de 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -77,37 +77,37 @@ mysqli_close($link); bool(true) bool(true) object(mysqli_stmt)#%d (%d) { - [%u|b%"affected_rows"]=> + ["affected_rows"]=> int(%i) - [%u|b%"insert_id"]=> + ["insert_id"]=> int(0) - [%u|b%"num_rows"]=> + ["num_rows"]=> int(0) - [%u|b%"param_count"]=> + ["param_count"]=> int(0) - [%u|b%"field_count"]=> + ["field_count"]=> int(1) - [%u|b%"errno"]=> + ["errno"]=> int(0) - [%u|b%"error"]=> - %unicode|string%(0) "" - [%u|b%"error_list"]=> + ["error"]=> + string(0) "" + ["error_list"]=> array(0) { } - [%u|b%"sqlstate"]=> - %unicode|string%(5) "00000" - [%u|b%"id"]=> + ["sqlstate"]=> + string(5) "00000" + ["id"]=> int(3) } bool(true) bool(false) -%unicode|string%(0) "" +string(0) "" Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, boolean given in %s on line %d NULL Rows: 3 array(1) { [0]=> - %unicode|string%(1) "1" + string(1) "1" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index 3d2eed7fbe..3d268749b9 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -64,10 +64,10 @@ array(4) { [0]=> int(1) [1]=> - %unicode|string%(3) "foo" + string(3) "foo" [2]=> int(2) [3]=> - %unicode|string%(3) "bar" + string(3) "bar" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index e4b6a0b9fe..d6e9d6ed55 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -53,5 +53,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) mysqli_close($link); ?> --EXPECTF-- -%unicode|string%(6) "foobar" +string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt index 5d17f8f953..04d6c8a015 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -56,19 +56,19 @@ mysqli_close($link); --EXPECTF-- test_class::__construct(1,2) object(test_class)#%d (7) { - [%u|b%"c1"]=> - %unicode|string%(1) "0" - [%u|b%"c2"]=> - %unicode|string%(5) "35999" - [%u|b%"c3"]=> + ["c1"]=> + string(1) "0" + ["c2"]=> + string(5) "35999" + ["c3"]=> NULL - [%u|b%"c4"]=> - %unicode|string%(4) "-500" - [%u|b%"c5"]=> - %unicode|string%(6) "-32768" - [%u|b%"c6"]=> - %unicode|string%(1) "0" - [%u|b%"c7"]=> - %unicode|string%(1) "0" + ["c4"]=> + string(4) "-500" + ["c5"]=> + string(6) "-32768" + ["c6"]=> + string(1) "0" + ["c7"]=> + string(1) "0" } Done
\ No newline at end of file diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index b2d67014ff..a6a0c4f205 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -72,7 +72,7 @@ mysqli_close($link); ?> --EXPECTF-- foo-bar -%unicode|string%-%unicode|string% +string-string rab-oof -%unicode|string%-%unicode|string% +string-string done! diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index bc6198c6a1..bfb7ea35bf 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -25,6 +25,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [0]=> - %unicode|string%(3) "foo" + string(3) "foo" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index b184d72eea..da6708c0ac 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc'); var_dump($foo); ?> --EXPECTF-- -%unicode|string%(3) "foo"
\ No newline at end of file +string(3) "foo"
\ No newline at end of file diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt index 57a4a2543a..78f710db8c 100644 --- a/ext/mysqli/tests/068.phpt +++ b/ext/mysqli/tests/068.phpt @@ -8,4 +8,4 @@ mysqli get_client_info echo gettype($s); ?> --EXPECTF-- -%unicode|string%
\ No newline at end of file +string
\ No newline at end of file diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index ee76ca5c10..c83cbc3c16 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -29,10 +29,10 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [1]=> - %unicode|string%(1) "1" + string(1) "1" } array(1) { [2]=> - %unicode|string%(1) "2" + string(1) "2" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index a1e9983bf3..3aaef33c67 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -27,6 +27,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- int(1) int(1051) -%unicode|string%(%d) "Unknown table %snot_exists%s" -%unicode|string%(5) "HY000" +string(%d) "Unknown table %snot_exists%s" +string(5) "HY000" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt index c70f7d9471..90fae8b7c6 100644 --- a/ext/mysqli/tests/073.phpt +++ b/ext/mysqli/tests/073.phpt @@ -17,7 +17,7 @@ mysqli_driver properties --EXPECTF-- bool(%s) int(%d) -%unicode|string%(%d) "%s" +string(%d) "%s" int(%d) bool(%s) int(%d) diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 7d9d01b3be..7b4590f99c 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -25,10 +25,10 @@ require_once('skipifconnectfailure.inc'); bool(true) array(1) { [0]=> - %unicode|string%(1) "0" + string(1) "0" } bool(true) array(1) { [0]=> - %unicode|string%(1) "1" + string(1) "1" }
\ No newline at end of file diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index 4fe87f4c00..43edfd7d50 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -63,84 +63,84 @@ mysqli_close($link); ?> --EXPECTF-- object(mysqli)#%d (%d) { - [%u|b%"affected_rows"]=> + ["affected_rows"]=> int(0) - [%u|b%"client_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"client_version"]=> + ["client_info"]=> + string(%d) "%s" + ["client_version"]=> int(%d) - [%u|b%"connect_errno"]=> + ["connect_errno"]=> int(0) - [%u|b%"connect_error"]=> + ["connect_error"]=> NULL - [%u|b%"errno"]=> + ["errno"]=> int(0) - [%u|b%"error"]=> - %unicode|string%(0) "" - [%u|b%"error_list"]=> + ["error"]=> + string(0) "" + ["error_list"]=> array(0) { } - [%u|b%"field_count"]=> + ["field_count"]=> int(0) - [%u|b%"host_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"info"]=> + ["host_info"]=> + string(%d) "%s" + ["info"]=> NULL - [%u|b%"insert_id"]=> + ["insert_id"]=> int(0) - [%u|b%"server_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"server_version"]=> + ["server_info"]=> + string(%d) "%s" + ["server_version"]=> int(%d) - [%u|b%"stat"]=> + ["stat"]=> string(%d) "Uptime: %d Threads: %d Questions: %d Slow queries: %d Opens: %d Flush tables: %d Open tables: %d Queries per second avg: %d.%d" - [%u|b%"sqlstate"]=> - %unicode|string%(5) "00000" - [%u|b%"protocol_version"]=> + ["sqlstate"]=> + string(5) "00000" + ["protocol_version"]=> int(10) - [%u|b%"thread_id"]=> + ["thread_id"]=> int(%d) - [%u|b%"warning_count"]=> + ["warning_count"]=> int(0) } object(mysqli)#%d (%d) { - [%u|b%"affected_rows"]=> + ["affected_rows"]=> NULL - [%u|b%"client_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"client_version"]=> + ["client_info"]=> + string(%d) "%s" + ["client_version"]=> int(%d) - [%u|b%"connect_errno"]=> + ["connect_errno"]=> int(0) - [%u|b%"connect_error"]=> + ["connect_error"]=> NULL - [%u|b%"errno"]=> + ["errno"]=> int(0) - [%u|b%"error"]=> - %unicode|string%(0) "" - [%u|b%"error_list"]=> + ["error"]=> + string(0) "" + ["error_list"]=> NULL - [%u|b%"field_count"]=> + ["field_count"]=> NULL - [%u|b%"host_info"]=> + ["host_info"]=> NULL - [%u|b%"info"]=> + ["info"]=> NULL - [%u|b%"insert_id"]=> + ["insert_id"]=> NULL - [%u|b%"server_info"]=> + ["server_info"]=> NULL - [%u|b%"server_version"]=> + ["server_version"]=> NULL - [%u|b%"stat"]=> + ["stat"]=> NULL - [%u|b%"sqlstate"]=> + ["sqlstate"]=> NULL - [%u|b%"protocol_version"]=> + ["protocol_version"]=> NULL - [%u|b%"thread_id"]=> + ["thread_id"]=> NULL - [%u|b%"warning_count"]=> + ["warning_count"]=> NULL } Done diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index b8828c7428..b4c115d4cc 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Using CAST('somestring' AS CHAR)... -%unicode|string%(3) "one" -%unicode|string%(5) "three" -%unicode|string%(3) "two" +string(3) "one" +string(5) "three" +string(3) "two" done! diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt index 35434bdd2d..55b74ce017 100644 --- a/ext/mysqli/tests/bug49027.phpt +++ b/ext/mysqli/tests/bug49027.phpt @@ -53,10 +53,10 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [0]=> - %unicode|string%(2) "42" + string(2) "42" } array(1) { - [%u|b%"id"]=> - %unicode|string%(1) "1" + ["id"]=> + string(1) "1" } done! diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index 54267451ee..dce7b33cb7 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/ext/mysqli/tests/bug49442.phpt @@ -110,21 +110,21 @@ mysqli.max_persistent=1 ?> --EXPECTF-- array(2) { - [%u|b%"id"]=> - %unicode|string%(2) "97" - [%u|b%"label"]=> - %unicode|string%(1) "x" + ["id"]=> + string(2) "97" + ["label"]=> + string(1) "x" } array(2) { - [%u|b%"id"]=> - %unicode|string%(2) "98" - [%u|b%"label"]=> - %unicode|string%(1) "y" + ["id"]=> + string(2) "98" + ["label"]=> + string(1) "y" } array(2) { - [%u|b%"id"]=> - %unicode|string%(2) "99" - [%u|b%"label"]=> - %unicode|string%(1) "z" + ["id"]=> + string(2) "99" + ["label"]=> + string(1) "z" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index 7254929bbf..27d399be16 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -281,19 +281,19 @@ ok Magic, magic properties: mysqli->affected_rows = '%s'/integer ('%s'/integer) -mysqli->client_info = '%s'/%unicode|string% ('%s'/%unicode|string%) +mysqli->client_info = '%s'/string ('%s'/string) mysqli->client_version = '%d'/integer ('%d'/integer) mysqli->errno = '0'/integer ('0'/integer) -mysqli->error = ''/%unicode|string% (''/%unicode|string%) +mysqli->error = ''/string (''/string) mysqli->field_count = '0'/integer ('0'/integer) mysqli->insert_id = '0'/integer ('0'/integer) -mysqli->sqlstate = '00000'/%unicode|string% ('00000'/%unicode|string%) +mysqli->sqlstate = '00000'/string ('00000'/string) mysqli->stat = 'Uptime: %d Threads: %d Questions: %d Slow queries: %d Opens: %d Flush tables: %d Open tables: %d Queries per second avg: %d.%d'/string ('Uptime: %d Threads: %d Questions: %d Slow queries: %d Opens: %d Flush tables: %d Open tables: %d Queries per second avg: %d.%d'/string) -mysqli->host_info = '%s'/%unicode|string% ('%s'/%unicode|string%) +mysqli->host_info = '%s'/string ('%s'/string) mysqli->info = ''/NULL (''/NULL) mysqli->thread_id = '%d'/integer ('%d'/integer) mysqli->protocol_version = '%d'/integer ('%d'/integer) -mysqli->server_info = '%s'/%unicode|string% ('%s'/%unicode|string%) +mysqli->server_info = '%s'/string ('%s'/string) mysqli->server_version = '%d'/integer ('%d'/integer) mysqli->warning_count = '0'/integer ('0'/integer) diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index 4381805acd..544a6a3f22 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt @@ -187,7 +187,7 @@ mysqli_result->unknown = '' Constructor: -Warning: mysqli_result::__construct() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d +Warning: mysqli_result::__construct() expects parameter 2 to be integer, string given in %s on line %d -Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, %unicode_string_optional% given in %s on line %d +Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, string given in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index acf7379198..fd14154322 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt @@ -194,5 +194,5 @@ stmt->unknown = '13' Prepare using the constructor: -Warning: mysqli_stmt::__construct() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d +Warning: mysqli_stmt::__construct() expects parameter 2 to be string, object given in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index e14d88fe71..8b1c923304 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -151,25 +151,25 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d array(1) { - [%u|b%"testing"]=> - %unicode|string%(21) "mysqli.default_socket" + ["testing"]=> + string(21) "mysqli.default_socket" } array(1) { - [%u|b%"testing"]=> - %unicode|string%(19) "mysqli.default_port" + ["testing"]=> + string(19) "mysqli.default_port" } array(1) { - [%u|b%"testing"]=> - %unicode|string%(17) "mysqli.default_pw" + ["testing"]=> + string(17) "mysqli.default_pw" } array(2) { [0]=> - %unicode|string%(19) "mysqli.default_user" - [%u|b%"testing"]=> - %unicode|string%(19) "mysqli.default_user" + string(19) "mysqli.default_user" + ["testing"]=> + string(19) "mysqli.default_user" } array(1) { [0]=> - %unicode|string%(19) "mysqli.default_host" + string(19) "mysqli.default_host" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index 1855a20314..7f049b052f 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -158,23 +158,23 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - [%u|b%"testing"]=> - %unicode|string%(19) "mysqli.default_port" + ["testing"]=> + string(19) "mysqli.default_port" } array(1) { - [%u|b%"testing"]=> - %unicode|string%(17) "mysqli.default_pw" + ["testing"]=> + string(17) "mysqli.default_pw" } array(1) { - [%u|b%"testing"]=> - %unicode|string%(19) "mysqli.default_user" + ["testing"]=> + string(19) "mysqli.default_user" } array(1) { - [%u|b%"all_defaults"]=> - %unicode|string%(13) "have been set" + ["all_defaults"]=> + string(13) "have been set" } array(1) { - [%u|b%"all_defaults"]=> - %unicode|string%(13) "have been set" + ["all_defaults"]=> + string(13) "have been set" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index a9d5b7ec94..2809a3feda 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -74,11 +74,11 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - [%u|b%"it_works"]=> - %unicode|string%(2) "ok" + ["it_works"]=> + string(2) "ok" } array(1) { - [%u|b%"syntax"]=> - %unicode|string%(18) "works also with oo" + ["syntax"]=> + string(18) "works also with oo" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index e6b5585a38..e6bf1c9bc7 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -%unicode|string%(%d) "Table 'няма_такава_таблица' doesn't exist" +string(%d) "Table 'няма_такава_таблица' doesn't exist" Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d NULL diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index 854b8160f0..dce785af51 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -331,16 +331,16 @@ array(2) { [0]=> array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(1) "a" + string(1) "a" } [1]=> array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } } [007] @@ -348,16 +348,16 @@ array(2) { [0]=> array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(1) "a" + string(1) "a" } [1]=> array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } } [008] @@ -365,41 +365,41 @@ array(2) { [0]=> array(4) { [0]=> - %unicode|string%(1) "1" - [%u|b%"id"]=> - %unicode|string%(1) "1" + string(1) "1" + ["id"]=> + string(1) "1" [1]=> - %unicode|string%(1) "a" - [%u|b%"label"]=> - %unicode|string%(1) "a" + string(1) "a" + ["label"]=> + string(1) "a" } [1]=> array(4) { [0]=> - %unicode|string%(1) "2" - [%u|b%"id"]=> - %unicode|string%(1) "2" + string(1) "2" + ["id"]=> + string(1) "2" [1]=> - %unicode|string%(1) "b" - [%u|b%"label"]=> - %unicode|string%(1) "b" + string(1) "b" + ["label"]=> + string(1) "b" } } [010] array(2) { [0]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [1]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "2" - [%u|b%"label"]=> - %unicode|string%(1) "b" + ["id"]=> + string(1) "2" + ["label"]=> + string(1) "b" } } [011] @@ -409,17 +409,17 @@ array(0) { array(2) { [0]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [1]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "2" - [%u|b%"label"]=> - %unicode|string%(1) "b" + ["id"]=> + string(1) "2" + ["label"]=> + string(1) "b" } } [016] @@ -430,27 +430,27 @@ array(1) { [0]=> array(11) { [0]=> - %unicode|string%(1) "1" - [%u|b%"a"]=> - %unicode|string%(1) "2" + string(1) "1" + ["a"]=> + string(1) "2" [1]=> - %unicode|string%(1) "2" + string(1) "2" [2]=> - %unicode|string%(1) "3" - [%u|b%"c"]=> - %unicode|string%(1) "3" + string(1) "3" + ["c"]=> + string(1) "3" [3]=> - %unicode|string%(1) "4" - [%u|b%"C"]=> - %unicode|string%(1) "4" + string(1) "4" + ["C"]=> + string(1) "4" [4]=> NULL - [%u|b%"d"]=> + ["d"]=> NULL [5]=> - %unicode|string%(1) "1" - [%u|b%"e"]=> - %unicode|string%(1) "1" + string(1) "1" + ["e"]=> + string(1) "1" } } diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 575f953969..450c67ecd9 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -313,16 +313,16 @@ array(2) { [0]=> array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(1) "a" + string(1) "a" } [1]=> array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } } [007] @@ -330,16 +330,16 @@ array(2) { [0]=> array(2) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(1) "a" + string(1) "a" } [1]=> array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } } [008] @@ -347,41 +347,41 @@ array(2) { [0]=> array(4) { [0]=> - %unicode|string%(1) "1" - [%u|b%"id"]=> - %unicode|string%(1) "1" + string(1) "1" + ["id"]=> + string(1) "1" [1]=> - %unicode|string%(1) "a" - [%u|b%"label"]=> - %unicode|string%(1) "a" + string(1) "a" + ["label"]=> + string(1) "a" } [1]=> array(4) { [0]=> - %unicode|string%(1) "2" - [%u|b%"id"]=> - %unicode|string%(1) "2" + string(1) "2" + ["id"]=> + string(1) "2" [1]=> - %unicode|string%(1) "b" - [%u|b%"label"]=> - %unicode|string%(1) "b" + string(1) "b" + ["label"]=> + string(1) "b" } } [010] array(2) { [0]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [1]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "2" - [%u|b%"label"]=> - %unicode|string%(1) "b" + ["id"]=> + string(1) "2" + ["label"]=> + string(1) "b" } } [011] @@ -390,17 +390,17 @@ NULL array(2) { [0]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [1]=> array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "2" - [%u|b%"label"]=> - %unicode|string%(1) "b" + ["id"]=> + string(1) "2" + ["label"]=> + string(1) "b" } } [016] @@ -410,27 +410,27 @@ array(1) { [0]=> array(11) { [0]=> - %unicode|string%(1) "1" - [%u|b%"a"]=> - %unicode|string%(1) "2" + string(1) "1" + ["a"]=> + string(1) "2" [1]=> - %unicode|string%(1) "2" + string(1) "2" [2]=> - %unicode|string%(1) "3" - [%u|b%"c"]=> - %unicode|string%(1) "3" + string(1) "3" + ["c"]=> + string(1) "3" [3]=> - %unicode|string%(1) "4" - [%u|b%"C"]=> - %unicode|string%(1) "4" + string(1) "4" + ["C"]=> + string(1) "4" [4]=> NULL - [%u|b%"d"]=> + ["d"]=> NULL [5]=> - %unicode|string%(1) "1" - [%u|b%"e"]=> - %unicode|string%(1) "1" + string(1) "1" + ["e"]=> + string(1) "1" } } diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index aa19ff6eb3..e232898c7b 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -296,74 +296,74 @@ require_once('skipifconnectfailure.inc'); [005] array(4) { [0]=> - %unicode|string%(1) "1" - [%u|b%"id"]=> - %unicode|string%(1) "1" + string(1) "1" + ["id"]=> + string(1) "1" [1]=> - %unicode|string%(1) "a" - [%u|b%"label"]=> - %unicode|string%(1) "a" + string(1) "a" + ["label"]=> + string(1) "a" } [006] array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } [007] array(4) { [0]=> - %unicode|string%(1) "3" - [%u|b%"id"]=> - %unicode|string%(1) "3" + string(1) "3" + ["id"]=> + string(1) "3" [1]=> - %unicode|string%(1) "c" - [%u|b%"label"]=> - %unicode|string%(1) "c" + string(1) "c" + ["label"]=> + string(1) "c" } [008] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "4" - [%u|b%"label"]=> - %unicode|string%(1) "d" + ["id"]=> + string(1) "4" + ["label"]=> + string(1) "d" } [009] array(4) { [0]=> - %unicode|string%(1) "5" - [%u|b%"id"]=> - %unicode|string%(1) "5" + string(1) "5" + ["id"]=> + string(1) "5" [1]=> - %unicode|string%(1) "e" - [%u|b%"label"]=> - %unicode|string%(1) "e" + string(1) "e" + ["label"]=> + string(1) "e" } [011] array(11) { [0]=> - %unicode|string%(1) "1" - [%u|b%"a"]=> - %unicode|string%(1) "2" + string(1) "1" + ["a"]=> + string(1) "2" [1]=> - %unicode|string%(1) "2" + string(1) "2" [2]=> - %unicode|string%(1) "3" - [%u|b%"c"]=> - %unicode|string%(1) "3" + string(1) "3" + ["c"]=> + string(1) "3" [3]=> - %unicode|string%(1) "4" - [%u|b%"C"]=> - %unicode|string%(1) "4" + string(1) "4" + ["C"]=> + string(1) "4" [4]=> NULL - [%u|b%"d"]=> + ["d"]=> NULL [5]=> - %unicode|string%(1) "1" - [%u|b%"e"]=> - %unicode|string%(1) "1" + string(1) "1" + ["e"]=> + string(1) "1" } Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 957ca12de9..2fb8281939 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -34,16 +34,16 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [002] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [004] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index 21d78ae6fb..0fb1a72e93 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -284,74 +284,74 @@ require_once('skipifconnectfailure.inc'); [005] array(4) { [0]=> - %unicode|string%(1) "1" - [%u|b%"id"]=> - %unicode|string%(1) "1" + string(1) "1" + ["id"]=> + string(1) "1" [1]=> - %unicode|string%(1) "a" - [%u|b%"label"]=> - %unicode|string%(1) "a" + string(1) "a" + ["label"]=> + string(1) "a" } [006] array(2) { [0]=> - %unicode|string%(1) "2" + string(1) "2" [1]=> - %unicode|string%(1) "b" + string(1) "b" } [007] array(4) { [0]=> - %unicode|string%(1) "3" - [%u|b%"id"]=> - %unicode|string%(1) "3" + string(1) "3" + ["id"]=> + string(1) "3" [1]=> - %unicode|string%(1) "c" - [%u|b%"label"]=> - %unicode|string%(1) "c" + string(1) "c" + ["label"]=> + string(1) "c" } [008] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "4" - [%u|b%"label"]=> - %unicode|string%(1) "d" + ["id"]=> + string(1) "4" + ["label"]=> + string(1) "d" } [009] array(4) { [0]=> - %unicode|string%(1) "5" - [%u|b%"id"]=> - %unicode|string%(1) "5" + string(1) "5" + ["id"]=> + string(1) "5" [1]=> - %unicode|string%(1) "e" - [%u|b%"label"]=> - %unicode|string%(1) "e" + string(1) "e" + ["label"]=> + string(1) "e" } [011] array(11) { [0]=> - %unicode|string%(1) "1" - [%u|b%"a"]=> - %unicode|string%(1) "2" + string(1) "1" + ["a"]=> + string(1) "2" [1]=> - %unicode|string%(1) "2" + string(1) "2" [2]=> - %unicode|string%(1) "3" - [%u|b%"c"]=> - %unicode|string%(1) "3" + string(1) "3" + ["c"]=> + string(1) "3" [3]=> - %unicode|string%(1) "4" - [%u|b%"C"]=> - %unicode|string%(1) "4" + string(1) "4" + ["C"]=> + string(1) "4" [4]=> NULL - [%u|b%"d"]=> + ["d"]=> NULL [5]=> - %unicode|string%(1) "1" - [%u|b%"e"]=> - %unicode|string%(1) "1" + string(1) "1" + ["e"]=> + string(1) "1" } Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index edf143b726..0d721fd5c6 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -74,45 +74,45 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [005] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [006] NULL [008] array(15) { - [%u|b%"a"]=> - %unicode|string%(1) "2" - [%u|b%"c"]=> - %unicode|string%(1) "3" - [%u|b%"C"]=> - %unicode|string%(1) "4" - [%u|b%"d"]=> + ["a"]=> + string(1) "2" + ["c"]=> + string(1) "3" + ["C"]=> + string(1) "4" + ["d"]=> NULL - [%u|b%"e"]=> - %unicode|string%(1) "1" + ["e"]=> + string(1) "1" [-1]=> - %unicode|string%(1) "5" + string(1) "5" [-10]=> - %unicode|string%(1) "6" + string(1) "6" [-100]=> - %unicode|string%(1) "7" + string(1) "7" [-1000]=> - %unicode|string%(1) "8" + string(1) "8" [10000]=> - %unicode|string%(1) "9" + string(1) "9" [100000]=> - %unicode|string%(1) "a" + string(1) "a" [1000000]=> - %unicode|string%(1) "b" + string(1) "b" [9]=> - %unicode|string%(1) "d" - [%u|b%"01"]=> - %unicode|string%(1) "e" - [%u|b%"-02"]=> - %unicode|string%(1) "f" + string(1) "d" + ["01"]=> + string(1) "e" + ["-02"]=> + string(1) "f" } Warning: mysqli_fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index a273b73aa9..e09e8b2cc3 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt @@ -86,57 +86,57 @@ require_once('skipifconnectfailure.inc'); [002] array(2) { [1]=> - %unicode|string%(1) "1" + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [004] array(2) { - [%u|b%"a"]=> - %unicode|string%(1) "1" + ["a"]=> + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [006] array(2) { - [%u|b%"a"]=> - %unicode|string%(1) "1" + ["a"]=> + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [008] array(2) { - [%u|b%"a"]=> - %unicode|string%(1) "1" + ["a"]=> + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [011] array(2) { [1]=> - %unicode|string%(1) "1" + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [014] array(2) { - [%u|b%"a"]=> + ["a"]=> %s(1) "1" [2]=> %s(1) "2" } [017] array(2) { - [%u|b%"a"]=> - %unicode|string%(1) "1" + ["a"]=> + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } [017] array(2) { - [%u|b%"a"]=> - %unicode|string%(1) "1" + ["a"]=> + string(1) "1" [2]=> - %unicode|string%(1) "2" + string(1) "2" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt index ac2e7c0001..22aee90c49 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt @@ -81,84 +81,84 @@ mysqli_fetch_assoc() - utf8 --EXPECTF-- [003] array(3) { - [%u|b%"Андрей Христов"]=> - %unicode|string%(%r[1|3]%r) "1" - [%u|b%"Улф Вендел"]=> - %unicode|string%(1) "2" - [%u|b%"Георг Рихтер"]=> - %unicode|string%(1) "3" + ["Андрей Христов"]=> + string(%r[1|3]%r) "1" + ["Улф Вендел"]=> + string(1) "2" + ["Георг Рихтер"]=> + string(1) "3" } [009] array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "4" - [%u|b%"име"]=> - %unicode|string%(6) "Andrey" - [%u|b%"фамилия"]=> - %unicode|string%(7) "Hristov" + ["id"]=> + string(1) "4" + ["име"]=> + string(6) "Andrey" + ["фамилия"]=> + string(7) "Hristov" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "7" - [%u|b%"име"]=> - %unicode|string%(9) "安德烈" - [%u|b%"фамилия"]=> - %unicode|string%(7) "Hristov" + ["id"]=> + string(1) "7" + ["име"]=> + string(9) "安德烈" + ["фамилия"]=> + string(7) "Hristov" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "5" - [%u|b%"име"]=> - %unicode|string%(5) "Georg" - [%u|b%"фамилия"]=> - %unicode|string%(7) "Richter" + ["id"]=> + string(1) "5" + ["име"]=> + string(5) "Georg" + ["фамилия"]=> + string(7) "Richter" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "8" - [%u|b%"име"]=> - %unicode|string%(9) "格奥尔" - [%u|b%"фамилия"]=> - %unicode|string%(7) "Richter" + ["id"]=> + string(1) "8" + ["име"]=> + string(9) "格奥尔" + ["фамилия"]=> + string(7) "Richter" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "6" - [%u|b%"име"]=> - %unicode|string%(3) "Ulf" - [%u|b%"фамилия"]=> - %unicode|string%(6) "Wendel" + ["id"]=> + string(1) "6" + ["име"]=> + string(3) "Ulf" + ["фамилия"]=> + string(6) "Wendel" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "9" - [%u|b%"име"]=> - %unicode|string%(9) "乌尔夫" - [%u|b%"фамилия"]=> - %unicode|string%(6) "Wendel" + ["id"]=> + string(1) "9" + ["име"]=> + string(9) "乌尔夫" + ["фамилия"]=> + string(6) "Wendel" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "3" - [%u|b%"име"]=> - %unicode|string%(6) "Улф" - [%u|b%"фамилия"]=> - %unicode|string%(12) "Вендел" + ["id"]=> + string(1) "3" + ["име"]=> + string(6) "Улф" + ["фамилия"]=> + string(12) "Вендел" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "2" - [%u|b%"име"]=> - %unicode|string%(10) "Георг" - [%u|b%"фамилия"]=> - %unicode|string%(12) "Рихтер" + ["id"]=> + string(1) "2" + ["име"]=> + string(10) "Георг" + ["фамилия"]=> + string(12) "Рихтер" } array(3) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"име"]=> - %unicode|string%(12) "Андрей" - [%u|b%"фамилия"]=> - %unicode|string%(14) "Христов" + ["id"]=> + string(1) "1" + ["име"]=> + string(12) "Андрей" + ["фамилия"]=> + string(14) "Христов" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index 8a71fa740c..026252b504 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -61,25 +61,25 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [005] array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } [006] NULL [008] array(5) { - [%u|b%"a"]=> - %unicode|string%(1) "2" - [%u|b%"c"]=> - %unicode|string%(1) "3" - [%u|b%"C"]=> - %unicode|string%(1) "4" - [%u|b%"d"]=> + ["a"]=> + string(1) "2" + ["c"]=> + string(1) "3" + ["C"]=> + string(1) "4" + ["d"]=> NULL - [%u|b%"e"]=> - %unicode|string%(1) "1" + ["e"]=> + string(1) "1" } Warning: mysqli_result::fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index 2b9108072b..f1d6db0599 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -88,94 +88,94 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "ID" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "ID" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(1) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "label" - [%u|b%"orgname"]=> - %unicode|string%(5) "label" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "label" + ["orgname"]=> + string(5) "label" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(254) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } bool(false) Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d array(1) { - [%u|b%"_default_test"]=> - %unicode|string%(1) "2" + ["_default_test"]=> + string(1) "2" } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(13) "_default_test" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(%d) "%s" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(13) "_default_test" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(%d) "%s" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(1) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(32769) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index fb34e44a6a..d17eb7506f 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -48,31 +48,31 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "ID" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "ID" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(%d) - [%u|b%"type"]=> + ["type"]=> int(%d) - [%u|b%"decimals"]=> + ["decimals"]=> int(%d) } diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 9d511aa900..4ac84d580a 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -57,31 +57,31 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "ID" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "ID" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(%d) - [%u|b%"type"]=> + ["type"]=> int(%d) - [%u|b%"decimals"]=> + ["decimals"]=> int(%d) } diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index 8c5609b163..039d2b4e31 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -71,59 +71,59 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "ID" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "ID" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(1) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "label" - [%u|b%"orgname"]=> - %unicode|string%(5) "label" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "label" + ["orgname"]=> + string(5) "label" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(254) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } bool(false) diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 6b66d6f231..854af23302 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -67,59 +67,59 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "ID" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "ID" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(1) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "label" - [%u|b%"orgname"]=> - %unicode|string%(5) "label" - [%u|b%"table"]=> - %unicode|string%(4) "TEST" - [%u|b%"orgtable"]=> - %unicode|string%(%d) "%s" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "label" + ["orgname"]=> + string(5) "label" + ["table"]=> + string(4) "TEST" + ["orgtable"]=> + string(%d) "%s" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(1) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(254) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index 3a047a50fc..cb9f98cfa6 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -51,9 +51,9 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- No exception with PHP: object(mysqli_fetch_object_test)#%d (%d) { - [%u|b%"a"]=> + ["a"]=> NULL - [%u|b%"b"]=> + ["b"]=> NULL } diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index e0359e058e..59f6cbae3b 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -45,11 +45,11 @@ require_once('skipifconnectfailure.inc'); [004] array(3) { [0]=> - %unicode|string%(1) "1" + string(1) "1" [1]=> - %unicode|string%(1) "a" + string(1) "a" [2]=> - %unicode|string%(1) "1" + string(1) "1" } [005] NULL diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index 952c5056b7..b30b11cd27 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -127,89 +127,89 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_field_seek(): Invalid field offset in %s on line %d bool(false) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "id" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "id" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } bool(true) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "id" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "id" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } bool(true) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "label" - [%u|b%"orgname"]=> - %unicode|string%(5) "label" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "label" + ["orgname"]=> + string(5) "label" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(254) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } int(2) @@ -222,31 +222,31 @@ Warning: mysqli_field_seek() expects parameter 2 to be integer, float given in % NULL bool(true) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "_null" - [%u|b%"orgname"]=> - %unicode|string%(0) "" - [%u|b%"table"]=> - %unicode|string%(0) "" - [%u|b%"orgtable"]=> - %unicode|string%(0) "" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(0) "" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "_null" + ["orgname"]=> + string(0) "" + ["table"]=> + string(0) "" + ["orgtable"]=> + string(0) "" + ["def"]=> + string(0) "" + ["db"]=> + string(0) "" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(0) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(32896) - [%u|b%"type"]=> + ["type"]=> int(6) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index cac2001acf..0a89e45914 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -65,31 +65,31 @@ Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line NULL int(0) object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "id" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "id" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } bool(false) diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index 6ebcf3ef06..29f8b430de 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -129,7 +129,7 @@ mysqlnd.collect_memory_statistics=1 mysqli_get_client_stats_assert_eq('copy_on_write_saved', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('copy_on_write_performed', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('command_buffer_too_small', $new_info, $info, $test_counter); - // This is not a mistake that I use %unicode|string%(1) "1" here! Andrey did not go for int to avoid any + // This is not a mistake that I use string(1) "1" here! Andrey did not go for int to avoid any // issues for very large numbers and 32 vs. 64bit systems mysqli_get_client_stats_assert_eq('connect_success', $new_info, "1", $test_counter); mysqli_get_client_stats_assert_eq('connect_failure', $new_info, $info, $test_counter); @@ -958,332 +958,332 @@ mysqli_close($link); ?> --EXPECTF-- array(163) { - [%u|b%"bytes_sent"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received"]=> - %unicode|string%(1) "0" - [%u|b%"packets_sent"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received"]=> - %unicode|string%(1) "0" - [%u|b%"protocol_overhead_in"]=> - %unicode|string%(1) "0" - [%u|b%"protocol_overhead_out"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_ok_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_eof_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_rset_header_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_rset_field_meta_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_rset_row_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_prepare_response_packet"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_change_user_packet"]=> - %unicode|string%(1) "0" - [%u|b%"packets_sent_command"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_ok"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_eof"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_rset_header"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_rset_field_meta"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_rset_row"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_prepare_response"]=> - %unicode|string%(1) "0" - [%u|b%"packets_received_change_user"]=> - %unicode|string%(1) "0" - [%u|b%"result_set_queries"]=> - %unicode|string%(1) "0" - [%u|b%"non_result_set_queries"]=> - %unicode|string%(1) "0" - [%u|b%"no_index_used"]=> - %unicode|string%(1) "0" - [%u|b%"bad_index_used"]=> - %unicode|string%(1) "0" - [%u|b%"slow_queries"]=> - %unicode|string%(1) "0" - [%u|b%"buffered_sets"]=> - %unicode|string%(1) "0" - [%u|b%"unbuffered_sets"]=> - %unicode|string%(1) "0" - [%u|b%"ps_buffered_sets"]=> - %unicode|string%(1) "0" - [%u|b%"ps_unbuffered_sets"]=> - %unicode|string%(1) "0" - [%u|b%"flushed_normal_sets"]=> - %unicode|string%(1) "0" - [%u|b%"flushed_ps_sets"]=> - %unicode|string%(1) "0" - [%u|b%"ps_prepared_never_executed"]=> - %unicode|string%(1) "0" - [%u|b%"ps_prepared_once_executed"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_server_normal"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_server_ps"]=> - %unicode|string%(1) "0" - [%u|b%"rows_buffered_from_client_normal"]=> - %unicode|string%(1) "0" - [%u|b%"rows_buffered_from_client_ps"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_client_normal_buffered"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_client_normal_unbuffered"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_client_ps_buffered"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_client_ps_unbuffered"]=> - %unicode|string%(1) "0" - [%u|b%"rows_fetched_from_client_ps_cursor"]=> - %unicode|string%(1) "0" - [%u|b%"rows_affected_normal"]=> - %unicode|string%(1) "0" - [%u|b%"rows_affected_ps"]=> - %unicode|string%(1) "0" - [%u|b%"rows_skipped_normal"]=> - %unicode|string%(1) "0" - [%u|b%"rows_skipped_ps"]=> - %unicode|string%(1) "0" - [%u|b%"copy_on_write_saved"]=> - %unicode|string%(1) "0" - [%u|b%"copy_on_write_performed"]=> - %unicode|string%(1) "0" - [%u|b%"command_buffer_too_small"]=> - %unicode|string%(1) "0" - [%u|b%"connect_success"]=> - %unicode|string%(1) "0" - [%u|b%"connect_failure"]=> - %unicode|string%(1) "0" - [%u|b%"connection_reused"]=> - %unicode|string%(1) "0" - [%u|b%"reconnect"]=> - %unicode|string%(1) "0" - [%u|b%"pconnect_success"]=> - %unicode|string%(1) "0" - [%u|b%"active_connections"]=> - %unicode|string%(1) "0" - [%u|b%"active_persistent_connections"]=> - %unicode|string%(1) "0" - [%u|b%"explicit_close"]=> - %unicode|string%(1) "0" - [%u|b%"implicit_close"]=> - %unicode|string%(1) "0" - [%u|b%"disconnect_close"]=> - %unicode|string%(1) "0" - [%u|b%"in_middle_of_command_close"]=> - %unicode|string%(1) "0" - [%u|b%"explicit_free_result"]=> - %unicode|string%(1) "0" - [%u|b%"implicit_free_result"]=> - %unicode|string%(1) "0" - [%u|b%"explicit_stmt_close"]=> - %unicode|string%(1) "0" - [%u|b%"implicit_stmt_close"]=> - %unicode|string%(1) "0" - [%u|b%"mem_emalloc_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_emalloc_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_ecalloc_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_ecalloc_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_erealloc_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_erealloc_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_efree_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_efree_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_malloc_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_malloc_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_calloc_count"]=> - %unicode|string%(%d) "%d" - [%u|b%"mem_calloc_amount"]=> - %unicode|string%(%d) "%d" - [%u|b%"mem_realloc_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_realloc_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_free_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_free_amount"]=> - %unicode|string%(1) "0" - [%u|b%"mem_estrndup_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_strndup_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_estrdup_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_strdup_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_edupl_count"]=> - %unicode|string%(1) "0" - [%u|b%"mem_dupl_count"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_null"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_bit"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_tinyint"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_short"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_int24"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_int"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_bigint"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_decimal"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_float"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_double"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_date"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_year"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_time"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_datetime"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_timestamp"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_string"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_blob"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_enum"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_set"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_geometry"]=> - %unicode|string%(1) "0" - [%u|b%"proto_text_fetched_other"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_null"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_bit"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_tinyint"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_short"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_int24"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_int"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_bigint"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_decimal"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_float"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_double"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_date"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_year"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_time"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_datetime"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_timestamp"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_string"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_json"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_blob"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_enum"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_set"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_geometry"]=> - %unicode|string%(1) "0" - [%u|b%"proto_binary_fetched_other"]=> - %unicode|string%(1) "0" - [%u|b%"init_command_executed_count"]=> - %unicode|string%(1) "0" - [%u|b%"init_command_failed_count"]=> - %unicode|string%(1) "0" - [%u|b%"com_quit"]=> - %unicode|string%(1) "0" - [%u|b%"com_init_db"]=> - %unicode|string%(1) "0" - [%u|b%"com_query"]=> - %unicode|string%(1) "0" - [%u|b%"com_field_list"]=> - %unicode|string%(1) "0" - [%u|b%"com_create_db"]=> - %unicode|string%(1) "0" - [%u|b%"com_drop_db"]=> - %unicode|string%(1) "0" - [%u|b%"com_refresh"]=> - %unicode|string%(1) "0" - [%u|b%"com_shutdown"]=> - %unicode|string%(1) "0" - [%u|b%"com_statistics"]=> - %unicode|string%(1) "0" - [%u|b%"com_process_info"]=> - %unicode|string%(1) "0" - [%u|b%"com_connect"]=> - %unicode|string%(1) "0" - [%u|b%"com_process_kill"]=> - %unicode|string%(1) "0" - [%u|b%"com_debug"]=> - %unicode|string%(1) "0" - [%u|b%"com_ping"]=> - %unicode|string%(1) "0" - [%u|b%"com_time"]=> - %unicode|string%(1) "0" - [%u|b%"com_delayed_insert"]=> - %unicode|string%(1) "0" - [%u|b%"com_change_user"]=> - %unicode|string%(1) "0" - [%u|b%"com_binlog_dump"]=> - %unicode|string%(1) "0" - [%u|b%"com_table_dump"]=> - %unicode|string%(1) "0" - [%u|b%"com_connect_out"]=> - %unicode|string%(1) "0" - [%u|b%"com_register_slave"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_prepare"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_execute"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_send_long_data"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_close"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_reset"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_set_option"]=> - %unicode|string%(1) "0" - [%u|b%"com_stmt_fetch"]=> - %unicode|string%(1) "0" - [%u|b%"com_deamon"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_real_data_normal"]=> - %unicode|string%(1) "0" - [%u|b%"bytes_received_real_data_ps"]=> - %unicode|string%(1) "0" + ["bytes_sent"]=> + string(1) "0" + ["bytes_received"]=> + string(1) "0" + ["packets_sent"]=> + string(1) "0" + ["packets_received"]=> + string(1) "0" + ["protocol_overhead_in"]=> + string(1) "0" + ["protocol_overhead_out"]=> + string(1) "0" + ["bytes_received_ok_packet"]=> + string(1) "0" + ["bytes_received_eof_packet"]=> + string(1) "0" + ["bytes_received_rset_header_packet"]=> + string(1) "0" + ["bytes_received_rset_field_meta_packet"]=> + string(1) "0" + ["bytes_received_rset_row_packet"]=> + string(1) "0" + ["bytes_received_prepare_response_packet"]=> + string(1) "0" + ["bytes_received_change_user_packet"]=> + string(1) "0" + ["packets_sent_command"]=> + string(1) "0" + ["packets_received_ok"]=> + string(1) "0" + ["packets_received_eof"]=> + string(1) "0" + ["packets_received_rset_header"]=> + string(1) "0" + ["packets_received_rset_field_meta"]=> + string(1) "0" + ["packets_received_rset_row"]=> + string(1) "0" + ["packets_received_prepare_response"]=> + string(1) "0" + ["packets_received_change_user"]=> + string(1) "0" + ["result_set_queries"]=> + string(1) "0" + ["non_result_set_queries"]=> + string(1) "0" + ["no_index_used"]=> + string(1) "0" + ["bad_index_used"]=> + string(1) "0" + ["slow_queries"]=> + string(1) "0" + ["buffered_sets"]=> + string(1) "0" + ["unbuffered_sets"]=> + string(1) "0" + ["ps_buffered_sets"]=> + string(1) "0" + ["ps_unbuffered_sets"]=> + string(1) "0" + ["flushed_normal_sets"]=> + string(1) "0" + ["flushed_ps_sets"]=> + string(1) "0" + ["ps_prepared_never_executed"]=> + string(1) "0" + ["ps_prepared_once_executed"]=> + string(1) "0" + ["rows_fetched_from_server_normal"]=> + string(1) "0" + ["rows_fetched_from_server_ps"]=> + string(1) "0" + ["rows_buffered_from_client_normal"]=> + string(1) "0" + ["rows_buffered_from_client_ps"]=> + string(1) "0" + ["rows_fetched_from_client_normal_buffered"]=> + string(1) "0" + ["rows_fetched_from_client_normal_unbuffered"]=> + string(1) "0" + ["rows_fetched_from_client_ps_buffered"]=> + string(1) "0" + ["rows_fetched_from_client_ps_unbuffered"]=> + string(1) "0" + ["rows_fetched_from_client_ps_cursor"]=> + string(1) "0" + ["rows_affected_normal"]=> + string(1) "0" + ["rows_affected_ps"]=> + string(1) "0" + ["rows_skipped_normal"]=> + string(1) "0" + ["rows_skipped_ps"]=> + string(1) "0" + ["copy_on_write_saved"]=> + string(1) "0" + ["copy_on_write_performed"]=> + string(1) "0" + ["command_buffer_too_small"]=> + string(1) "0" + ["connect_success"]=> + string(1) "0" + ["connect_failure"]=> + string(1) "0" + ["connection_reused"]=> + string(1) "0" + ["reconnect"]=> + string(1) "0" + ["pconnect_success"]=> + string(1) "0" + ["active_connections"]=> + string(1) "0" + ["active_persistent_connections"]=> + string(1) "0" + ["explicit_close"]=> + string(1) "0" + ["implicit_close"]=> + string(1) "0" + ["disconnect_close"]=> + string(1) "0" + ["in_middle_of_command_close"]=> + string(1) "0" + ["explicit_free_result"]=> + string(1) "0" + ["implicit_free_result"]=> + string(1) "0" + ["explicit_stmt_close"]=> + string(1) "0" + ["implicit_stmt_close"]=> + string(1) "0" + ["mem_emalloc_count"]=> + string(1) "0" + ["mem_emalloc_amount"]=> + string(1) "0" + ["mem_ecalloc_count"]=> + string(1) "0" + ["mem_ecalloc_amount"]=> + string(1) "0" + ["mem_erealloc_count"]=> + string(1) "0" + ["mem_erealloc_amount"]=> + string(1) "0" + ["mem_efree_count"]=> + string(1) "0" + ["mem_efree_amount"]=> + string(1) "0" + ["mem_malloc_count"]=> + string(1) "0" + ["mem_malloc_amount"]=> + string(1) "0" + ["mem_calloc_count"]=> + string(%d) "%d" + ["mem_calloc_amount"]=> + string(%d) "%d" + ["mem_realloc_count"]=> + string(1) "0" + ["mem_realloc_amount"]=> + string(1) "0" + ["mem_free_count"]=> + string(1) "0" + ["mem_free_amount"]=> + string(1) "0" + ["mem_estrndup_count"]=> + string(1) "0" + ["mem_strndup_count"]=> + string(1) "0" + ["mem_estrdup_count"]=> + string(1) "0" + ["mem_strdup_count"]=> + string(1) "0" + ["mem_edupl_count"]=> + string(1) "0" + ["mem_dupl_count"]=> + string(1) "0" + ["proto_text_fetched_null"]=> + string(1) "0" + ["proto_text_fetched_bit"]=> + string(1) "0" + ["proto_text_fetched_tinyint"]=> + string(1) "0" + ["proto_text_fetched_short"]=> + string(1) "0" + ["proto_text_fetched_int24"]=> + string(1) "0" + ["proto_text_fetched_int"]=> + string(1) "0" + ["proto_text_fetched_bigint"]=> + string(1) "0" + ["proto_text_fetched_decimal"]=> + string(1) "0" + ["proto_text_fetched_float"]=> + string(1) "0" + ["proto_text_fetched_double"]=> + string(1) "0" + ["proto_text_fetched_date"]=> + string(1) "0" + ["proto_text_fetched_year"]=> + string(1) "0" + ["proto_text_fetched_time"]=> + string(1) "0" + ["proto_text_fetched_datetime"]=> + string(1) "0" + ["proto_text_fetched_timestamp"]=> + string(1) "0" + ["proto_text_fetched_string"]=> + string(1) "0" + ["proto_text_fetched_blob"]=> + string(1) "0" + ["proto_text_fetched_enum"]=> + string(1) "0" + ["proto_text_fetched_set"]=> + string(1) "0" + ["proto_text_fetched_geometry"]=> + string(1) "0" + ["proto_text_fetched_other"]=> + string(1) "0" + ["proto_binary_fetched_null"]=> + string(1) "0" + ["proto_binary_fetched_bit"]=> + string(1) "0" + ["proto_binary_fetched_tinyint"]=> + string(1) "0" + ["proto_binary_fetched_short"]=> + string(1) "0" + ["proto_binary_fetched_int24"]=> + string(1) "0" + ["proto_binary_fetched_int"]=> + string(1) "0" + ["proto_binary_fetched_bigint"]=> + string(1) "0" + ["proto_binary_fetched_decimal"]=> + string(1) "0" + ["proto_binary_fetched_float"]=> + string(1) "0" + ["proto_binary_fetched_double"]=> + string(1) "0" + ["proto_binary_fetched_date"]=> + string(1) "0" + ["proto_binary_fetched_year"]=> + string(1) "0" + ["proto_binary_fetched_time"]=> + string(1) "0" + ["proto_binary_fetched_datetime"]=> + string(1) "0" + ["proto_binary_fetched_timestamp"]=> + string(1) "0" + ["proto_binary_fetched_string"]=> + string(1) "0" + ["proto_binary_fetched_json"]=> + string(1) "0" + ["proto_binary_fetched_blob"]=> + string(1) "0" + ["proto_binary_fetched_enum"]=> + string(1) "0" + ["proto_binary_fetched_set"]=> + string(1) "0" + ["proto_binary_fetched_geometry"]=> + string(1) "0" + ["proto_binary_fetched_other"]=> + string(1) "0" + ["init_command_executed_count"]=> + string(1) "0" + ["init_command_failed_count"]=> + string(1) "0" + ["com_quit"]=> + string(1) "0" + ["com_init_db"]=> + string(1) "0" + ["com_query"]=> + string(1) "0" + ["com_field_list"]=> + string(1) "0" + ["com_create_db"]=> + string(1) "0" + ["com_drop_db"]=> + string(1) "0" + ["com_refresh"]=> + string(1) "0" + ["com_shutdown"]=> + string(1) "0" + ["com_statistics"]=> + string(1) "0" + ["com_process_info"]=> + string(1) "0" + ["com_connect"]=> + string(1) "0" + ["com_process_kill"]=> + string(1) "0" + ["com_debug"]=> + string(1) "0" + ["com_ping"]=> + string(1) "0" + ["com_time"]=> + string(1) "0" + ["com_delayed_insert"]=> + string(1) "0" + ["com_change_user"]=> + string(1) "0" + ["com_binlog_dump"]=> + string(1) "0" + ["com_table_dump"]=> + string(1) "0" + ["com_connect_out"]=> + string(1) "0" + ["com_register_slave"]=> + string(1) "0" + ["com_stmt_prepare"]=> + string(1) "0" + ["com_stmt_execute"]=> + string(1) "0" + ["com_stmt_send_long_data"]=> + string(1) "0" + ["com_stmt_close"]=> + string(1) "0" + ["com_stmt_reset"]=> + string(1) "0" + ["com_stmt_set_option"]=> + string(1) "0" + ["com_stmt_fetch"]=> + string(1) "0" + ["com_deamon"]=> + string(1) "0" + ["bytes_received_real_data_normal"]=> + string(1) "0" + ["bytes_received_real_data_ps"]=> + string(1) "0" } Testing buffered normal... Testing buffered normal... - SELECT id, label FROM test diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index 94e4e8f2e0..1059c3554f 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -82,63 +82,63 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_kill(): processid should have positive value in %s on line %d -%unicode|string%(%d) "%s" +string(%d) "%s" bool(false) object(mysqli)#%d (%d) { - [%u|b%"affected_rows"]=> + ["affected_rows"]=> int(-1) - [%u|b%"client_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"client_version"]=> + ["client_info"]=> + string(%d) "%s" + ["client_version"]=> int(%d) - [%u|b%"connect_errno"]=> + ["connect_errno"]=> int(0) - [%u|b%"connect_error"]=> + ["connect_error"]=> NULL - [%u|b%"errno"]=> + ["errno"]=> int(2006) - [%u|b%"error"]=> - %unicode|string%(%d) "%s" - [%u|b%"error_list"]=> + ["error"]=> + string(%d) "%s" + ["error_list"]=> array(1) { [0]=> array(3) { - [%u|b%"errno"]=> + ["errno"]=> int(2006) - [%u|b%"sqlstate"]=> - %unicode|string%(5) "%s" - [%u|b%"error"]=> - %unicode|string%(%d) "%s" + ["sqlstate"]=> + string(5) "%s" + ["error"]=> + string(%d) "%s" } } - [%u|b%"field_count"]=> + ["field_count"]=> int(0) - [%u|b%"host_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"info"]=> + ["host_info"]=> + string(%d) "%s" + ["info"]=> %s - [%u|b%"insert_id"]=> + ["insert_id"]=> int(0) - [%u|b%"server_info"]=> - %unicode|string%(%d) "%s" - [%u|b%"server_version"]=> + ["server_info"]=> + string(%d) "%s" + ["server_version"]=> int(%d) - [%u|b%"stat"]=> + ["stat"]=> %s - [%u|b%"sqlstate"]=> - %unicode|string%(5) "HY000" - [%u|b%"protocol_version"]=> + ["sqlstate"]=> + string(5) "HY000" + ["protocol_version"]=> int(10) - [%u|b%"thread_id"]=> + ["thread_id"]=> int(%d) - [%u|b%"warning_count"]=> + ["warning_count"]=> int(0) } Warning: mysqli_kill(): processid should have positive value in %s on line %d array(1) { - [%u|b%"id"]=> - %unicode|string%(1) "1" + ["id"]=> + string(1) "1" } Warning: mysqli_kill(): processid should have positive value in %s on line %d diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index fcbf4e652e..e42d3b31f3 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -42,7 +42,7 @@ max_execution_time=12 ?> --EXPECTF-- array(1) { - [%u|b%"SLEEP(6)"]=> - %unicode|string%(1) "0" + ["SLEEP(6)"]=> + string(1) "0" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt index eb4c431e7d..1d1b3c917f 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -41,7 +41,7 @@ mysqlnd.net_read_timeout=0 ?> --EXPECTF-- array(1) { - [%u|b%"SLEEP(2)"]=> - %unicode|string%(1) "0" + ["SLEEP(2)"]=> + string(1) "0" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index adc267131c..1453d663ba 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -142,20 +142,20 @@ mysqli.max_links=-1 ?> --EXPECTF-- array(1) { - [%u|b%"it_works"]=> - %unicode|string%(2) "ok" + ["it_works"]=> + string(2) "ok" } array(1) { - [%u|b%"syntax"]=> - %unicode|string%(18) "works also with oo" + ["syntax"]=> + string(18) "works also with oo" } Flipping phost/host order array(1) { - [%u|b%"it_works"]=> - %unicode|string%(2) "ok" + ["it_works"]=> + string(2) "ok" } array(1) { - [%u|b%"syntax"]=> - %unicode|string%(18) "works also with oo" + ["syntax"]=> + string(18) "works also with oo" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt index 5630d4e973..c550f0f495 100644 --- a/ext/mysqli/tests/mysqli_pconn_twice.phpt +++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt @@ -67,11 +67,11 @@ mysqli.max_links=-1 ?> --EXPECTF-- array(1) { - [%u|b%"it_works"]=> - %unicode|string%(2) "ok" + ["it_works"]=> + string(2) "ok" } array(1) { - [%u|b%"syntax"]=> - %unicode|string%(18) "works also with oo" + ["syntax"]=> + string(18) "works also with oo" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt index c69a251111..84cd0f68b9 100644 --- a/ext/mysqli/tests/mysqli_poll_kill.phpt +++ b/ext/mysqli/tests/mysqli_poll_kill.phpt @@ -186,13 +186,13 @@ if (!$IS_MYSQLND) To be fixed later. Minor issue about fetching error message from killed line --EXPECTF-- array(1) { - [%u|b%"processed before killed"]=> - %unicode|string%(1) "1" + ["processed before killed"]=> + string(1) "1" } Fetching from thread %d... array(1) { [1]=> - %unicode|string%(1) "1" + string(1) "1" } Warning: mysqli_reap_async_query(): Premature end of data (mysqlnd_wireprotocol.c:%d) in %s on line %d diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 9068f6f708..9d9ef64d91 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -179,10 +179,10 @@ mysqli_close($link); [003] 'UPDATE test SET id = 101 WHERE id > 3' caused 1062 [003] 'UPDATE_FIX test SET id = 101 WHERE id > 3' caused 1064 array(2) { - [%u|b%"id"]=> - %unicode|string%(3) "100" - [%u|b%"label"]=> - %unicode|string%(1) "z" + ["id"]=> + string(3) "100" + ["label"]=> + string(1) "z" } [009] [2014] %s done! diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index a4659c4267..730dc8403b 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -253,23 +253,23 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Using CAST('somestring' AS CHAR)... -%unicode|string%(3) "one" -%unicode|string%(5) "three" -%unicode|string%(3) "two" +string(3) "one" +string(5) "three" +string(3) "two" Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)... -%unicode|string%(1) "1" -%unicode|string%(5) "three" -%unicode|string%(1) "2" +string(1) "1" +string(5) "three" +string(1) "2" Using integer only... int(1) int(303) int(2) Testing bind_param(), strings only... -%unicode|string%(3) "one" -%unicode|string%(5) "three" -%unicode|string%(3) "two" +string(3) "one" +string(5) "three" +string(3) "two" Testing bind_param(), strings only, with CAST AS CHAR... -%unicode|string%(3) "one" -%unicode|string%(32) "three beers are more than enough" -%unicode|string%(3) "two" +string(3) "one" +string(32) "three beers are more than enough" +string(3) "two" done! diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 73bebe107c..4b1988b631 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -128,14 +128,14 @@ mysqli_close($link); ?> --EXPECTF-- array(1) { - [%u|b%"valid"]=> - %unicode|string%(30) "this is sql but with semicolon" + ["valid"]=> + string(30) "this is sql but with semicolon" } array(1) { - [%u|b%""]=> - %unicode|string%(1) "a" + [""]=> + string(1) "a" } -%unicode|string%(1) "a" +string(1) "a" Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 10bf86bf48..4f4e671f3b 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -165,31 +165,31 @@ mysqli_close($link); ?> --EXPECTF-- array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } array(2) { - [%u|b%"id"]=> - %unicode|string%(1) "1" - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["id"]=> + string(1) "1" + ["label"]=> + string(1) "a" } array(1) { - [%u|b%"id"]=> - %unicode|string%(1) "1" + ["id"]=> + string(1) "1" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt index 5487a1423c..a7540c5426 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -94,8 +94,8 @@ mysqli_close($link); ?> --EXPECTF-- array(1) { - [%u|b%"правилен"]=> - %unicode|string%(%d) "това ескюел, но с точка и запетая" + ["правилен"]=> + string(%d) "това ескюел, но с точка и запетая" } Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index 5477ea1745..a678399838 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -177,43 +177,43 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d object(mysqli)#%d (%d) { - [%u|b%"affected_rows"]=> + ["affected_rows"]=> NULL - [%u|b%"client_info"]=> + ["client_info"]=> %s - [%u|b%"client_version"]=> + ["client_version"]=> int(%d) - [%u|b%"connect_errno"]=> + ["connect_errno"]=> int(%d) - [%u|b%"connect_error"]=> + ["connect_error"]=> NULL - [%u|b%"errno"]=> + ["errno"]=> %s - [%u|b%"error"]=> + ["error"]=> %s - [%u|b%"error_list"]=> + ["error_list"]=> NULL - [%u|b%"field_count"]=> + ["field_count"]=> NULL - [%u|b%"host_info"]=> + ["host_info"]=> NULL - [%u|b%"info"]=> + ["info"]=> NULL - [%u|b%"insert_id"]=> + ["insert_id"]=> NULL - [%u|b%"server_info"]=> + ["server_info"]=> NULL - [%u|b%"server_version"]=> + ["server_version"]=> NULL - [%u|b%"stat"]=> + ["stat"]=> NULL - [%u|b%"sqlstate"]=> + ["sqlstate"]=> NULL - [%u|b%"protocol_version"]=> + ["protocol_version"]=> NULL - [%u|b%"thread_id"]=> + ["thread_id"]=> NULL - [%u|b%"warning_count"]=> + ["warning_count"]=> NULL } diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index db1acb4816..a121d5fb8f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - [%u|b%"label"]=> - %unicode|string%(1) "\" + ["label"]=> + string(1) "\" } done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index 866ad6a9d4..efc3eaa29f 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -105,8 +105,8 @@ mysqli_close($link); ?> --EXPECTF-- array(1) { - [%u|b%"valid"]=> - %unicode|string%(30) "this is sql but with semicolon" + ["valid"]=> + string(30) "this is sql but with semicolon" } Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index 8cf759cce6..e565e184ee 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -84,71 +84,71 @@ require_once('skipifconnectfailure.inc'); array(7) refcount(2){ [0]=> array(2) refcount(1){ - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) + ["label"]=> + string(1) "a" refcount(%d) } [1]=> array(2) refcount(1){ - [%u|b%"id"]=> + ["id"]=> int(2) - [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(%d) + ["label"]=> + string(1) "b" refcount(%d) } [2]=> array(2) refcount(1){ - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) + ["label"]=> + string(1) "a" refcount(%d) } [3]=> array(2) refcount(1){ - [%u|b%"id"]=> + ["id"]=> int(2) - [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(%d) + ["label"]=> + string(1) "b" refcount(%d) } [4]=> array(3) refcount(1){ - [%u|b%"id"]=> + ["id"]=> &int(3) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) - [%u|b%"id2"]=> + ["label"]=> + string(1) "a" refcount(%d) + ["id2"]=> &int(3) } [5]=> array(3) refcount(1){ - [%u|b%"id"]=> + ["id"]=> &int(4) - [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(%d) - [%u|b%"id2"]=> + ["label"]=> + string(1) "b" refcount(%d) + ["id2"]=> &int(4) } [6]=> &object(mysqli_result)#%d (5) refcount(%d){ - [%u|b%"current_field"]=> + ["current_field"]=> NULL - [%u|b%"field_count"]=> + ["field_count"]=> NULL - [%u|b%"lengths"]=> + ["lengths"]=> NULL - [%u|b%"num_rows"]=> + ["num_rows"]=> NULL - [%u|b%"type"]=> + ["type"]=> NULL } } array(1) refcount(2){ [0]=> array(2) refcount(1){ - [%u|b%"id"]=> - %unicode|string%(1) "1" refcount(%d) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) + ["id"]=> + string(1) "1" refcount(%d) + ["label"]=> + string(1) "a" refcount(%d) } } done! diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 8de065bffc..7f0a0896d7 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -56,59 +56,59 @@ if (!$IS_MYSQLND) array(1) refcount(%d){ [0]=> array(4) refcount(%d){ - [%u|b%"row_ref"]=> + ["row_ref"]=> &NULL - [%u|b%"row_copy"]=> + ["row_copy"]=> array(2) refcount(1){ - [%u|b%"id"]=> - %unicode|string%(1) "1" refcount(%d) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) + ["id"]=> + string(1) "1" refcount(%d) + ["label"]=> + string(1) "a" refcount(%d) } - [%u|b%"id_ref"]=> - %unicode|string%(1) "1" refcount(%d) - [%u|b%"id_copy"]=> - %unicode|string%(1) "1" refcount(%d) + ["id_ref"]=> + string(1) "1" refcount(%d) + ["id_copy"]=> + string(1) "1" refcount(%d) } } array(2) refcount(%d){ [0]=> array(4) refcount(%d){ - [%u|b%"row_ref"]=> + ["row_ref"]=> &NULL - [%u|b%"row_copy"]=> + ["row_copy"]=> array(2) refcount(%d){ - [%u|b%"id"]=> - %unicode|string%(1) "1" refcount(%d) - [%u|b%"label"]=> - %unicode|string%(1) "a" refcount(%d) + ["id"]=> + string(1) "1" refcount(%d) + ["label"]=> + string(1) "a" refcount(%d) } - [%u|b%"id_ref"]=> - %unicode|string%(1) "1" refcount(%d) - [%u|b%"id_copy"]=> - %unicode|string%(1) "1" refcount(%d) + ["id_ref"]=> + string(1) "1" refcount(%d) + ["id_copy"]=> + string(1) "1" refcount(%d) } [1]=> array(5) refcount(%d){ - [%u|b%"row_ref"]=> + ["row_ref"]=> &array(2) refcount(%d){ - [%u|b%"id"]=> - &%unicode|string%(1) "2" refcount(%d) - [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(%d) + ["id"]=> + &string(1) "2" refcount(%d) + ["label"]=> + string(1) "b" refcount(%d) } - [%u|b%"row_copy"]=> + ["row_copy"]=> array(2) refcount(%d){ - [%u|b%"id"]=> - %unicode|string%(1) "2" refcount(%d) - [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(%d) + ["id"]=> + string(1) "2" refcount(%d) + ["label"]=> + string(1) "b" refcount(%d) } - [%u|b%"id_ref"]=> - &%unicode|string%(1) "2" refcount(%d) - [%u|b%"id_copy"]=> - %unicode|string%(1) "2" refcount(%d) - [%u|b%"id_copy_mod"]=> + ["id_ref"]=> + &string(1) "2" refcount(%d) + ["id_copy"]=> + string(1) "2" refcount(%d) + ["id_copy_mod"]=> int(2) } } diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt index 6416e63002..97b15242dc 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -331,32 +331,32 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Regular, procedural, using variables int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for everything int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, object oriented, using references for everything int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, object oriented, using variable for types. using references for bound parameter int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, object oriented, using constant for types. using references for bound parameter int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for everything but using variable for types int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for bound parameter, using variables for resource and types int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for bound parameter, using variables for resource and types int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types int(1) -%unicode|string%(1) "a" +string(1) "a" Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types, array int(1) -%unicode|string%(1) "a" +string(1) "a" done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt index e7bce112af..bc189dea3f 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt @@ -69,41 +69,41 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Test 1: object(foo)#%d (1) { - [%u|b%"bar"]=> - %unicode|string%(%d) "фубар" + ["bar"]=> + string(%d) "фубар" } object(foo)#%d (1) { - [%u|b%"bar"]=> - &%unicode|string%(%d) "фубар" + ["bar"]=> + &string(%d) "фубар" } фубар Test 2: object(foo)#%d (1) { - [%u|b%"bar"]=> - %unicode|string%(%d) "фубар" + ["bar"]=> + string(%d) "фубар" } --- object(foo)#%d (1) { - [%u|b%"bar"]=> - &%unicode|string%(%d) "фубар" + ["bar"]=> + &string(%d) "фубар" } --- object(foo)#%d (1) { - [%u|b%"bar"]=> - &%unicode|string%(%d) "фубар" + ["bar"]=> + &string(%d) "фубар" } --- фубар - 0 Test 3: object(foo)#%d (1) { - [%u|b%"bar"]=> - %unicode|string%(%d) "фубар" + ["bar"]=> + string(%d) "фубар" } object(foo)#%d (1) { - [%u|b%"bar"]=> - &%unicode|string%(%d) "фубар" + ["bar"]=> + &string(%d) "фубар" } 0 - фубар diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index b8efec5eca..fec6a3f8df 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -248,67 +248,67 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- plain vanilla... int(1) -%unicode|string%(1) "a" +string(1) "a" reference, one level... int(1) int(1) -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" reference, two levels... int(1) int(1) int(1) -%unicode|string%(1) "a" -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" +string(1) "a" reference, $GLOBALS... int(1) int(1) -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" reference, same target... -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" reference, simple object... int(1) -%unicode|string%(1) "a" +string(1) "a" reference, simple object w reference... int(1) -%unicode|string%(1) "a" +string(1) "a" reference, simple object w reference, change after bind... int(1) int(1) -%unicode|string%(1) "a" +string(1) "a" int(1) reference, one level, change after bind... int(1) int(1) -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" reference, circle... int(1) -%unicode|string%(1) "a" -%unicode|string%(1) "a" +string(1) "a" +string(1) "a" reference, object, forward declaration... int(1) object(bar)#%d (2) { - [%u|b%"bar"]=> - &%unicode|string%(1) "a" - [%u|b%"foo"]=> - &%unicode|string%(1) "a" + ["bar"]=> + &string(1) "a" + ["foo"]=> + &string(1) "a" } -%unicode|string%(1) "a" +string(1) "a" references, object, private... int(1) -%unicode|string%(1) "a" +string(1) "a" object(mega_bar)#5 (4) { [%s]=> &int(1) - [%u|b%"id_ref"]=> + ["id_ref"]=> &int(1) - [%u|b%"bar"]=> - &%unicode|string%(1) "a" - [%u|b%"foo"]=> - &%unicode|string%(1) "a" + ["bar"]=> + &string(1) "a" + ["foo"]=> + &string(1) "a" } done! diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index b23f94d81e..3380f0edbb 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -81,7 +81,7 @@ NULL ALTER bool(true) bool(false) -%unicode|string%(34) "Unknown column 'a' in 'field list'" +string(34) "Unknown column 'a' in 'field list'" ---- Row 1 bool(false) int(2) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index fe18be40c3..58d7c2fa72 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -171,15 +171,15 @@ Warning: mysqli_stmt_get_result(): invalid object or resource mysqli_stmt [038] [2014] [Commands out of sync; you can't run this command now] [039] [0] [] array(2) { - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> + ["label"]=> %s(1) "a" } array(2) { - [%u|b%"id"]=> + ["id"]=> int(2) - [%u|b%"label"]=> + ["label"]=> %s(1) "b" } diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index 8c2aad1f12..48f7ed8f30 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -157,17 +157,17 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- array(2) { - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["label"]=> + string(1) "a" } NULL array(2) { - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["label"]=> + string(1) "a" } NULL [017] [2014] Commands out of sync; you can't run this command now diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index 86898807ad..879e87f0d8 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -211,10 +211,10 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- array(2) { - [%u|b%"id"]=> + ["id"]=> int(1) - [%u|b%"label"]=> - %unicode|string%(1) "a" + ["label"]=> + string(1) "a" } NULL bool(false) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 739bf56ea1..5481db04f4 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -67,115 +67,115 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(2) "id" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "id" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(5) "label" - [%u|b%"orgname"]=> - %unicode|string%(5) "label" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(5) "label" + ["orgname"]=> + string(5) "label" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(254) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(3) "_id" - [%u|b%"orgname"]=> - %unicode|string%(0) "" - [%u|b%"table"]=> - %unicode|string%(0) "" - [%u|b%"orgtable"]=> - %unicode|string%(0) "" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(0) "" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(3) "_id" + ["orgname"]=> + string(0) "" + ["table"]=> + string(0) "" + ["orgtable"]=> + string(0) "" + ["def"]=> + string(0) "" + ["db"]=> + string(0) "" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(32897) - [%u|b%"type"]=> + ["type"]=> int(8) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } object(stdClass)#%d (13) { - [%u|b%"name"]=> - %unicode|string%(8) "___label" - [%u|b%"orgname"]=> - %unicode|string%(0) "" - [%u|b%"table"]=> - %unicode|string%(0) "" - [%u|b%"orgtable"]=> - %unicode|string%(0) "" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(0) "" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(8) "___label" + ["orgname"]=> + string(0) "" + ["table"]=> + string(0) "" + ["orgtable"]=> + string(0) "" + ["def"]=> + string(0) "" + ["db"]=> + string(0) "" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(%d) - [%u|b%"length"]=> + ["length"]=> int(%d) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(%d) - [%u|b%"flags"]=> + ["flags"]=> int(0) - [%u|b%"type"]=> + ["type"]=> int(253) - [%u|b%"decimals"]=> + ["decimals"]=> int(31) } done! diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index a38706f1a1..5fd76a2628 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -102,31 +102,31 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt in %s on line %d object(stdClass)#5 (13) { - [%u|b%"name"]=> - %unicode|string%(2) "id" - [%u|b%"orgname"]=> - %unicode|string%(2) "id" - [%u|b%"table"]=> - %unicode|string%(4) "test" - [%u|b%"orgtable"]=> - %unicode|string%(4) "test" - [%u|b%"def"]=> - %unicode|string%(0) "" - [%u|b%"db"]=> - %unicode|string%(%d) "%s" - [%u|b%"catalog"]=> - %unicode|string%(%d) "%s" - [%u|b%"max_length"]=> + ["name"]=> + string(2) "id" + ["orgname"]=> + string(2) "id" + ["table"]=> + string(4) "test" + ["orgtable"]=> + string(4) "test" + ["def"]=> + string(0) "" + ["db"]=> + string(%d) "%s" + ["catalog"]=> + string(%d) "%s" + ["max_length"]=> int(0) - [%u|b%"length"]=> + ["length"]=> int(11) - [%u|b%"charsetnr"]=> + ["charsetnr"]=> int(63) - [%u|b%"flags"]=> + ["flags"]=> int(49155) - [%u|b%"type"]=> + ["type"]=> int(3) - [%u|b%"decimals"]=> + ["decimals"]=> int(0) } |