summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/intl/tests/breakiter_getPartsIterator_basic2.phpt4
-rw-r--r--ext/intl/tests/breakiter_preceding_basic2.phpt4
-rw-r--r--ext/intl/tests/dateformat_create_cal_arg_variant5.phpt10
-rw-r--r--ext/intl/tests/uconverter_oop_callback2.phpt14
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, ...)