Fixed PHP6 unicode related tests

diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index d11c16636a7994051e5b6d107f143749ddf40c54..b643d159ae4ca311f4149343b9660e83934c8ed4 100644 (file)
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -31,7 +31,7 @@ mysqli_stmt_bind_result (SHOW)
        mysqli_stmt_bind_result($stmt, $c1, $c2);
        mysqli_stmt_fetch($stmt);
        mysqli_stmt_close($stmt);
-       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && mysqli_get_server_version($link) < 50000) {
+       if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && mysqli_get_server_version($link) < 50000) {
                /* variables are binary */
                settype($c1, "unicode");
                settype($c2, "unicode");

diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index 9426644c9d75ad2cf66b0a834bfa981f0575364a..fbdf6e127728040c7f781df8f81de00ce2419d73 100644 (file)
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_charset')) {
        die('skip mysqli_set_charset() not available');
 }
-if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
        die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
 }
 ?>

diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt
index 772dc30fa067d9d4134a2ef869e7a62c91cd6d8a..d2ef748e45f24f43d39894d80332d6f899495c2a 100644 (file)
--- a/ext/mysqli/tests/bug35517.phpt
+++ b/ext/mysqli/tests/bug35517.phpt
@@ -24,8 +24,7 @@ require_once('skipifconnectfailure.inc');
                        if (gettype($id) !== 'string') {
                                printf("[002] Expecting string on 32bit got %s/%s\n", gettype($id), var_export($id, true));
                        }
-                       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
-                           (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                       if ((version_compare(PHP_VERSION, '6.0', '==') == 1) &&
                            !is_unicode($id)) {
                                printf("[003] Expecting unicode string\n");
                        }

diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt
index 839081df5377e90f2510b56fb8fb96bfc90a862f..7c5a44851e9b1f45674b9e5eb0ab523653d24238 100644 (file)
--- a/ext/mysqli/tests/bug37090.phpt
+++ b/ext/mysqli/tests/bug37090.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_charset')) {
        die('skip mysqli_set_charset() not available');
 }
-if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
+if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
        die("skip Functionality not available in unicode mode");
 }
 ?>

diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
index 3579e3135815123288f34a1966eaaf4d0c75e7b3..913ade275ec0aaab40f1371d21c9df17fb45cc17 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
@@ -129,7 +129,7 @@ if ($version[0] <= 4 && $version[1] < 1)
                var_dump($defaults);
        }
 
-       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
+       if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
                // charsets cannot take any other value but utf8 in unicode mode
                $defaults['charset_client'] = 'utf8';
                $defaults['charset_connection'] = 'utf8';

diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 1bfe9cbdaa06c9c74746df84999c4206aa7282fc..7c254733316ce41636aea6d4e3fa8d3f6c474fd1 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -10,9 +10,6 @@ require_once('skipifemb.inc');
 if (!function_exists('mysqli_set_charset')) {
        die('skip mysqli_set_charset() not available');
 }
-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)');
-}
 ?>
 --FILE--
 <?php

diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index b59ed5f601249684bff52cea1b850131ed3935ee..b6fdeacaa8d23b51369d24d5708b83dae39635ab 100644 (file)
--- 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 (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
+       if (!(version_compare(PHP_VERSION, '6.0', '==') == 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 a22fc58f53fe533857dd6e694aa9b62c85dad0e6..a61165ae1580f700420850d07938c80d5fb760ee 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -119,7 +119,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 (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1))
+       if (!(version_compare(PHP_VERSION, '6.0', '==') == 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 a7370b7d30347ae5061de799c59698ba867e5248..0d5c768ece771c8eab37a577e6f4ea2fe5190678 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -129,8 +129,7 @@ if (!$TEST_EXPERIMENTAL)
        $warning = new mysqli_warning($mysqli);
                $i = 1;
        while ($warning->next() && ('' != ($tmp = $warning->message))) {
-               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
-                   (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+               if ((version_compare(PHP_VERSION, '6.0', '==') == 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_info.phpt b/ext/mysqli/tests/mysqli_info.phpt
index c8f78f43862aa386abf746a20916ac81e739a1da..a1b85175883b90f8c49cbccde503e4376d4d0b41 100644 (file)
--- a/ext/mysqli/tests/mysqli_info.phpt
+++ b/ext/mysqli/tests/mysqli_info.phpt
@@ -30,8 +30,7 @@ require_once('skipifconnectfailure.inc');
        if (!is_string($tmp = mysqli_info($link)) || ('' == $tmp))
                printf("[006] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
 
-       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
-           (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+       if ((version_compare(PHP_VERSION, '6.0', '==') == 1) &&
            !is_unicode($tmp))
                printf("[007] Expecting unicode, because unicode mode it on. Got binary string\n");
 

diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 478ccbd30f740701e861cad235d8e144169e6f75..5c33178f3caff518a614fbce2c42b53629e95830 100644 (file)
--- 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
+       if ((version_compare(PHP_VERSION, '6.0', '==') == 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_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index 2fd1121a76ad0813ed05f506c2c77962c87063ac..ee84c868668e3568456f6dae38f3915c01c2a31b 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
@@ -2,7 +2,7 @@
 mysqli_real_escape_string() - gbk
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
        die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
 }
 

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index 2ed2b8bf11bd2f9333a84e7639307d0c998fbb25..3fb2b7df253b280d3fa2918545cdfee61f353a8c 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -2,7 +2,7 @@
 mysqli_real_escape_string() - sjis
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
        die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
 }
 

diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
index 9b96c4f4ec070f6adfe96c16434f9d6fbd372ad0..39353652571a69b068fade56880bf16692c575dd 100644 (file)
--- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
@@ -10,7 +10,7 @@ require_once('connect.inc');
 if (!$IS_MYSQLND)
        die("skip Test for mysqlnd only");
 
-if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1))
+if ((version_compare(PHP_VERSION, '6.0', '==') == 1))
        die("skip (TODO) PHP 6.0 has a difference debug_zval_dump output format");
 ?>
 <?php require_once('skipifemb.inc'); ?>

diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt
index 38fe56841bf6614f9e4f2e878163ced40b048ac2..997af96f94afcba502a4a9b7a004496e5be371d9 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_charset.phpt
+++ b/ext/mysqli/tests/mysqli_set_charset.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 
-if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
        die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
 }
 

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index 553e71ab6b5fcf9512a9c107ee0e42925fb6032c..c8910c1249ee620a6f2ec81ab6881dad3ba302e0 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 <?php
        require_once("connect.inc");
 
-       $hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? "unicode":"string";
+       $hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? "unicode":"string";
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
index 724a32a7871df5b7adbd2d92ece539875dd3ee88..643e9080c440c508a689479a8165448f11a270fb 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
@@ -15,7 +15,7 @@ mysqli_stmt_get_result - data types
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
-       $hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? 'unicode' : 'string';
+       $hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? 'unicode' : 'string';
 
        function func_mysqli_stmt_get_result($link, $engine, $bind_type, $sql_type, $bind_value, $offset, $type_hint = null) {
 

diff --git a/ext/mysqli/tests/skipifunicode.inc b/ext/mysqli/tests/skipifunicode.inc
index d453363d2eab9bf4f7f1d807b7fa4022a51a4b09..89258d498e65b0ba73dcbb9b3492328645917026 100644 (file)
--- a/ext/mysqli/tests/skipifunicode.inc
+++ b/ext/mysqli/tests/skipifunicode.inc
@@ -1,5 +1,5 @@
 <?php
-if (version_compare(PHP_VERSION, '6.0', '!=') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
        die('skip Not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
 }
 ?>