Skip to content

Commit 9d838f3

Browse files
mtravermtraver
committed
php/php-src f543476: Fix off-by-one errors in skip reasons
Apply php/php-src commit f543476
1 parent 1052c7c commit 9d838f3

15 files changed

+17
-17
lines changed

‎ext/intl/tests/dateformat_set_timezone_id2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ datefmt_set_timezone_id_code() icu >= 4.8
44
date.timezone=Atlantic/Azores
55
--SKIPIF--
66
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
7-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
7+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
88
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?>
99
--FILE--
1010
<?php

‎ext/intl/tests/formatter_format2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
numfmt_format() icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
<?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU <= 52.1'); ?>
77
--FILE--
88
<?php

‎ext/intl/tests/formatter_format_currency2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
numfmt_format_currency() icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
--FILE--
77
<?php
88

‎ext/intl/tests/formatter_get_set_symbol2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
numfmt_get/set_symbol() icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
<?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
77
--FILE--
88
<?php

‎ext/intl/tests/intl_icu_data_version_constant.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
INTL_ICU_DATA_VERSION constant
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare('INTL_ICU_VERSION', '4.4', '<') < 0) print 'skip for ICU > 4.4'; ?>
5+
<?php if(version_compare('INTL_ICU_VERSION', '4.4', '<') < 0) print 'skip for ICU >= 4.4'; ?>
66
--FILE--
77
<?php
88
var_dump(defined("INTL_ICU_DATA_VERSION"));

‎ext/intl/tests/locale_filter_matches2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?>
77
--FILE--
88
<?php

‎ext/intl/tests/locale_get_display_name2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_get_display_name() icu >= 4.8 && icu < 50.1.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU < 50.1.2'); ?>
77
--FILE--
88
<?php

‎ext/intl/tests/locale_get_display_region2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_get_display_region() icu >= 4.8 && icu < 51.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >= 0) die('skip for ICU <= 50.1.2'); ?>
77
--FILE--
88
<?php

‎ext/intl/tests/locale_get_display_script2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
locale_get_display_script() icu = 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
6-
<?php if (version_compare(INTL_ICU_VERSION, '49') >= 0) die('skip for ICU <= 49'); ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '49') >= 0) die('skip for ICU < 49'); ?>
77
--FILE--
88
<?php
99

‎ext/intl/tests/locale_get_display_script3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
locale_get_display_script() icu >= 49
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '49') < 0) print 'skip for ICU > 49'; ?>
6-
<?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU <= 52.1'); ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '49') < 0) print 'skip for ICU >= 49'; ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU < 52.1'); ?>
77
--FILE--
88
<?php
99

‎ext/intl/tests/locale_get_display_script4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_get_display_script() icu >= 52.1
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip for ICU > 52.1'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip for ICU >= 52.1'; ?>
66
--FILE--
77
<?php
88

‎ext/intl/tests/locale_get_display_variant2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_get_display_variant() icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
--FILE--
77
<?php
88

‎ext/intl/tests/locale_parse_locale2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
locale_parse_locale() icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
--FILE--
77
<?php
88

‎ext/intl/tests/msgfmt_fail2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
msgfmt creation failures icu >= 4.8
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU >= 4.8'; ?>
66
--FILE--
77
<?php
88

‎ext/intl/tests/resourcebundle_internal.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Test ResourceBundle::__construct() with internal ICU bundles
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' )) print 'skip intl extension not loaded'; ?>
55
<?php if( !defined('INTL_ICU_DATA_VERSION')) print 'skip INTL_ICU_DATA_VERSION constant not defined'; ?>
6-
<?php if( version_compare(INTL_ICU_DATA_VERSION, '4.4', '<')) print 'skip for ICU > 4.4'; ?>
6+
<?php if( version_compare(INTL_ICU_DATA_VERSION, '4.4', '<')) print 'skip for ICU >= 4.4'; ?>
77
--FILE--
88
<?php
99
$b = new ResourceBundle('de_DE', 'ICUDATA-region');

0 commit comments

Comments
 (0)