uw Fri Jul 3 08:42:25 2009 UTC
Modified files:
/php-src/ext/mysql/tests mysql_client_encoding.phpt
mysql_db_name.phpt mysql_db_query.phpt
mysql_error.phpt mysql_field_flags.phpt
mysql_get_client_info.phpt
mysql_get_host_info.phpt
mysql_get_server_info.phpt mysql_info.phpt
mysql_list_dbs.phpt
mysql_list_processes.phpt
mysql_set_charset.phpt mysql_stat.phpt
Log:
Global s/ini_get('unicode.semantics')/version check/ . Early PHP 6 times are
gone. I hope unicode logic will not change any more
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_client_encoding.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_client_encoding.phpt
diff -u php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.3
php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.4
--- php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.3 Fri Oct 12
12:32:39 2007
+++ php-src/ext/mysql/tests/mysql_client_encoding.phpt Fri Jul 3 08:42:25 2009
@@ -50,7 +50,7 @@
}
}
-if (ini_get('unicode.semantics') && function_exists('is_unicode')) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
function_exists('is_unicode')) {
// unicode mode
if (!is_unicode($default_link_enc) || !is_unicode($link_enc)) {
printf("[010] No unicode returned!\n");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_name.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_name.phpt
diff -u php-src/ext/mysql/tests/mysql_db_name.phpt:1.4
php-src/ext/mysql/tests/mysql_db_name.phpt:1.5
--- php-src/ext/mysql/tests/mysql_db_name.phpt:1.4 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_db_name.phpt Fri Jul 3 08:42:25 2009
@@ -34,7 +34,7 @@
printf("[006] Expecting boolean/false, got %s/%s. [%d] %s\n",
gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-$unicode = (boolean)ini_get('unicode.semantics');
+$unicode = (boolean)(version_compare(PHP_VERSION, '5.9.9', '>') == 1);
for ($i = 0; $i < $num; $i++) {
if ('' === ($dbname = mysql_db_name($res, $i)))
printf("[%03d] Got empty database name! [%d] %s\n",
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.5
php-src/ext/mysql/tests/mysql_db_query.phpt:1.6
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.5 Thu Jul 2 10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Fri Jul 3 08:42:25 2009
@@ -32,7 +32,7 @@
if (1 != $row['id'])
printf("[005] Expecting record 1/a, got record %s/%s\n", $row['id'],
$row['label']);
-if (ini_get('unicode.semantics') && !is_unicode($row['label'])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
!is_unicode($row['label'])) {
printf("[006] No unicode returned! [%d] %s\n", mysql_errno($link),
mysql_error($link));
var_inspect($row);
}
@@ -47,7 +47,7 @@
if (1 != $row['id'])
printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'],
$row['label']);
-if (ini_get('unicode.semantics') && !is_unicode($row['label'])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
!is_unicode($row['label'])) {
printf("[009] No unicode returned! [%d] %s\n", mysql_errno(),
mysql_error());
var_inspect($row);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_error.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_error.phpt
diff -u php-src/ext/mysql/tests/mysql_error.phpt:1.5
php-src/ext/mysql/tests/mysql_error.phpt:1.6
--- php-src/ext/mysql/tests/mysql_error.phpt:1.5 Thu Jul 2 10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_error.phpt Fri Jul 3 08:42:25 2009
@@ -39,7 +39,7 @@
if (!is_string($tmp) || !preg_match("/Table '\w*\.test' doesn't exist/su",
$tmp))
printf("[006] Expecting string/[Table... doesn't exit], got %s/%s. [%d]
%s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
printf("[007] Expecting Unicode error message!\n");
var_inspect($tmp);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_flags.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_flags.phpt
diff -u php-src/ext/mysql/tests/mysql_field_flags.phpt:1.5
php-src/ext/mysql/tests/mysql_field_flags.phpt:1.6
--- php-src/ext/mysql/tests/mysql_field_flags.phpt:1.5 Thu Jul 2 10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_field_flags.phpt Fri Jul 3 08:42:25 2009
@@ -32,7 +32,7 @@
if (!is_string($tmp = mysql_field_flags($res, 0)) || empty($tmp))
printf("[006] Expecting non empty string, got %s/%s\n", gettype($tmp),
$tmp);
-if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
printf("[007] Check the unicode support!\n");
var_inspect($tmp);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_client_info.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_client_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.2
php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.3
--- php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.2 Wed Jul 11
14:45:53 2007
+++ php-src/ext/mysql/tests/mysql_get_client_info.phpt Fri Jul 3 08:42:25 2009
@@ -8,7 +8,7 @@
if (!is_string($info = mysql_get_client_info()) || ('' === $info))
printf("[001] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
-if (ini_get('unicode.semantics') && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
printf("[002] Expecting Unicode!\n");
var_inspect($info);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_host_info.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_host_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.5
php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.6
--- php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.5 Thu Jul 2
10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_get_host_info.phpt Fri Jul 3 08:42:25 2009
@@ -25,7 +25,7 @@
var_dump($info);
}
-if (ini_get('unicode.semantics') && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
printf("[005] Expecting Unicode error message!\n");
var_inspect($info);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_server_info.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_server_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.5
php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.6
--- php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.5 Thu Jul 2
10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_get_server_info.phpt Fri Jul 3 08:42:25 2009
@@ -25,7 +25,7 @@
var_dump($info);
}
-if (ini_get('unicode.semantics') && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
printf("[005] Expecting Unicode error message!\n");
var_inspect($info);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_info.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_info.phpt
diff -u php-src/ext/mysql/tests/mysql_info.phpt:1.4
php-src/ext/mysql/tests/mysql_info.phpt:1.5
--- php-src/ext/mysql/tests/mysql_info.phpt:1.4 Thu Jul 2 10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_info.phpt Fri Jul 3 08:42:25 2009
@@ -46,7 +46,7 @@
if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
printf("[012] Expecting string/any_non_empty, got %s/%s\n",
gettype($tmp), $tmp);
-if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
printf("[013] Expecting Unicode!\n");
var_inspect($info);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_dbs.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_dbs.phpt
diff -u php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.5
php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.6
--- php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.5 Thu Jul 2 10:04:25 2009
+++ php-src/ext/mysql/tests/mysql_list_dbs.phpt Fri Jul 3 08:42:25 2009
@@ -27,7 +27,7 @@
printf("[004] Empty database list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
$row = mysql_fetch_array($res, MYSQL_NUM);
-if (ini_get('unicode.semantics') && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0]))
{
printf("[005] Check for unicode support\n");
var_inspect($row);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_processes.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_processes.phpt
diff -u php-src/ext/mysql/tests/mysql_list_processes.phpt:1.3
php-src/ext/mysql/tests/mysql_list_processes.phpt:1.4
--- php-src/ext/mysql/tests/mysql_list_processes.phpt:1.3 Thu Aug 9
11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_list_processes.phpt Fri Jul 3 08:42:25 2009
@@ -1,8 +1,8 @@
--TEST--
mysql_list_processes()
--SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@@ -24,7 +24,7 @@
printf("[003] Empty process list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
$row = mysql_fetch_array($res, MYSQL_NUM);
-if (ini_get('unicode.semantics') && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0]))
{
printf("[004] Check for unicode support\n");
var_inspect($row);
}
@@ -38,7 +38,7 @@
printf("[006] Empty process list? [%d] %s\n", mysql_errno(),
mysql_error());
$row = mysql_fetch_array($res, MYSQL_NUM);
-if (ini_get('unicode.semantics') && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0]))
{
printf("[007] Check for unicode support\n");
var_inspect($row);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_set_charset.phpt?r1=1.4&r2=1.5&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.4
php-src/ext/mysql/tests/mysql_set_charset.phpt:1.5
--- php-src/ext/mysql/tests/mysql_set_charset.phpt:1.4 Wed Jul 1 15:31:32 2009
+++ php-src/ext/mysql/tests/mysql_set_charset.phpt Fri Jul 3 08:42:25 2009
@@ -38,7 +38,7 @@
/* unicode mode should throw a warning */
$tmp = mysql_set_charset('uFt8', $link);
-if (ini_get('unicode.semantics'))
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1))
$expect = false;
else
$expect = true;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_stat.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_stat.phpt
diff -u php-src/ext/mysql/tests/mysql_stat.phpt:1.4
php-src/ext/mysql/tests/mysql_stat.phpt:1.5
--- php-src/ext/mysql/tests/mysql_stat.phpt:1.4 Thu Aug 9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_stat.phpt Fri Jul 3 08:42:25 2009
@@ -1,8 +1,8 @@
--TEST--
mysql_stat()
--SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@@ -25,7 +25,7 @@
printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
gettype($stat), $stat, mysql_errno($link), mysql_error($link));
-if (ini_get('unicode.semantics') && !is_unicode($stat)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($stat)) {
printf("[004] Expecting Unicode error message!\n");
var_inspect($stat);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
