Use EXPECT instead of EXPECTF when possible

EXPECTF logic in run-tests.php is considerable, so let's avoid it.

27 files changed, 27 insertions, 27 deletions

diff --git a/ext/intl/tests/breakiter_getText_basic.phpt b/ext/intl/tests/breakiter_getText_basic.phpt
index 0e5a26c16a..37cd161e02 100644
--- a/ext/intl/tests/breakiter_getText_basic.phpt
+++ b/ext/intl/tests/breakiter_getText_basic.phpt
@@ -12,6 +12,6 @@ $bi = IntlBreakIterator::createWordInstance('pt');
 var_dump($bi->getText());
 $bi->setText('foo bar');
 var_dump($bi->getText());
---EXPECTF--
+--EXPECT--
 NULL
 string(7) "foo bar"
diff --git a/ext/intl/tests/breakiter_last_basic.phpt b/ext/intl/tests/breakiter_last_basic.phpt
index cf816c3670..48693f1ed0 100644
--- a/ext/intl/tests/breakiter_last_basic.phpt
+++ b/ext/intl/tests/breakiter_last_basic.phpt
@@ -14,7 +14,7 @@ $bi->setText('foo bar trans');
 var_dump($bi->current());
 var_dump($bi->last());
 var_dump($bi->current());
---EXPECTF--
+--EXPECT--
 int(0)
 int(13)
 int(13)
diff --git a/ext/intl/tests/bug53512.phpt b/ext/intl/tests/bug53512.phpt
index 0de2c49a20..872e5987be 100644
--- a/ext/intl/tests/bug53512.phpt
+++ b/ext/intl/tests/bug53512.phpt
@@ -16,7 +16,7 @@ foreach ($badvals as $val) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(65) "numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR"
 bool(false)
diff --git a/ext/intl/tests/bug67397.phpt b/ext/intl/tests/bug67397.phpt
index b2b2911f8a..b2278ea7e6 100644
--- a/ext/intl/tests/bug67397.phpt
+++ b/ext/intl/tests/bug67397.phpt
@@ -16,6 +16,6 @@ function ut_main()
 include_once( 'ut_common.inc' );
 ut_run();
 ?>
---EXPECTF--
+--EXPECT--
 false
 'locale_get_display_name : name too long: U_ILLEGAL_ARGUMENT_ERROR'
diff --git a/ext/intl/tests/bug69374.phpt b/ext/intl/tests/bug69374.phpt
index 4d9fffab7a..6788255289 100644
--- a/ext/intl/tests/bug69374.phpt
+++ b/ext/intl/tests/bug69374.phpt
@@ -16,7 +16,7 @@ echo IntlDateFormatter::formatObject ($date, $pattern2, 'ko_KR'), "\n";
 ?>
 ==DONE==
 
---EXPECTF--
+--EXPECT--
 tháng 04, 2015
 2015년 4월
 ==DONE==
diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt
index ea7dbd5098..152feedc39 100644
--- a/ext/intl/tests/bug69398.phpt
+++ b/ext/intl/tests/bug69398.phpt
@@ -14,7 +14,7 @@ echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, Int
 ?>
 ==DONE==
 
---EXPECTF--
+--EXPECT--
 04/04/2015
 15. 4. 4.
 ==DONE==
diff --git a/ext/intl/tests/bug72533.phpt b/ext/intl/tests/bug72533.phpt
index c7fcba39d0..1a182afdd9 100644
--- a/ext/intl/tests/bug72533.phpt
+++ b/ext/intl/tests/bug72533.phpt
@@ -24,7 +24,7 @@ function ut_main()
 include_once( 'ut_common.inc' );
 ut_run();
 ?>
---EXPECTF--
+--EXPECT--
 false
 'locale_accept_from_http: locale string too long: U_ILLEGAL_ARGUMENT_ERROR'
 'en'
\ No newline at end of file
diff --git a/ext/intl/tests/bug74298.phpt b/ext/intl/tests/bug74298.phpt
index 0bfb59b48e..c86bca9fba 100644
--- a/ext/intl/tests/bug74298.phpt
+++ b/ext/intl/tests/bug74298.phpt
@@ -24,7 +24,7 @@ var_dump(datefmt_create(
     'yyyy-MM-dd HH:mm:ss.SSSSSS'
 )->format(new \DateTime('2017-01-01 01:02:03.123456', new \DateTimeZone('UTC'))));
 ?>
