com php-src: Fix off-by-one errors in skip reasons: ext/intl/tests/dateformat_set_timezone_id2.phpt ext /intl/tests/formatter_format2.phpt
ext/intl/tests/forma tter_format_currency2.phpt ext/intl/tests/formatter _get_set_symbol2.phpt ext/intl/tests/intl_icu_d ata_version_constant.phpt
ext/intl/tests/locale_filte r_matches2.phpt ext/intl/tests/locale_get_display _name2.phpt ext/intl/tests/locale_get_display_reg ion2.phpt
ext/intl/tests/locale_get_display

From: Date: Mon, 03 Sep 2018 10:46:34 +0000
Subject: com php-src: Fix off-by-one errors in skip reasons: ext/intl/tests/dateformat_set_timezone_id2.phpt ext /intl/tests/formatter_format2.phpt
ext/intl/tests/forma tter_format_currency2.phpt ext/intl/tests/formatter _get_set_symbol2.phpt ext/intl/tests/intl_icu_d ata_version_constant.phpt
ext/intl/tests/locale_filte r_matches2.phpt ext/intl/tests/locale_get_display _name2.phpt ext/intl/tests/locale_get_display_reg ion2.phpt
ext/intl/tests/locale_get_display
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102969@lists.php.net to get a copy of this message
Commit: f543476e899d5b1f0df5aac15758c4e0db18cb17 Author: Christoph M. Becker <cmbecker69@gmx.de> Mon, 3 Sep 2018 12:46:34 +0200 Parents: d36cb3d30ea460db5886c673a0f8ecd5db9bf303 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f543476e899d5b1f0df5aac15758c4e0db18cb17 Log: Fix off-by-one errors in skip reasons Changed paths: M ext/intl/tests/dateformat_set_timezone_id2..phpt M ext/intl/tests/formatter_format2.phpt M ext/intl/tests/formatter_format_currency2.phpt M ext/intl/tests/formatter_get_set_symbol2.phpt M ext/intl/tests/intl_icu_data_version_constant.phpt M ext/intl/tests/locale_filter_matches2.phpt M ext/intl/tests/locale_get_display_name2.phpt M ext/intl/tests/locale_get_display_region2.phpt M ext/intl/tests/locale_get_display_script2.phpt M ext/intl/tests/locale_get_display_script3.phpt M ext/intl/tests/locale_get_display_script4.phpt M ext/intl/tests/locale_get_display_variant2.phpt M ext/intl/tests/locale_parse_locale2.phpt M ext/intl/tests/msgfmt_fail2.phpt M ext/intl/tests/resourcebundle_internal.phpt

diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt index cb3b780..46d635f 100644 --- a/ext/intl/tests/dateformat_set_timezone_id2.phpt +++ b/ext/intl/tests/dateformat_set_timezone_id2.phpt @@ -4,7 +4,7 @@ datefmt_set_timezone_id_code() icu >= 4.8 date.timezone=Atlantic/Azores --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/formatter_format2.phpt b/ext/intl/tests/formatter_format2.phpt index 9a3596c..9e4f836 100644 --- a/ext/intl/tests/formatter_format2.phpt +++ b/ext/intl/tests/formatter_format2.phpt @@ -2,7 +2,7 @@ numfmt_format() icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU <= 52.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/formatter_format_currency2.phpt b/ext/intl/tests/formatter_format_currency2.phpt index 088c889..d17bb49 100644 --- a/ext/intl/tests/formatter_format_currency2.phpt +++ b/ext/intl/tests/formatter_format_currency2.phpt @@ -2,7 +2,7 @@ numfmt_format_currency() icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> --FILE-- <?php diff --git a/ext/intl/tests/formatter_get_set_symbol2.phpt b/ext/intl/tests/formatter_get_set_symbol2.phpt index dc581f8..6be6adf 100644 --- a/ext/intl/tests/formatter_get_set_symbol2.phpt +++ b/ext/intl/tests/formatter_get_set_symbol2.phpt @@ -2,7 +2,7 @@ numfmt_get/set_symbol() icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?> --FILE-- <?php diff --git a/ext/intl/tests/intl_icu_data_version_constant.phpt b/ext/intl/tests/intl_icu_data_version_constant.phpt index e06bc92..13e26a9 100644 --- a/ext/intl/tests/intl_icu_data_version_constant.phpt +++ b/ext/intl/tests/intl_icu_data_version_constant.phpt @@ -2,7 +2,7 @@ INTL_ICU_DATA_VERSION constant --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare('INTL_ICU_VERSION', '4.4', '<') < 0) print 'skip for ICU > 4.4'; ?> +<?php if(version_compare('INTL_ICU_VERSION', '4.4', '<') < 0) print 'skip for ICU >= 4.4'; ?> --FILE-- <?php var_dump(defined("INTL_ICU_DATA_VERSION")); diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt index 97e9bdd..307b236 100644 --- a/ext/intl/tests/locale_filter_matches2.phpt +++ b/ext/intl/tests/locale_filter_matches2.phpt @@ -2,7 +2,7 @@ locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_name2.phpt b/ext/intl/tests/locale_get_display_name2.phpt index 9edc8e0..185f583 100644 --- a/ext/intl/tests/locale_get_display_name2.phpt +++ b/ext/intl/tests/locale_get_display_name2.phpt @@ -2,7 +2,7 @@ locale_get_display_name() icu >= 4.8 && icu < 50.1.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_region2.phpt b/ext/intl/tests/locale_get_display_region2.phpt index 835261d..03f323d 100644 --- a/ext/intl/tests/locale_get_display_region2.phpt +++ b/ext/intl/tests/locale_get_display_region2.phpt @@ -2,7 +2,7 @@ locale_get_display_region() icu >= 4.8 && icu < 51.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU <= 50.1.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_script2.phpt b/ext/intl/tests/locale_get_display_script2.phpt index d59425e..45dfbcf 100644 --- a/ext/intl/tests/locale_get_display_script2.phpt +++ b/ext/intl/tests/locale_get_display_script2.phpt @@ -2,8 +2,8 @@ locale_get_display_script() icu = 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> -<?php if (version_compare(INTL_ICU_VERSION, '49') >= 0) die('skip for ICU <= 49'); ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '49') >= 0) die('skip for ICU < 49'); ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_script3.phpt b/ext/intl/tests/locale_get_display_script3.phpt index b0a5423..36bfe29 100644 --- a/ext/intl/tests/locale_get_display_script3.phpt +++ b/ext/intl/tests/locale_get_display_script3.phpt @@ -2,8 +2,8 @@ locale_get_display_script() icu >= 49 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '49') < 0) print 'skip for ICU > 49'; ?> -<?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU <= 52.1'); ?> +<?php if(version_compare(INTL_ICU_VERSION, '49') < 0) print 'skip for ICU >= 49'; ?> +<?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU < 52.1'); ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_script4.phpt b/ext/intl/tests/locale_get_display_script4.phpt index 470ece2..9577b34 100644 --- a/ext/intl/tests/locale_get_display_script4.phpt +++ b/ext/intl/tests/locale_get_display_script4.phpt @@ -2,7 +2,7 @@ locale_get_display_script() icu >= 52.1 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip for ICU > 52.1'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip for ICU >= 52.1'; ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_get_display_variant2.phpt b/ext/intl/tests/locale_get_display_variant2.phpt index c432eb7..f46bd78 100644 --- a/ext/intl/tests/locale_get_display_variant2.phpt +++ b/ext/intl/tests/locale_get_display_variant2.phpt @@ -2,7 +2,7 @@ locale_get_display_variant() icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> --FILE-- <?php diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt index 5f885cc..5ab7047 100644 --- a/ext/intl/tests/locale_parse_locale2.phpt +++ b/ext/intl/tests/locale_parse_locale2.phpt @@ -2,7 +2,7 @@ locale_parse_locale() icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> --FILE-- <?php diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt index 1b7e4e1..59535ba 100644 --- a/ext/intl/tests/msgfmt_fail2.phpt +++ b/ext/intl/tests/msgfmt_fail2.phpt @@ -2,7 +2,7 @@ msgfmt creation failures icu >= 4.8 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> -<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?> +<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?> --FILE-- <?php diff --git a/ext/intl/tests/resourcebundle_internal.phpt b/ext/intl/tests/resourcebundle_internal.phpt index 1a62713..6f301a0 100644 --- a/ext/intl/tests/resourcebundle_internal.phpt +++ b/ext/intl/tests/resourcebundle_internal.phpt @@ -3,7 +3,7 @@ Test ResourceBundle::__construct() with internal ICU bundles --SKIPIF-- <?php if( !extension_loaded( 'intl' )) print 'skip intl extension not loaded'; ?> <?php if( !defined('INTL_ICU_DATA_VERSION')) print 'skip INTL_ICU_DATA_VERSION constant not defined'; ?> -<?php if( version_compare(INTL_ICU_DATA_VERSION, '4.4', '<')) print 'skip for ICU > 4.4'; ?> +<?php if( version_compare(INTL_ICU_DATA_VERSION, '4.4', '<')) print 'skip for ICU >= 4.4'; ?> --FILE-- <?php $b = new ResourceBundle('de_DE', 'ICUDATA-region');
« previous php.cvs (#102969) next »