diff options
| author | Anatol Belski <ab@php.net> | 2017-10-21 10:31:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-21 10:31:02 +0200 |
| commit | 2e64f139ec0716de2a91ff3c67ac211bc3fb6670 (patch) | |
| tree | 35f1fda4a482dc8b7b2440179548b07cb656485b | |
| parent | 68c0c690572dc9829e84901003f0c75d55430299 (diff) | |
| parent | 3eb7ea55ae89337c96ab9b5b32b0ab5da1348f73 (diff) | |
| download | php-git-2e64f139ec0716de2a91ff3c67ac211bc3fb6670.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
4 files changed, 14 insertions, 18 deletions
diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt index 2bbd999904..2f96fa9aed 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt @@ -23,7 +23,7 @@ print_r(iterator_to_array($pi)); var_dump($pi->getRuleStatus()); ?> ==DONE== ---EXPECT-- +--EXPECTF-- string(17) "IntlPartsIterator" Array ( @@ -35,5 +35,5 @@ Array [1] => [2] => bar ) -int(200) +int(%d) ==DONE== diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt index b964365025..4ddf08c177 100644 --- a/ext/intl/tests/breakiter_preceding_basic2.phpt +++ b/ext/intl/tests/breakiter_preceding_basic2.phpt @@ -18,8 +18,8 @@ var_dump($bi->preceding(50)); var_dump($bi->preceding(-1)); ?> ==DONE== ---EXPECT-- +--EXPECTF-- int(4) int(21) -int(-1) +int(%d) ==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt index 1b61df82f0..8e94d42867 100644 --- a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt @@ -43,11 +43,11 @@ echo $df->format($ts), "\n"; ?> ==DONE== --EXPECTF-- -domingo%S 1 de enero de 2012, 0:00:00 (tiempo universal coordinado) -domingo%S 8 de safar de 1433, 0:00:00 (tiempo universal coordinado) +domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado) +domingo%S 8 de %safar de 1433, 0:00:00 (%siempo %sniversal %sordinado) domingo, 1 de enero de 2012, 1:00:00 (hora estándar de Europa central) sábado, 31 de diciembre de 2011 d. C., 23:00:00 (hora estándar de las Azores) -sábado, 7 de safar de 1433 AH, 23:00:00 (hora estándar de las Azores) -domingo%S 8 de safar de 1433 AH, 0:00:00 (tiempo universal coordinado) -domingo%S 1 de enero de 2012, 0:00:00 (tiempo universal coordinado) +sábado, 7 de %safar de 1433 AH, 23:00:00 (hora estándar de las Azores) +domingo%S 8 de %safar de 1433 AH, 0:00:00 (%siempo %sniversal %sordinado) +domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado) ==DONE== diff --git a/ext/intl/tests/uconverter_oop_callback2.phpt b/ext/intl/tests/uconverter_oop_callback2.phpt index 6c09947c36..fde850c085 100644 --- a/ext/intl/tests/uconverter_oop_callback2.phpt +++ b/ext/intl/tests/uconverter_oop_callback2.phpt @@ -28,23 +28,19 @@ $c = new MyConverter('ascii', 'utf-8'); foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) { $c->convert($word); } ---EXPECT-- +--EXPECTF-- toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...) -toUCallback(REASON_ILLEGAL, ...) -toUCallback(REASON_ILLEGAL, ...) +toUCallback(REASON_ILLEGAL, ...)%S toUCallback(REASON_RESET, ...) -toUCallback(REASON_ILLEGAL, ...) -toUCallback(REASON_ILLEGAL, ...) +toUCallback(REASON_ILLEGAL, ...)%S fromUCallback(REASON_RESET, ...) -fromUCallback(REASON_UNASSIGNED, ...) -fromUCallback(REASON_UNASSIGNED, ...) +fromUCallback(REASON_UNASSIGNED, ...)%S fromUCallback(REASON_RESET, ...) -fromUCallback(REASON_UNASSIGNED, ...) -fromUCallback(REASON_UNASSIGNED, ...) +fromUCallback(REASON_UNASSIGNED, ...)%S toUCallback(REASON_RESET, ...) toUCallback(REASON_RESET, ...) fromUCallback(REASON_RESET, ...) |