com php-src: Fixed PHP6 unicode related tests: ext/mysql/tests/ mysql_client_encoding.phpt ext/mysql/tests/mysql_db _name.phpt
ext/mysql/tests/mysql_db_query.phpt ex t/mysql/tests/mysql_error.phpt ext/mysql/tests/mysql_fi eld_flags.phpt ext/mysql/tests/mysql_get_client_inf
o.phpt ext/mysql/tests/mysql_get_host_info.phpt e xt/mysql/tests/mysql_get_server_info.phpt ext/mysql/t ests/mysql_info.phpt
ext/mysql/tests/mysql_list_dbs .phpt ext/mysql/tests/mysql_
| From: | Dmitry Stogov | Date: | Fri, 15 Aug 2014 09:08:53 +0000 |
| Subject: | com php-src: Fixed PHP6 unicode related tests: ext/mysql/tests/ mysql_client_encoding.phpt ext/mysql/tests/mysql_db _name.phpt ext/mysql/tests/mysql_db_query.phpt ex t/mysql/tests/mysql_error.phpt ext/mysql/tests/mysql_fi eld_flags.phpt ext/mysql/tests/mysql_get_client_inf o.phpt ext/mysql/tests/mysql_get_host_info.phpt e xt/mysql/tests/mysql_get_server_info.phpt ext/mysql/t ests/mysql_info.phpt ext/mysql/tests/mysql_list_dbs .phpt ext/mysql/tests/mysql_ |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80217@lists.php.net to get a copy of this message | ||
Commit: e3de409eac95870cc0323f3e4df32a0435658333
Author: Dmitry Stogov <dmitry@zend.com> Fri, 15 Aug 2014 13:08:53 +0400
Parents: d1b48a8b02d2fcee393aab7921d16054d323729b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e3de409eac95870cc0323f3e4df32a0435658333
Log:
Fixed PHP6 unicode related tests
Changed paths:
M ext/mysql/tests/mysql_client_encoding.phpt
M ext/mysql/tests/mysql_db_name.phpt
M ext/mysql/tests/mysql_db_query.phpt
M ext/mysql/tests/mysql_error.phpt
M ext/mysql/tests/mysql_field_flags.phpt
M ext/mysql/tests/mysql_get_client_info.phpt
M ext/mysql/tests/mysql_get_host_info.phpt
M ext/mysql/tests/mysql_get_server_info.phpt
M ext/mysql/tests/mysql_info.phpt
M ext/mysql/tests/mysql_list_dbs.phpt
M ext/mysql/tests/mysql_list_processes.phpt
M ext/mysql/tests/mysql_query.phpt
M ext/mysql/tests/mysql_stat.phpt
M ext/mysql/tests/mysql_unbuffered_query.phpt
M ext/mysqli/mysqli_api.c
M ext/mysqli/tests/bug35517.phpt
M ext/mysqli/tests/mysqli_get_warnings.phpt
M ext/mysqli/tests/mysqli_info.phpt
M ext/phar/tests/017.phpt
M ext/phar/tests/017U.phpt
M ext/phar/tests/018.phpt
M ext/phar/tests/018U.phpt
M ext/phar/tests/019b.phpt
M ext/phar/tests/019bU.phpt
M ext/phar/tests/019c.phpt
M ext/phar/tests/019cU.phpt
M ext/phar/tests/027.phpt
M ext/phar/tests/027U.phpt
M ext/phar/tests/bug45218_SLOWTEST.phpt
M ext/phar/tests/bug45218_SLOWTESTU.phpt
M ext/phar/tests/cached_manifest_1.phpt
M ext/phar/tests/cached_manifest_1U.phpt
M ext/phar/tests/fgc_edgecases.phpt
M ext/phar/tests/fopen_edgecases2U.phpt
M ext/phar/tests/ini_set_off.phpt
M ext/phar/tests/ini_set_offU.phpt
M ext/phar/tests/metadata_read.phpt
M ext/phar/tests/metadata_readU.phpt
M ext/phar/tests/metadata_write.phpt
M ext/phar/tests/metadata_writeU.phpt
M ext/phar/tests/metadata_write_commit.phpt
M ext/phar/tests/metadata_write_commitU.phpt
M ext/phar/tests/mounteddir.phpt
M ext/phar/tests/mounteddirU.phpt
M ext/phar/tests/phar_begin_setstub_commit.phpt
M ext/phar/tests/phar_begin_setstub_commitU.phpt
M ext/phar/tests/phar_gzip.phpt
M ext/phar/tests/phar_gzipU.phpt
M ext/phar/tests/phar_metadata_read.phpt
M ext/phar/tests/phar_metadata_readU.phpt
M ext/phar/tests/phar_metadata_write.phpt
M ext/phar/tests/phar_metadata_writeU.phpt
M ext/phar/tests/phar_oo_001.phpt
M ext/phar/tests/phar_oo_001U.phpt
M ext/phar/tests/phar_oo_002.phpt
M ext/phar/tests/phar_oo_002U.phpt
M ext/phar/tests/phar_oo_004.phpt
M ext/phar/tests/phar_oo_004U.phpt
M ext/phar/tests/phar_oo_005U.phpt
M ext/phar/tests/readfile_edgecasesU.phpt
M ext/phar/tests/tar/all.phpt
M ext/phar/tests/tar/allU.phpt
M ext/phar/tests/tar/phar_begin_setstub_commit.phpt
M ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
M ext/phar/tests/tar/tar_004.phpt
M ext/phar/tests/tar/tar_004U.phpt
M ext/phar/tests/tar/tar_bz2.phpt
M ext/phar/tests/tar/tar_bz2U.phpt
M ext/phar/tests/tar/tar_gzip.phpt
M ext/phar/tests/tar/tar_gzipU.phpt
M ext/phar/tests/zip/all.phpt
M ext/phar/tests/zip/allU.phpt
M ext/phar/tests/zip/metadata_write_commit.phpt
M ext/phar/tests/zip/metadata_write_commitU.phpt
M ext/phar/tests/zip/phar_begin_setstub_commit.phpt
M ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
M ext/phar/tests/zip/phar_magic.phpt
M ext/phar/tests/zip/phar_magicU.phpt
diff --git a/ext/mysql/tests/mysql_client_encoding.phpt b/ext/mysql/tests/mysql_client_encoding.phpt index 5b21765..c10303b 100644 --- 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 9321701..ba8334a 100644 --- 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 291fbfa..dc556f4 100644 --- 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 82a43fb..9b0729d 100644 --- 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 cd9e4b5..bf2a193 100644 --- 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 95de0ad..6e84628 100644 --- 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 4b21ddb..a98ab5b 100644 --- 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 ad192e4..e29222b 100644 --- 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 c478679..82c6807 100644 --- 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 402161a..559b5a0 100644 --- 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 7838a6f..402a10d 100644 --- 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 80b985e..abe7adb 100644 --- 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 ef5bb45..95868b7 100644 --- 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 5b10cc4..8c3c2d6 100644 --- 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 b5a68c2..254bae1 100644 --- 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 746251f..772dc30 100644 --- 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 00548de..a7370b7 100644 --- 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 6bb5d21..c8f78f4 100644 --- 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 7c64c40..fdbb3be 100644 --- 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 af65b6d..edcfcf4 100644 --- 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 2e2df47..5640cfb 100644 --- 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 c8d798d..7d75e96 100644 --- 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 5a0ef71..7a22d8b 100644 --- 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 c0864aa..eb3f07a 100644 --- 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 2cb508c..d31981e 100644 --- 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 36ef6d8..6ea5cf2 100644 --- 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 8736efb..45837bf 100644 --- 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 6794c52..598f969 100644 --- 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 80356af..fd3b2fa 100644 --- 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 1639691..e4a82a1 100644 --- 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 af58523..84ec5cb 100644 --- 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 df77f07..3c870bd 100644 --- 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 2699834..094a432 100644 --- 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 09c7b00..c6ab93f 100644 --- 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 878f8bf..e3a5ab7 100644 --- 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 150cbed..10a36f9 100644 --- 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 5c37382..1e852c0 100644 --- 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 7197ead..bca71bd 100644 --- 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 1aaa30d..a961795 100644 --- 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 dc0764b..52903ea 100644 --- 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 fd2f107..caaa7d9 100644 --- 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 712a6f5..bd642c7 100644 --- 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 e130895..9c07ea3 100644 --- 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 d05cb00..e20bd2b 100644 --- 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 9d3e383..59a80dc 100644 --- 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 805e762..10b73a0 100644 --- 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 c722834..2421414 100644 --- 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 662f862..2dc4530 100644 --- 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 2d6586d..bf7b6c4 100644 --- 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 281e978..325c3cc 100644 --- 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 0a3b66d..d9f0aba 100644 --- 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 21c42d7..715b697 100644 --- 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 bb4c9d7..e89e3c2 100644 --- 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 a21026a..ce00579 100644 --- 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 476cd7d..bcdcc35 100644 --- 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 da17152..ec44ba4 100644 --- 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 3e45819..e801978 100644 --- 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 51be9da..d3272f4 100644 --- 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 9c04b93..9a2589c 100644 --- 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 c26b45f..905227a 100644 --- 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 4dfb654..2765263 100644 --- 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 50c7fc7..65e2c09 100644 --- 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 d18f32e..ffbdc2f 100644 --- 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 d058b36..02d64a4 100644 --- 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 bb1d3bf..f6d8838 100644 --- 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 45c77a9..0584108 100644 --- 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 6093bb9..24bcf0e 100644 --- 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 2f92976..bdd13f7 100644 --- 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 d44e1b1..50019ca 100644 --- 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 4aa348e..6b2c8a6 100644 --- 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 49d79a4..d69b76e 100644 --- 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 93fe5da..97a9dd5 100644 --- 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 1629636..326695f 100644 --- 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 bc589af..9e54ba7 100644 --- 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 dc59f2f..5c42c29 100644 --- 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 2956fc6..ae38d59 100644 --- 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 694f927..b05e697 100644 --- 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 f034e4e..4f843bc 100644 --- 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
diff --git a/ext/mysql/tests/mysql_client_encoding.phpt b/ext/mysql/tests/mysql_client_encoding.phpt index 5b21765..c10303b 100644 --- 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 9321701..ba8334a 100644 --- 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 291fbfa..dc556f4 100644 --- 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 82a43fb..9b0729d 100644 --- 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 cd9e4b5..bf2a193 100644 --- 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 95de0ad..6e84628 100644 --- 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 4b21ddb..a98ab5b 100644 --- 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 ad192e4..e29222b 100644 --- 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 c478679..82c6807 100644 --- 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 402161a..559b5a0 100644 --- 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 7838a6f..402a10d 100644 --- 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 80b985e..abe7adb 100644 --- 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 ef5bb45..95868b7 100644 --- 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 5b10cc4..8c3c2d6 100644 --- 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 b5a68c2..254bae1 100644 --- 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 746251f..772dc30 100644 --- 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 00548de..a7370b7 100644 --- 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 6bb5d21..c8f78f4 100644 --- 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 7c64c40..fdbb3be 100644 --- 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 af65b6d..edcfcf4 100644 --- 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 2e2df47..5640cfb 100644 --- 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 c8d798d..7d75e96 100644 --- 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 5a0ef71..7a22d8b 100644 --- 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 c0864aa..eb3f07a 100644 --- 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 2cb508c..d31981e 100644 --- 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 36ef6d8..6ea5cf2 100644 --- 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 8736efb..45837bf 100644 --- 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 6794c52..598f969 100644 --- 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 80356af..fd3b2fa 100644 --- 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 1639691..e4a82a1 100644 --- 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 af58523..84ec5cb 100644 --- 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 df77f07..3c870bd 100644 --- 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 2699834..094a432 100644 --- 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 09c7b00..c6ab93f 100644 --- 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 878f8bf..e3a5ab7 100644 --- 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 150cbed..10a36f9 100644 --- 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 5c37382..1e852c0 100644 --- 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 7197ead..bca71bd 100644 --- 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 1aaa30d..a961795 100644 --- 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 dc0764b..52903ea 100644 --- 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 fd2f107..caaa7d9 100644 --- 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 712a6f5..bd642c7 100644 --- 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 e130895..9c07ea3 100644 --- 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 d05cb00..e20bd2b 100644 --- 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 9d3e383..59a80dc 100644 --- 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 805e762..10b73a0 100644 --- 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 c722834..2421414 100644 --- 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 662f862..2dc4530 100644 --- 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 2d6586d..bf7b6c4 100644 --- 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 281e978..325c3cc 100644 --- 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 0a3b66d..d9f0aba 100644 --- 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 21c42d7..715b697 100644 --- 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 bb4c9d7..e89e3c2 100644 --- 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 a21026a..ce00579 100644 --- 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 476cd7d..bcdcc35 100644 --- 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 da17152..ec44ba4 100644 --- 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 3e45819..e801978 100644 --- 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 51be9da..d3272f4 100644 --- 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 9c04b93..9a2589c 100644 --- 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 c26b45f..905227a 100644 --- 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 4dfb654..2765263 100644 --- 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 50c7fc7..65e2c09 100644 --- 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 d18f32e..ffbdc2f 100644 --- 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 d058b36..02d64a4 100644 --- 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 bb1d3bf..f6d8838 100644 --- 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 45c77a9..0584108 100644 --- 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 6093bb9..24bcf0e 100644 --- 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 2f92976..bdd13f7 100644 --- 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 d44e1b1..50019ca 100644 --- 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 4aa348e..6b2c8a6 100644 --- 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 49d79a4..d69b76e 100644 --- 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 93fe5da..97a9dd5 100644 --- 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 1629636..326695f 100644 --- 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 bc589af..9e54ba7 100644 --- 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 dc59f2f..5c42c29 100644 --- 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 2956fc6..ae38d59 100644 --- 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 694f927..b05e697 100644 --- 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 f034e4e..4f843bc 100644 --- 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