diff options
| author | Anatol Belski <ab@php.net> | 2016-01-02 13:59:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-02 13:59:13 +0100 |
| commit | fe99f024372fa98974bf26e9f0f92e7f77411eb3 (patch) | |
| tree | fa020b93c68d18ad7c9837483b85086e6d5a4c59 | |
| parent | 563659822de1e22d835df94e13cc66a34e7261b2 (diff) | |
| parent | 302a35bb15dcc304d084abd7b57668fcc98db479 (diff) | |
| download | php-git-fe99f024372fa98974bf26e9f0f92e7f77411eb3.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
remove duplicated skipif conditions
4 files changed, 0 insertions, 4 deletions
diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt index 406f79250e..70a8adc913 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt @@ -3,7 +3,6 @@ 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'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> --FILE-- diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt index 8efb41c5b1..6ae6dfedd3 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt @@ -3,7 +3,6 @@ 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'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> --FILE-- diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt index 18a9b89de7..8a563d8a90 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt @@ -3,7 +3,6 @@ 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'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?> --FILE-- diff --git a/ext/intl/tests/formatter_format5.phpt b/ext/intl/tests/formatter_format5.phpt index 0a96451699..0bc4a6679b 100644 --- a/ext/intl/tests/formatter_format5.phpt +++ b/ext/intl/tests/formatter_format5.phpt @@ -4,7 +4,6 @@ numfmt_format() icu >= 54.1 && icu < 56.1 <?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'); ?> -<?php if (version_compare(INTL_ICU_VERSION, '56.1') >= 0) die('skip for ICU < 56.1'); ?> --FILE-- <?php |