Fix off-by-one errors in skip reasons

diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt
index cb3b7802051a6e4cf78f4ada843d0c90b3465575..46d635f4766408207bd51bfa91a746df679cdee0 100644 (file)
--- 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 9a3596c153b68650b33ce3713c9e0ac13c597d4d..9e4f8369d85efccde4aa07fcd39653f802002641 100644 (file)
--- 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 088c8896d947e7ef851e54293ef6c4515a0feb02..d17bb495459893e7bb96f4729cc4ee8186d7e564 100644 (file)
--- 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 dc581f8882eb002a05f2eb5d91e1422b7e360754..6be6adf5e5fe901e13523befa920d3cfaa6c875c 100644 (file)
--- 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 e06bc92e107626cd0ea8465986f5abf28b9080a6..13e26a950e8260b82a1d079eaf5030570d34610f 100644 (file)
--- 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 97e9bdde2cf355b6b222f2e58156ad4cb9d7c7b2..307b236f44e569a55cdad940964ed2637cb83954 100644 (file)
--- 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 9edc8e0aeb4a27d0cbcecd8f920f8c7b3f0b43b5..185f58334de5cdeabca313e3dd24abb7bb68bba2 100644 (file)
--- 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 835261da027b855acee30aed72b44e05bbddc192..03f323d651e6da17e68a23aaf07c8aba36856476 100644 (file)
--- 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 d59425e5f03376a63ca12c365d97b8c3ed80e021..45dfbcffafb11534b3edea47b16770b4e52d4718 100644 (file)
--- 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 b0a54230b7cbc491e7eb67a46a18c94235a0afb1..36bfe297505af58f6bde5b3c20310c29631876ed 100644 (file)
--- 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 470ece2e79bcaa34e01f6ee1e4120381938ca5fb..9577b34b0834ccbccd4025e8e4d5cbb25ca37f19 100644 (file)
--- 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 c432eb7b050f556a38f32f8325bff5fb74103241..f46bd78e2a5a4084f026c12f593005539914a695 100644 (file)
--- 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 5f885ccfe38b9135cf7b3f03352554b67d475de5..5ab7047176500d5b48dc3cd89a7d3bad22f9ccb7 100644 (file)
--- 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 1b7e4e14493257f81b70604f232f9a2a28208908..59535ba902be811520cb31b09c9a8d6bd76baa06 100644 (file)
--- 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 1a62713a6019b84810a481242bdcde774ce32dc2..6f301a0c5fa2b0f62aa7979910439d71e2c21d0a 100644 (file)
--- 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');