From: Ulf Wendel <uw@php.net>
Date: Fri, 3 Jul 2009 08:42:25 +0000 (+0000)
Subject: Global s/ini_get('unicode.semantics')/version check/ . Early PHP 6 times are gone... 
X-Git-Tag: php-5.4.0alpha1~191^2~3173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c81e71e5aebe30d9b832979b299d9a7984bf75e;p=php

Global s/ini_get('unicode.semantics')/version check/ . Early PHP 6 times are gone. I hope unicode logic will not change any more
---

diff --git a/ext/mysql/tests/mysql_client_encoding.phpt b/ext/mysql/tests/mysql_client_encoding.phpt
index 399b1e8704..8aa67a03ac 100644
--- a/ext/mysql/tests/mysql_client_encoding.phpt
+++ b/ext/mysql/tests/mysql_client_encoding.phpt
@@ -50,7 +50,7 @@ if ($link_enc !== $tmp['charset']) {
 	}
 }
 
-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");
diff --git a/ext/mysql/tests/mysql_db_name.phpt b/ext/mysql/tests/mysql_db_name.phpt
index b1a03ed2cd..be4f604d9c 100644
--- a/ext/mysql/tests/mysql_db_name.phpt
+++ b/ext/mysql/tests/mysql_db_name.phpt
@@ -34,7 +34,7 @@ if (false !== ($tmp = mysql_db_name($res, $num + 1)))
 	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",
diff --git a/ext/mysql/tests/mysql_db_query.phpt b/ext/mysql/tests/mysql_db_query.phpt
index a3fc8c5608..bb837dd6c0 100644
--- a/ext/mysql/tests/mysql_db_query.phpt
+++ b/ext/mysql/tests/mysql_db_query.phpt
@@ -32,7 +32,7 @@ $row = mysql_fetch_assoc($res);
 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 @@ $row = mysql_fetch_assoc($res);
 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);
 }
diff --git a/ext/mysql/tests/mysql_error.phpt b/ext/mysql/tests/mysql_error.phpt
index b92a646e88..aae4480174 100644
--- a/ext/mysql/tests/mysql_error.phpt
+++ b/ext/mysql/tests/mysql_error.phpt
@@ -39,7 +39,7 @@ $tmp = mysql_error($link);
 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);
 }
diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt
index d655595f7d..75872182ff 100644
--- a/ext/mysql/tests/mysql_field_flags.phpt
+++ b/ext/mysql/tests/mysql_field_flags.phpt
@@ -32,7 +32,7 @@ if (false !== ($tmp = mysql_field_flags($res, -1)))
 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);
 }
diff --git a/ext/mysql/tests/mysql_get_client_info.phpt b/ext/mysql/tests/mysql_get_client_info.phpt
index 2f8c62c916..95de0ad5ed 100644
--- a/ext/mysql/tests/mysql_get_client_info.phpt
+++ b/ext/mysql/tests/mysql_get_client_info.phpt
@@ -8,7 +8,7 @@ include "connect.inc";
 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);
 }
diff --git a/ext/mysql/tests/mysql_get_host_info.phpt b/ext/mysql/tests/mysql_get_host_info.phpt
index 4d60c21e80..443910c319 100644
--- a/ext/mysql/tests/mysql_get_host_info.phpt
+++ b/ext/mysql/tests/mysql_get_host_info.phpt
@@ -25,7 +25,7 @@ if ($def_info !== $info) {
 	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);
 }
diff --git a/ext/mysql/tests/mysql_get_server_info.phpt b/ext/mysql/tests/mysql_get_server_info.phpt
index 037adfb44c..e806335e29 100644
--- a/ext/mysql/tests/mysql_get_server_info.phpt
+++ b/ext/mysql/tests/mysql_get_server_info.phpt
@@ -25,7 +25,7 @@ if ($def_info !== $info) {
 	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);
 }
diff --git a/ext/mysql/tests/mysql_info.phpt b/ext/mysql/tests/mysql_info.phpt
index ea73433f89..757c7fac81 100644
--- a/ext/mysql/tests/mysql_info.phpt
+++ b/ext/mysql/tests/mysql_info.phpt
@@ -46,7 +46,7 @@ if (!$res = mysql_query('UPDATE test SET label = "b" WHERE id >= 100', $link))
 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);
 }
diff --git a/ext/mysql/tests/mysql_list_dbs.phpt b/ext/mysql/tests/mysql_list_dbs.phpt
index 57a7efb451..3e12ce5501 100644
--- a/ext/mysql/tests/mysql_list_dbs.phpt
+++ b/ext/mysql/tests/mysql_list_dbs.phpt
@@ -27,7 +27,7 @@ if (!$num = mysql_num_rows($res))
 	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);
 }
diff --git a/ext/mysql/tests/mysql_list_processes.phpt b/ext/mysql/tests/mysql_list_processes.phpt
index 9cf51db617..b0c71ad1b4 100644
--- a/ext/mysql/tests/mysql_list_processes.phpt
+++ b/ext/mysql/tests/mysql_list_processes.phpt
@@ -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 @@ if (!$num = mysql_num_rows($res))
 	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 @@ if (!$num = mysql_num_rows($res))
 	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);
 }
diff --git a/ext/mysql/tests/mysql_set_charset.phpt b/ext/mysql/tests/mysql_set_charset.phpt
index 946e8e05fd..953323b49c 100644
--- a/ext/mysql/tests/mysql_set_charset.phpt
+++ b/ext/mysql/tests/mysql_set_charset.phpt
@@ -38,7 +38,7 @@ if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
 /* 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;
diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt
index bc5be9540d..288c53f067 100644
--- a/ext/mysql/tests/mysql_stat.phpt
+++ b/ext/mysql/tests/mysql_stat.phpt
@@ -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 @@ if ((!is_string($stat = mysql_stat($link))) || ('' === $stat))
 	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);
 }