uw Wed Jul 1 15:31:33 2009 UTC Modified files: /php-src/ext/mysql/tests 001.phpt 002.phpt 003.phpt mysql_escape_string.phpt mysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch_object.phpt mysql_fetch_row.phpt mysql_field_name.phpt mysql_field_seek.phpt mysql_field_table.phpt mysql_field_type.phpt mysql_pconn_max_links.phpt mysql_query_load_data_openbasedir.phpt mysql_query.phpt mysql_real_escape_string.phpt mysql_result.phpt mysql_select_db.phpt mysql_set_charset.phpt mysql_tablename.phpt mysql_trace_mode.phpt mysql_unbuffered_query.phpt Log: Changing tests to run with both PHP 6 and PHP 5.3 to make future MFH easier. Basically three changes over all files: a) s/unicode(/%unicode|string% b) s/[u/[%u|b% c) s/unicode.semantics/version_compare
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/001.phpt diff -u php-src/ext/mysql/tests/001.phpt:1.6 php-src/ext/mysql/tests/001.phpt:1.7 --- php-src/ext/mysql/tests/001.phpt:1.6 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/001.phpt Wed Jul 1 15:31:32 2009 @@ -26,5 +26,5 @@ print "done!"; ?> --EXPECTF-- -unicode(2) "11" +%unicode|string%(2) "11" done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/002.phpt diff -u php-src/ext/mysql/tests/002.phpt:1.4 php-src/ext/mysql/tests/002.phpt:1.5 --- php-src/ext/mysql/tests/002.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/002.phpt Wed Jul 1 15:31:32 2009 @@ -39,19 +39,19 @@ bool(true) resource(%d) of type (mysql result) array(3) { - [u"col1"]=> - unicode(1) "1" - [u"col2"]=> - unicode(3) "foo" - [u"col3"]=> - unicode(3) "bar" + [%u|b%"col1"]=> + %unicode|string%(1) "1" + [%u|b%"col2"]=> + %unicode|string%(3) "foo" + [%u|b%"col3"]=> + %unicode|string%(3) "bar" } array(3) { - [u"col1"]=> - unicode(1) "2" - [u"col2"]=> - unicode(3) "foo" - [u"col3"]=> - unicode(3) "bar" + [%u|b%"col1"]=> + %unicode|string%(1) "2" + [%u|b%"col2"]=> + %unicode|string%(3) "foo" + [%u|b%"col3"]=> + %unicode|string%(3) "bar" } done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/003.phpt diff -u php-src/ext/mysql/tests/003.phpt:1.4 php-src/ext/mysql/tests/003.phpt:1.5 --- php-src/ext/mysql/tests/003.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/003.phpt Wed Jul 1 15:31:32 2009 @@ -55,31 +55,31 @@ --EXPECTF-- ==stdClass== object(stdClass)#%d (1) { - [u"a"]=> - unicode(3) "one" + [%u|b%"a"]=> + %unicode|string%(3) "one" } object(stdClass)#%d (1) { - [u"a"]=> - unicode(3) "two" + [%u|b%"a"]=> + %unicode|string%(3) "two" } object(stdClass)#%d (1) { - [u"a"]=> - unicode(5) "three" + [%u|b%"a"]=> + %unicode|string%(5) "three" } ==class24== class24::__construct object(class24)#%d (1) { - [u"a"]=> - unicode(3) "one" + [%u|b%"a"]=> + %unicode|string%(3) "one" } class24::__construct object(class24)#%d (1) { - [u"a"]=> - unicode(3) "two" + [%u|b%"a"]=> + %unicode|string%(3) "two" } class24::__construct object(class24)#%d (1) { - [u"a"]=> - unicode(5) "three" + [%u|b%"a"]=> + %unicode|string%(5) "three" } done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_escape_string.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/mysql_escape_string.phpt diff -u php-src/ext/mysql/tests/mysql_escape_string.phpt:1.3 php-src/ext/mysql/tests/mysql_escape_string.phpt:1.4 --- php-src/ext/mysql/tests/mysql_escape_string.phpt:1.3 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_escape_string.phpt Wed Jul 1 15:31:32 2009 @@ -23,11 +23,11 @@ print "done!"; ?> --EXPECTF-- -unicode(31) "Am I a unicode string in PHP 6?" -unicode(2) "\\" -unicode(2) "\"" -unicode(2) "\'" -unicode(2) "\n" -unicode(2) "\r" -unicode(8) "foo\0bar" +%unicode|string%(31) "Am I a unicode string in PHP 6?" +%unicode|string%(2) "\\" +%unicode|string%(2) "\"" +%unicode|string%(2) "\'" +%unicode|string%(2) "\n" +%unicode|string%(2) "\r" +%unicode|string%(8) "foo\0bar" done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.6 php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.7 --- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.6 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_fetch_array.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_fetch_array() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -281,74 +281,74 @@ [005] array(4) { [0]=> - unicode(1) "1" - [u"id"]=> - unicode(1) "1" + %unicode|string%(1) "1" + [%u|b%"id"]=> + %unicode|string%(1) "1" [1]=> - unicode(1) "a" - [u"label"]=> - unicode(1) "a" + %unicode|string%(1) "a" + [%u|b%"label"]=> + %unicode|string%(1) "a" } [006] array(2) { [0]=> - unicode(1) "2" + %unicode|string%(1) "2" [1]=> - unicode(1) "b" + %unicode|string%(1) "b" } [007] array(4) { [0]=> - unicode(1) "3" - [u"id"]=> - unicode(1) "3" + %unicode|string%(1) "3" + [%u|b%"id"]=> + %unicode|string%(1) "3" [1]=> - unicode(1) "c" - [u"label"]=> - unicode(1) "c" + %unicode|string%(1) "c" + [%u|b%"label"]=> + %unicode|string%(1) "c" } [008] array(2) { - [u"id"]=> - unicode(1) "4" - [u"label"]=> - unicode(1) "d" + [%u|b%"id"]=> + %unicode|string%(1) "4" + [%u|b%"label"]=> + %unicode|string%(1) "d" } [009] array(4) { [0]=> - unicode(1) "5" - [u"id"]=> - unicode(1) "5" + %unicode|string%(1) "5" + [%u|b%"id"]=> + %unicode|string%(1) "5" [1]=> - unicode(1) "e" - [u"label"]=> - unicode(1) "e" + %unicode|string%(1) "e" + [%u|b%"label"]=> + %unicode|string%(1) "e" } [011] array(11) { [0]=> - unicode(1) "1" - [u"a"]=> - unicode(1) "2" + %unicode|string%(1) "1" + [%u|b%"a"]=> + %unicode|string%(1) "2" [1]=> - unicode(1) "2" + %unicode|string%(1) "2" [2]=> - unicode(1) "3" - [u"c"]=> - unicode(1) "3" + %unicode|string%(1) "3" + [%u|b%"c"]=> + %unicode|string%(1) "3" [3]=> - unicode(1) "4" - [u"C"]=> - unicode(1) "4" + %unicode|string%(1) "4" + [%u|b%"C"]=> + %unicode|string%(1) "4" [4]=> NULL - [u"d"]=> + [%u|b%"d"]=> NULL [5]=> - unicode(1) "1" - [u"e"]=> - unicode(1) "1" + %unicode|string%(1) "1" + [%u|b%"e"]=> + %unicode|string%(1) "1" } Warning: mysql_fetch_array(): %d is not a valid MySQL result resource in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.6 php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.7 --- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.6 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Wed Jul 1 15:31:32 2009 @@ -61,39 +61,39 @@ --EXPECTF-- [005] array(2) { - [u"id"]=> - unicode(1) "1" - [u"label"]=> - unicode(1) "a" + [%u|b%"id"]=> + %unicode|string%(1) "1" + [%u|b%"label"]=> + %unicode|string%(1) "a" } [006] bool(false) [008] array(5) { - [u"a"]=> - unicode(1) "2" - [u"c"]=> - unicode(1) "3" - [u"C"]=> - unicode(1) "4" - [u"d"]=> + [%u|b%"a"]=> + %unicode|string%(1) "2" + [%u|b%"c"]=> + %unicode|string%(1) "3" + [%u|b%"C"]=> + %unicode|string%(1) "4" + [%u|b%"d"]=> NULL - [u"e"]=> - unicode(1) "1" + [%u|b%"e"]=> + %unicode|string%(1) "1" } Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on line %d [010] array(5) { - [u"id"]=> - unicode(1) "1" - [u"label"]=> - unicode(1) "a" - [u"_id"]=> - unicode(1) "1" - [u"_label"]=> - unicode(2) "aa" - [u"_foo"]=> + [%u|b%"id"]=> + %unicode|string%(1) "1" + [%u|b%"label"]=> + %unicode|string%(1) "a" + [%u|b%"_id"]=> + %unicode|string%(1) "1" + [%u|b%"_label"]=> + %unicode|string%(2) "aa" + [%u|b%"_foo"]=> NULL } done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_field.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.7 php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.8 --- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.7 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_fetch_field.phpt Wed Jul 1 15:31:32 2009 @@ -39,13 +39,13 @@ if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 1", $link)) { printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link)); } - if (false !== ($tmp = mysql_fetch_field($res, PHP_INT_MAX * 2))) - printf("[006] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysql_fetch_field($res, PHP_INT_MAX - 1))) + printf("[006] Expecting boolean/false got %s/%s\n", gettype($tmp), var_export($tmp, true)); mysql_free_result($res); if (false !== ($tmp = mysql_fetch_field($res))) - printf("[007] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + printf("[007] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true)); $types = array( 'BIT' => array(1, 'int'), @@ -135,59 +135,59 @@ ?> --EXPECTF-- object(stdClass)#%d (13) { - [u"name"]=> - unicode(2) "ID" - [u"table"]=> - unicode(4) "TEST" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "ID" + [%u|b%"table"]=> + %unicode|string%(4) "TEST" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(1) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(1) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(1) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(3) "int" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(3) "int" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } object(stdClass)#%d (13) { - [u"name"]=> - unicode(5) "label" - [u"table"]=> - unicode(4) "TEST" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(5) "label" + [%u|b%"table"]=> + %unicode|string%(4) "TEST" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(0) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(0) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(0) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(6) "string" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(6) "string" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } bool(false) @@ -196,59 +196,59 @@ Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on line %d object(stdClass)#%d (13) { - [u"name"]=> - unicode(2) "id" - [u"table"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "id" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(0) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(0) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(1) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(3) "int" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(3) "int" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } object(stdClass)#%d (13) { - [u"name"]=> - unicode(2) "id" - [u"table"]=> - unicode(4) "test" - [u"def"]=> - unicode(1) "1" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "id" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(1) "1" + [%u|b%"max_length"]=> int(0) - [u"not_null"]=> + [%u|b%"not_null"]=> int(0) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(0) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(1) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(3) "int" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(3) "int" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_object.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_object.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.5 php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.6 --- php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_fetch_object.phpt Wed Jul 1 15:31:32 2009 @@ -79,20 +79,20 @@ ?> --EXPECTF-- object(stdClass)#%d (2) { - [u"ID"]=> - unicode(1) "1" - [u"label"]=> - unicode(1) "a" + [%u|b%"ID"]=> + %unicode|string%(1) "1" + [%u|b%"label"]=> + %unicode|string%(1) "a" } object(mysql_fetch_object_test)#%d (4) { - [u"a"]=> + [%u|b%"a"]=> NULL - [u"b"]=> + [%u|b%"b"]=> NULL - [u"ID"]=> - unicode(1) "2" - [u"label"]=> - unicode(1) "b" + [%u|b%"ID"]=> + %unicode|string%(1) "2" + [%u|b%"label"]=> + %unicode|string%(1) "b" } Warning: Missing argument 1 for mysql_fetch_object_construct::__construct() in %s on line %d @@ -103,38 +103,38 @@ Notice: Undefined variable: b in %s on line %d object(mysql_fetch_object_construct)#%d (4) { - [u"a"]=> + [%u|b%"a"]=> NULL - [u"b"]=> + [%u|b%"b"]=> NULL - [u"ID"]=> - unicode(1) "3" - [u"label"]=> - unicode(1) "c" + [%u|b%"ID"]=> + %unicode|string%(1) "3" + [%u|b%"label"]=> + %unicode|string%(1) "c" } Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %s on line %d Notice: Undefined variable: b in %s on line %d object(mysql_fetch_object_construct)#%d (4) { - [u"a"]=> - unicode(1) "a" - [u"b"]=> + [%u|b%"a"]=> + %unicode|string%(1) "a" + [%u|b%"b"]=> NULL - [u"ID"]=> - unicode(1) "4" - [u"label"]=> - unicode(1) "d" + [%u|b%"ID"]=> + %unicode|string%(1) "4" + [%u|b%"label"]=> + %unicode|string%(1) "d" } object(mysql_fetch_object_construct)#%d (4) { - [u"a"]=> - unicode(1) "a" - [u"b"]=> - unicode(1) "b" - [u"ID"]=> - unicode(1) "5" - [u"label"]=> - unicode(1) "e" + [%u|b%"a"]=> + %unicode|string%(1) "a" + [%u|b%"b"]=> + %unicode|string%(1) "b" + [%u|b%"ID"]=> + %unicode|string%(1) "5" + [%u|b%"label"]=> + %unicode|string%(1) "e" } bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.6 php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.7 --- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.6 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_fetch_row.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_fetch_row() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -40,13 +40,13 @@ [004] array(2) { [0]=> - unicode(1) "1" + %unicode|string%(1) "1" [1]=> - unicode(1) "a" + %unicode|string%(1) "a" } [005] bool(false) Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on line %d bool(false) -done! +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_name.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_name.phpt diff -u php-src/ext/mysql/tests/mysql_field_name.phpt:1.5 php-src/ext/mysql/tests/mysql_field_name.phpt:1.6 --- php-src/ext/mysql/tests/mysql_field_name.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_field_name.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_field_name() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -45,7 +45,7 @@ Warning: mysql_field_name() expects exactly 2 parameters, 1 given in %s on line %d Warning: mysql_field_name(): Field -1 is invalid for MySQL result index %d in %s on line %d -unicode(2) "id" +%unicode|string%(2) "id" Warning: mysql_field_name(): Field 2 is invalid for MySQL result index %d in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_seek.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_seek.phpt diff -u php-src/ext/mysql/tests/mysql_field_seek.phpt:1.4 php-src/ext/mysql/tests/mysql_field_seek.phpt:1.5 --- php-src/ext/mysql/tests/mysql_field_seek.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_field_seek.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_field_seek() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -43,89 +43,89 @@ Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in %s on line %d bool(false) object(stdClass)#%d (13) { - [u"name"]=> - unicode(2) "id" - [u"table"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "id" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(1) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(1) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(1) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(3) "int" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(3) "int" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } bool(true) object(stdClass)#%d (13) { - [u"name"]=> - unicode(2) "id" - [u"table"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "id" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(1) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(1) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(1) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(3) "int" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(3) "int" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } bool(true) object(stdClass)#%d (13) { - [u"name"]=> - unicode(5) "label" - [u"table"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> + [%u|b%"name"]=> + %unicode|string%(5) "label" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - [u"not_null"]=> + [%u|b%"not_null"]=> int(0) - [u"primary_key"]=> + [%u|b%"primary_key"]=> int(0) - [u"multiple_key"]=> + [%u|b%"multiple_key"]=> int(0) - [u"unique_key"]=> + [%u|b%"unique_key"]=> int(0) - [u"numeric"]=> + [%u|b%"numeric"]=> int(0) - [u"blob"]=> + [%u|b%"blob"]=> int(0) - [u"type"]=> - unicode(6) "string" - [u"unsigned"]=> + [%u|b%"type"]=> + %unicode|string%(6) "string" + [%u|b%"unsigned"]=> int(0) - [u"zerofill"]=> + [%u|b%"zerofill"]=> int(0) } http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_table.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_table.phpt diff -u php-src/ext/mysql/tests/mysql_field_table.phpt:1.5 php-src/ext/mysql/tests/mysql_field_table.phpt:1.6 --- php-src/ext/mysql/tests/mysql_field_table.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_field_table.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_field_table() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -45,7 +45,7 @@ Warning: mysql_field_table() expects exactly 2 parameters, 1 given in %s on line %d Warning: mysql_field_table(): Field -1 is invalid for MySQL result index %d in %s on line %d -unicode(4) "test" +%unicode|string%(4) "test" Warning: mysql_field_table(): Field 2 is invalid for MySQL result index %d in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_type.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_type.phpt diff -u php-src/ext/mysql/tests/mysql_field_type.phpt:1.5 php-src/ext/mysql/tests/mysql_field_type.phpt:1.6 --- php-src/ext/mysql/tests/mysql_field_type.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_field_type.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_field_type() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -45,7 +45,7 @@ Warning: mysql_field_type() expects exactly 2 parameters, 1 given in %s on line %d Warning: mysql_field_type(): Field -1 is invalid for MySQL result index %d in %s on line %d -unicode(3) "int" +%unicode|string%(3) "int" Warning: mysql_field_type(): Field 2 is invalid for MySQL result index %d in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_max_links.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/mysql_pconn_max_links.phpt diff -u php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.3 php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.4 --- php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.3 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_pconn_max_links.phpt Wed Jul 1 15:31:32 2009 @@ -141,15 +141,15 @@ ?> --EXPECTF-- array(2) { - [u"id"]=> - unicode(1) "1" - [u"label"]=> - unicode(1) "a" + [%u|b%"id"]=> + %unicode|string%(1) "1" + [%u|b%"label"]=> + %unicode|string%(1) "a" } array(2) { - [u"id"]=> - unicode(1) "1" - [u"label"]=> - unicode(1) "a" + [%u|b%"id"]=> + %unicode|string%(1) "1" + [%u|b%"label"]=> + %unicode|string%(1) "a" } done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt diff -u php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt:1.3 php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt:1.4 --- php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt:1.3 Sun Mar 9 01:06:38 2008 +++ php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt Wed Jul 1 15:31:32 2009 @@ -52,7 +52,7 @@ if (!$fp = fopen('./simple.csv', 'w')) printf("[003] Cannot open CSV file\n"); -if (ini_get('unicode.semantics')) { +if (version_compare(PHP_VERSION, '5.9.9', '>') >= 0) { if (!fwrite($fp, (binary)"'97';'x';\n") || !fwrite($fp, (binary)"'98';'y';\n") || !fwrite($fp, (binary)"99;'z';\n")) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_query.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_query.phpt diff -u php-src/ext/mysql/tests/mysql_query.phpt:1.5 php-src/ext/mysql/tests/mysql_query.phpt:1.6 --- php-src/ext/mysql/tests/mysql_query.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_query.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_query() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -58,7 +58,7 @@ printf("[009] Result seems wrong, dumping\n"); var_dump($tmp); } - if (ini_get('unicode.semantics') && !is_unicode($tmp['p_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) { printf("[010] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -75,7 +75,7 @@ printf("[012] Result seems wrong, dumping\n"); var_dump($tmp); } - if (ini_get('unicode.semantics') && !is_unicode($tmp['f_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) { printf("[013] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -94,14 +94,14 @@ ?> --EXPECTF-- array(1) { - [u"valid"]=> - unicode(30) "this is sql but with semicolon" + [%u|b%"valid"]=> + %unicode|string%(30) "this is sql but with semicolon" } array(1) { - [u""]=> - unicode(1) "a" + [%u|b%""]=> + %unicode|string%(1) "a" } -unicode(1) "a" +%unicode|string%(1) "a" Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_real_escape_string.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/mysql_real_escape_string.phpt diff -u php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.4 php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.5 --- php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_real_escape_string.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_real_escape_string() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -33,11 +33,11 @@ print "done!"; ?> --EXPECTF-- -unicode(31) "Am I a unicode string in PHP 6?" -unicode(2) "\\" -unicode(2) "\"" -unicode(2) "\'" -unicode(2) "\n" -unicode(2) "\r" -unicode(8) "foo\0bar" +%unicode|string%(31) "Am I a unicode string in PHP 6?" +%unicode|string%(2) "\\" +%unicode|string%(2) "\"" +%unicode|string%(2) "\'" +%unicode|string%(2) "\n" +%unicode|string%(2) "\r" +%unicode|string%(8) "foo\0bar" done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_result.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysql/tests/mysql_result.phpt diff -u php-src/ext/mysql/tests/mysql_result.phpt:1.5 php-src/ext/mysql/tests/mysql_result.phpt:1.6 --- php-src/ext/mysql/tests/mysql_result.phpt:1.5 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_result.phpt Wed Jul 1 15:31:32 2009 @@ -73,12 +73,12 @@ Warning: mysql_result(): Bad column offset specified in %s on line %d bool(false) valid fields -unicode(1) "1" -unicode(1) "a" -unicode(1) "1" -unicode(1) "1" -unicode(1) "a" -unicode(1) "a" +%unicode|string%(1) "1" +%unicode|string%(1) "a" +%unicode|string%(1) "1" +%unicode|string%(1) "1" +%unicode|string%(1) "a" +%unicode|string%(1) "a" some invalid fields Warning: mysql_result(): unknown not found in MySQL result index %d in %s on line %d @@ -93,7 +93,7 @@ Warning: mysql_result(): _test. not found in MySQL result index %d in %s on line %d bool(false) _id -unicode(1) "1" +%unicode|string%(1) "1" _label string(2) "aa" _foo http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_select_db.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/mysql_select_db.phpt diff -u php-src/ext/mysql/tests/mysql_select_db.phpt:1.4 php-src/ext/mysql/tests/mysql_select_db.phpt:1.5 --- php-src/ext/mysql/tests/mysql_select_db.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_select_db.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_select_db() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -66,7 +66,7 @@ print "done!\n"; ?> --EXPECTF-- -unicode(%d) "%s" +%unicode|string%(%d) "%s" bool(false) Warning: mysql_select_db(): %d is not a valid MySQL-Link resource in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_set_charset.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/mysql_set_charset.phpt diff -u php-src/ext/mysql/tests/mysql_set_charset.phpt:1.3 php-src/ext/mysql/tests/mysql_set_charset.phpt:1.4 --- php-src/ext/mysql/tests/mysql_set_charset.phpt:1.3 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_set_charset.phpt Wed Jul 1 15:31:32 2009 @@ -4,6 +4,11 @@ <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); + +if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { + die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)'); +} + if (!function_exists('mysql_set_charset')) die("skip Function not available"); ?> @@ -53,5 +58,4 @@ print "done!"; ?> --EXPECTF-- -Warning: mysql_set_charset(): Character set %s is not supported when running PHP with unicode.semantics=On. in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_tablename.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/mysql_tablename.phpt diff -u php-src/ext/mysql/tests/mysql_tablename.phpt:1.6 php-src/ext/mysql/tests/mysql_tablename.phpt:1.7 --- php-src/ext/mysql/tests/mysql_tablename.phpt:1.6 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_tablename.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_tablename() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -45,7 +45,7 @@ Warning: mysql_tablename() expects at least 2 parameters, 1 given in %s on line %d Warning: mysql_tablename(): Unable to jump to row -1 on MySQL result index %d in %s on line %d -unicode(1) "1" +%unicode|string%(1) "1" Warning: mysql_tablename(): Unable to jump to row 2 on MySQL result index %d in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_trace_mode.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysql/tests/mysql_trace_mode.phpt diff -u php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.6 php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.7 --- php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.6 Wed Jun 11 10:07:20 2008 +++ php-src/ext/mysql/tests/mysql_trace_mode.phpt Wed Jul 1 15:31:32 2009 @@ -26,9 +26,9 @@ print "done!\n"; ?> --EXPECTF-- -Deprecated: mysql_db_query(): use mysql_query() instead in %s on line %d +Deprecated: mysql_db_query(): %s -Deprecated: mysql_escape_string(): use mysql_real_escape_string() instead. in %s on line %d +Deprecated: mysql_escape_string(): %s I don\'t mind character sets, do I?\n Warning: mysql_query(): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BOGUS_SQL' at line 1 in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_unbuffered_query.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysql/tests/mysql_unbuffered_query.phpt diff -u php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.4 php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.5 --- php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.4 Mon Jan 5 18:22:01 2009 +++ php-src/ext/mysql/tests/mysql_unbuffered_query.phpt Wed Jul 1 15:31:32 2009 @@ -1,8 +1,8 @@ --TEST-- mysql_unbuffered_query() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -48,7 +48,7 @@ printf("[008] Result seems wrong, dumping\n"); var_dump($tmp); } - if (ini_get('unicode.semantics') && !is_unicode($tmp['p_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) { printf("[009] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -65,7 +65,7 @@ printf("[011] Result seems wrong, dumping\n"); var_dump($tmp); } - if (ini_get('unicode.semantics') && !is_unicode($tmp['f_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) { printf("[012] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -88,8 +88,8 @@ ?> --EXPECTF-- array(1) { - [u"valid"]=> - unicode(30) "this is sql but with semicolon" + [%u|b%"valid"]=> + %unicode|string%(30) "this is sql but with semicolon" } bool(true) resource(%d) of type (mysql result)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php