---EXPECTF--
+--EXPECT--
 string(26) "2017-01-01T01:02:03.123456"
 string(26) "2017-01-01 01:02:03.123000"
 string(26) "2017-01-01 01:02:03.123000"
diff --git a/ext/intl/tests/dateformat_clone.phpt b/ext/intl/tests/dateformat_clone.phpt
index f060444741..2a98ff30cd 100644
--- a/ext/intl/tests/dateformat_clone.phpt
+++ b/ext/intl/tests/dateformat_clone.phpt
@@ -28,7 +28,7 @@ $res_str .= "\nResult of clone formatting timestamp=0 is :  \n$formatted";
 echo $res_str;
 
 ?>
---EXPECTF--
+--EXPECT--
 Result of formatting timestamp=0 is :  
 31-12-69
 Result of formatting timestamp=0 is :  
diff --git a/ext/intl/tests/dateformat_clone2.phpt b/ext/intl/tests/dateformat_clone2.phpt
index c91f4b8b32..34b802120a 100644
--- a/ext/intl/tests/dateformat_clone2.phpt
+++ b/ext/intl/tests/dateformat_clone2.phpt
@@ -28,7 +28,7 @@ $res_str .= "\nResult of clone formatting timestamp=0 is :  \n$formatted";
 echo $res_str;
 
 ?>
---EXPECTF--
+--EXPECT--
 Result of formatting timestamp=0 is :  
 31-12-70
 Result of formatting timestamp=0 is :  
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
index 7be709a66f..be6b1221ce 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
@@ -35,7 +35,7 @@ echo $df->format($ts), "\n";
 $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0);
 echo $df->format($ts), "\n";
 
---EXPECTF--
+--EXPECT--
 sábado, 31 de diciembre de 2011, 23:00:00 (hora estándar de las Azores)
 domingo, 1 de enero de 2012, 1:00:00 (hora estándar de Europa central)
 domingo, 1 de enero de 2012, 0:00:00 (hora estándar de Europa occidental)
