diff options
| author | Anatol Belski <ab@php.net> | 2017-11-02 12:38:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-11-02 12:38:32 +0100 |
| commit | e8af216ce5e8425408f0027a4a99af30c4e62a29 (patch) | |
| tree | 4cb897ee03da3be94973c168ef4b3dc8556ffeb2 | |
| parent | ba50b27284de132602d9cb9b0bcb4c2a147334bf (diff) | |
| parent | dbfa0140aeed76b4e4738d76994ab22664ce146e (diff) | |
| download | php-git-e8af216ce5e8425408f0027a4a99af30c4e62a29.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync and fix tests for ICU 60.1 compat
| -rw-r--r-- | ext/intl/tests/breakiter_preceding_basic2.phpt | 2 | ||||
| -rw-r--r-- | ext/intl/tests/uconverter_oop_callback2.phpt | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt index 4ddf08c177..e6f4f70387 100644 --- a/ext/intl/tests/breakiter_preceding_basic2.phpt +++ b/ext/intl/tests/breakiter_preceding_basic2.phpt @@ -21,5 +21,5 @@ var_dump($bi->preceding(-1)); --EXPECTF-- int(4) int(21) -int(%d) +int(%i) ==DONE== diff --git a/ext/intl/tests/uconverter_oop_callback2.phpt b/ext/intl/tests/uconverter_oop_callback2.phpt index fde850c085..960e4edfc9 100644 --- a/ext/intl/tests/uconverter_oop_callback2.phpt +++ b/ext/intl/tests/uconverter_oop_callback2.phpt @@ -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, ...) |