Skip to content

Commit 5d85d96

Browse files
committed
Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
1 parent ede8cee commit 5d85d96

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

ext/intl/tests/breakiter_getPartsIterator_basic2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ print_r(iterator_to_array($pi));
2323
var_dump($pi->getRuleStatus());
2424
?>
2525
==DONE==
26-
--EXPECT--
26+
--EXPECTF--
2727
string(17) "IntlPartsIterator"
2828
Array
2929
(
@@ -35,5 +35,5 @@ Array
3535
[1] =>
3636
[2] => bar
3737
)
38-
int(200)
38+
int(%d)
3939
==DONE==

ext/intl/tests/breakiter_preceding_basic2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var_dump($bi->preceding(50));
1818
var_dump($bi->preceding(-1));
1919
?>
2020
==DONE==
21-
--EXPECT--
21+
--EXPECTF--
2222
int(4)
2323
int(21)
24-
int(-1)
24+
int(%d)
2525
==DONE==

ext/intl/tests/dateformat_create_cal_arg_variant5.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ echo $df->format($ts), "\n";
4343
?>
4444
==DONE==
4545
--EXPECTF--
46-
domingo%S 1 de enero de 2012, 0:00:00 (tiempo universal coordinado)
47-
domingo%S 8 de safar de 1433, 0:00:00 (tiempo universal coordinado)
46+
domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado)
47+
domingo%S 8 de %safar de 1433, 0:00:00 (%siempo %sniversal %sordinado)
4848
domingo, 1 de enero de 2012, 1:00:00 (hora estándar de Europa central)
4949
sábado, 31 de diciembre de 2011 d. C., 23:00:00 (hora estándar de las Azores)
50-
sábado, 7 de safar de 1433 AH, 23:00:00 (hora estándar de las Azores)
51-
domingo%S 8 de safar de 1433 AH, 0:00:00 (tiempo universal coordinado)
52-
domingo%S 1 de enero de 2012, 0:00:00 (tiempo universal coordinado)
50+
sábado, 7 de %safar de 1433 AH, 23:00:00 (hora estándar de las Azores)
51+
domingo%S 8 de %safar de 1433 AH, 0:00:00 (%siempo %sniversal %sordinado)
52+
domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado)
5353
==DONE==

ext/intl/tests/uconverter_oop_callback2.phpt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,19 @@ $c = new MyConverter('ascii', 'utf-8');
2828
foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) {
2929
$c->convert($word);
3030
}
31-
--EXPECT--
31+
--EXPECTF--
3232
toUCallback(REASON_RESET, ...)
3333
toUCallback(REASON_RESET, ...)
3434
fromUCallback(REASON_RESET, ...)
3535
fromUCallback(REASON_RESET, ...)
3636
toUCallback(REASON_RESET, ...)
37-
toUCallback(REASON_ILLEGAL, ...)
38-
toUCallback(REASON_ILLEGAL, ...)
37+
toUCallback(REASON_ILLEGAL, ...)%S
3938
toUCallback(REASON_RESET, ...)
40-
toUCallback(REASON_ILLEGAL, ...)
41-
toUCallback(REASON_ILLEGAL, ...)
39+
toUCallback(REASON_ILLEGAL, ...)%S
4240
fromUCallback(REASON_RESET, ...)
43-
fromUCallback(REASON_UNASSIGNED, ...)
44-
fromUCallback(REASON_UNASSIGNED, ...)
41+
fromUCallback(REASON_UNASSIGNED, ...)%S
4542
fromUCallback(REASON_RESET, ...)
46-
fromUCallback(REASON_UNASSIGNED, ...)
47-
fromUCallback(REASON_UNASSIGNED, ...)
43+
fromUCallback(REASON_UNASSIGNED, ...)%S
4844
toUCallback(REASON_RESET, ...)
4945
toUCallback(REASON_RESET, ...)
5046
fromUCallback(REASON_RESET, ...)

0 commit comments

Comments
 (0)