Sync and fix tests for ICU 60.1 compat

This commit is contained in:
Anatol Belski 2017-11-02 12:37:04 +01:00
parent f5358c0e23
commit dbfa0140ae
2 changed files with 11 additions and 7 deletions

View file

@ -21,5 +21,5 @@ var_dump($bi->preceding(-1));
--EXPECTF-- --EXPECTF--
int(4) int(4)
int(21) int(21)
int(%d) int(%i)
==DONE== ==DONE==

View file

@ -2,7 +2,7 @@
UConverter::convert() w/ Callback Reasons UConverter::convert() w/ Callback Reasons
--SKIPIF-- --SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '60.1') < 0) die('skip for ICU >= 60.1'); ?>
--FILE-- --FILE--
<?php <?php
class MyConverter extends UConverter { class MyConverter extends UConverter {
@ -28,19 +28,23 @@ $c = new MyConverter('ascii', 'utf-8');
foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) { foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) {
$c->convert($word); $c->convert($word);
} }
--EXPECTF-- --EXPECT--
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...)
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
toUCallback(REASON_ILLEGAL, ...)%S toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
toUCallback(REASON_ILLEGAL, ...)%S toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_ILLEGAL, ...)
fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_UNASSIGNED, ...)%S fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_UNASSIGNED, ...)%S fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_UNASSIGNED, ...)
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...)
fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...)