Skip to content

Commit 4840b0a

Browse files
weltlingweltling
committed
fixed failing tests for ICU >= 51.2
1 parent fa40290 commit 4840b0a

24 files changed

+47
-34
lines changed

‎ext/intl/tests/bug58756_MessageFormatter.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Bug #58756: w.r.t MessageFormatter
44
<?php
55
if (!extension_loaded('intl'))
66
die('skip intl extension not enabled');
7+
if (version_compare(INTL_ICU_VERSION, '51.2') >= 0)
8+
die('skip for ICU < 51.2');
9+
?>
710
--FILE--
811
<?php
912
ini_set("intl.error_level", E_WARNING);
@@ -31,4 +34,4 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ",
3134
--EXPECT--
3235
date: Tuesday, July 7, 2009 8:41:13 PM EDT
3336
msgf: Tuesday, July 7, 2009 8:41:13 PM EDT
34-
==DONE==
37+
==DONE==

‎ext/intl/tests/collator_asort.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
asort()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/collator_compare.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
compare()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/collator_get_sort_key.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ collator_get_sort_key()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
55
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU >= 4.8 only'; ?>
6+
<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */
7+
if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
68
--FILE--
79
<?php
810

@@ -95,4 +97,4 @@ key: 5c0a161801070107
9597
source: жжж
9698
key: 5c3a3a3a01070107
9799
source: эюя
98-
key: 5d3b3f4501070107
100+
key: 5d3b3f4501070107

‎ext/intl/tests/collator_sort.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
sort()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/collator_sort_with_sort_keys.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
sort_with_sort_keys()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/dateformat_calendars.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ IntlDateFormatter, calendars and time zone
44
date.timezone=Atlantic/Azores
55
--SKIPIF--
66
<?php
7-
if (!extension_loaded('intl'))
8-
die('skip intl extension not enabled');
7+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
8+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
99
--FILE--
1010
<?php
1111
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_create_cal_arg.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter: several forms of the calendar arg
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_format.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
datefmt_format_code()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/dateformat_formatObject_calendar.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter::formatObject(): IntlCalendar tests
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_formatObject_datetime.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter::formatObject(): DateTime tests
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled') ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_format_parse.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
datefmt_format_code() and datefmt_parse_code()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/dateformat_get_set_calendar.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_get_set_timezone.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter: get/setTimeZone()
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/dateformat_set_timezone_id2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ date.timezone=Atlantic/Azores
55
--SKIPIF--
66
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
77
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
8+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
89
--FILE--
910
<?php
1011

‎ext/intl/tests/dateformat_timezone_arg_variations.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
IntlDateFormatter: several forms of the timezone arg
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/formatter_get_locale.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
numfmt_get_locale()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/locale_filter_matches2.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
2-
locale_filter_matches.phpt() icu >= 4.8
2+
locale_filter_matches.phpt() icu >= 4.8 && icu < 51.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
55
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
67
--FILE--
78
<?php
89

‎ext/intl/tests/locale_get_display_name2.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
2-
locale_get_display_name() icu >= 4.8
2+
locale_get_display_name() icu >= 4.8 && icu < 51.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
55
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
67
--FILE--
78
<?php
89

‎ext/intl/tests/locale_get_display_region2.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
2-
locale_get_display_region() icu >= 4.8
2+
locale_get_display_region() icu >= 4.8 && icu < 51.2
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
55
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
67
--FILE--
78
<?php
89

‎ext/intl/tests/locale_lookup.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
locale_lookup.phpt()
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/msgfmt_format_intlcalendar.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
MessageFormat accepts IntlCalendar args
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
5+
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
77
--FILE--
88
<?php
99
ini_set("intl.error_level", E_WARNING);
@@ -27,4 +27,4 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ",
2727
==DONE==
2828
--EXPECT--
2929
Quinta-feira, 17 de Maio de 2012 5:35:36 p.m. WEST
30-
==DONE==
30+
==DONE==

‎ext/intl/tests/resourcebundle_null_mandatory_args.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ ResourceBundle constructor bundle accepts NULL for first two arguments
33
--INI--
44
date.timezone=Atlantic/Azores
55
--SKIPIF--
6-
<?php
7-
if (!extension_loaded('intl'))
8-
die('skip intl extension not enabled');
9-
if (version_compare(INTL_ICU_VERSION, '4.8') < 0)
10-
die('skip ICU >= 4.8 only');
6+
<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
7+
<?php if (version_compare(INTL_ICU_VERSION, '4.8') < 0) die('skip ICU >= 4.8 only'); ?>
8+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
119
--FILE--
1210
<?php
1311
ini_set("intl.error_level", E_WARNING);

‎ext/intl/tests/timezone_getDisplayName_variant2-49+.phpt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
--TEST--
2-
IntlTimeZone::getDisplayName(): type parameter (ICU >= 49)
2+
IntlTimeZone::getDisplayName(): type parameter (ICU >= 49 && ICU < 51.2)
33
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
7-
if (version_compare(INTL_ICU_VERSION, '49') < 0)
8-
die('skip for ICU 49+');
4+
<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '49') < 0) die('skip for ICU 49+'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
97
--FILE--
108
<?php
119
ini_set("intl.error_level", E_WARNING);
@@ -35,4 +33,4 @@ string(5) "+0000"
3533
string(3) "GMT"
3634
string(3) "GMT"
3735
string(22) "Portugal Time (Lisbon)"
38-
==DONE==
36+
==DONE==

0 commit comments

Comments
 (0)