From: Ulf Wendel <uw@php.net>
Date: Mon, 6 Jul 2009 15:08:13 +0000 (+0000)
Subject: MFH. Adapting (old) tests to current PHP 6 semantics - s/unicode.semantics test/versi... 
X-Git-Tag: php-5.3.1RC1~448
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=556feffbd4aa490d1f261116bd7b7515dc8b3381;p=php

MFH. Adapting (old) tests to current PHP 6 semantics - s/unicode.semantics test/version_compare
---

diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index a1ef9ec40e..bae2ce8e2c 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -31,7 +31,7 @@ mysqli_bind_result (SHOW)
 	mysqli_bind_result($stmt, $c1, $c2);
 	mysqli_fetch($stmt);
 	mysqli_stmt_close($stmt);
-	if (ini_get("unicode.semantics") && mysqli_get_server_version($link) < 50000) {
+	if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && mysqli_get_server_version($link) < 50000) {
 		/* variables are binary */
 		settype($c1, "unicode");
 		settype($c2, "unicode");
diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index 09ab5a9992..8789f89e84 100644
--- a/ext/mysqli/tests/mysqli_error_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_error_unicode.phpt
@@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc');
 			$host, $user, $db, $port, $socket);
 	}
 
-	if (!ini_get("unicode.semantics")) {
+	if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
 		mysqli_query($link, "set names utf8");
 	}
 
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 26a1e76c73..9c1a0c6714 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -118,7 +118,7 @@ mysqlnd.collect_memory_statistics=1
 	mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, $info, $test_counter);
 
 	/* we need to skip this test in unicode - we send set names utf8 during mysql_connect */
-	if (!ini_get("unicode.semantics"))
+	if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1))
 		mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter);
 	mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, $test_counter);
 	mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, $test_counter);
diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt
index 661018be76..a8b632c67a 100644
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -129,7 +129,7 @@ if (!$TEST_EXPERIMENTAL)
 	$warning = new mysqli_warning($mysqli);
 		$i = 1;
 	while ($warning->next() && ('' != ($tmp = $warning->message))) {
-		if (ini_get('unicode.semantics') && !is_unicode($tmp))
+		if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp))
 			printf("[033a] Warning should have been a unicode string, got %s/%s", gettype($tmp), $tmp);
 		$i++;
 	}
diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index c05f22a2f1..478ccbd30f 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -88,7 +88,7 @@ mysqli_close($link);
 	/*
 	Trying to test what Ramil suggests in http://bugs.mysql.com/bug.php?id=29576
 	However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME.
-	if (ini_get("unicode.semantics")) {
+	if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
 		if (mysqli_get_server_version() > 50002) {
 			@mysqli_query($link, "DROP USER IF EXISTS 'тест'@'%'");
 			if (TRUE !== mysqli_query($link, "CREATE USER 'тест'@'%'")) {
diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
index 9e69ce4f57..ddcfdc8b87 100644
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
@@ -42,7 +42,7 @@ mysqli.allow_local_infile=1
 
 		printf("Callback: %d\n", $invocation++);
 
-		$num_chars = (ini_get('unicode.semantics')) ? (floor($buflen / 2) - 10) : ($buflen - 5);
+		$num_chars = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? (floor($buflen / 2) - 10) : ($buflen - 5);
 		$part1 = floor($num_chars / 2);
 		$part2 = $num_chars - $part1;