diff options
8 files changed, 10 insertions, 5 deletions
diff --git a/ext/intl/tests/collator_get_sort_key_variant4.phpt b/ext/intl/tests/collator_get_sort_key_variant4.phpt index 2c86f21111..bd7af6a284 100644 --- a/ext/intl/tests/collator_get_sort_key_variant4.phpt +++ b/ext/intl/tests/collator_get_sort_key_variant4.phpt @@ -2,6 +2,7 @@ collator_get_sort_key() icu >= 54.1 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt index 2ca57c245f..d857aa2fb1 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt @@ -3,6 +3,7 @@ IntlDateFormatter::formatObject(): IntlCalendar tests --SKIPIF-- <?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt index c47e2b59bd..46d1c8b496 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt @@ -3,6 +3,7 @@ IntlDateFormatter::formatObject(): DateTime tests --SKIPIF-- <?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt index adedd74965..27babf3a1f 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt @@ -3,6 +3,7 @@ IntlDateFormatter: get/setTimeZone() --SKIPIF-- <?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/formatter_format5.phpt b/ext/intl/tests/formatter_format5.phpt index cbaf140a0f..3028f63517 100644 --- a/ext/intl/tests/formatter_format5.phpt +++ b/ext/intl/tests/formatter_format5.phpt @@ -2,6 +2,7 @@ numfmt_format() icu >= 54.1 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '56.1') >= 0) die('skip for ICU < 56.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/formatter_get_set_text_attribute.phpt b/ext/intl/tests/formatter_get_set_text_attribute.phpt index 539ff52322..99e278ebdc 100644 --- a/ext/intl/tests/formatter_get_set_text_attribute.phpt +++ b/ext/intl/tests/formatter_get_set_text_attribute.phpt @@ -2,6 +2,7 @@ numfmt_get/set_text_attribute() --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '56.1') >= 0) die('skip for ICU < 56.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/spoofchecker_004.phpt b/ext/intl/tests/spoofchecker_004.phpt index b38c61d717..a26b39209f 100644 --- a/ext/intl/tests/spoofchecker_004.phpt +++ b/ext/intl/tests/spoofchecker_004.phpt @@ -2,6 +2,7 @@ spoofchecker with settings changed --SKIPIF-- <?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt index e90cc4748c..e67fcab491 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt @@ -1,11 +1,9 @@ --TEST-- IntlTimeZone::getDisplayName(): locale parameter --SKIPIF-- -<?php -if (!extension_loaded('intl')) - die('skip intl extension not enabled'); -if (version_compare(INTL_ICU_VERSION, '49') < 0) - die('skip for ICU 49+'); +<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '49') < 0) die('skip for ICU >= 49'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> --FILE-- <?php ini_set("intl.error_level", E_WARNING); |