Skip to content

Commit 5d90c50

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Replace xfail with skipif in calendar_clear_variation1.phpt
2 parents 9a358b2 + 6b6a5cd commit 5d90c50

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ext/intl/tests/calendar_clear_variation1.phpt

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ IntlCalendar::clear() 1 arg variation
44
date.timezone=Atlantic/Azores
55
--EXTENSIONS--
66
intl
7-
--XFAIL--
8-
May currently fail with ICU 73.
9-
See https://github.com/php/php-src/issues/11128
7+
--SKIPIF--
8+
<?php
9+
if (version_compare(INTL_ICU_VERSION, '73.1') >= 0 && version_compare(INTL_ICU_VERSION, '74.1') < 0) {
10+
die('skip Broken for ICU >= 73.1 and < 74.1, see https://github.com/php/php-src/issues/11128');
11+
}
12+
?>
1013
--FILE--
1114
<?php
1215
ini_set("intl.error_level", E_WARNING);
@@ -29,4 +32,4 @@ bool(true)
2932
bool(true)
3033
bool(false)
3134
float(1327813567000)
32-
float(1327813567000)
35+
float(1327813567000)

0 commit comments

Comments
 (0)