Fixed PHP6 unicode related tests

diff --git a/ext/mysql/tests/mysql_client_encoding.phpt b/ext/mysql/tests/mysql_client_encoding.phpt
index 5b21765ddb29ac7b5e671bd02de15a7d55e5a9c3..c10303b55a5f918ed699f99361d2b99ba36a2224 100644 (file)
--- a/ext/mysql/tests/mysql_client_encoding.phpt
+++ b/ext/mysql/tests/mysql_client_encoding.phpt
@@ -50,7 +50,9 @@ if ($link_enc !== $tmp['charset']) {
        }
 }
 
-if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && function_exists('is_unicode')) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 93217013379b27453db5fccf1ddd3e029b769a26..ba8334aaff983c10f5fb69a914e2475cec8c36d7 100644 (file)
--- a/ext/mysql/tests/mysql_db_name.phpt
+++ b/ext/mysql/tests/mysql_db_name.phpt
@@ -34,7 +34,8 @@ 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)(version_compare(PHP_VERSION, '5.9.9', '>') == 1);
+$unicode = (boolean)(version_compare(PHP_VERSION, '5.9.9', '>') == 1 &&
+                     version_compare(PHP_VERSION, '6.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 291fbfaac61d3dc4aa81f1322b8ddc8b5c633b55..dc556f449e3ee342ac6514ebe1c46beafa2b3e72 100644 (file)
--- a/ext/mysql/tests/mysql_db_query.phpt
+++ b/ext/mysql/tests/mysql_db_query.phpt
@@ -32,7 +32,9 @@ $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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 +49,9 @@ $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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 82a43fb7b457cbaf0c73c2cc114971de01a4833c..9b0729d0c05a8e97722b6eaad8c1fcce5fbd0d1e 100644 (file)
--- a/ext/mysql/tests/mysql_error.phpt
+++ b/ext/mysql/tests/mysql_error.phpt
@@ -39,7 +39,9 @@ $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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 cd9e4b5671b32b2f5d69606bb990a3a80848e9c9..bf2a193f573ab55c22257836e98a71bc6010bf73 100644 (file)
--- a/ext/mysql/tests/mysql_field_flags.phpt
+++ b/ext/mysql/tests/mysql_field_flags.phpt
@@ -32,7 +32,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 95de0ad5edceae6901874d6b988762771aadbbe9..6e8462847680dd6c89c35baf985c637768f05e1f 100644 (file)
--- a/ext/mysql/tests/mysql_get_client_info.phpt
+++ b/ext/mysql/tests/mysql_get_client_info.phpt
@@ -8,7 +8,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 4b21ddbb41ef9c0cb46f61fa4c6784e657650e4b..a98ab5be358f1aa2ea9c7fa5c5fff0e8759485f5 100644 (file)
--- a/ext/mysql/tests/mysql_get_host_info.phpt
+++ b/ext/mysql/tests/mysql_get_host_info.phpt
@@ -25,7 +25,9 @@ if ($def_info !== $info) {
        var_dump($info);
 }
 
-if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
+    (version_compare(PHP_VERSION, '6.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 ad192e4722cf8629217bd4fff72686d9b7dafc9e..e29222b966a22e60ffdc57604fe5853ff42c2fd3 100644 (file)
--- a/ext/mysql/tests/mysql_get_server_info.phpt
+++ b/ext/mysql/tests/mysql_get_server_info.phpt
@@ -25,7 +25,9 @@ if ($def_info !== $info) {
        var_dump($info);
 }
 
-if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
+    (version_compare(PHP_VERSION, '6.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 c4786790424048feb62dde3725cfbca8b55c8d2c..82c680768b819f764a58cf5df9bd3e91f30a831d 100644 (file)
--- a/ext/mysql/tests/mysql_info.phpt
+++ b/ext/mysql/tests/mysql_info.phpt
@@ -46,7 +46,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.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 402161aa63366b6bc1a099a791033bc8f72cb75d..559b5a05d96fc2dc7d6f192310d1e2be86aa62dd 100644 (file)
--- a/ext/mysql/tests/mysql_list_dbs.phpt
+++ b/ext/mysql/tests/mysql_list_dbs.phpt
@@ -27,7 +27,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
+    (version_compare(PHP_VERSION, '6.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 7838a6f98adc9d08f5601185b089805186385cf4..402a10d995a51f3fc3a73e8cb2f339b1e677e537 100644 (file)
--- a/ext/mysql/tests/mysql_list_processes.phpt
+++ b/ext/mysql/tests/mysql_list_processes.phpt
@@ -24,7 +24,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+    !is_unicode($row[0])) {
        printf("[004] Check for unicode support\n");
        var_inspect($row);
 }
@@ -38,7 +40,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+    !is_unicode($row[0])) {
        printf("[007] Check for unicode support\n");
        var_inspect($row);
 }

diff --git a/ext/mysql/tests/mysql_query.phpt b/ext/mysql/tests/mysql_query.phpt
index 80b985e0993d3f1dafb62efd5067ef05d65ef631..abe7adb88c2861dcfb90e3d7e9573abd5541f595 100644 (file)
--- a/ext/mysql/tests/mysql_query.phpt
+++ b/ext/mysql/tests/mysql_query.phpt
@@ -58,7 +58,9 @@ if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) {
                        printf("[009] Result seems wrong, dumping\n");
                        var_dump($tmp);
                }
-               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) {
+               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                   (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                   !is_unicode($tmp['p_version'])) {
                        printf("[010] Expecting unicode string, dumping\n");
                        var_dump($tmp);
                }
@@ -75,7 +77,9 @@ if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) {
                        printf("[012] Result seems wrong, dumping\n");
                        var_dump($tmp);
                }
-               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) {
+               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                   (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                   !is_unicode($tmp['f_version'])) {
                        printf("[013] Expecting unicode string, dumping\n");
                        var_dump($tmp);
                }

diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt
index ef5bb451057be2ba54655171c1a890df1f634ee2..95868b7b90c228d79271a52dded174c86fd4cae1 100644 (file)
--- a/ext/mysql/tests/mysql_stat.phpt
+++ b/ext/mysql/tests/mysql_stat.phpt
@@ -25,7 +25,9 @@ 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 ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($stat)) {
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+    (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+    !is_unicode($stat)) {
        printf("[004] Expecting Unicode error message!\n");
        var_inspect($stat);
 }

diff --git a/ext/mysql/tests/mysql_unbuffered_query.phpt b/ext/mysql/tests/mysql_unbuffered_query.phpt
index 5b10cc41d95ba1818301cb8547a50336388e0602..8c3c2d6e10397247b3017e4251cc86d729e2bd7f 100644 (file)
--- a/ext/mysql/tests/mysql_unbuffered_query.phpt
+++ b/ext/mysql/tests/mysql_unbuffered_query.phpt
@@ -48,7 +48,9 @@ if (mysql_unbuffered_query('DROP PROCEDURE IF EXISTS p', $link)) {
                        printf("[008] Result seems wrong, dumping\n");
                        var_dump($tmp);
                }
-               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) {
+               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                   (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                   !is_unicode($tmp['p_version'])) {
                        printf("[009] Expecting unicode string, dumping\n");
                        var_dump($tmp);
                }
@@ -65,7 +67,9 @@ if (mysql_unbuffered_query('DROP PROCEDURE IF EXISTS p', $link)) {
                        printf("[011] Result seems wrong, dumping\n");
                        var_dump($tmp);
                }
-               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) {
+               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                   (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                   !is_unicode($tmp['f_version'])) {
                        printf("[012] Expecting unicode string, dumping\n");
                        var_dump($tmp);
                }

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index b5a68c2b93f4e6952c319be8cf4f912ece58299a..254bae16959b9db2467f6965f045921ce7cea454 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1688,9 +1688,9 @@ static int mysqli_options_get_option_zval_type(int option)
 {
        switch (option) {
 #ifdef MYSQLI_USE_MYSQLND
-#if PHP_MAJOR_VERSION >= 6
+#if PHP_MAJOR_VERSION == 6
                /* PHP-7 doesn't supprt unicode yet ??? */
-               /*case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:*/
+               case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:
 #endif
                case MYSQLND_OPT_NET_CMD_BUFFER_SIZE:
                case MYSQLND_OPT_NET_READ_BUFFER_SIZE:

diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt
index 746251f97cff4958de759f0400fbbc836b5a2842..772dc30fa067d9d4134a2ef869e7a62c91cd6d8a 100644 (file)
--- a/ext/mysqli/tests/bug35517.phpt
+++ b/ext/mysqli/tests/bug35517.phpt
@@ -24,7 +24,9 @@ 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) && !is_unicode($id)) {
+                       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                           (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+                           !is_unicode($id)) {
                                printf("[003] Expecting unicode string\n");
                        }
                }

diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt
index 00548de709397ddb8983304aa6519eebfcae5019..a7370b7d30347ae5061de799c59698ba867e5248 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -129,7 +129,9 @@ 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) && !is_unicode($tmp))
+               if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+                   (version_compare(PHP_VERSION, '6.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_info.phpt b/ext/mysqli/tests/mysqli_info.phpt
index 6bb5d215e034e33e0406ff1851d8461e89953fbe..c8f78f43862aa386abf746a20916ac81e739a1da 100644 (file)
--- a/ext/mysqli/tests/mysqli_info.phpt
+++ b/ext/mysqli/tests/mysqli_info.phpt
@@ -30,7 +30,9 @@ 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) && !is_unicode($tmp))
+       if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
+           (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
+           !is_unicode($tmp))
                printf("[007] Expecting unicode, because unicode mode it on. Got binary string\n");
 
        if (!$res = mysqli_query($link, 'INSERT INTO test(id, label) SELECT id + 200, label FROM test'))

diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index 7c64c401c88c93f045856907a926c1afb2b1954c..fdbb3be17b83332aff01fda4edb831b6b424b1ce 100644 (file)
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -3,7 +3,7 @@ Phar: opendir test - no dir specified at all
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/017U.phpt b/ext/phar/tests/017U.phpt
index af65b6d020a099dfa9f80a15309ad285cd9360fe..edcfcf4078d4dbb02425cd52db9229acc5448fb3 100644 (file)
--- a/ext/phar/tests/017U.phpt
+++ b/ext/phar/tests/017U.phpt
@@ -3,7 +3,7 @@ Phar: opendir test - no dir specified at all
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt
index 2e2df470bfbc5858978c60804819a81eb06d0749..5640cfb82cd44ed5d4c47bfa577de94fb0b7ffca 100644 (file)
--- a/ext/phar/tests/018.phpt
+++ b/ext/phar/tests/018.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, root directory
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/018U.phpt b/ext/phar/tests/018U.phpt
index c8d798df20c31cc42133826554099401abcb9ee9..7d75e96b018adb0011061134cf3fd3d61edc512c 100644 (file)
--- a/ext/phar/tests/018U.phpt
+++ b/ext/phar/tests/018U.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, root directory
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt
index 5a0ef713350d10f6fcc39a4958c7772f569c11da..7a22d8b4f6a9100c0e9d281881bcb64744e12f4d 100644 (file)
--- a/ext/phar/tests/019b.phpt
+++ b/ext/phar/tests/019b.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, recurse into
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/019bU.phpt b/ext/phar/tests/019bU.phpt
index c0864aa2ceef4a73f2c88653358c85db1709adc9..eb3f07a1f8c5a2375c8b00fd7070149f03c7095a 100644 (file)
--- a/ext/phar/tests/019bU.phpt
+++ b/ext/phar/tests/019bU.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, recurse into
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt
index 2cb508c46c3121fd7c1d356d2f2d77f0d5699f4d..d31981e9149c0511a65c7d11af8da2576cdce6e1 100644 (file)
--- a/ext/phar/tests/019c.phpt
+++ b/ext/phar/tests/019c.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, recurse into
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/019cU.phpt b/ext/phar/tests/019cU.phpt
index 36ef6d8208ee3c348e29a53ad0044b1fc3ac0861..6ea5cf285c20d975ab250247cfe061b4931432f5 100644 (file)
--- a/ext/phar/tests/019cU.phpt
+++ b/ext/phar/tests/019cU.phpt
@@ -3,7 +3,7 @@ Phar: opendir test, recurse into
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 8736efbeb2c55aec99d6dc19b5feef782c659c90..45837bfd1e929b6a7f83f5af247cf7b4985367c8 100644 (file)
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -3,7 +3,7 @@ Phar: phar:// opendir
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/027U.phpt b/ext/phar/tests/027U.phpt
index 6794c5229e16b308ff0e4cc09569c59216fd04a5..598f969a5907e988bb8cb7abaeb926d1928b8f5e 100644 (file)
--- a/ext/phar/tests/027U.phpt
+++ b/ext/phar/tests/027U.phpt
@@ -3,7 +3,7 @@ Phar: phar:// opendir
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt
index 80356afc521776425483bdc462a6e04839be4cc6..fd3b2fa7101d0563bc4d2e9c0eb61863b9a260ba 100644 (file)
--- a/ext/phar/tests/bug45218_SLOWTEST.phpt
+++ b/ext/phar/tests/bug45218_SLOWTEST.phpt
@@ -3,7 +3,7 @@ Phar::buildFromIterator() iterator, too many files for open file handles (Bug #4
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 ?>
 --INI--

diff --git a/ext/phar/tests/bug45218_SLOWTESTU.phpt b/ext/phar/tests/bug45218_SLOWTESTU.phpt
index 1639691badae2d641504567a9071aaeef94439ef..e4a82a16ec48f1fc210c2d8bd6151528552d14a8 100644 (file)
--- a/ext/phar/tests/bug45218_SLOWTESTU.phpt
+++ b/ext/phar/tests/bug45218_SLOWTESTU.phpt
@@ -3,7 +3,7 @@ Phar::buildFromIterator() iterator, too many files for open file handles (Bug #4
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow tests excluded by request");
 ?>
 --INI--

diff --git a/ext/phar/tests/cached_manifest_1.phpt b/ext/phar/tests/cached_manifest_1.phpt
index af58523e7b3c04a5ec9d44a9fd72aaaa5a784298..84ec5cb5835794170840d2eeeeda1950fc6f4535 100644 (file)
--- a/ext/phar/tests/cached_manifest_1.phpt
+++ b/ext/phar/tests/cached_manifest_1.phpt
@@ -3,7 +3,7 @@ Phar: phar.cache_list basic read test
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.cache_list={PWD}/files/nophar.phar

diff --git a/ext/phar/tests/cached_manifest_1U.phpt b/ext/phar/tests/cached_manifest_1U.phpt
index df77f07a7944dfd7d70595bf9ca1640f75c9487f..3c870bdf032e908d08b021b9ad3f320da79c74c1 100644 (file)
--- a/ext/phar/tests/cached_manifest_1U.phpt
+++ b/ext/phar/tests/cached_manifest_1U.phpt
@@ -3,7 +3,7 @@ Phar: phar.cache_list basic read test
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.cache_list={PWD}/files/nophar.phar

diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt
index 2699834eb0cd5b1b079c594bfb0c6e1adc0eb4be..094a432339d2159415fb4397607270b7f5f4286d 100644 (file)
--- a/ext/phar/tests/fgc_edgecases.phpt
+++ b/ext/phar/tests/fgc_edgecases.phpt
@@ -3,7 +3,7 @@ Phar: test edge cases of file_get_contents() function interception
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/fopen_edgecases2U.phpt b/ext/phar/tests/fopen_edgecases2U.phpt
index 09c7b005704cd334cb7d616da16a381c2ff3c80b..c6ab93fe734d169fc56e54e78abb4f7701c25109 100644 (file)
--- a/ext/phar/tests/fopen_edgecases2U.phpt
+++ b/ext/phar/tests/fopen_edgecases2U.phpt
@@ -2,7 +2,7 @@
 Phar: test edge cases of fopen() function interception #2 (PHP 6)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (version_compare(PHP_VERSION, "6.0.0-dev", "<")) die("skip Unicode support required"); ?>
+<?php if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required"); ?>
 --INI--
 phar.readonly=0
 --FILE--
@@ -43,4 +43,4 @@ blah
 test
 
 Warning: fopen(phar://%sfopen_edgecases2U.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2U.phar.php/foo/hi on line 6
-===DONE===
\ No newline at end of file
+===DONE===

diff --git a/ext/phar/tests/ini_set_off.phpt b/ext/phar/tests/ini_set_off.phpt
index 878f8bf90df78b604a0bf041c746aca78e1ba685..e3a5ab7b1ef74a13148142e4d0811f9093a06db6 100644 (file)
--- a/ext/phar/tests/ini_set_off.phpt
+++ b/ext/phar/tests/ini_set_off.phpt
@@ -3,7 +3,7 @@ Phar: test ini_set with readonly and require_hash disabled
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/ini_set_offU.phpt b/ext/phar/tests/ini_set_offU.phpt
index 150cbeda5f1108712fa157c083fc2a43d3ba51b7..10a36f935b89deeaccff5518c05370811a701cbf 100644 (file)
--- a/ext/phar/tests/ini_set_offU.phpt
+++ b/ext/phar/tests/ini_set_offU.phpt
@@ -3,7 +3,7 @@ Phar: test ini_set with readonly and require_hash disabled
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_read.phpt b/ext/phar/tests/metadata_read.phpt
index 5c37382ec63478ac7f59bacd0abddeead18f5134..1e852c0f5344d3e070616f3f4d6a2d70029e24f2 100644 (file)
--- a/ext/phar/tests/metadata_read.phpt
+++ b/ext/phar/tests/metadata_read.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (read)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_readU.phpt b/ext/phar/tests/metadata_readU.phpt
index 7197eadfa6dc3ded13df627e6f047d2f5d3906b8..bca71bdd3f9975f87467edab2a2ac8507882ec40 100644 (file)
--- a/ext/phar/tests/metadata_readU.phpt
+++ b/ext/phar/tests/metadata_readU.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (read)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt
index 1aaa30d630ac2f296c3ddaae86c0d8c6be391eb4..a9617956b7b108d7e486b600443b33f040a43e51 100644 (file)
--- a/ext/phar/tests/metadata_write.phpt
+++ b/ext/phar/tests/metadata_write.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_writeU.phpt b/ext/phar/tests/metadata_writeU.phpt
index dc0764be4be0cbef806d67b1b241228691a17a99..52903ea83a67d475c76248fe43cf15e8bf1785d5 100644 (file)
--- a/ext/phar/tests/metadata_writeU.phpt
+++ b/ext/phar/tests/metadata_writeU.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt
index fd2f10762afa9230fb541c6103c22670bc91ffdd..caaa7d91325e171c35e35f4139f48abb9abcda9d 100644 (file)
--- a/ext/phar/tests/metadata_write_commit.phpt
+++ b/ext/phar/tests/metadata_write_commit.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/metadata_write_commitU.phpt b/ext/phar/tests/metadata_write_commitU.phpt
index 712a6f557158ead4569f1fbab07985bbc299ac04..bd642c7fa15b6f6fdd0a7869d77b47187668dbdb 100644 (file)
--- a/ext/phar/tests/metadata_write_commitU.phpt
+++ b/ext/phar/tests/metadata_write_commitU.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt
index e1308956fef4c1c725b1bd9074085692f1cc109b..9c07ea34a545e60bb579c58d8bff37e2a1b74c45 100644 (file)
--- a/ext/phar/tests/mounteddir.phpt
+++ b/ext/phar/tests/mounteddir.phpt
@@ -3,7 +3,7 @@ Phar: mounted manifest directory test
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/mounteddirU.phpt b/ext/phar/tests/mounteddirU.phpt
index d05cb00b2a59091f2a077721276c1c8c4c28109e..e20bd2b0c9f71979125e8f5bd7a11f52235ad705 100644 (file)
--- a/ext/phar/tests/mounteddirU.phpt
+++ b/ext/phar/tests/mounteddirU.phpt
@@ -3,7 +3,7 @@ Phar: mounted manifest directory test
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 9d3e38323e9d4434d8c80d771bfa741eee88bc06..59a80dc6dd9e05271d3e0722526b49da88f63009 100644 (file)
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering()
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_begin_setstub_commitU.phpt b/ext/phar/tests/phar_begin_setstub_commitU.phpt
index 805e762320bb6b6fcb16fbeb0d73f7da07cf52cd..10b73a0467fb1dcb88b9c2e4dee873d4890da198 100644 (file)
--- a/ext/phar/tests/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commitU.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering()
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt
index c722834ba6c0a025cf7af703a842b9b6fb96f868..2421414f8ccc32128655028242e5ca3fd9b8e7d6 100644 (file)
--- a/ext/phar/tests/phar_gzip.phpt
+++ b/ext/phar/tests/phar_gzip.phpt
@@ -3,7 +3,7 @@ Phar: gzipped phar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP < 5.2.6");

diff --git a/ext/phar/tests/phar_gzipU.phpt b/ext/phar/tests/phar_gzipU.phpt
index 662f862ef0ce2c6d42299d16b8430e1d8aaa0eb3..2dc4530969c936a995e1f64d20a0554036d79025 100644 (file)
--- a/ext/phar/tests/phar_gzipU.phpt
+++ b/ext/phar/tests/phar_gzipU.phpt
@@ -3,7 +3,7 @@ Phar: gzipped phar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP < 5.2.6");

diff --git a/ext/phar/tests/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt
index 2d6586d590fa917ec36d632ce59caca85d9a050a..bf7b6c4981d63d882bbc9a7a014f3d0c42cb88a0 100644 (file)
--- a/ext/phar/tests/phar_metadata_read.phpt
+++ b/ext/phar/tests/phar_metadata_read.phpt
@@ -3,7 +3,7 @@ Phar with metadata (read)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/phar_metadata_readU.phpt b/ext/phar/tests/phar_metadata_readU.phpt
index 281e9786ddb328b71bd0472ca52605d32a61c25a..325c3ccf2542962d3f69627686175fdbdb58bda3 100644 (file)
--- a/ext/phar/tests/phar_metadata_readU.phpt
+++ b/ext/phar/tests/phar_metadata_readU.phpt
@@ -3,7 +3,7 @@ Phar with metadata (read)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt
index 0a3b66d7495b850b6343304634bfc346977ad129..d9f0aba60109ad33ddb9ee9dd35a0d7c8bc2fb31 100644 (file)
--- a/ext/phar/tests/phar_metadata_write.phpt
+++ b/ext/phar/tests/phar_metadata_write.phpt
@@ -3,7 +3,7 @@ Phar with metadata (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_metadata_writeU.phpt b/ext/phar/tests/phar_metadata_writeU.phpt
index 21c42d7f1a7174f4f737c5d7e36fbbdd7b6d8fa3..715b6975963d87ad8c152c4ae56322243d27f0d2 100644 (file)
--- a/ext/phar/tests/phar_metadata_writeU.phpt
+++ b/ext/phar/tests/phar_metadata_writeU.phpt
@@ -3,7 +3,7 @@ Phar with metadata (write)
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index bb4c9d7188cc90793267d014cdd407a261508888..e89e3c27947811218ecdaffd0c1e4e5b851008ae 100644 (file)
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -3,7 +3,7 @@ Phar object: basics
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/phar_oo_001U.phpt b/ext/phar/tests/phar_oo_001U.phpt
index a21026a5b694714e71dd18cc20efbbd288b81b85..ce0057918bc3290bbbb06d2edd6234e52c80ae80 100644 (file)
--- a/ext/phar/tests/phar_oo_001U.phpt
+++ b/ext/phar/tests/phar_oo_001U.phpt
@@ -3,7 +3,7 @@ Phar object: basics
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 476cd7d3c216f89633c542f3d00bb555f3c0c1c1..bcdcc35b31fb1933b49a32bca28a428f4e5e3db7 100644 (file)
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -3,7 +3,7 @@ Phar object: iterator & entries
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/phar_oo_002U.phpt b/ext/phar/tests/phar_oo_002U.phpt
index da17152b3273f4cac110fd8de548e321a27d13c1..ec44ba4b40fe0eb1e843ee2c42a638109dbb2745 100644 (file)
--- a/ext/phar/tests/phar_oo_002U.phpt
+++ b/ext/phar/tests/phar_oo_002U.phpt
@@ -3,7 +3,7 @@ Phar object: iterator & entries
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip requires Unicode support");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip requires Unicode support");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index 3e4581992eaab16b63aab2d4bb66cf46f5a47655..e801978903a036f50df14b28f5e13dd61d522c63 100644 (file)
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -4,7 +4,7 @@ Phar and DirectoryIterator
 <?php
 if (!extension_loaded("phar")) die("skip");
 if (!extension_loaded("spl")) die("skip SPL not available");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_oo_004U.phpt b/ext/phar/tests/phar_oo_004U.phpt
index 51be9dab2e2bc7f191351ca2331744a3416f270e..d3272f434d08aafe9323b144dd91944d4d88607f 100644 (file)
--- a/ext/phar/tests/phar_oo_004U.phpt
+++ b/ext/phar/tests/phar_oo_004U.phpt
@@ -4,7 +4,7 @@ Phar and DirectoryIterator
 <?php
 if (!extension_loaded("phar")) die("skip");
 if (!extension_loaded("spl")) die("skip SPL not available");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip requires Unicode support");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip requires Unicode support");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_oo_005U.phpt b/ext/phar/tests/phar_oo_005U.phpt
index 9c04b93cef33ce6388490cde7be2824026f4cc60..9a2589cdfed7f145abdcf2507d0e3c8d15fb7bda 100644 (file)
--- a/ext/phar/tests/phar_oo_005U.phpt
+++ b/ext/phar/tests/phar_oo_005U.phpt
@@ -4,7 +4,7 @@ Phar and RecursiveDirectoryIterator
 <?php
 if (!extension_loaded("phar")) die("skip");
 if (!extension_loaded("spl")) die("skip SPL not available");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip requires Unicode support");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip requires Unicode support");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/readfile_edgecasesU.phpt b/ext/phar/tests/readfile_edgecasesU.phpt
index c26b45fc57076e7749c870aba75a1da6e8eb4d74..905227a24268dd3ef790c4446bc3c5327d99496b 100644 (file)
--- a/ext/phar/tests/readfile_edgecasesU.phpt
+++ b/ext/phar/tests/readfile_edgecasesU.phpt
@@ -2,7 +2,7 @@
 Phar: test edge cases of readfile() function interception
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip");?>
-<?php if (version_compare(PHP_VERSION, "6.0", "<")) die("skip requires php 6.0 or newer"); ?>
+<?php if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip requires php 6.0 or newer"); ?>
 --INI--
 phar.readonly=0
 --FILE--

diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt
index 4dfb65459a11d98fb5da3b519549f18053c3a273..276526381273f404a74d5721a7bf78d4d8b83e8c 100644 (file)
--- a/ext/phar/tests/tar/all.phpt
+++ b/ext/phar/tests/tar/all.phpt
@@ -3,7 +3,7 @@ Phar: test that creation of tar-based phar generates valid tar with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");

diff --git a/ext/phar/tests/tar/allU.phpt b/ext/phar/tests/tar/allU.phpt
index 50c7fc711d01807269a36c20941dbe43df37c728..65e2c091bea5d20893a743004acbe0068c45e55d 100644 (file)
--- a/ext/phar/tests/tar/allU.phpt
+++ b/ext/phar/tests/tar/allU.phpt
@@ -3,7 +3,7 @@ Phar: test that creation of tar-based phar generates valid tar with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");

diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index d18f32ed3bd0152c03f8b284a20957ca34631dd7..ffbdc2f1a60772e92a72b21745867c77f22c3bbb 100644 (file)
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering() tar-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt b/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
index d058b36165d6ccef08a575bc1cfdb4b723d20809..02d64a454097f2a147f5cda761df2d5f5728e909 100644 (file)
--- a/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering() tar-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt
index bb1d3bf9e167decb1e818d7716414e97b5d663a4..f6d883888ec37c057e04b518482e589d74f4e5a5 100644 (file)
--- a/ext/phar/tests/tar/tar_004.phpt
+++ b/ext/phar/tests/tar/tar_004.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, tar phar with stub, mapPhar()
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/tar/tar_004U.phpt b/ext/phar/tests/tar/tar_004U.phpt
index 45c77a924011d5a248d08e176954dd836a0855c3..0584108938088111f364599f15c93b0bd1497cbb 100644 (file)
--- a/ext/phar/tests/tar/tar_004U.phpt
+++ b/ext/phar/tests/tar/tar_004U.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, tar phar with stub, mapPhar()
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--

diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt
index 6093bb9afb99d61ceb98af1e652b4324c305773e..24bcf0e5d8a77fa248fab41d49c31b63c6b71044 100644 (file)
--- a/ext/phar/tests/tar/tar_bz2.phpt
+++ b/ext/phar/tests/tar/tar_bz2.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, bzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>

diff --git a/ext/phar/tests/tar/tar_bz2U.phpt b/ext/phar/tests/tar/tar_bz2U.phpt
index 2f92976509b1b819035264cc72edca3aaab8821a..bdd13f73abcec15353615e6dabcaac294db732e0 100644 (file)
--- a/ext/phar/tests/tar/tar_bz2U.phpt
+++ b/ext/phar/tests/tar/tar_bz2U.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, bzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>

diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt
index d44e1b193c9bd260768f84b016e10bdfe43c9d10..50019ca5805b603475499cf5921bf0ca27a4d19f 100644 (file)
--- a/ext/phar/tests/tar/tar_gzip.phpt
+++ b/ext/phar/tests/tar/tar_gzip.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, gzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP < 5.2.6");

diff --git a/ext/phar/tests/tar/tar_gzipU.phpt b/ext/phar/tests/tar/tar_gzipU.phpt
index 4aa348e427e89e410c4aebac1aa1c7a0333d920f..6b2c8a66e903d292ba1f8d31ecd4a3032070a156 100644 (file)
--- a/ext/phar/tests/tar/tar_gzipU.phpt
+++ b/ext/phar/tests/tar/tar_gzipU.phpt
@@ -3,7 +3,7 @@ Phar: tar-based phar, gzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP < 5.2.6");

diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt
index 49d79a44cce5563b0dc324f60112088a8a140803..d69b76e1ea6919af7485d89b84d0fd262bc6d002 100644 (file)
--- a/ext/phar/tests/zip/all.phpt
+++ b/ext/phar/tests/zip/all.phpt
@@ -3,7 +3,7 @@ Phar: test that creation of zip-based phar generates valid zip with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");

diff --git a/ext/phar/tests/zip/allU.phpt b/ext/phar/tests/zip/allU.phpt
index 93fe5da4c0bd0af3c2b8d394778b8000cddf9abb..97a9dd53bdffad1f7265f2348e8eebe069d92b0e 100644 (file)
--- a/ext/phar/tests/zip/allU.phpt
+++ b/ext/phar/tests/zip/allU.phpt
@@ -3,7 +3,7 @@ Phar: test that creation of zip-based phar generates valid zip with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");

diff --git a/ext/phar/tests/zip/metadata_write_commit.phpt b/ext/phar/tests/zip/metadata_write_commit.phpt
index 162963622273ed257128715bf7db77b453915eaf..326695f825da9f67d4a47c590b1b6ac314d66a72 100644 (file)
--- a/ext/phar/tests/zip/metadata_write_commit.phpt
+++ b/ext/phar/tests/zip/metadata_write_commit.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write) zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/metadata_write_commitU.phpt b/ext/phar/tests/zip/metadata_write_commitU.phpt
index bc589af909de31061bdac00a3704430e54ad7528..9e54ba7f6bb48d91b6c7abca41f1a474966f91a4 100644 (file)
--- a/ext/phar/tests/zip/metadata_write_commitU.phpt
+++ b/ext/phar/tests/zip/metadata_write_commitU.phpt
@@ -3,7 +3,7 @@ Phar with meta-data (write) zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index dc59f2f3aa18286e10a49177bec804b08529bd58..5c42c29962028b0a0e4fded1fd2a74972704b62a 100644 (file)
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering() zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt b/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
index 2956fc6f4a6f8b4a682fd4fa236843c3d34cc6e9..ae38d59c5fc57aa00b6ca6fe1c1d497e2ddc9877 100644 (file)
--- a/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
@@ -3,7 +3,7 @@ Phar::startBuffering()/setStub()/stopBuffering() zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.readonly=0

diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt
index 694f92777321fbd9ef856166164ed37a2a316774..b05e6974a8590e74b61905d24b513cd38f6f1a01 100644 (file)
--- a/ext/phar/tests/zip/phar_magic.phpt
+++ b/ext/phar/tests/zip/phar_magic.phpt
@@ -3,7 +3,7 @@ Phar: include/fopen magic zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of PHP required");
+if (version_compare(PHP_VERSION, "6.0", "==")) die("skip pre-unicode version of PHP required");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/phar_magicU.phpt b/ext/phar/tests/zip/phar_magicU.phpt
index f034e4ede7667aaf85f5f8b0ec098f518feabb02..4f843bc3780621d55cc9fe0f40f3ec15a9d7f31b 100644 (file)
--- a/ext/phar/tests/zip/phar_magicU.phpt
+++ b/ext/phar/tests/zip/phar_magicU.phpt
@@ -3,7 +3,7 @@ Phar: include/fopen magic zip-based
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (version_compare(PHP_VERSION, "6.0", "<")) die("skip Unicode support required");
+if (version_compare(PHP_VERSION, "6.0", "!=")) die("skip Unicode support required");
 ?>
 --INI--
 phar.require_hash=0