diff options
Diffstat (limited to 'ext/mysqli/tests')
303 files changed, 1957 insertions, 2038 deletions
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index f7a72aea05..ed09b2eecb 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -60,4 +60,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- %s(4) "1111" -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index cecd37756b..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index ccbe091063..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 995378a607..89ad7ae3da 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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index 5908b11736..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt index d60c52fbde..2043cc5d07 100644 --- a/ext/mysqli/tests/006.phpt +++ b/ext/mysqli/tests/006.phpt @@ -73,4 +73,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt index 86c7fc2e57..26b5763bb4 100644 --- a/ext/mysqli/tests/007.phpt +++ b/ext/mysqli/tests/007.phpt @@ -73,4 +73,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt index f36e524d11..0ae09df842 100644 --- a/ext/mysqli/tests/008.phpt +++ b/ext/mysqli/tests/008.phpt @@ -73,4 +73,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index 528880a44e..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]=> @@ -113,4 +113,4 @@ array(8) { } 20123456 3123456789 -done! +done!
\ No newline at end of file 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/013.phpt b/ext/mysqli/tests/013.phpt index f7089099f0..6d75bde731 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -69,4 +69,4 @@ mysqli_close($link); ?> --EXPECTF-- ok -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index e2c000dcf1..59425ac9d0 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -8,10 +8,10 @@ mysqli autocommit/commit/rollback $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$link) - die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); + die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); if (!have_innodb($link)) - die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error)); + die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error)); ?> --FILE-- <?php @@ -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! diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index bc94161958..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index b3dab9ade7..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" -done! +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 ed0874a684..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt index 8b3c960924..d5466e2241 100644 --- a/ext/mysqli/tests/018.phpt +++ b/ext/mysqli/tests/018.phpt @@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(0) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 69c73226a0..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt index 57016de4b8..6512cd8b9c 100644 --- a/ext/mysqli/tests/020.phpt +++ b/ext/mysqli/tests/020.phpt @@ -95,4 +95,4 @@ array(7) { [6]=> %s(19) "1999-12-29 00:00:00" } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index e89e527de2..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index c6e0156389..81450d2845 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -57,8 +57,8 @@ mysqli_close($link); --EXPECTF-- array(2) { [0]=> - %unicode|string%(10) "1234567890" + string(10) "1234567890" [1]=> %s(13) "32K String ok" } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt index 17a8abce77..2528519ebd 100644 --- a/ext/mysqli/tests/023.phpt +++ b/ext/mysqli/tests/023.phpt @@ -80,4 +80,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt index 5294a24883..893ca0dce3 100644 --- a/ext/mysqli/tests/024.phpt +++ b/ext/mysqli/tests/024.phpt @@ -80,4 +80,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt index 3b472f9513..937d624165 100644 --- a/ext/mysqli/tests/025.phpt +++ b/ext/mysqli/tests/025.phpt @@ -85,4 +85,4 @@ array(7) { [6]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 9fd9be1fd0..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt index f4d985a744..69233d683e 100644 --- a/ext/mysqli/tests/027.phpt +++ b/ext/mysqli/tests/027.phpt @@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- bool(true) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index e047c130cc..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" -done! +string(%d) "%s" +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt index cf59999eaf..936420649d 100644 --- a/ext/mysqli/tests/029.phpt +++ b/ext/mysqli/tests/029.phpt @@ -39,4 +39,4 @@ mysqli_close($link); ?> --EXPECT-- int(3) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt index e51aec3734..c4b1710439 100644 --- a/ext/mysqli/tests/030.phpt +++ b/ext/mysqli/tests/030.phpt @@ -27,4 +27,4 @@ require_once('skipifconnectfailure.inc'); --EXPECT-- int(0) int(1146) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index 27736abd49..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" -done! +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 a1dae08541..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" -done! +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 5f4a5194dc..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" -done! +string(%d) "%s via %s" +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt index 1eae37e1a5..3fda560080 100644 --- a/ext/mysqli/tests/034.phpt +++ b/ext/mysqli/tests/034.phpt @@ -22,4 +22,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(10) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt index 8e755b9846..7b18e027b8 100644 --- a/ext/mysqli/tests/035.phpt +++ b/ext/mysqli/tests/035.phpt @@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(1) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt index 919625c8cd..b0d259c3f4 100644 --- a/ext/mysqli/tests/036.phpt +++ b/ext/mysqli/tests/036.phpt @@ -60,4 +60,4 @@ array(2) { [1]=> bool(true) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt index 5826a9834e..03d5d5562c 100644 --- a/ext/mysqli/tests/037.phpt +++ b/ext/mysqli/tests/037.phpt @@ -50,4 +50,4 @@ array(2) { [1]=> int(2) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt index bde6460d97..ae881e1d2d 100644 --- a/ext/mysqli/tests/039.phpt +++ b/ext/mysqli/tests/039.phpt @@ -27,4 +27,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(2) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt index a860f30d81..3e28883550 100644 --- a/ext/mysqli/tests/040.phpt +++ b/ext/mysqli/tests/040.phpt @@ -44,4 +44,4 @@ mysqli_close($link); ?> --EXPECT-- int(1) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt index 86ddd67069..ec67e476ca 100644 --- a/ext/mysqli/tests/041.phpt +++ b/ext/mysqli/tests/041.phpt @@ -35,4 +35,4 @@ mysqli_close($link); ?> --EXPECT-- int(1) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index d52971fae6..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index 82e01ddff8..c3a9901e4f 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -56,4 +56,4 @@ array(1) { [0]=> string(15) "Rasmus is No. 1" } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt index 7dbbbb20a2..3ddae3e420 100644 --- a/ext/mysqli/tests/044.phpt +++ b/ext/mysqli/tests/044.phpt @@ -23,4 +23,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(1) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index 24a49045b7..5eff0b03bc 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -31,11 +31,6 @@ mysqli_stmt_bind_result (SHOW) mysqli_stmt_bind_result($stmt, $c1, $c2); mysqli_stmt_fetch($stmt); mysqli_stmt_close($stmt); - if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && mysqli_get_server_version($link) < 50000) { - /* variables are binary */ - settype($c1, "unicode"); - settype($c2, "unicode"); - } $test = array ($c1,$c2); var_dump($test); @@ -46,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/046.phpt b/ext/mysqli/tests/046.phpt index 8e4b8c3b2c..1abc5e7bb6 100644 --- a/ext/mysqli/tests/046.phpt +++ b/ext/mysqli/tests/046.phpt @@ -47,4 +47,4 @@ mysqli_close($link); ?> --EXPECT-- bool(true) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index c13c09f8f8..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index d23189cc7a..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index d155bcc64c..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 297a4c912b..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index 59edb3ffe4..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index e0ba8902c2..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" -done! +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 800bbe2c83..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 +Done
\ No newline at end of file diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index 5817d8230d..a6a0c4f205 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -32,7 +32,7 @@ mysqli_close($link); /* create temporary file */ $filename = dirname(__FILE__) . "061.csv"; $fp = fopen($filename, "w"); - fwrite($fp, b"foo;bar"); + fwrite($fp, "foo;bar"); fclose($fp); if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061")) @@ -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 12e4d2c13a..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index 713b625213..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" +string(3) "foo"
\ No newline at end of file diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt index a5e8ed8d8e..75c4b02a29 100644 --- a/ext/mysqli/tests/065.phpt +++ b/ext/mysqli/tests/065.phpt @@ -8,9 +8,6 @@ require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); } -if (version_compare(PHP_VERSION, '6.0', '==') == 1) { - die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); -} ?> --FILE-- <?php @@ -44,7 +41,7 @@ if (version_compare(PHP_VERSION, '6.0', '==') == 1) { printf("[005] Expecting 2/int got %s/%s\n", gettype($tmp), $tmp); if ('gbk' !== ($tmp = $mysql->character_set_name())) - printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp);; + printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp); } } $mysql->close(); diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt index e36993bb6b..d5795bdee8 100644 --- a/ext/mysqli/tests/067.phpt +++ b/ext/mysqli/tests/067.phpt @@ -78,4 +78,4 @@ for ($i =0; $i < 3; $i++) { mysqli_close($link); ?> --EXPECT-- -int(63) +int(63)
\ No newline at end of file diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt index 47f5a622e5..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% +string
\ No newline at end of file diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index b48294b7a3..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt index 6452d6ab78..b71d9b2e49 100644 --- a/ext/mysqli/tests/070.phpt +++ b/ext/mysqli/tests/070.phpt @@ -16,4 +16,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- bool(true) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 48b719c629..6f45777978 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -71,4 +71,4 @@ bool(true) bool(false) bool(true) bool(false) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index b3eb527186..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" -done! +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 3973236001..90fae8b7c6 100644 --- a/ext/mysqli/tests/073.phpt +++ b/ext/mysqli/tests/073.phpt @@ -17,8 +17,8 @@ mysqli_driver properties --EXPECTF-- bool(%s) int(%d) -%unicode|string%(%d) "%s" +string(%d) "%s" int(%d) bool(%s) int(%d) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index f013e03d81..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/bug28817.phpt b/ext/mysqli/tests/bug28817.phpt index 6ae266dc71..254c0e50de 100644 --- a/ext/mysqli/tests/bug28817.phpt +++ b/ext/mysqli/tests/bug28817.phpt @@ -39,4 +39,4 @@ array(2) { %s(3) "bar" } NULL -bool(true) +bool(true)
\ No newline at end of file diff --git a/ext/mysqli/tests/bug32490.phpt b/ext/mysqli/tests/bug32490.phpt index 4f9ef6f80d..3d877c0d9c 100644 --- a/ext/mysqli/tests/bug32490.phpt +++ b/ext/mysqli/tests/bug32490.phpt @@ -10,3 +10,4 @@ var_dump(method_exists("mysqli", "__construct")); --EXPECT-- bool(false) bool(true) + diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt index f8bfdb23a2..ac2de197bb 100644 --- a/ext/mysqli/tests/bug33263.phpt +++ b/ext/mysqli/tests/bug33263.phpt @@ -34,4 +34,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ 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/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt index ece93466e6..c40035d9c8 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -24,10 +24,6 @@ require_once('skipifconnectfailure.inc'); if (gettype($id) !== 'string') { printf("[002] Expecting string on 32bit got %s/%s\n", gettype($id), var_export($id, true)); } - if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && - !is_unicode($id)) { - printf("[003] Expecting unicode string\n"); - } } print $id; print "\n"; diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt index d6d7a7582b..99c1380d95 100644 --- a/ext/mysqli/tests/bug35759.phpt +++ b/ext/mysqli/tests/bug35759.phpt @@ -55,4 +55,4 @@ require_once('skipifconnectfailure.inc'); --CLEAN-- <?php require("clean_table.inc"); ?> --EXPECT-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt index 7c5a44851e..d24e0d4a7f 100644 --- a/ext/mysqli/tests/bug37090.phpt +++ b/ext/mysqli/tests/bug37090.phpt @@ -7,9 +7,6 @@ require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); } -if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) { - die("skip Functionality not available in unicode mode"); -} ?> --FILE-- <?php diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt index 2d1883c2f1..bcfd239911 100644 --- a/ext/mysqli/tests/bug38003.phpt +++ b/ext/mysqli/tests/bug38003.phpt @@ -17,4 +17,7 @@ $DB = new DB(); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Access level to DB::__construct() must be public (as in class mysqli) in %s%ebug38003.php on line %d +Fatal error: Uncaught Error: Call to private DB::__construct() from invalid context in %s +Stack trace: +#0 {main} + thrown in %s diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index 615379dd78..c3bb7285c8 100644 --- a/ext/mysqli/tests/bug38710.phpt +++ b/ext/mysqli/tests/bug38710.phpt @@ -21,4 +21,4 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5 echo "Done"; ?> --EXPECTF-- -Done +Done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index b3fd7ca524..f3bbe346fa 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -128,19 +128,18 @@ memory_limit=83886080 } } - if (!empty($expected)) - reset($expected); - while ((list($k, $v) = each($expected)) && mysqli_stmt_fetch($stmt)) { - if (!empty($expected)) { - if ($result !== $v) { - printf("[%03d] Row %d - expecting %s/%s got %s/%s [%s] with %s - %s.\n", - $offset + 8, - $k, - gettype($v), $v, - gettype($result), $result, - $order_by_col, - $format, $sql); - } + foreach ($expected as $k => $v) { + if (!mysqli_stmt_fetch($stmt)) { + break; + } + if ($result !== $v) { + printf("[%03d] Row %d - expecting %s/%s got %s/%s [%s] with %s - %s.\n", + $offset + 8, + $k, + gettype($v), $v, + gettype($result), $result, + $order_by_col, + $format, $sql); } } diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt index 8624250eb1..ef0c831e4d 100644 --- a/ext/mysqli/tests/bug42548.phpt +++ b/ext/mysqli/tests/bug42548.phpt @@ -72,4 +72,4 @@ Array ) ----- next result ----------- no results found -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 31299ac74b..84c245d0fc 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -84,5 +84,6 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); mysqli_close($link); ?> + --EXPECTF-- 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/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt index 49de03a24c..76901390cb 100644 --- a/ext/mysqli/tests/bug48909.phpt +++ b/ext/mysqli/tests/bug48909.phpt @@ -43,4 +43,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done +done
\ No newline at end of file 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 6676893437..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt index ef20ce0df3..eecef84ad2 100644 --- a/ext/mysqli/tests/bug50772.phpt +++ b/ext/mysqli/tests/bug50772.phpt @@ -33,4 +33,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- ok 1 ok 2 -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt index f79a603e9e..8e3bd59ba5 100644 --- a/ext/mysqli/tests/bug52082.phpt +++ b/ext/mysqli/tests/bug52082.phpt @@ -47,4 +47,4 @@ array(2) { [1]=> string(6) "latin2" } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt index b3e856e76b..463efd6d4e 100644 --- a/ext/mysqli/tests/bug52891.phpt +++ b/ext/mysqli/tests/bug52891.phpt @@ -157,4 +157,4 @@ array(1) { ["a"]=> string(10) "4294967297" } -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt index bb8d00109f..a34b7a3416 100644 --- a/ext/mysqli/tests/bug53503.phpt +++ b/ext/mysqli/tests/bug53503.phpt @@ -63,4 +63,4 @@ $link->close(); unlink('bug53503.data'); ?> --EXPECT-- -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt index ba98fa872c..a10c604fdd 100644 --- a/ext/mysqli/tests/bug55283.phpt +++ b/ext/mysqli/tests/bug55283.phpt @@ -72,4 +72,4 @@ array(2) { [1]=> string(7) "RC4-MD5" } -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug55653.phpt b/ext/mysqli/tests/bug55653.phpt index 80e654771c..1caff1a27a 100644 --- a/ext/mysqli/tests/bug55653.phpt +++ b/ext/mysqli/tests/bug55653.phpt @@ -33,4 +33,4 @@ require_once('skipifconnectfailure.inc'); echo "done!"; ?> --EXPECT-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug62046.phpt b/ext/mysqli/tests/bug62046.phpt index e996de361d..3ad913d951 100644 --- a/ext/mysqli/tests/bug62046.phpt +++ b/ext/mysqli/tests/bug62046.phpt @@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECT-- int(42) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt index 09f36a4358..8c0027f9e6 100644 --- a/ext/mysqli/tests/bug66124.phpt +++ b/ext/mysqli/tests/bug66124.phpt @@ -98,4 +98,4 @@ fetch id:1311200011005001566 Using 's': insert id:1311200011005001566 fetch id:1311200011005001566 -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug66762.phpt b/ext/mysqli/tests/bug66762.phpt index f5240bc926..cf1309e5a2 100644 --- a/ext/mysqli/tests/bug66762.phpt +++ b/ext/mysqli/tests/bug66762.phpt @@ -24,4 +24,4 @@ done! --EXPECT-- bool(true) bool(true) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug69899.phpt b/ext/mysqli/tests/bug69899.phpt index 177b5e3dce..6859b91c13 100644 --- a/ext/mysqli/tests/bug69899.phpt +++ b/ext/mysqli/tests/bug69899.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/skipif.inc'; require_once __DIR__ . '/skipifconnectfailure.inc'; require_once __DIR__ . '/connect.inc'; if (!$IS_MYSQLND) { - die('mysqlnd only'); + die('skip mysqlnd only'); } ?> --FILE-- diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt index 36e8372f08..e3b18ae212 100644 --- a/ext/mysqli/tests/bug70384.phpt +++ b/ext/mysqli/tests/bug70384.phpt @@ -59,4 +59,4 @@ mysqli_float_handling - ensure 4 byte float is handled correctly require_once("clean_table.inc"); ?> --EXPECTF-- -OK +OK
\ No newline at end of file diff --git a/ext/mysqli/tests/bug74737.phpt b/ext/mysqli/tests/bug74737.phpt new file mode 100644 index 0000000000..b45f843830 --- /dev/null +++ b/ext/mysqli/tests/bug74737.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #74737: Incorrect ReflectionFunction information for mysqli_get_client_info +--SKIPIF-- +<?php +require_once('skipif.inc'); +if (!extension_loaded('reflection')) { die("skip"); } +?> +--FILE-- +<?php +$client_info = mysqli_get_client_info(); +$rf = new ReflectionFunction('mysqli_get_client_info'); +echo $rf->getNumberOfParameters(); +echo PHP_EOL; +echo $rf->getNumberOfRequiredParameters(); +?> + +--EXPECT-- +0 +0 diff --git a/ext/mysqli/tests/bug_mysql_49406.phpt b/ext/mysqli/tests/bug_mysql_49406.phpt index 74ea471702..7ed7b447bf 100644 --- a/ext/mysqli/tests/bug_mysql_49406.phpt +++ b/ext/mysqli/tests/bug_mysql_49406.phpt @@ -104,4 +104,4 @@ Charsetnr : %d Flags : %d Type : %d (%s) Decimals : %d -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc index 748fd43c62..af66d4c20c 100644 --- a/ext/mysqli/tests/local_infile_tools.inc +++ b/ext/mysqli/tests/local_infile_tools.inc @@ -59,22 +59,12 @@ register_shutdown_function("shutdown_clean", $file); } - if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) { - if (!fwrite($fp, (binary)"'97';'x';\n") || - !fwrite($fp, (binary)"'98';'y';\n") || - !fwrite($fp, (binary)"99;'z';\n")) { - if ($verbose) - printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file); - return NULL; - } - } else { - if (!fwrite($fp, "97;'x';\n") || - !fwrite($fp, "98;'y';\n") || - !fwrite($fp, "99;'z';\n")) { - if ($verbose) - printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file); - return NULL; - } + if (!fwrite($fp, "97;'x';\n") || + !fwrite($fp, "98;'y';\n") || + !fwrite($fp, "99;'z';\n")) { + if ($verbose) + printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file); + return NULL; } fclose($fp); diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index 8efbefe33e..958b83cb3c 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -132,4 +132,4 @@ mysqli_affected_rows() require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 9c5a6519b6..6da026bc5a 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -111,4 +111,4 @@ mysqli->affected_rows require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt index be00772985..b5dfad77cd 100644 --- a/ext/mysqli/tests/mysqli_auth_pam.phpt +++ b/ext/mysqli/tests/mysqli_auth_pam.phpt @@ -6,10 +6,6 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('connect.inc'); -if (version_compare(PHP_VERSION, '5.3.99') >= 0) { - die("SKIP Available as of PHP 5.3.99"); -} - if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); @@ -92,6 +88,7 @@ max_execution_time=240 mysqli_query($link, 'DROP USER pamtest@localhost'); ?> --EXPECTF-- + Warning: mysqli_real_connect(): (28000/1045): Access denied for user %s [001] Cannot connect to the server using host=%s done! diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 8004b3edc2..3a5a25779d 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -134,4 +134,4 @@ mysqli->autocommit() require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt index b316ca9fe3..57f0595238 100644 --- a/ext/mysqli/tests/mysqli_begin_transaction.phpt +++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt @@ -123,4 +123,4 @@ NULL Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d [019] [%d]%A -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index 9452e22976..7d1c398142 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -62,4 +62,4 @@ if (!$IS_MYSQLND) { require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt index ba973a39e6..6a37b6b44a 100644 --- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt +++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt @@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index d9b0e376cc..ed3330e064 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -67,4 +67,4 @@ if (!have_innodb($link)) require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt index 2f2018e303..0adaf52b85 100644 --- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt +++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt @@ -129,14 +129,6 @@ if ($version[0] <= 4 && $version[1] < 1) var_dump($defaults); } - if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) { - // charsets cannot take any other value but utf8 in unicode mode - $defaults['charset_client'] = 'utf8'; - $defaults['charset_connection'] = 'utf8'; - $defaults['charset_results'] = 'utf8'; - $defaults['collation_connection'] = 'utf8_general_ci'; - } - if ($new != $defaults) { printf("[012] Charsets/collations have not been reset to their defaults.\n"); printf("Got:\n"); diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 7c25473331..82be2c4683 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -4,7 +4,6 @@ Fetching results from tables of different charsets. <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); -require_once('skipifunicode.inc'); require_once('skipifemb.inc'); if (!function_exists('mysqli_set_charset')) { diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index c0706f560e..722facab00 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -72,4 +72,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 7b7931fd55..7b71940e59 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -67,4 +67,4 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] print "done!"; ?> --EXPECTF-- -done! +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 5c5d4923b7..27d399be16 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -60,10 +60,6 @@ require_once('skipifconnectfailure.inc'); 'use_result' => true, ); - if (version_compare(PHP_VERSION, '5.3.99', '<=')) { - $expected_methods['client_encoding'] = true; - } - if ($IS_MYSQLND) { // mysqlnd only /* $expected_methods['get_client_stats'] = true; */ @@ -118,10 +114,8 @@ require_once('skipifconnectfailure.inc'); "warning_count" => true, ); - if (version_compare(PHP_VERSION, '5.3.99', '>')) { - $expected_class_variables["error_list"] = true; - $expected_object_variables["error_list"] = true; - } + $expected_class_variables["error_list"] = true; + $expected_object_variables["error_list"] = true; $variables = get_class_vars(get_class($mysqli)); foreach ($variables as $var => $v) { @@ -188,10 +182,8 @@ require_once('skipifconnectfailure.inc'); $mysqli->error, gettype($mysqli->error), mysqli_error($link), gettype(mysqli_error($link))); - if (version_compare(PHP_VERSION, '5.3.99', '>')) { - assert(mysqli_error_list($link) === $mysqli->error_list); - assert(is_array($mysqli->error_list)); - } + assert(mysqli_error_list($link) === $mysqli->error_list); + assert(is_array($mysqli->error_list)); assert(mysqli_field_count($link) === $mysqli->field_count); printf("mysqli->field_count = '%s'/%s ('%s'/%s)\n", @@ -289,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_properties_no_conn.phpt b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt index eb6ddc594a..7e36c6571e 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt @@ -287,4 +287,4 @@ setting mysqli->unknown, @mysqli_unknown = 'friday' Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation): mysqli->connect_error = '%s'/%s) mysqli->connect_errno = '%s'/integer ('%s'/integer) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index f85d68932b..db1d3444c7 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -49,7 +49,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 8448 +Modifiers: 256 Number of Parameters: 6 Number of Required Parameters: 0 @@ -107,7 +107,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 8448 +Modifiers: 256 Number of Parameters: 6 Number of Required Parameters: 0 @@ -657,7 +657,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 268435713 +Modifiers: 257 Number of Parameters: 5 Number of Required Parameters: 4 diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index cbcff4d756..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 -done! +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_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt index 8f0ca21143..89be46fb8a 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt @@ -52,7 +52,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 8448 +Modifiers: 256 Number of Parameters: 0 Number of Required Parameters: 0 @@ -68,7 +68,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 8448 +Modifiers: 256 Number of Parameters: 0 Number of Required Parameters: 0 @@ -240,7 +240,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 268435712 +Modifiers: 256 Number of Parameters: 2 Number of Required Parameters: 0 diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index c005ce8881..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 -done! +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_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index 4d3c883e45..62f01cac6a 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -129,4 +129,4 @@ warning->errno = '' Access to undefined properties: warning->unknown = '' -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 94a266c6c6..c6ac92dd60 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index da8840d988..be67f779a8 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -33,4 +33,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index dc9b8d0b13..d20ba5dd23 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -74,4 +74,4 @@ if (!have_innodb($link)) require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index ec0ba1a29d..77bcf412e7 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -106,4 +106,4 @@ Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\- Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\-_=]+ in %s on line %d Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\-_=]+ in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index 258af43d70..3ae0050017 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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index ff0f7b41dc..a7f90f1527 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index c3263fb7ca..79ac3f1f79 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -36,4 +36,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt index 36b66e694e..7b19b1e41f 100644 --- a/ext/mysqli/tests/mysqli_connect_oo.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo.phpt @@ -150,4 +150,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d ... and now Exceptions Access denied for user '%s'@'%s' (using password: %s) -done! +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 2b6cfb3f6a..b3dde58c3d 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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt index e5a1b0fc99..5ede44591e 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt @@ -54,4 +54,4 @@ Warning: mysqli_connect(): (HY000/200%d): %s 4) be quiet %s(%d) "%s" int(200%d) -done! +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 f088f5ec64..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index cc5fa9f1c4..42113aef2b 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -20,6 +20,7 @@ require_once('skipifconnectfailure.inc'); 'MYSQLI_READ_DEFAULT_FILE' => true, 'MYSQLI_OPT_CONNECT_TIMEOUT' => true, 'MYSQLI_OPT_LOCAL_INFILE' => true, + 'MYSQLI_OPT_READ_TIMEOUT' => true, 'MYSQLI_INIT_COMMAND' => true, 'MYSQLI_CLIENT_SSL' => true, "MYSQLI_CLIENT_COMPRESS" => true, @@ -199,7 +200,7 @@ require_once('skipifconnectfailure.inc'); } } - if (($IS_MYSQLND && version_compare(PHP_VERSION, ' 5.4.12-dev', '>=')) || (!$IS_MYSQLND && ($version > 50610))) { + if ($IS_MYSQLND || (!$IS_MYSQLND && ($version > 50610))) { /* could be that MySQL/libmysql 5.6.9 had the flag already but it was no stable release */ $expected_constants["MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true; $expected_constants["MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true; diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt index ca218eda82..e51325a213 100644 --- a/ext/mysqli/tests/mysqli_constants_categories.phpt +++ b/ext/mysqli/tests/mysqli_constants_categories.phpt @@ -21,4 +21,4 @@ require_once('skipifemb.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index ef86c5123e..9e2d65047b 100644 --- a/ext/mysqli/tests/mysqli_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_data_seek.phpt @@ -71,4 +71,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index ed0d302617..0858218a46 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -80,4 +80,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_result::data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_result::data_seek(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt index 2b754eac36..aa455d7f6e 100644 --- a/ext/mysqli/tests/mysqli_debug.phpt +++ b/ext/mysqli/tests/mysqli_debug.phpt @@ -17,7 +17,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); if (NULL !== ($tmp = @mysqli_debug())) printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index f916995464..68e600772b 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -20,7 +20,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); if (true !== ($tmp = mysqli_debug(sprintf('d:t:O,%s/mysqli_debug_phpt.trace', sys_get_temp_dir())))) printf("[001] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); @@ -46,7 +46,7 @@ if (!$IS_MYSQLND) printf("[004] Cannot create trace file to test append mode\n"); } else { - if (!fwrite($fp, (binary) 'mysqli_debug.phpt test line')) + if (!fwrite($fp, 'mysqli_debug.phpt test line')) printf("[005] Cannot write to trace file.\n"); fclose($fp); diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index 43cd3acd35..bcf00672d6 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -50,4 +50,4 @@ mysqlnd.debug="t:O,/tmp/mysqli_debug_phpt.trace" ?> --EXPECTF-- string(32) "t:O,/tmp/mysqli_debug_phpt.trace" -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index 1de2eebb2e..b5ba9a5a05 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt @@ -20,7 +20,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); require_once('table.inc'); function try_control_string($link, $control_string, $trace_file, $offset) { diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index dc3683e747..2886694440 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -21,7 +21,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); require_once('table.inc'); function try_control_string($link, $control_string, $trace_file, $offset) { diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt index 268bd619cb..9814c6e255 100644 --- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt @@ -44,4 +44,4 @@ if (!function_exists('mysqli_disable_reads_from_master')) { ?> --EXPECTF-- Warning: mysqli_disable_reads_from_master(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt index 9f70cb4899..02223809ee 100644 --- a/ext/mysqli/tests/mysqli_driver.phpt +++ b/ext/mysqli/tests/mysqli_driver.phpt @@ -111,4 +111,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'NO_SQL' at line 1 in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt index 2b82f91d65..e761d06532 100644 --- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt @@ -13,4 +13,4 @@ Trying to clone mysqli_driver object Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_driver in %s:%d Stack trace: #0 {main} - thrown in %s on line %d + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt index bc5c6c3cd7..bd87ddf0c8 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt @@ -41,4 +41,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_dump_debug_info(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt index 852dad0bf9..82edef5619 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt @@ -35,4 +35,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli::dump_debug_info(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt index d1a8730a06..37891f55e6 100644 --- a/ext/mysqli/tests/mysqli_embedded_connect.phpt +++ b/ext/mysqli/tests/mysqli_embedded_connect.phpt @@ -29,4 +29,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_embedded_connect() expects parameter 1 to be mysqli, null given in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt index 17b4b37529..e23ddd1671 100644 --- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt @@ -40,4 +40,4 @@ if (!function_exists('mysqli_enable_reads_from_master')) { ?> --EXPECTF-- Warning: mysqli_enable_reads_from_master(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index b6a0d20c53..0e9f0496af 100644 --- a/ext/mysqli/tests/mysqli_errno.phpt +++ b/ext/mysqli/tests/mysqli_errno.phpt @@ -49,4 +49,4 @@ int(%d) Warning: mysqli_errno(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index 0db25ff692..5d5ea25089 100644 --- a/ext/mysqli/tests/mysqli_errno_oo.phpt +++ b/ext/mysqli/tests/mysqli_errno_oo.phpt @@ -46,4 +46,4 @@ int(%d) Warning: main(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt index ac5e7f3072..5e70d59d41 100644 --- a/ext/mysqli/tests/mysqli_error.phpt +++ b/ext/mysqli/tests/mysqli_error.phpt @@ -46,4 +46,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt index 25acfcaef3..1f0589679d 100644 --- a/ext/mysqli/tests/mysqli_error_oo.phpt +++ b/ext/mysqli/tests/mysqli_error_oo.phpt @@ -43,4 +43,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: main(): Couldn't fetch mysqli in %s on line %d NULL -done! +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 920d93c4e4..e6bf1c9bc7 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -24,9 +24,7 @@ require_once('skipifconnectfailure.inc'); $host, $user, $db, $port, $socket); } - if (!(version_compare(PHP_VERSION, '6.0', '==') == 1)) { - mysqli_query($link, "set names utf8"); - } + mysqli_query($link, "set names utf8"); $tmp = mysqli_error($link); if (!is_string($tmp) || ('' !== $tmp)) @@ -44,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_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt index 4a3e8836d2..272be79f8c 100644 --- a/ext/mysqli/tests/mysqli_expire_password.phpt +++ b/ext/mysqli/tests/mysqli_expire_password.phpt @@ -6,10 +6,6 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('connect.inc'); -if ($IS_MYSQLND && !version_compare(PHP_VERSION, '5.4.12-dev', ">=")) { - die("SKIP Available in mysqlnd as of PHP 5.4.12-dev"); -} - if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); @@ -126,6 +122,7 @@ if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'% mysqli_query($link, 'DROP USER expiretest@localhost'); ?> --EXPECTF-- + Warning: mysqli%sconnect(): (HY000/1862): %s in %s on line %d [001] Cannot connect [1862] %s diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index fc1f9dbe49..8f4a7cc8c5 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -130,7 +130,8 @@ if (!$IS_MYSQLND) } reset($fields); foreach ($fields_stmt as $fields_stmt_val) { - list(,$fields_val) = each($fields); + $fields_val = current($fields); + next($fields); unset($fields_stmt_val->max_length); unset($fields_val->max_length); if ($fields_stmt_val != $fields_val) { diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index fc86a22363..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,31 +430,31 @@ 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" } } Warning: mysqli_fetch_all(): Mode can be only MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC or MYSQLI_FETCH_BOTH in %s on line %d Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 68a6c024f8..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,31 +410,31 @@ 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" } } Warning: mysqli_result::fetch_all(): Mode can be only MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC or MYSQLI_FETCH_BOTH in %s on line %d Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index 780a5a15f9..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 @@ -371,4 +371,4 @@ Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQ Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 4cd937a3d8..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 8fb671f8cc..82e4d7b666 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -112,4 +112,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +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 e0ef063404..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 @@ -359,4 +359,4 @@ Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_N Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index bcb3b84cd1..0d721fd5c6 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -74,46 +74,46 @@ 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 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index bd49d948f3..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! +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 3ad4fbdc66..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! +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 4348139f43..026252b504 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -61,26 +61,26 @@ 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 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index f6012674db..ce7e82dc08 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -75,4 +75,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file 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 92c496d2e7..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) } @@ -80,4 +80,4 @@ Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in % bool(false) Warning: mysqli_fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 3fd655a21c..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) } @@ -89,4 +89,4 @@ Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for result bool(false) Warning: mysqli_result::fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 7141070441..e234a28fe5 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -241,4 +241,4 @@ mysqli_close($link); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file 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_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index 6b90f01297..d02c02c765 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -123,4 +123,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file 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_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index 2e5e14abb2..6d0b698ee7 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -54,4 +54,4 @@ bool(false) Warning: mysqli_fetch_lengths(): Couldn't fetch mysqli_result in %s on line %d NULL -done! +done!
\ No newline at end of file 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 83c9ef009e..59f6cbae3b 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -45,15 +45,15 @@ 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 Warning: mysqli_fetch_row(): Couldn't fetch mysqli_result in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index 60e230ccc2..9a778c94cb 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -60,4 +60,4 @@ int(3) Warning: mysqli_field_count(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file 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 b1ab947151..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) @@ -107,4 +107,4 @@ int(0) Warning: mysqli_field_tell(): Couldn't fetch mysqli_result in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index aab134fbba..f5a0b7bc95 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -249,4 +249,4 @@ array(1) { child array parent conti child stop -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt index 203d20abe1..bb3f5cc1f1 100644 --- a/ext/mysqli/tests/mysqli_get_client_info.phpt +++ b/ext/mysqli/tests/mysqli_get_client_info.phpt @@ -15,4 +15,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index 4a6d9086a1..29f8b430de 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -119,8 +119,7 @@ mysqlnd.collect_memory_statistics=1 mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, $info, $test_counter); /* we need to skip this test in unicode - we send set names utf8 during mysql_connect */ - if (!(version_compare(PHP_VERSION, '6.0', '==') == 1)) - mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter); + mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('ps_buffered_sets', $new_info, $info, $test_counter); @@ -130,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); @@ -959,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_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt index 9c889caf8f..880ee321f0 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt @@ -43,4 +43,4 @@ mysqlnd.collect_memory_statistics=1 --EXPECTF-- BEGINNING: implicit_free_result = %d END: implicit_free_result = %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index 481f6f9cf9..e2dff9befb 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -45,4 +45,4 @@ mysqlnd.collect_memory_statistics=0 require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt index ea1055f806..d12957b113 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt @@ -103,4 +103,4 @@ BUFFERED: rows_fetched_from_client_ps_cursor = 0 UNBUFFERED: rows_fetched_from_client_ps_unbuffered = %d UNBUFFERED: rows_fetched_from_client_ps_buffered = %d UNBUFFERED: rows_fetched_from_client_ps_cursor = 0 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt index 21c2ef94e8..7994c1d65c 100644 --- a/ext/mysqli/tests/mysqli_get_client_version.phpt +++ b/ext/mysqli/tests/mysqli_get_client_version.phpt @@ -11,4 +11,4 @@ mysqli_get_client_version() print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt index 711afea4c6..4897063c12 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -50,4 +50,4 @@ if (!function_exists('mysqli_get_connection_stats')) { print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index 0e095655ec..2dff6ae8b3 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -32,4 +32,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index 2bc2bf99d3..7fbefeb853 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -26,4 +26,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt index 19b10983a0..a7f785302b 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index 979142d01e..b30c4a3801 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -25,4 +25,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 794184dcf7..2b70fda3ed 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -129,9 +129,6 @@ if (!$TEST_EXPERIMENTAL) $warning = new mysqli_warning($mysqli); $i = 1; while ($warning->next() && ('' != ($tmp = $warning->message))) { - if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && - !is_unicode($tmp)) - printf("[033a] Warning should have been a unicode string, got %s/%s", gettype($tmp), $tmp); $i++; } if (3 != $i) diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index 5b8b2ea908..d60ffd9fbe 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -30,10 +30,6 @@ require_once('skipifconnectfailure.inc'); if (!is_string($tmp = mysqli_info($link)) || ('' == $tmp)) printf("[006] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp); - if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && - !is_unicode($tmp)) - printf("[007] Expecting unicode, because unicode mode it on. Got binary string\n"); - if (!$res = mysqli_query($link, 'INSERT INTO test(id, label) SELECT id + 200, label FROM test')) printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -67,9 +63,9 @@ require_once('skipifconnectfailure.inc'); /* ignore this error */ break; - if (!fwrite($fp, b"100;'a';\n") || - !fwrite($fp, b"101;'b';\n") || - !fwrite($fp, b"102;'c';\n")) { + if (!fwrite($fp, "100;'a';\n") || + !fwrite($fp, "101;'b';\n") || + !fwrite($fp, "102;'c';\n")) { @unlink($file); break; } diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index 8e549db07c..0c4059175b 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -22,4 +22,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt index 2130c1e4f9..549d71d156 100644 --- a/ext/mysqli/tests/mysqli_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_insert_id.phpt @@ -137,4 +137,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_insert_id(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index da443b75cc..e858ca0689 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -100,4 +100,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var")) mysqli_close($link); ?> --EXPECTF-- -DONE +DONE
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt index 9d8818bb81..c7f38fa0fc 100644 --- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt +++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt @@ -113,4 +113,4 @@ memory_limit=256M require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index e29ba32fb3..1059c3554f 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -82,64 +82,64 @@ 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 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_last_insert_id.phpt b/ext/mysqli/tests/mysqli_last_insert_id.phpt index d966eca05e..996c401f74 100644 --- a/ext/mysqli/tests/mysqli_last_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_last_insert_id.phpt @@ -191,4 +191,4 @@ id = %d, label = 'c' id = %d, label = 'a%d' id = %d, label = 'c%d' id = 101, label = 'b%d' -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 9a224170f0..271c63e1d1 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -111,4 +111,4 @@ bool(false) Warning: mysqli_more_results(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index c248ad6fb4..91c07c2564 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -159,4 +159,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_multi_query(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt index 7dbdc134eb..67a5ab6d5b 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt @@ -33,4 +33,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d Warning: mysqli_query(): Error reading result set's header in %s on line %d [002] [%d] %s -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index 96998be611..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! +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 ed253e4882..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 4c7704292d..c36920e1ec 100644 --- a/ext/mysqli/tests/mysqli_next_result.phpt +++ b/ext/mysqli/tests/mysqli_next_result.phpt @@ -121,4 +121,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt index 44068302dc..653c672077 100644 --- a/ext/mysqli/tests/mysqli_no_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt @@ -124,4 +124,4 @@ mysqli.reconnect=0 print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index 8e2cf05e08..4c2510af45 100644 --- a/ext/mysqli/tests/mysqli_num_fields.phpt +++ b/ext/mysqli/tests/mysqli_num_fields.phpt @@ -54,4 +54,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_num_fields(): Couldn't fetch mysqli_result in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index f16ae5c454..376ddd4e8f 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -86,4 +86,4 @@ Warning: mysqli_num_rows(): Couldn't fetch mysqli_result in %s on line %d run_tests.php don't fool me with your 'ungreedy' expression '.+?'! Warning: mysqli_num_rows(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_open_bug74432.phpt b/ext/mysqli/tests/mysqli_open_bug74432.phpt index 08139081c4..c1ed86d88d 100644 --- a/ext/mysqli/tests/mysqli_open_bug74432.phpt +++ b/ext/mysqli/tests/mysqli_open_bug74432.phpt @@ -26,3 +26,4 @@ require_once('skipifconnectfailure.inc'); object(mysqli)#%d (%d) { %A } + diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt index 734adcf5c8..a78dfca20f 100644 --- a/ext/mysqli/tests/mysqli_options_init_command.phpt +++ b/ext/mysqli/tests/mysqli_options_init_command.phpt @@ -75,4 +75,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_real_connect(): (%s/%d): %s in %s on line %d [010] Cannot connect to the server using %s -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt index 7dc028a6de..42acfd2af0 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -106,4 +106,4 @@ if (!$IS_MYSQLND) require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt index 1157f1b883..3016e200d7 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt @@ -110,4 +110,4 @@ $link->close(); $link->query('DROP USER shatest@localhost'); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt index cd96c55ad5..70835739cf 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt @@ -123,6 +123,7 @@ mysqlnd.sha256_server_public_key="test_sha256_ini" @unlink($file); ?> --EXPECTF-- + Warning: mysqli::__construct(): (HY000/1045): %s in %s on line %d [001] [1045] %s -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt index 8716f55e0b..afed773b01 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -129,4 +129,4 @@ $link->close(); @unlink($file); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt index 73b2ebe95c..e2626240d8 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt @@ -185,4 +185,4 @@ Warning: mysqli::real_connect(%sest_sha256_wrong_%d): failed to open stream: No Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d [400 + 002] [1045] %s -done! +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 f4d8a449a3..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt index e8c592f9ff..7222212db0 100644 --- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt +++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt @@ -59,4 +59,4 @@ Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading t Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d Connecction 1 - SELECT @pcondisabled -> 'Connection 1' Connecction 2 - SELECT @pcondisabled -> '' -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index 24b44e2283..f8d8d7e8bd 100644 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -92,4 +92,4 @@ mysqli.max_persistent=2 require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt index 824923c36f..ee9e1f9cc6 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -95,4 +95,4 @@ Regular connection 2 - 'works...' Persistent connection 1 - 'works...' Persistent connection 2 - 'works...' Persistent connection 3 - 'works...' -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index 4b610c3a9a..99e51e7c5e 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -269,4 +269,4 @@ array(3) { ["cached_plinks"]=> int(0) } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt index 926f6b797c..6e210bd4c5 100644 --- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt +++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt @@ -88,4 +88,4 @@ Connection 2 (no reuse) - Thread ID -> '%d' Connection 2 - SELECT @pcondisabled -> 'Connection 2' Connection 2 (reuse) - SELECT @pcondisabled -> 'Connection 2' Connection 2 (reuse) - Thread ID -> '%d' -done! +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 ea33850027..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index faa78fa9c2..734029acb1 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -69,4 +69,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt index 4b579f6c69..e23a5f696f 100644 --- a/ext/mysqli/tests/mysqli_phpinfo.phpt +++ b/ext/mysqli/tests/mysqli_phpinfo.phpt @@ -69,4 +69,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt index ebc4c0efe7..d9a134c0e9 100644 --- a/ext/mysqli/tests/mysqli_ping.phpt +++ b/ext/mysqli/tests/mysqli_ping.phpt @@ -44,4 +44,4 @@ bool(true) bool(true) Warning: mysqli_ping(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt index b9c66381f9..8a49ba3f82 100644 --- a/ext/mysqli/tests/mysqli_poll.phpt +++ b/ext/mysqli/tests/mysqli_poll.phpt @@ -134,6 +134,7 @@ if (!$IS_MYSQLND) print "done!"; ?> --EXPECTF-- + Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line %d Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line %d @@ -144,4 +145,4 @@ Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line [015 + 6] Rejecting thread %d: 0/ [015 + 6] Rejecting thread %d: 0/ [016 + 6] Rejecting thread %d: 0/ -done! +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 01251e001b..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 @@ -207,4 +207,4 @@ Warning: mysqli_reap_async_query(): %s Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d [018] Error: %d/%s -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 18a82a2812..9d9ef64d91 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -173,15 +173,16 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); mysqli_close($link); ?> + --EXPECTF-- [003] 'SELECT' caused 1064 [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_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index dff7f4089e..e45de69eda 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -43,4 +43,4 @@ a) [1065] Query was empty b) [1065] Query was empty c) [1065] Query was empty c) [1065] Query was empty -done! +done!
\ No newline at end of file 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 b50560ac2d..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_query_iterators.phpt b/ext/mysqli/tests/mysqli_query_iterators.phpt index 81ca8c0fae..2577aa76ee 100644 --- a/ext/mysqli/tests/mysqli_query_iterators.phpt +++ b/ext/mysqli/tests/mysqli_query_iterators.phpt @@ -198,4 +198,4 @@ array(1) { ["id"]=> string(1) "6" } -done! +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 f17f05799b..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! +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 1076c4ede6..a7540c5426 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -85,37 +85,6 @@ mysqli_close($link); } } - /* - Trying to test what Ramil suggests in http://bugs.mysql.com/bug.php?id=29576 - However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME. - if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) { - if (mysqli_get_server_version() > 50002) { - @mysqli_query($link, "DROP USER IF EXISTS 'тест'@'%'"); - if (TRUE !== mysqli_query($link, "CREATE USER 'тест'@'%'")) { - var_dump(mysqli_error($link); - } - } - if (TRUE !== mysqli_query($link, "GRANT SELECT ON $db.* TO 'тест'@'%' IDENTIFIED BY 'парола'")) { - var_dump(mysqli_error($link); - } else { - $link2 = mysqli_init(); - if (!(mysqli_real_connect($link2, $host, "тест", 'парола', $db, $port, $socket))) { - printf("[011] Cannot connect to the server using host=%s, user=%s, passwd=парола, dbname=%s, port=%s, socket=%s, [%d] %s\n", - $host, "тест", $db, $port, $socket, - mysqli_connect_errno(), mysqli_connect_error()); - } - mysqli_close($link2); - if (mysqli_get_server_version() > 50002) { - if (!mysqli_query($link, "DROP USER 'тест'@'%'")) - printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - } else { - printf("[015] Cannot create user or grant privileges, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - } - } - } - } - */ - mysqli_close($link); if (NULL !== ($tmp = mysqli_query($link, "SELECT id FROM test"))) @@ -125,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.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt index f9358a1dc9..6c372581e0 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt @@ -55,4 +55,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 53424e6e74..945e1eaed7 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -2,10 +2,6 @@ mysqli_real_escape_string() - gbk --SKIPIF-- <?php -if (version_compare(PHP_VERSION, '6.0', '==') == 1) { - die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); -} - require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index 3f61cc0fe7..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! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt index 3fb2b7df25..ae4986e0b1 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt @@ -2,10 +2,6 @@ mysqli_real_escape_string() - sjis --SKIPIF-- <?php -if (version_compare(PHP_VERSION, '6.0', '==') == 1) { - die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); -} - require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt index abf5de7e6d..72d171f9e5 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt @@ -85,4 +85,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d -done! +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 558a6ec68e..efc3eaa29f 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -105,9 +105,9 @@ 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 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt index bb9a77a0af..ba4c564385 100644 --- a/ext/mysqli/tests/mysqli_release_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt @@ -81,4 +81,4 @@ array(1) { ["id"]=> string(1) "1" } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index 889fda5fbd..3dcf4981b8 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -299,4 +299,4 @@ Warning: mysqli_kill(): processid should have positive value in %s on line %d Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d [013] Access denied for user '%s'@'%s' (using password: YES) [016] Access denied for user '%s'@'%s' (using password: YES) -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt index 0717aaf73b..5cf5ca8e3b 100644 --- a/ext/mysqli/tests/mysqli_report_new.phpt +++ b/ext/mysqli/tests/mysqli_report_new.phpt @@ -45,5 +45,6 @@ if (mysqli_get_server_version($link) < 50600) require_once("clean_table.inc"); ?> --EXPECTF-- + Warning: mysqli_change_user(): (%d/%d): Access denied for user '%s'@'%s' (using password: %s) in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt index d08ffa5e7d..2665793407 100644 --- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt +++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt @@ -117,4 +117,4 @@ Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; che Warning: mysqli_kill(): processid should have positive value in %s on line %d [011] Access denied for user '%s'@'%s' (using password: YES) [014] Access denied for user '%s'@'%s' (using password: YES) -done! +done!
\ No newline at end of file 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 15a3f4563a..1a8f44b3f3 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -9,11 +9,7 @@ require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$IS_MYSQLND) die("skip Test for mysqlnd only"); - -if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) - die("skip (TODO) PHP 6.0 has a difference debug_zval_dump output format"); -?> -<?php require_once('skipifemb.inc'); ?> +require_once('skipifemb.inc'); ?> --FILE-- <?php require_once('connect.inc'); @@ -60,59 +56,59 @@ if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) 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_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 6eff412a1d..6164197a6c 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -24,4 +24,4 @@ require_once('skipifconnectfailure.inc'); Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_result in %s:%d Stack trace: #0 {main} - thrown in %s on line %d + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index 7865015bf0..be49000315 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -74,4 +74,4 @@ mysqli_rollback() ?> --EXPECTF-- Warning: mysqli_rollback(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt index cb0d1169c8..5775b0eaec 100644 --- a/ext/mysqli/tests/mysqli_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_savepoint.phpt @@ -67,5 +67,6 @@ if (!have_innodb($link)) require_once("clean_table.inc"); ?> --EXPECTF-- + Warning: mysqli_savepoint(): Savepoint name cannot be empty in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index d73b1d7eee..0a7acb4b20 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -109,4 +109,4 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> --EXPECTF-- Warning: mysqli_select_db(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt index d07985c2b7..7de2bfc21c 100644 --- a/ext/mysqli/tests/mysqli_send_query.phpt +++ b/ext/mysqli/tests/mysqli_send_query.phpt @@ -47,4 +47,4 @@ if (!$TEST_EXPERIMENTAL) ?> --EXPECTF-- Warning: mysqli_send_query(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index a81ecad8a2..ed534fa71e 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -6,10 +6,6 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (version_compare(PHP_VERSION, '6.0', '==') == 1) { - die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); -} - if (!function_exists('mysqli_set_charset')) die("skip Function not available"); diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index 470c5ddcde..7c96d5980d 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -66,4 +66,4 @@ bool(false) Warning: mysqli_set_opt(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt index b2f46acbb2..56580cda46 100644 --- a/ext/mysqli/tests/mysqli_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_sqlstate.phpt @@ -47,4 +47,4 @@ NULL Warning: mysqli_sqlstate(): Couldn't fetch mysqli in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt index b8375b14c6..f1cd56ccd1 100644 --- a/ext/mysqli/tests/mysqli_stat.phpt +++ b/ext/mysqli/tests/mysqli_stat.phpt @@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stat(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 99cd6728fd..0d5e8f9bec 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -26,4 +26,4 @@ die("SKIP: prefetch isn't supported at the moment"); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index da2808570a..39c602034d 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt @@ -126,4 +126,4 @@ Testing 273 columns with 240 rows... ... statement with 65520 parameters prepared Statement done bool(true) -done! +done!
\ No newline at end of file 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 c95461866e..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 @@ -5,10 +5,6 @@ mysqli_stmt_bind_param used with call_user_func_array() (see also bug #43568) require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - -// TODO remove once a decision has been made on call_user_func_array() -if (version_compare(PHP_VERSION, '5.3.0-dev') == -1) - die("skip needs PHP 5.3.0-dev+, see http://bugs.php.net/bug.php?id=43568"); ?> --FILE-- <?php @@ -335,32 +331,32 @@ if (version_compare(PHP_VERSION, '5.3.0-dev') == -1) --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 319ccf93b2..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,42 +69,42 @@ 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 - фубар -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt index 57f345fe77..daab40c506 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -124,4 +124,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index c61cb8efd5..52e9d4b24b 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -10,8 +10,6 @@ require_once('skipifconnectfailure.inc'); <?php require_once("connect.inc"); - $hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? "unicode":"string"; - $tmp = NULL; $link = NULL; @@ -243,16 +241,16 @@ require_once('skipifconnectfailure.inc'); func_mysqli_stmt_bind_result($link, $engine, "s", "YEAR", NULL, 1080); $string255 = func_mysqli_stmt_bind_make_string(255); - func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(1)", "a", 1110, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(255)", $string255, 1120, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(1) NOT NULL", "a", 1140, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(1)", "a", 1110, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(255)", $string255, 1120, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(1) NOT NULL", "a", 1140, 'string'); func_mysqli_stmt_bind_result($link, $engine, "s", "CHAR(1)", NULL, 1160); $string65k = func_mysqli_stmt_bind_make_string(65535); - func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(1)", "a", 1180, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(255)", $string255, 1200, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(65635)", $string65k, 1220, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(1) NOT NULL", "a", 1240, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(1)", "a", 1180, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(255)", $string255, 1200, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(65635)", $string65k, 1220, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(1) NOT NULL", "a", 1240, 'string'); func_mysqli_stmt_bind_result($link, $engine, "s", "VARCHAR(1)", NULL, 1260); func_mysqli_stmt_bind_result($link, $engine, "s", "BINARY(1)", "a", 1280); @@ -270,29 +268,29 @@ require_once('skipifconnectfailure.inc'); func_mysqli_stmt_bind_result($link, $engine, "s", "TINYBLOB NOT NULL", "b", 1480); func_mysqli_stmt_bind_result($link, $engine, "s", "TINYBLOB", NULL, 1500); - func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT", "a", 1520, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT NOT NULL", "a", 1540, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT", NULL, 1560, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT", "a", 1520, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT NOT NULL", "a", 1540, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "TINYTEXT", NULL, 1560, 'string'); // Note: you cannot insert any blob values this way. But you can check the API at least partly this way // Extra BLOB tests are in mysqli_stmt_send_long() - func_mysqli_stmt_bind_result($link, $engine, "b", "BLOB", b"", 1580); - func_mysqli_stmt_bind_result($link, $engine, "b", "TEXT", "", 1600, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "b", "MEDIUMBLOB", b"", 1620); - func_mysqli_stmt_bind_result($link, $engine, "b", "MEDIUMTEXT", "", 1640, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "b", "BLOB", "", 1580); + func_mysqli_stmt_bind_result($link, $engine, "b", "TEXT", "", 1600, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "b", "MEDIUMBLOB", "", 1620); + func_mysqli_stmt_bind_result($link, $engine, "b", "MEDIUMTEXT", "", 1640, 'string'); /* Is this one related? http://bugs.php.net/bug.php?id=35759 */ if (($IS_MYSQLND) || (!$IS_MYSQLND && (ini_get('memory_limit') > 4294967296))) { /* NOTE: the MySQL Client Library - not mysqlnd - will allocate a hugge max_length(type) = 4GB bind buffer */ func_mysqli_stmt_bind_result($link, $engine, "b", "LONGBLOB", "", 1660); - func_mysqli_stmt_bind_result($link, $engine, "b", "LONGTEXT", "", 1680, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "b", "LONGTEXT", "", 1680, 'string'); } - func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", "a", 1700, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", NULL, 1720, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", "a", 1740, $hint_str_or_unicode); - func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760, $hint_str_or_unicode); + func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", "a", 1700, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", NULL, 1720, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", "a", 1740, 'string'); + func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760, 'string'); if (mysqli_get_server_version($link) >= 50600) func_mysqli_stmt_bind_result($link, $engine, "s", "TIME", "13:31:34.123456", 1770, "13:31:34"); diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 8d25134b66..acf0d0be2d 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -156,4 +156,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt index d94212872c..0993f7eccf 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -117,8 +117,10 @@ memory_limit=83886080 return false; } - reset($expected); - while ((list($k, $v) = each($expected)) && mysqli_stmt_fetch($stmt)) { + foreach ($expected as $k => $v) { + if (!mysqli_stmt_fetch($stmt)) { + break; + } if ($result !== $v) { printf("[%03d] Row %d - expecting %s/%s got %s/%s [%s] with %s - %s.\n", $offset + 8, @@ -269,9 +271,10 @@ memory_limit=83886080 break; } - reset($values); - while (mysqli_stmt_fetch($stmt)) { - list($exp_trend, $exp_targetport) = each($values); + foreach ($values as $exp_trend => $exp_targetport) { + if (!mysqli_stmt_fetch($stmt)) { + break; + } if ($targetport != $exp_targetport) { printf("[306] Values fetched from MySQL seem to be wrong, check manually\n"); printf("%s/%s - %s/%s - '%s'\n", $trend, $exp_trend, $targetport, $exp_targetport, $format); @@ -308,9 +311,10 @@ memory_limit=83886080 break; } - reset($values); - while ($stmt->fetch()) { - list($exp_trend, $exp_targetport) = each($values); + foreach ($values as $exp_trend => $exp_targetport) { + if (!$stmt->fetch()) { + break; + } if ($targetport != $exp_targetport) { printf("[312] Values fetched from MySQL seem to be wrong, check manually\n"); printf("%s/%s - %s/%s - '%s'\n", $trend, $exp_trend, $targetport, $exp_targetport, $format); 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_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index c602595b68..56508533ba 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -94,4 +94,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index 32609674c4..64e76e54ce 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -88,4 +88,4 @@ Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_close(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index 009952f7b7..a1cebeae80 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -96,4 +96,4 @@ Warning: mysqli_stmt_data_seek(): Offset must be positive in %s on line %d int(1) Warning: mysqli_stmt_data_seek(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index b292a66d54..3380f0edbb 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -65,6 +65,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change")) mysqli_close($link); ?> + --EXPECTF-- bool(true) bool(true) @@ -80,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) @@ -90,4 +91,4 @@ int(2) ---- Row 3 bool(false) ---- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 77ad48da2e..070f2514a2 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -65,4 +65,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stmt_errno(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index 417e1b9bbd..e18aa07f32 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -65,4 +65,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stmt_error(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index 147d45cf5c..85ae80c51e 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -147,4 +147,4 @@ bool(true) [027] Expecting boolean/false, got boolean/1 Warning: mysqli_stmt_execute(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index e85717121e..29e3947a78 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -195,4 +195,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt index 6239f13a49..35433b136a 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt @@ -128,4 +128,4 @@ Unsupported and undefined, under development --EXPECTF-- [010] More results: yes [011] Next result: yes -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt index 6ab270b8f4..8c7c799def 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt @@ -78,4 +78,4 @@ Unsupported and undefined, under development --EXPECTF-- [008] More results: %s [009] Next results: %s -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt index 9641ebafad..7598ffeb1b 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt @@ -95,4 +95,4 @@ Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt [014] [%d] Commands out of sync; you can't run this command now Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index ec621a9a00..2a2914ad88 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -73,4 +73,4 @@ Fetching BIT column values using the PS API require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt index 6467f87910..84998b9423 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -138,4 +138,4 @@ mysqli_stmt_fetch - geometry / spatial types require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 15401f4a69..7dfd3a400c 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -97,4 +97,4 @@ Warning: mysqli_stmt_bind_param(): Number of variables doesn't match number of p Warning: mysqli_stmt_prepare(): Couldn't fetch mysqli_stmt in %s on line %d Warning: mysqli_stmt_field_count(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index d5ddc766eb..08b33b7959 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -83,4 +83,4 @@ Warning: mysqli_stmt_free_result(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_free_result(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index 1e05cbc79a..58d7c2fa72 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -171,17 +171,17 @@ 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" } Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index 9bbda7b523..48f7ed8f30 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -157,20 +157,20 @@ 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 Warning: mysqli_stmt_get_result(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index 6b55fd5bd8..6c476f7e9d 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -130,4 +130,4 @@ Fetching BIT column values using the PS API require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt index a021d629f0..046f90438e 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -47,4 +47,4 @@ mysqli_stmt_get_result() - meta data, field_count() ?> --EXPECTF-- 2 2 -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt index b6794ad41e..c86a385bee 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -140,4 +140,4 @@ mysqli_stmt_get_result - geometry / spatial types require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index abadae504f..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) @@ -234,4 +234,4 @@ NULL Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d NULL -done! +done!
\ No newline at end of file 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_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index 41d60043fa..c057f7d9fb 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -92,4 +92,4 @@ if (!function_exists('mysqli_stmt_get_result')) require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index 28b12e1398..7b6d3c26a0 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -15,8 +15,6 @@ mysqli_stmt_get_result - data types if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); - $hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? 'unicode' : 'string'; - function func_mysqli_stmt_get_result($link, $engine, $bind_type, $sql_type, $bind_value, $offset, $type_hint = null) { if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) { @@ -201,16 +199,16 @@ mysqli_stmt_get_result - data types func_mysqli_stmt_get_result($link, $engine, "s", "YEAR", NULL, 1080); $string255 = func_mysqli_stmt_bind_make_string(255); - func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(1)", "a", 1110, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(255)", $string255, 1120, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(1) NOT NULL", "a", 1140, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(1)", "a", 1110, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(255)", $string255, 1120, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(1) NOT NULL", "a", 1140, 'string'); func_mysqli_stmt_get_result($link, $engine, "s", "CHAR(1)", NULL, 1160); $string65k = func_mysqli_stmt_bind_make_string(65535); - func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(1)", "a", 1180, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(255)", $string255, 1200, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(65635)", $string65k, 1220, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(1) NOT NULL", "a", 1240, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(1)", "a", 1180, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(255)", $string255, 1200, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(65635)", $string65k, 1220, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(1) NOT NULL", "a", 1240, 'string'); func_mysqli_stmt_get_result($link, $engine, "s", "VARCHAR(1)", NULL, 1260); func_mysqli_stmt_get_result($link, $engine, "s", "BINARY(1)", "a", 1280); @@ -228,25 +226,25 @@ mysqli_stmt_get_result - data types func_mysqli_stmt_get_result($link, $engine, "s", "TINYBLOB NOT NULL", "b", 1480); func_mysqli_stmt_get_result($link, $engine, "s", "TINYBLOB", NULL, 1500); - func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT", "a", 1520, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT NOT NULL", "a", 1540, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT", NULL, 1560, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT", "a", 1520, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT NOT NULL", "a", 1540, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "TINYTEXT", NULL, 1560, 'string'); // Note: you cannot insert any blob values this way. But you can check the API at least partly this way // Extra BLOB tests are in mysqli_stmt_send_long() - func_mysqli_stmt_get_result($link, $engine, "b", "BLOB", b"", 1580); - func_mysqli_stmt_get_result($link, $engine, "b", "TEXT", "", 1600, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "b", "MEDIUMBLOB", b"", 1620); - func_mysqli_stmt_get_result($link, $engine, "b", "MEDIUMTEXT", "", 1640, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "b", "BLOB", "", 1580); + func_mysqli_stmt_get_result($link, $engine, "b", "TEXT", "", 1600, 'string'); + func_mysqli_stmt_get_result($link, $engine, "b", "MEDIUMBLOB", "", 1620); + func_mysqli_stmt_get_result($link, $engine, "b", "MEDIUMTEXT", "", 1640, 'string'); /* Is this one related? http://bugs.php.net/bug.php?id=35759 */ func_mysqli_stmt_get_result($link, $engine, "b", "LONGBLOB", "", 1660); - func_mysqli_stmt_get_result($link, $engine, "b", "LONGTEXT", "", 1680, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "b", "LONGTEXT", "", 1680, 'string'); - func_mysqli_stmt_get_result($link, $engine, "s", "ENUM('a', 'b')", "a", 1700, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "ENUM('a', 'b')", NULL, 1720, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "SET('a', 'b')", "a", 1740, $hint_str_or_unicode); - func_mysqli_stmt_get_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760, $hint_str_or_unicode); + func_mysqli_stmt_get_result($link, $engine, "s", "ENUM('a', 'b')", "a", 1700, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "ENUM('a', 'b')", NULL, 1720, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "SET('a', 'b')", "a", 1740, 'string'); + func_mysqli_stmt_get_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760, 'string'); mysqli_close($link); print "done!"; diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt index 3375b131ba..69755865e9 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt @@ -107,4 +107,4 @@ Warning: mysqli_stmt_get_warnings(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_get_warnings(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index 30cdcb96ad..4f09719c87 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -55,4 +55,4 @@ Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt Warning: mysqli_stmt_init() expects parameter 1 to be mysqli, object given in %s on line %d Warning: mysqli_stmt_init(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index 6dfe4766e4..c7a5affd9d 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -74,4 +74,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_stmt_insert_id(): Couldn't fetch mysqli_stmt in %s on line %d NULL -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index 47b56b3dd9..7420e85b9d 100644 --- a/ext/mysqli/tests/mysqli_stmt_multires.phpt +++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt @@ -117,4 +117,4 @@ string(5) "a---a" string(18) "[013] next_result:" bool(true) [014] No result, as expected -done +done
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt index 2171b32c98..a1f5e89c7a 100644 --- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt @@ -115,4 +115,4 @@ require_once('skipifconnectfailure.inc'); run_tests.php don't fool me with your 'ungreedy' expression '.+?'! Warning: mysqli_stmt_num_rows(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index e77112b6a1..3526956898 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -69,4 +69,4 @@ Warning: mysqli_stmt_param_count(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_param_count(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index d2c13e5871..d731da2f5e 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -109,4 +109,4 @@ Warning: mysqli_stmt_reset(): invalid object or resource mysqli_stmt int(1) Warning: mysqli_stmt_reset(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index 75383a43a2..5fd76a2628 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -98,36 +98,37 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- + 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) } Warning: mysqli_stmt_result_metadata(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index d539ed7d6c..a7dad1b47c 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -229,4 +229,4 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug. require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt index adb4e07ec5..a1fc2007fe 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt @@ -95,4 +95,4 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt index cf19c1e512..95d2302f4c 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt @@ -100,4 +100,4 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index 9388552ea3..5ea35df240 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -60,4 +60,4 @@ Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_sqlstate(): Couldn't fetch mysqli_stmt in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index 3a0a8ae181..a6411ca937 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -87,4 +87,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index 18dddc90c7..6576c15d90 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -25,4 +25,4 @@ require_once('skipifconnectfailure.inc'); Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_stmt in %s:%d Stack trace: #0 {main} - thrown in %s on line %d + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index cf9894a953..c61c124daf 100644 --- a/ext/mysqli/tests/mysqli_store_result.phpt +++ b/ext/mysqli/tests/mysqli_store_result.phpt @@ -61,4 +61,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt index 3f82b8a892..cdbccee198 100644 --- a/ext/mysqli/tests/mysqli_store_result_copy.phpt +++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt @@ -282,4 +282,4 @@ array(2) { string(1) "b" } } -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index 499cf95963..3a7e1ae5da 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -41,4 +41,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_thread_id(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt index 4c84de1b1e..0777c2abd7 100644 --- a/ext/mysqli/tests/mysqli_thread_safe.phpt +++ b/ext/mysqli/tests/mysqli_thread_safe.phpt @@ -13,4 +13,4 @@ require_once('skipifemb.inc'); print "done!"; ?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index a6bb1946c7..f4471bf831 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -23,4 +23,4 @@ require_once('skipifconnectfailure.inc'); Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli in %s:%d Stack trace: #0 {main} - thrown in %s on line %d + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index 4adc2fc5b4..25d16926a8 100644 --- a/ext/mysqli/tests/mysqli_use_result.phpt +++ b/ext/mysqli/tests/mysqli_use_result.phpt @@ -63,4 +63,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_use_result(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index d548da3bbf..cff9c02b1f 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -49,4 +49,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_warning_count(): Couldn't fetch mysqli in %s on line %d -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt index 1079ac374b..d3ae47d0b4 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -38,4 +38,4 @@ if (!$TEST_EXPERIMENTAL) require_once("clean_table.inc"); ?> --EXPECTF-- -Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d +Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/skipifunicode.inc b/ext/mysqli/tests/skipifunicode.inc deleted file mode 100644 index 89258d498e..0000000000 --- a/ext/mysqli/tests/skipifunicode.inc +++ /dev/null @@ -1,5 +0,0 @@ -<?php -if (version_compare(PHP_VERSION, '6.0', '==') == 1) { - die('skip Not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); -} -?> |