diff --git a/ext/intl/tests/formatter_clone.phpt b/ext/intl/tests/formatter_clone.phpt
index 4e8d096244..d474eb2b70 100644
--- a/ext/intl/tests/formatter_clone.phpt
+++ b/ext/intl/tests/formatter_clone.phpt
@@ -24,7 +24,7 @@ $res_str .= "Formatted(clone) number: " . ut_nfmt_format( $fmt_clone, $test_valu
 echo $res_str;
 
 ?>
---EXPECTF--
+--EXPECT--
 Formatted number: 12345.123456
 Formatted number: 12345.1
 Formatted(clone) number: 12345.123456
diff --git a/ext/intl/tests/formatter_clone_bad_obj.phpt b/ext/intl/tests/formatter_clone_bad_obj.phpt
index ef7b28a546..f90aae011f 100644
--- a/ext/intl/tests/formatter_clone_bad_obj.phpt
+++ b/ext/intl/tests/formatter_clone_bad_obj.phpt
@@ -16,5 +16,5 @@ try {
 	var_dump($e->getMessage());
 }
 
---EXPECTF--
+--EXPECT--
 string(42) "Cannot clone unconstructed NumberFormatter"
diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt
index 30cc8cc0ae..f1482730c3 100644
--- a/ext/intl/tests/locale_parse_locale2.phpt
+++ b/ext/intl/tests/locale_parse_locale2.phpt
@@ -96,7 +96,7 @@ include_once( 'ut_common.inc' );
 ut_run();
 
 ?>
---EXPECTF--
+--EXPECT--
 ---------------------
 uk-ua_CALIFORNIA@currency=;currency=GRN:
 language : 'uk' , region : 'UA' , variant0 : 'CALIFORNIA' ,
diff --git a/ext/intl/tests/msgfmt_clone.phpt b/ext/intl/tests/msgfmt_clone.phpt
index 9d8ea64442..04c1c1cee4 100644
--- a/ext/intl/tests/msgfmt_clone.phpt
+++ b/ext/intl/tests/msgfmt_clone.phpt
@@ -24,7 +24,7 @@ $res_str .= "Formatting clone result: " . ut_msgfmt_format( $fmt_clone, array(12
 echo $res_str;
 
 ?>
---EXPECTF--
+--EXPECT--
 Formatting result: 123 monkeys on 456 trees
 Formatting result: 123 trees hosting 456 monkeys
 Formatting clone result: 123 monkeys on 456 trees
diff --git a/ext/intl/tests/msgfmt_format_error1.phpt b/ext/intl/tests/msgfmt_format_error1.phpt
index 684b05970a..da4880a97b 100644
--- a/ext/intl/tests/msgfmt_format_error1.phpt
+++ b/ext/intl/tests/msgfmt_format_error1.phpt
@@ -15,5 +15,5 @@ EOD;
 $mf = new MessageFormatter('en_US', $fmt);
 var_dump($mf->format(array(7)));
 
---EXPECTF--
+--EXPECT--
 string(5) "7 {1}"
diff --git a/ext/intl/tests/resourcebundle_create.phpt b/ext/intl/tests/resourcebundle_create.phpt
index 2bf4f556a8..9d551219ec 100644
--- a/ext/intl/tests/resourcebundle_create.phpt
+++ b/ext/intl/tests/resourcebundle_create.phpt
@@ -38,7 +38,7 @@ function ut_main() {
 	include_once( 'ut_common.inc' );
 	ut_run();
 ?>
---EXPECTF--
+--EXPECT--
 ResourceBundle Object
 (
 )
diff --git a/ext/intl/tests/resourcebundle_internal.phpt b/ext/intl/tests/resourcebundle_internal.phpt
index fe90081e79..2063ae2277 100644
--- a/ext/intl/tests/resourcebundle_internal.phpt
+++ b/ext/intl/tests/resourcebundle_internal.phpt
@@ -13,7 +13,7 @@ var_dump($b->get('ICUVersion') !== NULL);
 $b = new ResourceBundle('supplementalData', 'ICUDATA', false);
 var_dump($b->get('cldrVersion') !== NULL);
 ?>
---EXPECTF--
+--EXPECT--
 string(11) "Deutschland"
 bool(true)
 bool(true)
diff --git a/ext/intl/tests/resourcebundle_iterator.phpt b/ext/intl/tests/resourcebundle_iterator.phpt
index a10b9deb89..e0b83d8190 100644
--- a/ext/intl/tests/resourcebundle_iterator.phpt
+++ b/ext/intl/tests/resourcebundle_iterator.phpt
@@ -32,7 +32,7 @@ Test ResourceBundle iterator
 	   echo "$onekey => $oneval\n";
 	}
 ?>
---EXPECTF--
+--EXPECT--
 Here comes testarray:
 ResourceBundle Object
 (
diff --git a/ext/intl/tests/resourcebundle_traversable.phpt b/ext/intl/tests/resourcebundle_traversable.phpt
index 1e6af7b909..4aeec2330d 100644
--- a/ext/intl/tests/resourcebundle_traversable.phpt
+++ b/ext/intl/tests/resourcebundle_traversable.phpt
@@ -11,7 +11,7 @@ Bug #55610: ResourceBundle does not implement Traversable
 	var_dump($r instanceof Traversable);
 	var_dump(iterator_to_array($r->get('testarray')));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 array(3) {
   [0]=>
diff --git a/ext/intl/tests/spoofchecker_001.phpt b/ext/intl/tests/spoofchecker_001.phpt
index 71cb665849..3bcc429906 100644
--- a/ext/intl/tests/spoofchecker_001.phpt
+++ b/ext/intl/tests/spoofchecker_001.phpt
@@ -16,7 +16,7 @@ echo "certain all-uppercase Latin sequences can be spoof of Greek\n";
 var_dump($x->isSuspicious("NAPKIN PEZ"));
 var_dump($x->isSuspicious("napkin pez"));
 ?>
---EXPECTF--
+--EXPECT--
 paypal with Cyrillic spoof characters
 bool(true)
 certain all-uppercase Latin sequences can be spoof of Greek
diff --git a/ext/intl/tests/spoofchecker_002.phpt b/ext/intl/tests/spoofchecker_002.phpt
index d570917350..0917f68a2f 100644
--- a/ext/intl/tests/spoofchecker_002.phpt
+++ b/ext/intl/tests/spoofchecker_002.phpt
@@ -13,7 +13,7 @@ var_dump($x->areConfusable("hello, world", "goodbye, world"));
 var_dump($x->areConfusable("hello, world", "hello, world"));
 var_dump($x->areConfusable("hello, world", "he11o, wor1d"));
 ?>
---EXPECTF--
+--EXPECT--
 Checking if words are confusable
 bool(false)
 bool(true)
diff --git a/ext/intl/tests/spoofchecker_003.phpt b/ext/intl/tests/spoofchecker_003.phpt
index 0be9bfa409..9cd7f350dc 100644
--- a/ext/intl/tests/spoofchecker_003.phpt
+++ b/ext/intl/tests/spoofchecker_003.phpt
@@ -18,7 +18,7 @@ echo "Is suspcious, ko_KR\n";
 $x->setAllowedLocales('en_US, ko_KR');
 var_dump($x->isSuspicious($korean));
 ?>
---EXPECTF--
+--EXPECT--
 Is suspcious, en_US
 bool(true)
 Is suspcious, ko_KR
diff --git a/ext/intl/tests/spoofchecker_004.phpt b/ext/intl/tests/spoofchecker_004.phpt
index a26b39209f..b84eceb07b 100644
--- a/ext/intl/tests/spoofchecker_004.phpt
+++ b/ext/intl/tests/spoofchecker_004.phpt
@@ -20,7 +20,7 @@ $x->setChecks(Spoofchecker::MIXED_SCRIPT_CONFUSABLE |
 var_dump($x->areConfusable("HELLO", "H\xD0\x95LLO"));
 var_dump($x->areConfusable("hello", "h\xD0\xB5llo"));
 ?>
---EXPECTF--
+--EXPECT--
 Check with default settings
 bool(true)
 bool(true)
diff --git a/ext/intl/tests/spoofchecker_005.phpt b/ext/intl/tests/spoofchecker_005.phpt
index 0fc3d52a8c..0b963d55de 100644
--- a/ext/intl/tests/spoofchecker_005.phpt
+++ b/ext/intl/tests/spoofchecker_005.phpt
@@ -20,7 +20,7 @@ $x->setChecks(Spoofchecker::MIXED_SCRIPT_CONFUSABLE |
 var_dump($x->areConfusable("HELLO", "H\xD0\x95LLO"));
 var_dump($x->areConfusable("hello", "h\xD0\xB5llo"));
 ?>
---EXPECTF--
+--EXPECT--
 Check with default settings
 bool(true)
 bool(true)
diff --git a/ext/intl/tests/spoofchecker_006.phpt b/ext/intl/tests/spoofchecker_006.phpt
index 038a255419..7839d2e424 100644
--- a/ext/intl/tests/spoofchecker_006.phpt
+++ b/ext/intl/tests/spoofchecker_006.phpt
@@ -17,7 +17,7 @@ $x->setAllowedLocales("gr_GR");
 var_dump($x->isSuspicious("NAPKIN PEZ"));
 var_dump($x->isSuspicious("napkin pez"));
 ?>
---EXPECTF--
+--EXPECT--
 paypal with Cyrillic spoof characters
 bool(true)
 bool(true)
diff --git a/ext/intl/tests/uconverter_func_subst.phpt b/ext/intl/tests/uconverter_func_subst.phpt
index 5cac5ce59c..12168f3cca 100644
--- a/ext/intl/tests/uconverter_func_subst.phpt
+++ b/ext/intl/tests/uconverter_func_subst.phpt
@@ -22,7 +22,7 @@ foreach(array('?','','??') as $subst) {
   }
 }
 
---EXPECTF--
+--EXPECT--
 string(23) "This is an ascii string"
 string(12) "Snowman: (?)"
 Error: transcode() returned error 1: U_ILLEGAL_ARGUMENT_ERROR: U_ILLEGAL_ARGUMENT_ERROR