diff options
| author | Felipe Pena <felipe@php.net> | 2009-01-06 00:56:04 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-01-06 00:56:04 +0000 |
| commit | 2632316e809278a0b0d7beade07b0aa0df2ba69b (patch) | |
| tree | 445a3b7a392a09d7be0cf905b453808415211e22 | |
| parent | 5a3b59995ff6e7f4888e24722a80d04e99ffab8a (diff) | |
| download | php-git-2632316e809278a0b0d7beade07b0aa0df2ba69b.tar.gz | |
- Removed UEXPECT(F)
- Unicodified some tests
94 files changed, 140 insertions, 2988 deletions
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index ac3e611406..929fab1823 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -67,32 +67,6 @@ array(11) { [8]=> NULL [9]=> - string(4) "foo1" - [10]=> - string(4) "1000" -} -done! ---UEXPECTF-- -array(11) { - [0]=> - int(1) - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - [5]=> - NULL - [6]=> - NULL - [7]=> - NULL - [8]=> - NULL - [9]=> unicode(4) "foo1" [10]=> unicode(4) "1000" diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index 89dbf11605..c19a56ac7d 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -75,24 +75,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(7) { [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - string(19) "2002-01-02 17:46:59" - [3]=> - int(2010) - [4]=> - string(19) "2010-07-10 00:00:00" - [5]=> - string(19) "0000-00-00 00:00:00" - [6]=> - string(19) "1999-12-29 00:00:00" -} -done! ---UEXPECTF-- -array(7) { - [0]=> unicode(10) "2002-01-02" [1]=> unicode(8) "12:49:00" diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 4aab97dacf..bced0d1359 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -50,32 +50,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(2) { [0]=> - string(10) "1234567890" - [1]=> - string(15) "this is a test0" -} -array(2) { - [0]=> - string(10) "1234567891" - [1]=> - string(15) "this is a test1" -} -array(2) { - [0]=> - string(10) "1234567892" - [1]=> - string(15) "this is a test2" -} -array(2) { - [0]=> - string(10) "1234567893" - [1]=> - string(15) "this is a test3" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(10) "1234567890" [1]=> unicode(15) "this is a test0" @@ -98,4 +72,4 @@ array(2) { [1]=> unicode(15) "this is a test3" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index a05dc501b0..e40e6a7982 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -40,16 +40,8 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(2) { [0]=> - string(10) "1234567890" - [1]=> - string(13) "32K String ok" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(10) "1234567890" [1]=> unicode(13) "32K String ok" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index 5a498953be..5091335ff4 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -78,7 +78,6 @@ mysqli fetch bigint values (ok to fail with 4.1.x) mysqli_close($link); print "done!"; ?> - --EXPECTF-- array(8) { [0]=> @@ -88,28 +87,6 @@ array(8) { [2]=> int(4) [3]=> - string(14) "33333333333333" - [4]=> - int(0) - [5]=> - int(0) - [6]=> - int(100) - [7]=> - int(4567) -} -20123456 -3123456789 -done! ---UEXPECTF-- -array(8) { - [0]=> - int(5) - [1]=> - int(-23) - [2]=> - int(4) - [3]=> unicode(14) "33333333333333" [4]=> int(0) diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index e3b5922eaa..cf0f6c295f 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -62,26 +62,6 @@ array(8) { [6]=> string(6) "foobar" [7]=> - string(11) "mysql rulez" -} -done! ---UEXPECTF-- -array(8) { - [0]=> - int(19) - [1]=> - int(2999) - [2]=> - int(3999) - [3]=> - int(4999999) - [4]=> - float(2345.60009766) - [5]=> - float(5678.89563) - [6]=> - string(6) "foobar" - [7]=> unicode(11) "mysql rulez" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index eb2f6410ce..461d04b778 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -61,26 +61,6 @@ array(8) { [6]=> string(3) "206" [7]=> - string(3) "6.7" -} -done! ---UEXPECTF-- -array(8) { - [0]=> - int(120) - [1]=> - int(2999) - [2]=> - int(3999) - [3]=> - int(54) - [4]=> - float(2.59999990463) - [5]=> - float(58.89) - [6]=> - string(3) "206" - [7]=> unicode(3) "6.7" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index 1f845f8e6f..37b4d76225 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -86,21 +86,6 @@ mysqli autocommit/commit/rollback Num_of_rows=1 array(2) { [0]=> - string(1) "1" - [1]=> - string(6) "foobar" -} -array(2) { - [0]=> - string(1) "2" - [1]=> - string(4) "egon" -} -done! ---UEXPECTF-- -Num_of_rows=1 -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(6) "foobar" @@ -111,4 +96,4 @@ array(2) { [1]=> unicode(4) "egon" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index ac50fc8c6d..3fe105fcb8 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -80,20 +80,6 @@ mysqli autocommit/commit/rollback with innodb --EXPECTF-- array(2) { [0]=> - string(1) "1" - [1]=> - string(6) "foobar" -} -array(2) { - [0]=> - string(1) "2" - [1]=> - string(4) "egon" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(6) "foobar" @@ -104,4 +90,4 @@ array(2) { [1]=> unicode(4) "egon" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 3e058ea69c..f2fafad462 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -29,8 +29,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(6) "foobar" -done! ---UEXPECTF-- unicode(6) "foobar" done! diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index 8acac0e5bc..95d6735735 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -36,16 +36,6 @@ array(3) { [0]=> string(32) "37b51d194a7513e45b56f6524f2d51f2" [1]=> - string(%d) "%s" - [2]=> - string(3) "foo" -} -done! ---UEXPECTF-- -array(3) { - [0]=> - string(32) "37b51d194a7513e45b56f6524f2d51f2" - [1]=> unicode(%d) "%s" [2]=> unicode(3) "foo" diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 964ed8fa47..40eb75aae7 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -76,34 +76,8 @@ array(11) { [8]=> NULL [9]=> - string(3) "foo" - [10]=> - string(6) "foobar" -} -done! ---UEXPECTF-- -array(11) { - [0]=> - int(1) - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - [5]=> - float(3.14) - [6]=> - NULL - [7]=> - NULL - [8]=> - NULL - [9]=> unicode(3) "foo" [10]=> unicode(6) "foobar" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 955af29558..39b1fb8a94 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -41,16 +41,8 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(2) { [0]=> - string(10) "1234567890" - [1]=> - %s(14) "this is a test" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(10) "1234567890" [1]=> %s(14) "this is a test" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index 0ab5179e85..4e07b4426d 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -46,16 +46,8 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(2) { [0]=> - string(10) "1234567890" - [1]=> - %s(13) "32K String ok" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(10) "1234567890" [1]=> %s(13) "32K String ok" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index ebf94fa5ac..54a09f0262 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -46,16 +46,8 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(2) { [0]=> - string(10) "Hello Worl" - [1]=> - string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence." -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(10) "Hello Worl" [1]=> %s(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence." } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index 83ea67f342..c579af1c44 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -20,8 +20,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(%d) "%s" -done! ---UEXPECTF-- unicode(%d) "%s" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index 198224d3a9..a1f8c37ed1 100644 --- a/ext/mysqli/tests/031.phpt +++ b/ext/mysqli/tests/031.phpt @@ -25,10 +25,6 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(0) "" -string(%d) "%s" -done! ---UEXPECTF-- unicode(0) "" unicode(%d) "%s" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index 9c6da6706b..43617b4ffa 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -27,8 +27,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(38) "Records: 3 Duplicates: 0 Warnings: 0" -done! ---UEXPECTF-- unicode(38) "Records: 3 Duplicates: 0 Warnings: 0" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index 7113b22ccb..4224fb5465 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -21,8 +21,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(%d) "%s via %s" -done! ---UEXPECTF-- unicode(%d) "%s via %s" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index 6f82636677..4532d23fb4 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -50,24 +50,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (7) { - ["c1"]=> - string(1) "0" - ["c2"]=> - string(5) "35999" - ["c3"]=> - NULL - ["c4"]=> - string(4) "-500" - ["c5"]=> - string(6) "-32768" - ["c6"]=> - string(1) "0" - ["c7"]=> - string(1) "0" -} -done! ---UEXPECTF-- -object(stdClass)#%d (7) { [u"c1"]=> unicode(1) "0" [u"c2"]=> @@ -83,4 +65,4 @@ object(stdClass)#%d (7) { [u"c7"]=> unicode(1) "0" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index ca916b0d32..06c54b5907 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -46,14 +46,6 @@ mysqli_bind_result (SHOW) --EXPECTF-- array(2) { [0]=> - string(4) "port" - [1]=> - string(%d) "%s" -} -done! ---UEXPECTF-- -array(2) { - [0]=> unicode(4) "port" [1]=> unicode(%d) "%s" diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index db24ec44b5..ed589e99c0 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -50,161 +50,6 @@ require_once('skipifconnectfailure.inc'); array(2) { [0]=> object(stdClass)#5 (11) { - ["name"]=> - string(3) "foo" - ["orgname"]=> - string(3) "foo" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(32768) - ["type"]=> - int(3) - ["decimals"]=> - int(0) - } - [1]=> - object(stdClass)#6 (11) { - ["name"]=> - string(3) "bar" - ["orgname"]=> - string(3) "bar" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(0) - ["type"]=> - int(253) - ["decimals"]=> - int(0) - } -} - -=== fetch_field_direct === -object(stdClass)#6 (11) { - ["name"]=> - string(3) "foo" - ["orgname"]=> - string(3) "foo" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(32768) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#6 (11) { - ["name"]=> - string(3) "bar" - ["orgname"]=> - string(3) "bar" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(0) - ["type"]=> - int(253) - ["decimals"]=> - int(0) -} - -=== fetch_field === -object(stdClass)#6 (11) { - ["name"]=> - string(3) "foo" - ["orgname"]=> - string(3) "foo" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(32768) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#5 (11) { - ["name"]=> - string(3) "bar" - ["orgname"]=> - string(3) "bar" - ["table"]=> - string(13) "test_affected" - ["orgtable"]=> - string(13) "test_affected" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(0) - ["type"]=> - int(253) - ["decimals"]=> - int(0) -} -done! ---UEXPECTF-- -=== fetch_fields === -array(2) { - [0]=> - object(stdClass)#5 (11) { [u"name"]=> unicode(3) "foo" [u"orgname"]=> @@ -354,4 +199,4 @@ object(stdClass)#5 (11) { [u"decimals"]=> int(0) } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index 73a6712fbc..f5415ee4c1 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -61,34 +61,8 @@ array(11) { [8]=> NULL [9]=> - string(4) "foo1" - [10]=> - string(4) "1000" -} -done! ---UEXPECTF-- -array(11) { - [0]=> - int(1) - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - [5]=> - NULL - [6]=> - NULL - [7]=> - NULL - [8]=> - NULL - [9]=> unicode(4) "foo1" [10]=> unicode(4) "1000" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index 5be8b40f3b..0f8c0e5fee 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -26,12 +26,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [0]=> - string(%d) "%s" -} -done! ---UEXPECTF-- -array(1) { - [0]=> unicode(%d) "%s" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 0efea3569c..f6c37663b6 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -62,41 +62,6 @@ require_once('skipifconnectfailure.inc'); bool(true) bool(true) object(mysqli_stmt)#%d (%d) { - ["affected_rows"]=> - int(-1) - ["insert_id"]=> - int(0) - ["num_rows"]=> - int(0) - ["param_count"]=> - int(0) - ["field_count"]=> - int(1) - ["errno"]=> - int(0) - ["error"]=> - string(0) "" - ["sqlstate"]=> - string(5) "00000" - ["id"]=> - int(3) -} -bool(true) -bool(false) -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]=> - string(1) "1" -} -done! ---UEXPECTF-- -bool(true) -bool(true) -object(mysqli_stmt)#%d (%d) { } bool(true) bool(false) diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index 32a735322d..2e6865d807 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -53,22 +53,10 @@ array(4) { [0]=> int(1) [1]=> - string(3) "foo" - [2]=> - int(2) - [3]=> - string(3) "bar" -} -done! ---UEXPECTF-- -array(4) { - [0]=> - int(1) - [1]=> unicode(3) "foo" [2]=> int(2) [3]=> unicode(3) "bar" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index b56dc26e2a..536d3d92db 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -42,8 +42,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECT-- -string(6) "foobar" -done! ---UEXPECT-- unicode(6) "foobar" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt index 52af2605c8..90f6f3d8d5 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -45,25 +45,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- test_class::__construct(1,2) object(test_class)#%d (7) { - ["c1"]=> - string(1) "0" - ["c2"]=> - string(5) "35999" - ["c3"]=> - NULL - ["c4"]=> - string(4) "-500" - ["c5"]=> - string(6) "-32768" - ["c6"]=> - string(1) "0" - ["c7"]=> - string(1) "0" -} -Done ---UEXPECTF-- -test_class::__construct(1,2) -object(test_class)#%d (7) { [u"c1"]=> unicode(1) "0" [u"c2"]=> diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index 22575aaecc..489ffa09b9 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -49,13 +49,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) unlink($filename); print "done!"; ?> ---EXPECT-- -foo-bar -string-string -rab-oof -string-string -done! ---UEXPECTF-- +--EXPECTF-- foo-bar unicode-unicode rab-oof diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index 9a4166973c..12090260d2 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -25,12 +25,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [0]=> - string(3) "foo" -} -done! ---UEXPECTF-- -array(1) { - [0]=> unicode(3) "foo" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index 26acae09c0..3321318229 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -21,6 +21,4 @@ require_once('skipifconnectfailure.inc'); var_dump($foo); ?> --EXPECT-- -string(3) "foo" ---UEXPECT-- unicode(3) "foo" diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt index 446fb2013b..da5e988fb7 100644 --- a/ext/mysqli/tests/068.phpt +++ b/ext/mysqli/tests/068.phpt @@ -8,6 +8,4 @@ mysqli get_client_info echo gettype($s); ?> --EXPECT-- -string ---UEXPECT-- unicode diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index f63cdd715c..6812c21a02 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -29,20 +29,10 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- array(1) { [1]=> - string(1) "1" -} -array(1) { - [2]=> - string(1) "2" -} -done! ---UEXPECTF-- -array(1) { - [1]=> unicode(1) "1" } array(1) { [2]=> unicode(1) "2" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index 23b474980a..785affb664 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -27,12 +27,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- int(1) int(1051) -string(26) "Unknown table 'not_exists'" -string(5) "HY000" -done! ---UEXPECTF-- -int(1) -int(1051) unicode(26) "Unknown table 'not_exists'" unicode(5) "HY000" -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt index 80e77c2ad2..f9274e0f0f 100644 --- a/ext/mysqli/tests/073.phpt +++ b/ext/mysqli/tests/073.phpt @@ -17,16 +17,8 @@ mysqli_driver properties --EXPECTF-- bool(%s) int(%d) -string(%d) "%s" -int(%d) -bool(%s) -int(%d) -done! ---UEXPECTF-- -bool(%s) -int(%d) unicode(%d) "%s" int(%d) bool(%s) int(%d) -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index d3765f9a2a..fda8181dec 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -25,21 +25,10 @@ require_once('skipifconnectfailure.inc'); bool(true) array(1) { [0]=> - string(1) "0" -} -bool(true) -array(1) { - [0]=> - string(1) "1" -} ---UEXPECTF-- -bool(true) -array(1) { - [0]=> unicode(1) "0" } bool(true) array(1) { [0]=> unicode(1) "1" -}
\ No newline at end of file +} diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index 9ddba23173..7b95a3ee18 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -35,83 +35,83 @@ echo "Done\n"; ?> --EXPECTF-- object(mysqli)#%d (%d) { - ["affected_rows"]=> + [u"affected_rows"]=> int(0) - ["client_info"]=> - string(%d) "%s" - ["client_version"]=> + [u"client_info"]=> + unicode(%d) "%s" + [u"client_version"]=> int(%d) - ["connect_errno"]=> + [u"connect_errno"]=> int(0) - ["connect_error"]=> - string(0) "" - ["errno"]=> + [u"connect_error"]=> + unicode(0) "" + [u"errno"]=> int(0) - ["error"]=> - string(0) "" - ["field_count"]=> + [u"error"]=> + unicode(0) "" + [u"field_count"]=> int(0) - ["host_info"]=> - string(%d) "MySQL host info: %s via %s%s" - ["info"]=> + [u"host_info"]=> + unicode(%d) "MySQL host info: %s via %s%s" + [u"info"]=> NULL - ["insert_id"]=> + [u"insert_id"]=> int(0) - ["server_info"]=> - string(%d) "%s" - ["server_version"]=> + [u"server_info"]=> + unicode(%d) "%s" + [u"server_version"]=> int(%d) - ["sqlstate"]=> - string(5) "00000" - ["protocol_version"]=> + [u"sqlstate"]=> + unicode(5) "00000" + [u"protocol_version"]=> int(10) - ["thread_id"]=> + [u"thread_id"]=> int(%d) - ["warning_count"]=> + [u"warning_count"]=> int(0) } object(mysqli)#%d (%d) { - ["affected_rows"]=> + [u"affected_rows"]=> NULL - ["client_info"]=> - string(%d) "%s" - ["client_version"]=> + [u"client_info"]=> + unicode(%d) "%s" + [u"client_version"]=> int(%d) - ["connect_errno"]=> + [u"connect_errno"]=> int(0) - ["connect_error"]=> - string(0) "" - ["errno"]=> + [u"connect_error"]=> + unicode(0) "" + [u"errno"]=> int(0) - ["error"]=> - string(0) "" - ["field_count"]=> + [u"error"]=> + unicode(0) "" + [u"field_count"]=> NULL - ["host_info"]=> + [u"host_info"]=> NULL - ["info"]=> + [u"info"]=> NULL - ["insert_id"]=> + [u"insert_id"]=> NULL - ["server_info"]=> + [u"server_info"]=> NULL - ["server_version"]=> + [u"server_version"]=> NULL - ["sqlstate"]=> + [u"sqlstate"]=> NULL - ["protocol_version"]=> + [u"protocol_version"]=> NULL - ["thread_id"]=> + [u"thread_id"]=> NULL - ["warning_count"]=> + [u"warning_count"]=> NULL } object(mysqli_warning)#%d (%d) { - ["message"]=> - string(25) "Column 'a' cannot be null" - ["sqlstate"]=> - string(5) "HY000" - ["errno"]=> + [u"message"]=> + unicode(25) "Column 'a' cannot be null" + [u"sqlstate"]=> + unicode(5) "HY000" + [u"errno"]=> int(1048) } Done diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt index 003ace9d11..e8b32cb355 100644 --- a/ext/mysqli/tests/bug37090.phpt +++ b/ext/mysqli/tests/bug37090.phpt @@ -35,14 +35,14 @@ array(6) { [0]=> bool(true) [1]=> - string(6) "latin1" + unicode(6) "latin1" [2]=> bool(true) [3]=> - string(4) "utf8" + unicode(4) "utf8" [4]=> bool(false) [5]=> - string(4) "utf8" + unicode(4) "utf8" } done! diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index 260806522c..9bf138a48b 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -136,23 +136,23 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Using CAST('somestring' AS CHAR)... -string(3) "one" -string(5) "three" -string(3) "two" +unicode(3) "one" +unicode(5) "three" +unicode(3) "two" Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)... -string(1) "1" -string(5) "three" -string(1) "2" +unicode(1) "1" +unicode(5) "three" +unicode(1) "2" Using integer only... int(1) int(303) int(2) Testing bind_param(), strings only... -string(3) "one" -string(5) "three" -string(3) "two" +unicode(3) "one" +unicode(5) "three" +unicode(3) "two" Testing bind_param(), strings only, with CAST AS CHAR... -string(3) "one" -string(32) "three beers are more than enough" -string(3) "two" +unicode(3) "one" +unicode(32) "three beers are more than enough" +unicode(3) "two" done! diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index 30ed9d074a..f2b33c3633 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -254,77 +254,6 @@ warning_count Magic, magic properties: mysqli->affected_rows = '%s'/integer ('%s'/integer) -mysqli->client_info = '%s'/string ('%s'/string) -mysqli->client_version = '%d'/integer ('%d'/integer) -mysqli->errno = '0'/integer ('0'/integer) -mysqli->error = ''/string (''/string) -mysqli->field_count = '0'/integer ('0'/integer) -mysqli->insert_id = '0'/integer ('0'/integer) -mysqli->sqlstate = '00000'/string ('00000'/string) -mysqli->host_info = '%s'/string ('%s'/string) -mysqli->info = ''/NULL (''/string) -mysqli->thread_id = '%d'/integer ('%d'/integer) -mysqli->protocol_version = '%d'/integer ('%d'/integer) -mysqli->server_info = '%s'/string ('%s'/string) -mysqli->server_version = '%d'/integer ('%d'/integer) -mysqli->warning_count = '0'/integer ('0'/integer) - -Access to undefined properties: -mysqli->unknown = '' -setting mysqli->unknown, mysqli_unknown = '13' -setting mysqli->unknown, mysqli_unknown = 'friday' - -Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation): -mysqli->connect_error = ''/string (''/string) -mysqli->connect_errno = '0'/integer ('0'/integer) -done! ---UEXPECTF-- -Parent class: -bool(false) - -Methods: -ok - -Class variables: -affected_rows -client_info -client_version -connect_errno -connect_error -errno -error -field_count -host_info -info -insert_id -protocol_version -server_info -server_version -sqlstate -thread_id -warning_count - -Object variables: -affected_rows -client_info -client_version -connect_errno -connect_error -errno -error -field_count -host_info -info -insert_id -server_info -server_version -sqlstate -protocol_version -thread_id -warning_count - -Magic, magic properties: -mysqli->affected_rows = '%s'/integer ('%s'/integer) mysqli->client_info = '%s'/unicode ('%s'/unicode) mysqli->client_version = '%d'/integer ('%d'/integer) mysqli->errno = '0'/integer ('0'/integer) diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index cd4206510e..5d15a67f4a 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt @@ -187,43 +187,6 @@ mysqli_result->unknown = '' Constructor: -Warning: mysqli_result::mysqli_result() expects parameter 2 to be long, string given in %s on line %d - -Warning: mysqli_result::mysqli_result() expects parameter 1 to be mysqli, string given in %s on line %d -done! ---UEXPECTF-- -Parent class: -bool(false) - -Methods: -ok - -Class variables: -current_field -field_count -lengths -num_rows -type - -Object variables: -current_field -field_count -lengths -num_rows -type - -Magic, magic properties: -mysqli_result->current_field = '0'/integer ('0'/integer) -mysqli_result->field_count = '2'/integer ('2'/integer) -mysqli_result->lengths -> '1 1'/array ('1 1'/array) -mysqli_result->num_rows = '6'/integer ('6'/integer) -mysqli_result->type = 'store'/integer - -Access to undefined properties: -mysqli_result->unknown = '' - -Constructor: - Warning: mysqli_result::mysqli_result() expects parameter 2 to be long, Unicode string given in %s on line %d Warning: mysqli_result::mysqli_result() expects parameter 1 to be mysqli, Unicode string given in %s on line %d diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index dce75af358..7532b742c9 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt @@ -187,61 +187,5 @@ stmt->unknown = '13' Prepare using the constructor: -Warning: mysqli_stmt::mysqli_stmt() expects parameter 2 to be string, object given in %s on line %d -done! ---UEXPECTF-- -Parent class: -bool(false) - -Methods: -ok - -Class variables: -affected_rows -errno -error -field_count -id -insert_id -num_rows -param_count -sqlstate - -Object variables: -affected_rows -insert_id -num_rows -param_count -field_count -errno -error -sqlstate -id - -Magic, magic properties: - -Warning: mysqli_stmt_affected_rows(): invalid object or resource mysqli_stmt - in %s on line %d - -Warning: main(): Property access is not allowed yet in %s on line %d - -Warning: main(): Property access is not allowed yet in %s on line %d -stmt->affected_rows = '' -stmt->affected_rows = '1' -stmt->errno = '0' -stmt->error = '' -stmt->field_count = '0' -stmt->id = '%d' -stmt->insert_id = '0' -stmt->num_rows = '0' -stmt->param_count = '0' -stmt->sqlstate = '00000' - -Access to undefined properties: -stmt->unknown = '' -stmt->unknown = '13' - -Prepare using the constructor: - Warning: mysqli_stmt::mysqli_stmt() expects parameter 2 to be binary string, object given in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index ebddca94b7..145cedaf6c 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -148,31 +148,6 @@ mysqli_connect() --EXPECTF-- Warning: mysqli_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d array(1) { - ["testing"]=> - string(21) "mysqli.default_socket" -} -array(1) { - ["testing"]=> - string(19) "mysqli.default_port" -} -array(1) { - ["testing"]=> - string(17) "mysqli.default_pw" -} -array(2) { - [0]=> - string(19) "mysqli.default_user" - ["testing"]=> - string(19) "mysqli.default_user" -} -array(1) { - [0]=> - string(19) "mysqli.default_host" -} -done! ---UEXPECTF-- -Warning: mysqli_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d -array(1) { [u"testing"]=> unicode(21) "mysqli.default_socket" } @@ -194,4 +169,4 @@ array(1) { [0]=> unicode(19) "mysqli.default_host" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index 6a72c249fe..bd14c39a9b 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -144,32 +144,6 @@ new mysqli() ?> --EXPECTF-- array(1) { - ["testing"]=> - string(21) "mysqli.default_socket" -} -array(1) { - ["testing"]=> - string(19) "mysqli.default_port" -} -array(1) { - ["testing"]=> - string(17) "mysqli.default_pw" -} -array(1) { - ["testing"]=> - string(19) "mysqli.default_user" -} -array(1) { - ["all_defaults"]=> - string(13) "have been set" -} -array(1) { - ["all_defaults"]=> - string(13) "have been set" -} -done! ---UEXPECTF-- -array(1) { [u"testing"]=> unicode(21) "mysqli.default_socket" } diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index c194ce6937..5bdca86629 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -74,16 +74,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - ["it_works"]=> - string(2) "ok" -} -array(1) { - ["syntax"]=> - string(18) "works also with oo" -} -done! ---UEXPECTF-- -array(1) { [u"it_works"]=> unicode(2) "ok" } @@ -91,4 +81,4 @@ array(1) { [u"syntax"]=> unicode(18) "works also with oo" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index 7089a6cbeb..52754cba44 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -48,8 +48,5 @@ mysqlnd.debug="t:O,/tmp/mysqli_debug_phpt.trace" print "done!"; ?> --EXPECTF-- -string(32) "t:O,/tmp/mysqli_debug_phpt.trace" -done! ---UEXPECTF-- unicode(32) "t:O,/tmp/mysqli_debug_phpt.trace" done! diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index b622f2897e..eb9b1b5d8b 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -44,14 +44,8 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -string(58) "Table 'няма_такава_таблица' doesn't exist" - -Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d -NULL -done! ---UEXPECTF-- unicode(41) "Table 'няма_такава_таблица' doesn't exist" Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d NULL -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index 7559b05034..84028f0294 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -303,137 +303,6 @@ array(2) { [0]=> array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "a" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" - } -} -[007] -array(2) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "a" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" - } -} -[008] -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - ["id"]=> - string(1) "1" - [1]=> - string(1) "a" - ["label"]=> - string(1) "a" - } - [1]=> - array(4) { - [0]=> - string(1) "2" - ["id"]=> - string(1) "2" - [1]=> - string(1) "b" - ["label"]=> - string(1) "b" - } -} -[010] -array(2) { - [0]=> - array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["label"]=> - string(1) "b" - } -} -[011] -NULL -[013] -array(2) { - [0]=> - array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["label"]=> - string(1) "b" - } -} -[016] -NULL -[017] -array(1) { - [0]=> - array(11) { - [0]=> - string(1) "1" - ["a"]=> - string(1) "2" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - ["c"]=> - string(1) "3" - [3]=> - string(1) "4" - ["C"]=> - string(1) "4" - [4]=> - NULL - ["d"]=> - NULL - [5]=> - 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! ---UEXPECTF-- -[005] -array(2) { - [0]=> - array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "a" diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index b0901e01a9..2c3cebb4e3 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -306,137 +306,6 @@ array(2) { [0]=> array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "a" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" - } -} -[007] -array(2) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "a" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" - } -} -[008] -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - ["id"]=> - string(1) "1" - [1]=> - string(1) "a" - ["label"]=> - string(1) "a" - } - [1]=> - array(4) { - [0]=> - string(1) "2" - ["id"]=> - string(1) "2" - [1]=> - string(1) "b" - ["label"]=> - string(1) "b" - } -} -[010] -array(2) { - [0]=> - array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["label"]=> - string(1) "b" - } -} -[011] -NULL -[013] -array(2) { - [0]=> - array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["label"]=> - string(1) "b" - } -} -[016] -NULL -[017] -array(1) { - [0]=> - array(11) { - [0]=> - string(1) "1" - ["a"]=> - string(1) "2" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - ["c"]=> - string(1) "3" - [3]=> - string(1) "4" - ["C"]=> - string(1) "4" - [4]=> - NULL - ["d"]=> - NULL - [5]=> - 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! ---UEXPECTF-- -[005] -array(2) { - [0]=> - array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "a" @@ -561,4 +430,4 @@ array(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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index 1b46d0d356..ae5dba9dbe 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -296,86 +296,6 @@ require_once('skipifconnectfailure.inc'); [005] array(4) { [0]=> - string(1) "1" - ["id"]=> - string(1) "1" - [1]=> - string(1) "a" - ["label"]=> - string(1) "a" -} -[006] -array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" -} -[007] -array(4) { - [0]=> - string(1) "3" - ["id"]=> - string(1) "3" - [1]=> - string(1) "c" - ["label"]=> - string(1) "c" -} -[008] -array(2) { - ["id"]=> - string(1) "4" - ["label"]=> - string(1) "d" -} -[009] -array(4) { - [0]=> - string(1) "5" - ["id"]=> - string(1) "5" - [1]=> - string(1) "e" - ["label"]=> - string(1) "e" -} -[011] -array(11) { - [0]=> - string(1) "1" - ["a"]=> - string(1) "2" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - ["c"]=> - string(1) "3" - [3]=> - string(1) "4" - ["C"]=> - string(1) "4" - [4]=> - NULL - ["d"]=> - NULL - [5]=> - 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 - -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! ---UEXPECTF-- -[005] -array(4) { - [0]=> unicode(1) "1" [u"id"]=> unicode(1) "1" @@ -451,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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index ac638848ac..b273829e22 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -31,22 +31,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [002] array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -[004] -array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -done! ---UEXPECTF-- -[002] -array(2) { [u"id"]=> unicode(1) "1" [u"label"]=> @@ -59,4 +43,4 @@ array(2) { [u"label"]=> unicode(1) "a" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index 816ea9fe19..f4b9b266ca 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -277,86 +277,6 @@ require_once('skipifconnectfailure.inc'); [005] array(4) { [0]=> - string(1) "1" - ["id"]=> - string(1) "1" - [1]=> - string(1) "a" - ["label"]=> - string(1) "a" -} -[006] -array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "b" -} -[007] -array(4) { - [0]=> - string(1) "3" - ["id"]=> - string(1) "3" - [1]=> - string(1) "c" - ["label"]=> - string(1) "c" -} -[008] -array(2) { - ["id"]=> - string(1) "4" - ["label"]=> - string(1) "d" -} -[009] -array(4) { - [0]=> - string(1) "5" - ["id"]=> - string(1) "5" - [1]=> - string(1) "e" - ["label"]=> - string(1) "e" -} -[011] -array(11) { - [0]=> - string(1) "1" - ["a"]=> - string(1) "2" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - ["c"]=> - string(1) "3" - [3]=> - string(1) "4" - ["C"]=> - string(1) "4" - [4]=> - NULL - ["d"]=> - NULL - [5]=> - 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 - -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! ---UEXPECTF-- -[005] -array(4) { - [0]=> unicode(1) "1" [u"id"]=> unicode(1) "1" @@ -432,4 +352,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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 00ca325f4f..05167eb057 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -70,52 +70,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [005] array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -[006] -NULL -[008] -array(15) { - ["a"]=> - string(1) "2" - ["c"]=> - string(1) "3" - ["C"]=> - string(1) "4" - ["d"]=> - NULL - ["e"]=> - string(1) "1" - [-1]=> - string(1) "5" - [-10]=> - string(1) "6" - [-100]=> - string(1) "7" - [-1000]=> - string(1) "8" - [10000]=> - string(1) "9" - [100000]=> - string(1) "a" - [1000000]=> - string(1) "b" - [9]=> - 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! ---UEXPECTF-- -[005] -array(2) { [u"id"]=> unicode(1) "1" [u"label"]=> @@ -158,4 +112,4 @@ array(15) { } Warning: mysqli_fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index 6050d5253f..9787179fd3 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt @@ -87,64 +87,6 @@ require_once('skipifconnectfailure.inc'); [002] array(2) { [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -[004] -array(2) { - ["a"]=> - string(1) "1" - [2]=> - string(1) "2" -} -[006] -array(2) { - ["a"]=> - string(1) "1" - [2]=> - string(1) "2" -} -[008] -array(2) { - ["a"]=> - string(1) "1" - [2]=> - string(1) "2" -} -[011] -array(2) { - [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -[014] -array(2) { - ["a"]=> - %s(1) "1" - [2]=> - %s(1) "2" -} -[017] -array(2) { - ["a"]=> - string(1) "1" - [2]=> - string(1) "2" -} -[017] -array(2) { - ["a"]=> - string(1) "1" - [2]=> - string(1) "2" -} -done! ---UEXPECTF-- -[002] -array(2) { - [1]=> unicode(1) "1" [2]=> unicode(1) "2" @@ -198,4 +140,4 @@ array(2) { [2]=> unicode(1) "2" } -done!
\ No newline at end of file +done! 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 5706f6b020..aa90c33a4b 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt @@ -82,90 +82,6 @@ mysqli_fetch_assoc() - utf8 --EXPECTF-- [003] array(3) { - ["Андрей Христов"]=> - string(1) "1" - ["Улф Вендел"]=> - string(1) "2" - ["Георг Рихтер"]=> - string(1) "3" -} -[009] -array(3) { - ["id"]=> - string(1) "4" - ["име"]=> - string(6) "Andrey" - ["фамилия"]=> - string(7) "Hristov" -} -array(3) { - ["id"]=> - string(1) "7" - ["име"]=> - string(9) "安德烈" - ["фамилия"]=> - string(7) "Hristov" -} -array(3) { - ["id"]=> - string(1) "5" - ["име"]=> - string(5) "Georg" - ["фамилия"]=> - string(7) "Richter" -} -array(3) { - ["id"]=> - string(1) "8" - ["име"]=> - string(9) "格奥尔" - ["фамилия"]=> - string(7) "Richter" -} -array(3) { - ["id"]=> - string(1) "6" - ["име"]=> - string(3) "Ulf" - ["фамилия"]=> - string(6) "Wendel" -} -array(3) { - ["id"]=> - string(1) "9" - ["име"]=> - string(9) "乌尔夫" - ["фамилия"]=> - string(6) "Wendel" -} -array(3) { - ["id"]=> - string(1) "3" - ["име"]=> - string(6) "Улф" - ["фамилия"]=> - string(12) "Вендел" -} -array(3) { - ["id"]=> - string(1) "2" - ["име"]=> - string(10) "Георг" - ["фамилия"]=> - string(12) "Рихтер" -} -array(3) { - ["id"]=> - string(1) "1" - ["име"]=> - string(12) "Андрей" - ["фамилия"]=> - string(14) "Христов" -} -done! ---UEXPECTF-- -[003] -array(3) { [u"Андрей Христов"]=> unicode(1) "1" [u"Улф Вендел"]=> @@ -246,4 +162,4 @@ array(3) { [u"фамилия"]=> unicode(7) "Христов" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index 1751848378..9175823180 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -57,32 +57,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- [005] array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -[006] -NULL -[008] -array(5) { - ["a"]=> - string(1) "2" - ["c"]=> - string(1) "3" - ["C"]=> - string(1) "4" - ["d"]=> - NULL - ["e"]=> - string(1) "1" -} - -Warning: mysqli_result::fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d -done! ---UEXPECTF-- -[005] -array(2) { [u"id"]=> unicode(1) "1" [u"label"]=> @@ -105,4 +79,4 @@ array(5) { } Warning: mysqli_result::fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index 9491191320..3b23598ff8 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -58,87 +58,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (11) { - ["name"]=> - string(2) "ID" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(1) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(254) - ["decimals"]=> - int(0) -} -bool(false) - -Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -array(1) { - ["_default_test"]=> - string(1) "2" -} -object(stdClass)#%d (11) { - ["name"]=> - string(13) "_default_test" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(32769) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -done! ---UEXPECTF-- -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "ID" [u"orgname"]=> @@ -217,4 +136,4 @@ object(stdClass)#%d (11) { [u"decimals"]=> int(0) } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index a11e0f6bea..76a5acf7c1 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -44,39 +44,6 @@ 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 (11) { - ["name"]=> - string(2) "ID" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(%d) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(%d) - ["type"]=> - int(%d) - ["decimals"]=> - int(%d) -} - -Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d -bool(false) - -Warning: mysqli_fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! ---UEXPECTF-- -Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d -bool(false) -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "ID" [u"orgname"]=> @@ -105,4 +72,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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 42f8156af2..5296fb9bc1 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -53,39 +53,6 @@ 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 (11) { - ["name"]=> - string(2) "ID" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(%d) - ["length"]=> - int(11) - ["charsetnr"]=> - int(%d) - ["flags"]=> - int(%d) - ["type"]=> - int(%d) - ["decimals"]=> - int(%d) -} - -Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d -bool(false) - -Warning: mysqli_result::fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! ---UEXPECTF-- -Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d -bool(false) -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "ID" [u"orgname"]=> @@ -114,4 +81,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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index fcc326f5f3..cc4b734557 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -45,59 +45,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (11) { - ["name"]=> - string(2) "ID" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(1) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(254) - ["decimals"]=> - int(0) -} -bool(false) - -Warning: mysqli_result::fetch_field(): Couldn't fetch mysqli_result in %s on line %d -done! ---UEXPECTF-- -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "ID" [u"orgname"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 3ddf854e1b..60c1adb532 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -39,58 +39,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- object(stdClass)#%d (11) { - ["name"]=> - string(2) "ID" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "TEST" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(1) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(254) - ["decimals"]=> - int(0) -} - -Warning: mysqli_fetch_fields(): Couldn't fetch mysqli_result in %s on line %d -done! ---UEXPECTF-- -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "ID" [u"orgname"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index 9c87aabf18..aeafd57026 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -47,21 +47,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- No exception with PHP: object(mysqli_fetch_object_test)#%d (%d) { - ["a"]=> - NULL - ["b"]=> - NULL -} - -Exception with mysqli. Note that at all other places we throws errors but no exceptions unless the error mode has been changed: -Exception: Class mysqli_fetch_object_test does not have a constructor hence you cannot use ctor_params - -Fatal error with PHP (but no exception!): - -Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d ---UEXPECTF-- -No exception with PHP: -object(mysqli_fetch_object_test)#%d (%d) { [%s"a"]=> NULL [%s"b"]=> @@ -73,4 +58,4 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you Fatal error with PHP (but no exception!): -Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d
\ No newline at end of file +Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index 22ec282eb1..1ea1cf24c3 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -41,22 +41,6 @@ require_once('skipifconnectfailure.inc'); [004] array(3) { [0]=> - string(1) "1" - [1]=> - string(1) "a" - [2]=> - string(1) "1" -} -[005] -NULL - -Warning: mysqli_fetch_row(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! ---UEXPECTF-- -[004] -array(3) { - [0]=> unicode(1) "1" [1]=> unicode(1) "a" @@ -68,4 +52,4 @@ NULL Warning: mysqli_fetch_row(): Couldn't fetch mysqli_result in %s on line %d NULL -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index c3065dd494..52a566af12 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -105,120 +105,6 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_field_seek(): Invalid field offset in %s on line %d bool(false) object(stdClass)#%d (11) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -bool(true) -object(stdClass)#%d (11) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -bool(true) -object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(1) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(254) - ["decimals"]=> - int(0) -} -int(2) - -Warning: mysqli_field_seek(): Invalid field offset in %s on line %d -bool(false) -bool(false) - -Warning: mysqli_field_seek(): Invalid field offset in %s on line %d -bool(false) -bool(true) -object(stdClass)#3 (11) { - ["name"]=> - string(5) "_null" - ["orgname"]=> - string(0) "" - ["table"]=> - string(0) "" - ["orgtable"]=> - string(0) "" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(0) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(32896) - ["type"]=> - int(6) - ["decimals"]=> - int(0) -} - -Warning: mysqli_field_seek(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! ---UEXPECTF-- -Warning: mysqli_field_seek(): Invalid field offset in %s on line %d -bool(false) -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "id" [u"orgname"]=> @@ -328,4 +214,4 @@ object(stdClass)#3 (11) { Warning: mysqli_field_seek(): Couldn't fetch mysqli_result in %s on line %d NULL -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index fae8bc4d7f..2db9b87e83 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -61,52 +61,6 @@ Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line NULL int(0) object(stdClass)#%d (11) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -bool(false) -int(1) - -Warning: mysqli_field_seek(): Invalid field offset in %s on line %d -bool(false) -int(1) - -Warning: mysqli_field_seek(): Invalid field offset in %s on line %d -bool(false) -int(1) -bool(true) -int(0) - -Warning: mysqli_field_tell(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! ---UEXPECTF-- -int(0) - -Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line %d -NULL -int(0) -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "id" [u"orgname"]=> @@ -145,4 +99,4 @@ int(0) Warning: mysqli_field_tell(): Couldn't fetch mysqli_result in %s on line %d NULL -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index bede1b40b4..ac71c6df41 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -236,20 +236,6 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { ?> --EXPECTF-- array(1) { - ["message"]=> - string(20) "dumped by the parent" -} - child start - child array - parent conti - child array - parent conti - child array - parent conti - child stop -done! ---UEXPECTF-- -array(1) { [u"message"]=> unicode(20) "dumped by the parent" } @@ -261,4 +247,4 @@ array(1) { child array parent conti child stop -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_get_cache_stats.phpt b/ext/mysqli/tests/mysqli_get_cache_stats.phpt index 6f068f9227..2726175ee2 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats.phpt @@ -92,24 +92,6 @@ if (ini_get("unicode.semantics")) { ?> --EXPECTF-- array(7) { - ["put_hits"]=> - int(0) - ["put_misses"]=> - int(0) - ["get_hits"]=> - int(0) - ["get_misses"]=> - int(0) - ["size"]=> - int(%d) - ["free_items"]=> - int(%d) - ["references"]=> - int(%d) -} -done! ---UEXPECTF-- -array(7) { [u"put_hits"]=> int(0) [u"put_misses"]=> @@ -125,4 +107,4 @@ array(7) { [u"references"]=> int(%d) } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index e59f029ed1..a162419f7e 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -860,259 +860,6 @@ mysqlnd.collect_memory_statistics=1 ?> --EXPECTF-- array(119) { - ["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_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_ammount"]=> - string(1) "0" - ["mem_ecalloc_count"]=> - string(1) "0" - ["mem_ecalloc_ammount"]=> - string(1) "0" - ["mem_erealloc_count"]=> - string(1) "0" - ["mem_erealloc_ammount"]=> - string(1) "0" - ["mem_efree_count"]=> - string(1) "0" - ["mem_malloc_count"]=> - string(1) "0" - ["mem_malloc_ammount"]=> - string(1) "0" - ["mem_calloc_count"]=> - string(1) "0" - ["mem_calloc_ammount"]=> - string(1) "0" - ["mem_realloc_count"]=> - string(1) "0" - ["mem_realloc_ammount"]=> - string(1) "0" - ["mem_free_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_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" -} -Testing buffered normal... -Testing buffered normal... - SELECT id, label FROM test -Testing unbuffered normal... -Testing unbuffered normal... - SELECT id, label FROM test, not all fetched -Testing if implicit fetching and cleaning happens... -Testing buffered Prepared Statements... -Testing buffered Prepared Statements... - fetching all -Testing buffered Prepared Statements... - fetching all but one -Testing unbuffered Prepared Statements... - fetching all -Testing unbuffered Prepared Statements... - fetching all but one -... done with fetch statistics -done! ---UEXPECTF-- -array(119) { [u"bytes_sent"]=> unicode(1) "0" [u"bytes_received"]=> diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index 44a1828d4e..8e1665dd97 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -66,55 +66,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_kill(): processid should have positive value in %s on line %d -string(%d) "%s" -bool(false) -object(mysqli)#%d (%d) { - ["affected_rows"]=> - int(-1) - ["client_info"]=> - string(%d) "%s" - ["client_version"]=> - int(%d) - ["connect_errno"]=> - int(0) - ["connect_error"]=> - string(0) "" - ["errno"]=> - int(2006) - ["error"]=> - string(26) "MySQL server has gone away" - ["field_count"]=> - int(0) - ["host_info"]=> - string(42) "MySQL host info: Localhost via UNIX socket" - ["info"]=> - string(38) "Records: 6 Duplicates: 0 Warnings: 0" - ["insert_id"]=> - int(0) - ["server_info"]=> - string(%d) "%s" - ["server_version"]=> - int(%d) - ["sqlstate"]=> - string(5) "HY000" - ["protocol_version"]=> - int(10) - ["thread_id"]=> - int(%d) - ["warning_count"]=> - int(0) -} - -Warning: mysqli_kill(): processid should have positive value in %s on line %d -array(1) { - ["id"]=> - string(1) "1" -} - -Warning: mysqli_kill(): processid should have positive value in %s on line %d -done! ---UEXPECTF-- -Warning: mysqli_kill(): processid should have positive value in %s on line %d unicode(%d) "%s" bool(false) object(mysqli)#%d (0) { diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index 61d5624515..aad0182a40 100755 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -91,5 +91,3 @@ mysqli.max_persistent=2 ?> --EXPECTF-- done! ---UEXPECTF-- -done! diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index 8b47728c1e..f93dcc89fa 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -140,22 +140,6 @@ mysqli.max_persistent=2 ?> --EXPECTF-- array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} - -Warning: mysqli_connect(): Too many open persistent links (%d) in %s on line %d -done! ---UEXPECTF-- -array(2) { [u"id"]=> unicode(1) "1" [u"label"]=> @@ -169,4 +153,4 @@ array(2) { } Warning: mysqli_connect(): Too many open persistent links (%d) in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 18f65e2371..910338127e 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -114,19 +114,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - ["valid"]=> - string(30) "this is sql but with semicolon" -} -array(1) { - [""]=> - string(1) "a" -} -string(1) "a" - -Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d -done! ---UEXPECTF-- -array(1) { [u"valid"]=> unicode(30) "this is sql but with semicolon" } @@ -137,4 +124,4 @@ array(1) { unicode(1) "a" Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 051b541fdb..a1d4fa6786 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -152,36 +152,6 @@ END;')) { ?> --EXPECTF-- array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -array(2) { - ["id"]=> - string(1) "1" - ["label"]=> - string(1) "a" -} -array(1) { - ["id"]=> - string(1) "1" -} -done! ---UEXPECTF-- -array(2) { [u"id"]=> unicode(1) "1" [u"label"]=> @@ -209,4 +179,4 @@ array(1) { [u"id"]=> unicode(1) "1" } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt index 3b2a3dd710..99113233c6 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -125,17 +125,9 @@ mysqli_close($link); ?> --EXPECTF-- array(1) { - ["правилен"]=> - string(59) "това ескюел, но с точка и запетая" -} - -Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d -done! ---UEXPECTF-- -array(1) { [u"правилен"]=> unicode(33) "това ескюел, но с точка и запетая" } Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index 646686c027..c0794adc9c 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -173,39 +173,39 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d object(mysqli)#%d (%d) { - ["affected_rows"]=> + [u"affected_rows"]=> NULL - ["client_info"]=> - string(%d) "%s" - ["client_version"]=> + [u"client_info"]=> + unicode(%d) "%s" + [u"client_version"]=> int(%d) - ["connect_errno"]=> + [u"connect_errno"]=> int(%d) - ["connect_error"]=> - string(%d) "%s" - ["errno"]=> + [u"connect_error"]=> + unicode(%d) "%s" + [u"errno"]=> int(%d) - ["error"]=> - string(%d) "%s" - ["field_count"]=> + [u"error"]=> + unicode(%d) "%s" + [u"field_count"]=> NULL - ["host_info"]=> + [u"host_info"]=> NULL - ["info"]=> + [u"info"]=> NULL - ["insert_id"]=> + [u"insert_id"]=> NULL - ["server_info"]=> + [u"server_info"]=> NULL - ["server_version"]=> + [u"server_version"]=> NULL - ["sqlstate"]=> + [u"sqlstate"]=> NULL - ["protocol_version"]=> + [u"protocol_version"]=> NULL - ["thread_id"]=> + [u"thread_id"]=> NULL - ["warning_count"]=> + [u"warning_count"]=> NULL } done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index bdbcc19c14..c9b24a8a53 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -59,12 +59,6 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- array(1) { - ["label"]=> - string(1) "\" -} -done! ---UEXPECTF-- -array(1) { [u"label"]=> unicode(1) "\" } diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index e151a9b48d..66e0823420 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -91,17 +91,9 @@ ver_param;')) { ?> --EXPECTF-- array(1) { - ["valid"]=> - string(30) "this is sql but with semicolon" -} - -Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d -done! ---UEXPECTF-- -array(1) { [u"valid"]=> unicode(30) "this is sql but with semicolon" } Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index 291c42ca3b..70a8ff81a9 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -80,68 +80,6 @@ require_once('skipifconnectfailure.inc'); array(7) refcount(2){ [0]=> array(2) refcount(1){ - ["id"]=> - long(1) refcount(1) - ["label"]=> - string(1) "a" refcount(1) - } - [1]=> - array(2) refcount(1){ - ["id"]=> - long(2) refcount(1) - ["label"]=> - string(1) "b" refcount(1) - } - [2]=> - array(2) refcount(1){ - ["id"]=> - long(1) refcount(1) - ["label"]=> - string(1) "a" refcount(1) - } - [3]=> - array(2) refcount(1){ - ["id"]=> - long(2) refcount(1) - ["label"]=> - string(1) "b" refcount(1) - } - [4]=> - array(3) refcount(1){ - ["id"]=> - &long(3) refcount(2) - ["label"]=> - string(1) "a" refcount(1) - ["id2"]=> - &long(3) refcount(2) - } - [5]=> - array(3) refcount(1){ - ["id"]=> - &long(4) refcount(2) - ["label"]=> - string(1) "b" refcount(1) - ["id2"]=> - &long(4) refcount(2) - } - [6]=> - &object(mysqli_result)#2 (0) refcount(2){ - } -} -array(1) refcount(2){ - [0]=> - array(2) refcount(1){ - ["id"]=> - string(1) "1" refcount(1) - ["label"]=> - string(1) "a" refcount(1) - } -} -done! ---UEXPECTF-- -array(7) refcount(2){ - [0]=> - array(2) refcount(1){ [u"id" { 0069 0064 }]=> long(1) refcount(1) [u"label" { 006c 0061 0062 0065 006c }]=> diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 8e2dcf2aca..79e2fae0d4 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -55,49 +55,6 @@ if (!$IS_MYSQLND) array(2) refcount(2){ [0]=> array(4) refcount(1){ - ["row_ref"]=> - &NULL refcount(2) - ["row_copy"]=> - array(2) refcount(1){ - ["id"]=> - string(1) "1" refcount(2) - ["label"]=> - string(1) "a" refcount(2) - } - ["id_ref"]=> - string(1) "1" refcount(1) - ["id_copy"]=> - string(1) "1" refcount(1) - } - [1]=> - array(5) refcount(1){ - ["row_ref"]=> - &array(2) refcount(2){ - ["id"]=> - &string(1) "2" refcount(2) - ["label"]=> - string(1) "b" refcount(3) - } - ["row_copy"]=> - array(2) refcount(1){ - ["id"]=> - string(1) "2" refcount(2) - ["label"]=> - string(1) "b" refcount(3) - } - ["id_ref"]=> - &string(1) "2" refcount(2) - ["id_copy"]=> - string(1) "2" refcount(1) - ["id_copy_mod"]=> - long(2) refcount(1) - } -} -done! ---UEXPECTF-- -array(2) refcount(2){ - [0]=> - array(4) refcount(1){ [u"row_ref" { 0072 006f 0077 005f 0072 0065 0066 }]=> &NULL refcount(2) [u"row_copy" { 0072 006f 0077 005f 0063 006f 0070 0079 }]=> @@ -136,4 +93,4 @@ array(2) refcount(2){ long(2) refcount(1) } } -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt index 751d4b9643..d760b58f1a 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt @@ -176,39 +176,6 @@ Callback: 0 Callback: 1 [037] More results than expected! array(2) { - ["id"]=> - string(2) "97" - ["label"]=> - string(1) "x" -} -array(2) { - ["id"]=> - string(2) "98" - ["label"]=> - string(1) "y" -} -array(2) { - ["id"]=> - string(2) "99" - ["label"]=> - string(1) "z" -} -Callback set to 'callback_error' -Callback: 0 -[042] LOAD DATA failed, [2000] How to access this error? -done! ---UEXPECTF-- -Callback set to 'callback_simple' -Callback: 0 -Callback: 1 -Callback set to 'callback_fclose' -Callback: 0 -[022] LOAD DATA failed, [2000] File handle closed in handler -Callback set to 'callback_invalid_args' -Callback: 0 -Callback: 1 -[037] More results than expected! -array(2) { [u"id"]=> unicode(2) "97" [u"label"]=> 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 bddc6c2bfb..358940f5ff 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -331,38 +331,6 @@ if (version_compare(PHP_VERSION, '5.3.0-dev') == -1) --EXPECTF-- Regular, procedural, using variables int(1) -string(1) "a" -Call user func, procedural, using references for everything -int(1) -string(1) "a" -Call user func, object oriented, using references for everything -int(1) -string(1) "a" -Call user func, object oriented, using variable for types. using references for bound parameter -int(1) -string(1) "a" -Call user func, object oriented, using constant for types. using references for bound parameter -int(1) -string(1) "a" -Call user func, procedural, using references for everything but using variable for types -int(1) -string(1) "a" -Call user func, procedural, using references for bound parameter, using variables for resource and types -int(1) -string(1) "a" -Call user func, procedural, using references for bound parameter, using variables for resource and types -int(1) -string(1) "a" -Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types -int(1) -string(1) "a" -Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types, array -int(1) -string(1) "a" -done! ---UEXPECTF-- -Regular, procedural, using variables -int(1) unicode(1) "a" Call user func, procedural, using references for everything int(1) 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 5aab1a6777..4e6c1572cc 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 @@ -65,48 +65,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Test 1: object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} -фубар - -Test 2: -object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} ---- -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} ---- -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} ---- -фубар - 0 - -Test 3: -object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} -0 - фубар - -done! ---UEXPECTF-- -Test 1: -object(foo)#3 (1) { [u"bar"]=> unicode(5) "фубар" } 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 e9c3ad450e..7ca8b3fe2d 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -122,5 +122,3 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- done! ---UEXPECTF-- -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 f5f08ac672..62c32c4197 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -316,15 +316,5 @@ Warning: mysqli_stmt_bind_result(): Number of bind variables doesn't match numbe Warning: mysqli_stmt_bind_result(): Number of bind variables doesn't match number of fields in prepared statement in %s on line %d int(1) -%s(1) "a" -done! ---UEXPECTF-- -Warning: mysqli_stmt_bind_result(): invalid object or resource mysqli_stmt - in %s on line %d - -Warning: mysqli_stmt_bind_result(): Number of bind variables doesn't match number of fields in prepared statement in %s on line %d - -Warning: mysqli_stmt_bind_result(): Number of bind variables doesn't match number of fields in prepared statement in %s on line %d -int(1) unicode(1) "a" done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 4934177182..e5ce6a18eb 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -153,5 +153,3 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- done! ---UEXPECTF-- -done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index 1857805676..794754f369 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -245,73 +245,6 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- plain vanilla... int(1) -string(1) "a" -reference, one level... -int(1) -int(1) -string(1) "a" -string(1) "a" -reference, two levels... -int(1) -int(1) -int(1) -string(1) "a" -string(1) "a" -string(1) "a" -reference, $GLOBALS... -int(1) -int(1) -string(1) "a" -string(1) "a" -reference, same target... -string(1) "a" -string(1) "a" -reference, simple object... -int(1) -string(1) "a" -reference, simple object w reference... -int(1) -string(1) "a" -reference, simple object w reference, change after bind... -int(1) -int(1) -string(1) "a" -int(1) -reference, one level, change after bind... -int(1) -int(1) -string(1) "a" -string(1) "a" -reference, circle... -int(1) -string(1) "a" -string(1) "a" -reference, object, forward declaration... -int(1) -object(bar)#%d (2) { - ["bar"]=> - &string(1) "a" - ["foo"]=> - &string(1) "a" -} -string(1) "a" -references, object, private... -int(1) -string(1) "a" -object(mega_bar)#5 (4) { - [%s]=> - &int(1) - ["id_ref"]=> - &int(1) - ["bar"]=> - &string(1) "a" - ["foo"]=> - &string(1) "a" -} -done! ---UEXPECTF-- -plain vanilla... -int(1) unicode(1) "a" reference, one level... int(1) diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 27b66c0c0c..b012745833 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -71,32 +71,6 @@ NULL ALTER bool(true) bool(false) -string(34) "Unknown column 'a' in 'field list'" ----- Row 1 -bool(false) -int(2) ----- Row 2 -bool(false) -int(2) ----- Row 3 -bool(false) ----- -done! ---UEXPECTF-- -bool(true) -bool(true) ----- Row 1 -bool(true) -int(1) ----- Row 2 -bool(true) -int(2) ----- Row 3 -NULL ----- -ALTER -bool(true) -bool(false) unicode(34) "Unknown column 'a' in 'field list'" ---- Row 1 bool(false) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index 3c586508cf..54653c79b9 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -167,32 +167,6 @@ 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) { - ["id"]=> - int(1) - ["label"]=> - %s(1) "a" -} -array(2) { - ["id"]=> - int(2) - ["label"]=> - %s(1) "b" -} - -Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done! ---UEXPECTF-- -Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt - in %s on line %d - -Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt - in %s on line %d - -Warning: mysqli_stmt_get_result(): invalid object or resource mysqli_stmt - in %s on line %d -[038] [2014] [Commands out of sync; you can't run this command now] -[039] [0] [] -array(2) { [%s"id"]=> int(1) [%s"label"]=> @@ -206,4 +180,4 @@ array(2) { } Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index 4ba8e24544..95f1704b75 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -153,25 +153,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- array(2) { - ["id"]=> - int(1) - ["label"]=> - string(1) "a" -} -NULL -array(2) { - ["id"]=> - int(1) - ["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! ---UEXPECTF-- -array(2) { [u"id"]=> int(1) [u"label"]=> @@ -188,4 +169,4 @@ 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!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index afaa5765d9..44f94c25f6 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -208,32 +208,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- array(2) { - ["id"]=> - int(1) - ["label"]=> - string(1) "a" -} -NULL -bool(false) -bool(false) -id -label -_id -_label -_null -_label_concat - -Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL - -Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL - -Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! ---UEXPECTF-- -array(2) { [u"id"]=> int(1) [u"label"]=> @@ -257,4 +231,4 @@ NULL Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d NULL -done!
\ No newline at end of file +done! 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 12489cef5d..a8a52818de 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 @@ -41,104 +41,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- object(stdClass)#%d (11) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(1) - ["length"]=> - int(1) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(254) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(3) "_id" - ["orgname"]=> - string(0) "" - ["table"]=> - string(0) "" - ["orgtable"]=> - string(0) "" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(%d) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(32897) - ["type"]=> - int(8) - ["decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - ["name"]=> - string(8) "___label" - ["orgname"]=> - string(0) "" - ["table"]=> - string(0) "" - ["orgtable"]=> - string(0) "" - ["def"]=> - string(0) "" - ["max_length"]=> - int(2) - ["length"]=> - int(2) - ["charsetnr"]=> - int(8) - ["flags"]=> - int(0) - ["type"]=> - int(253) - ["decimals"]=> - int(31) -} -done! ---UEXPECTF-- -object(stdClass)#%d (11) { [u"name"]=> unicode(2) "id" [u"orgname"]=> @@ -234,4 +136,4 @@ object(stdClass)#%d (11) { [u"decimals"]=> int(31) } -done!
\ No newline at end of file +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 12e33f2209..159c45a2ab 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -90,5 +90,3 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --EXPECTF-- done! ---UEXPECTF-- -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 73b67a515f..3554761207 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -98,37 +98,6 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt in %s on line %d object(stdClass)#5 (%d) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> - int(0) - ["length"]=> - int(11) - ["charsetnr"]=> - int(63) - ["flags"]=> - int(49155) - ["type"]=> - int(3) - ["decimals"]=> - int(0) -} - -Warning: mysqli_stmt_result_metadata(): Couldn't fetch mysqli_stmt in %s on line %d -done! ---UEXPECTF-- - -Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt - in %s on line %d -object(stdClass)#5 (%d) { [u"name"]=> unicode(2) "id" [u"orgname"]=> @@ -154,4 +123,4 @@ object(stdClass)#5 (%d) { } Warning: mysqli_stmt_result_metadata(): Couldn't fetch mysqli_stmt in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index 80b9642c74..4426fd66db 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -225,5 +225,3 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- done! ---UEXPECTF-- -done!
\ No newline at end of file |