mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Sync and fix tests for ICU 60.1 compat
This commit is contained in:
commit
8a4702223d
@ -21,5 +21,5 @@ var_dump($bi->preceding(-1));
|
||||
--EXPECTF--
|
||||
int(4)
|
||||
int(21)
|
||||
int(%d)
|
||||
int(%i)
|
||||
==DONE==
|
||||
|
@ -2,7 +2,7 @@
|
||||
UConverter::convert() w/ Callback Reasons
|
||||
--SKIPIF--
|
||||
<?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--
|
||||
<?php
|
||||
class MyConverter extends UConverter {
|
||||
@ -28,19 +28,23 @@ $c = new MyConverter('ascii', 'utf-8');
|
||||
foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) {
|
||||
$c->convert($word);
|
||||
}
|
||||
--EXPECTF--
|
||||
--EXPECT--
|
||||
toUCallback(REASON_RESET, ...)
|
||||
toUCallback(REASON_RESET, ...)
|
||||
fromUCallback(REASON_RESET, ...)
|
||||
fromUCallback(REASON_RESET, ...)
|
||||
toUCallback(REASON_RESET, ...)
|
||||
toUCallback(REASON_ILLEGAL, ...)%S
|
||||
toUCallback(REASON_ILLEGAL, ...)
|
||||
toUCallback(REASON_ILLEGAL, ...)
|
||||
toUCallback(REASON_RESET, ...)
|
||||
toUCallback(REASON_ILLEGAL, ...)%S
|
||||
toUCallback(REASON_ILLEGAL, ...)
|
||||
toUCallback(REASON_ILLEGAL, ...)
|
||||
fromUCallback(REASON_RESET, ...)
|
||||
fromUCallback(REASON_UNASSIGNED, ...)%S
|
||||
fromUCallback(REASON_UNASSIGNED, ...)
|
||||
fromUCallback(REASON_UNASSIGNED, ...)
|
||||
fromUCallback(REASON_RESET, ...)
|
||||
fromUCallback(REASON_UNASSIGNED, ...)%S
|
||||
fromUCallback(REASON_UNASSIGNED, ...)
|
||||
fromUCallback(REASON_UNASSIGNED, ...)
|
||||
toUCallback(REASON_RESET, ...)
|
||||
toUCallback(REASON_RESET, ...)
|
||||
fromUCallback(REASON_RESET, ...)
|
||||
|
Loading…
Reference in New Issue
Block a user