Replace EXPECTF when possible

Closes GH-5779

99 files changed, 103 insertions, 108 deletions

diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index 004c219bf9..fb70067bbe 100644
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -26,7 +26,7 @@ foreach ($jd_days as $jd_day) {
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 === 2453396
 string(3) "Jan"
 string(7) "January"
diff --git a/ext/curl/tests/curl_copy_handle_variation4.phpt b/ext/curl/tests/curl_copy_handle_variation4.phpt
index e160c06c64..4ba3784139 100644
--- a/ext/curl/tests/curl_copy_handle_variation4.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation4.phpt
@@ -37,7 +37,7 @@ curl_multi_remove_handle($mh, $ch3);
 curl_multi_close($mh);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 bool(true)
 АБВ.txt|application/octet-stream|5АБВ.txt|application/octet-stream|5===DONE===
 --CLEAN--
diff --git a/ext/curl/tests/curl_multi_close_basic001.phpt b/ext/curl/tests/curl_multi_close_basic001.phpt
index f47028e873..2feaee4b5d 100644
--- a/ext/curl/tests/curl_multi_close_basic001.phpt
+++ b/ext/curl/tests/curl_multi_close_basic001.phpt
@@ -13,7 +13,7 @@ var_dump($multi_close_result);
 var_dump($cmh);
 curl_multi_close($cmh);
 ?>
---EXPECTF--
+--EXPECT--
 object(CurlMultiHandle)#1 (0) {
 }
 NULL
diff --git a/ext/curl/tests/curl_multi_init_basic.phpt b/ext/curl/tests/curl_multi_init_basic.phpt
index a9af60ea3f..626b8b7c43 100644
--- a/ext/curl/tests/curl_multi_init_basic.phpt
+++ b/ext/curl/tests/curl_multi_init_basic.phpt
@@ -18,7 +18,7 @@ var_dump($mh);
 curl_multi_close($mh);
 var_dump($mh);
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing curl_multi_init(void); ***
 object(CurlMultiHandle)#1 (0) {
 }
diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index de2936c853..1196168e19 100644
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -24,7 +24,7 @@ var_dump($d->getTimestamp());
 $i = new DateInterval('PT100000000000S');
 var_dump($i->format('%s'));
 ?>
---EXPECTF--
+--EXPECT--
 string(32) "5138-11-16 09:46:40 100000000000"
 bool(false)
 string(12) "100000000000"
diff --git a/ext/dba/tests/dba_handlers.phpt b/ext/dba/tests/dba_handlers.phpt
index f3c299ce2a..e896116818 100644
--- a/ext/dba/tests/dba_handlers.phpt
+++ b/ext/dba/tests/dba_handlers.phpt
@@ -50,7 +50,7 @@ foreach ($h as $key => $val) {
 <?php
 require(__DIR__ .'/clean.inc');
 ?>
---EXPECTF--
+--EXPECT--
 database handler: flatfile
 Test 1
 Success: flatfile enabled
diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt
index fb54531e5a..c0ecc3101d 100644
--- a/ext/dba/tests/dba_optimize.phpt
+++ b/ext/dba/tests/dba_optimize.phpt
@@ -34,7 +34,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 <?php
 	require(__DIR__ .'/clean.inc');
 ?>
---EXPECTF--
+--EXPECT--
 database handler: flatfile
 2YY
 bool(true)
diff --git a/ext/dba/tests/dba_split.phpt b/ext/dba/tests/dba_split.phpt
index c320163ec0..a857984741 100644
--- a/ext/dba/tests/dba_split.phpt
+++ b/ext/dba/tests/dba_split.phpt
@@ -19,7 +19,7 @@ var_dump(dba_key_split("[key1]name1[key2]name2"));
 var_dump(dba_key_split("[key1]name1"));
 
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   [0]=>
   string(0) ""
diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt
index 8ca7606626..56cba13a1c 100644
--- a/ext/dba/tests/dba_sync.phpt
+++ b/ext/dba/tests/dba_sync.phpt
@@ -34,7 +34,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 <?php
 	require(__DIR__ .'/clean.inc');
 ?>
---EXPECTF--
+--EXPECT--
 database handler: flatfile
 2YY
 bool(true)
diff --git a/ext/enchant/tests/invalidobj.phpt b/ext/enchant/tests/invalidobj.phpt
index 6a96972da1..a9cfabd96e 100644
--- a/ext/enchant/tests/invalidobj.phpt
+++ b/ext/enchant/tests/invalidobj.phpt
@@ -21,7 +21,7 @@ if (is_object($broker)) {
 }
 echo "OK\n";
 ?>
---EXPECTF--
+--EXPECT--
 OK
 Invalid or uninitialized EnchantBroker object
 OK
diff --git a/ext/exif/tests/bug77753.phpt b/ext/exif/tests/bug77753.phpt
index 8071603a04..565ff61080 100644
--- a/ext/exif/tests/bug77753.phpt
+++ b/ext/exif/tests/bug77753.phpt
@@ -7,6 +7,6 @@ Bug #77753 (Heap-buffer-overflow in php_ifd_get32s)
 @var_dump(exif_read_data(__DIR__."/bug77753.tiff"));
 ?>
 DONE
---EXPECTF--
+--EXPECT--
 bool(false)
 DONE
diff --git a/ext/exif/tests/bug77988.phpt b/ext/exif/tests/bug77988.phpt
index 1632c8afaa..6bbc53f134 100644
--- a/ext/exif/tests/bug77988.phpt
+++ b/ext/exif/tests/bug77988.phpt
@@ -7,5 +7,5 @@ Bug #77988 (heap-buffer-overflow on php_jpg_get16)
 exif_read_data(__DIR__."/bug77988.jpg", 'COMMENT', FALSE, TRUE);
 ?>
 DONE
---EXPECTF--
-DONE
\ No newline at end of file
+--EXPECT--
+DONE
diff --git a/ext/exif/tests/bug78222.phpt b/ext/exif/tests/bug78222.phpt
index 0e4ead33e4..fefc41d022 100644
--- a/ext/exif/tests/bug78222.phpt
+++ b/ext/exif/tests/bug78222.phpt
@@ -7,5 +7,5 @@ Bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 exif_read_data(__DIR__."/bug78222.jpg", 'THUMBNAIL', FALSE, TRUE);
 ?>
 DONE
---EXPECTF--
-DONE
\ No newline at end of file
+--EXPECT--
+DONE
diff --git a/ext/exif/tests/bug78256.phpt b/ext/exif/tests/bug78256.phpt
index 37a3f1d824..060d9c5bc6 100644
--- a/ext/exif/tests/bug78256.phpt
+++ b/ext/exif/tests/bug78256.phpt
@@ -7,5 +7,5 @@ Bug #78256 (heap-buffer-overflow on exif_process_user_comment)
 @exif_read_data(__DIR__."/bug78256.jpg", 'COMMENT', FALSE, TRUE);
 ?>
 DONE
---EXPECTF--
-DONE
\ No newline at end of file
+--EXPECT--
+DONE
diff --git a/ext/exif/tests/duplicate_copyright_tag_leak.phpt b/ext/exif/tests/duplicate_copyright_tag_leak.phpt
index 3a4eccf142..c23dac454b 100644
--- a/ext/exif/tests/duplicate_copyright_tag_leak.phpt
+++ b/ext/exif/tests/duplicate_copyright_tag_leak.phpt
@@ -14,5 +14,5 @@ if (!extension_loaded('exif')) {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/ext/ffi/tests/045.phpt b/ext/ffi/tests/045.phpt
index 7503fb763b..12625cfa92 100644
--- a/ext/ffi/tests/045.phpt
+++ b/ext/ffi/tests/045.phpt
@@ -20,7 +20,7 @@ try {
     echo get_class($e) . ": " . $e->getMessage()."\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
 TypeError: FFI::isNull(): Argument #1 ($ptr) must be of type FFI\CData, null given
diff --git a/ext/gd/tests/bug55005.phpt b/ext/gd/tests/bug55005.phpt
index 9b7044cee1..da218e4d97 100644
--- a/ext/gd/tests/bug55005.phpt
+++ b/ext/gd/tests/bug55005.phpt
@@ -16,6 +16,6 @@ trycatch_dump(
     fn () => imagepolygon($g, array(200,10, 200,100, 280,100), 2, $fgnd)
 );
 ?>
---EXPECTF--
+--EXPECT--
 !! [ValueError] imagefilledpolygon(): Argument #3 ($num_points_or_col) must be greater than or equal to 3
 !! [ValueError] imagepolygon(): Argument #3 ($num_points_or_col) must be greater than or equal to 3
diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index bd98a97dab..830ee542ba 100644
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -17,5 +17,5 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 imagepng(): Argument #2 ($to) must not contain null bytes
diff --git a/ext/gd/tests/imagexbm_nullbyte_injection.phpt b/ext/gd/tests/imagexbm_nullbyte_injection.phpt
index afcf731a8a..91f757614e 100644
--- a/ext/gd/tests/imagexbm_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagexbm_nullbyte_injection.phpt
@@ -13,5 +13,5 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 imagexbm(): Argument #2 ($filename) must be a valid path or null, string given
diff --git a/ext/gd/tests/lines.phpt b/ext/gd/tests/lines.phpt
index 34e8304dcd..61e022d11a 100644
--- a/ext/gd/tests/lines.phpt
+++ b/ext/gd/tests/lines.phpt
@@ -100,7 +100,7 @@ if ($p3) {
 
 
 ?>
---EXPECTF--
+--EXPECT--
 Horizontal: ok
 Vertical: ok
 Diagonal: ok
diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt
index 4675afd646..9df2cdddf6 100644
--- a/ext/imap/tests/imap_binary_basic.phpt
+++ b/ext/imap/tests/imap_binary_basic.phpt
@@ -29,7 +29,7 @@ $base64 = imap_binary($hex);
 var_dump(bin2hex($base64));
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing imap_binary() : basic functionality ***
 Encode as short string
 string(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a"
diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
index d8bda0c6a9..f45361f4a9 100644
--- a/ext/imap/tests/imap_mutf7_to_utf8.phpt
+++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt
@@ -12,7 +12,7 @@ var_dump(imap_mutf7_to_utf8("t&AOQ-st"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(0) ""
 string(1) "1"
 string(5) "täst"
diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
index 6046dc1c5f..8037ae9491 100644
--- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -12,7 +12,7 @@ var_dump(imap_utf8_to_mutf7("täst"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(0) ""
 string(1) "1"
 string(8) "t&AOQ-st"
diff --git a/ext/ldap/tests/ldap_explode_dn.phpt b/ext/ldap/tests/ldap_explode_dn.phpt
index aa8ab10088..f573bcfc39 100644
--- a/ext/ldap/tests/ldap_explode_dn.phpt
+++ b/ext/ldap/tests/ldap_explode_dn.phpt
@@ -32,7 +32,7 @@ var_dump(ldap_explode_dn("bob,dc=example,dc=com", 1));
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   ["count"]=>
   int(3)
diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt
index d1bf0066d3..c763d6c9d4 100644
--- a/ext/mbstring/tests/mb_parse_str.phpt
+++ b/ext/mbstring/tests/mb_parse_str.phpt
@@ -23,7 +23,7 @@ foreach ($queries as $query) {
     test($query);
 }
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   ["foo"]=>
   string(3) "abc"
diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt
index f6456ab661..c57b33fec3 100644
--- a/ext/mbstring/tests/mb_parse_str02.phpt
+++ b/ext/mbstring/tests/mb_parse_str02.phpt
@@ -25,7 +25,7 @@ foreach ($queries as $query) {
     test($query);
 }
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   ["foo"]=>
   string(3) "abc"
diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt
index 900b222c93..7f8467a549 100644
--- a/ext/mbstring/tests/mb_stripos.phpt
+++ b/ext/mbstring/tests/mb_stripos.phpt
@@ -102,7 +102,7 @@ $r = mb_stripos($euc_jp, "\n");
 ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 String len: 43
 == POSITIVE OFFSET ==
 10
diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt
index 619c41bd44..18e5307a1d 100644
--- a/ext/mysqli/tests/bug36420.phpt
+++ b/ext/mysqli/tests/bug36420.phpt
@@ -29,7 +29,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 mysqli_result object is already closed
 mysqli_result object is already closed
 Done
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt
index 278c5c4a96..11a3b70909 100644
--- a/ext/mysqli/tests/bug63398.phpt
+++ b/ext/mysqli/tests/bug63398.phpt
@@ -27,6 +27,6 @@ try {
 
 echo "okey";
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 okey
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index 6e673984f4..2c368abeb6 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -149,7 +149,7 @@ require_once('skipifconnectfailure.inc');
 
     print "done!";
 ?>
---EXPECTF--
+--EXPECT--
 Parent class:
 bool(false)
 
diff --git a/ext/mysqli/tests/mysqli_connect_attr.phpt b/ext/mysqli/tests/mysqli_connect_attr.phpt
index 86f3e08a5c..694dc72dab 100644
--- a/ext/mysqli/tests/mysqli_connect_attr.phpt
+++ b/ext/mysqli/tests/mysqli_connect_attr.phpt
@@ -74,5 +74,5 @@ mysqli_close($link);
 
     printf("done!");
 ?>
---EXPECTF--
-done!
\ No newline at end of file
+--EXPECT--
+done!
diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
index 203f58fd28..0365b14e75 100644
--- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
@@ -42,6 +42,6 @@ if (!function_exists('mysqli_enable_reads_from_master')) {
 
     print "done!";
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt
index f562573733..e0f0fce781 100644
--- a/ext/mysqli/tests/mysqli_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_free_result.phpt
@@ -52,7 +52,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 a
 NULL
 b
diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt
index b6a9cb3c6a..5963934b84 100644
--- a/ext/mysqli/tests/mysqli_more_results.phpt
+++ b/ext/mysqli/tests/mysqli_more_results.phpt
@@ -62,7 +62,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 [004]
 bool(false)
 [006]
diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt
index 571b2d7f2a..5f29dc6f6a 100644
--- a/ext/mysqli/tests/mysqli_multi_query.phpt
+++ b/ext/mysqli/tests/mysqli_multi_query.phpt
@@ -114,7 +114,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 [006] 3
 [008] 0
 [009] [2014] Commands out of sync; you can't run this command now
diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt
index 22e13f4e3f..090326dfa8 100644
--- a/ext/mysqli/tests/mysqli_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_next_result.phpt
@@ -67,6 +67,6 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt
index b8d5a1b801..cf271c5d07 100644
--- a/ext/mysqli/tests/mysqli_send_query.phpt
+++ b/ext/mysqli/tests/mysqli_send_query.phpt
@@ -47,6 +47,6 @@ if (!$TEST_EXPERIMENTAL)
     }
     print "done!";
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index eb902188e0..cb95ed896a 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -221,7 +221,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   ["id"]=>
   int(1)
diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
index 49e5517177..421854a480 100644
--- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
@@ -56,7 +56,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 mysqli_stmt object is not fully initialized
 mysqli_stmt object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt
index 6fa2d140f5..2213047a6c 100644
--- a/ext/mysqli/tests/mysqli_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_store_result.phpt
@@ -53,6 +53,6 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt
index c59084732b..18e80ac92d 100644
--- a/ext/mysqli/tests/mysqli_warning_count.phpt
+++ b/ext/mysqli/tests/mysqli_warning_count.phpt
@@ -38,6 +38,6 @@ require_once('skipifconnectfailure.inc');
 <?php
 	require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 mysqli object is already closed
 done!
diff --git a/ext/oci8/tests/coll_018.phpt b/ext/oci8/tests/coll_018.phpt
index 7e33ed8f43..ff66ec8030 100644
--- a/ext/oci8/tests/coll_018.phpt
+++ b/ext/oci8/tests/coll_018.phpt
@@ -52,7 +52,7 @@ echo "Done\n";
 require __DIR__."/drop_type.inc";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 2.
 bool(true)
 
diff --git a/ext/oci8/tests/existence_aliases.phpt b/ext/oci8/tests/existence_aliases.phpt
index 9cdd7fbcaf..e2c224e8a5 100644
--- a/ext/oci8/tests/existence_aliases.phpt
+++ b/ext/oci8/tests/existence_aliases.phpt
@@ -51,7 +51,8 @@ var_dump(function_exists('ocicollsize'));
 var_dump(function_exists('ocicollmax'));
 var_dump(function_exists('ocicolltrim'));
 ?>
---EXPECTF--
+--EXPECT--
+bool(true)
 bool(true)
 bool(true)
 bool(true)
@@ -97,4 +98,3 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
\ No newline at end of file
diff --git a/ext/oci8/tests/lob_014.phpt b/ext/oci8/tests/lob_014.phpt
index 3457b420c2..f39c7e1ad1 100644
--- a/ext/oci8/tests/lob_014.phpt
+++ b/ext/oci8/tests/lob_014.phpt
@@ -43,7 +43,7 @@ require __DIR__.'/drop_table.inc';
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 int(4)
 bool(true)
 int(4)
diff --git a/ext/oci8/tests/lob_aliases.phpt b/ext/oci8/tests/lob_aliases.phpt
index 672b520874..7ffec56e35 100644
--- a/ext/oci8/tests/lob_aliases.phpt
+++ b/ext/oci8/tests/lob_aliases.phpt
@@ -34,7 +34,7 @@ var_dump(function_exists('oci_free_descriptor'));
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1
 bool(true)
 bool(true)
diff --git a/ext/oci8/tests/num.phpt b/ext/oci8/tests/num.phpt
index ef1def4bdb..24758e1fe4 100644
--- a/ext/oci8/tests/num.phpt
+++ b/ext/oci8/tests/num.phpt
@@ -137,7 +137,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1
 int(0)
 int(0)
@@ -165,4 +165,4 @@ int(1)
 Test 7a
 int(3)
 int(0)
-Done
\ No newline at end of file
+Done
diff --git a/ext/odbc/tests/odbc_free_result_001.phpt b/ext/odbc/tests/odbc_free_result_001.phpt
index 223b3f0a4c..09b3e435fb 100644
--- a/ext/odbc/tests/odbc_free_result_001.phpt
+++ b/ext/odbc/tests/odbc_free_result_001.phpt
@@ -43,7 +43,7 @@ odbc_exec($conn, 'DROP TABLE FOO');
 odbc_exec($conn, 'DROP DATABASE odbcTEST');
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(1) "1"
 bool(true)
diff --git a/ext/opcache/tests/jit/bug77857.phpt b/ext/opcache/tests/jit/bug77857.phpt
index 9b9a80f533..27ab1d7305 100644
--- a/ext/opcache/tests/jit/bug77857.phpt
+++ b/ext/opcache/tests/jit/bug77857.phpt
@@ -22,6 +22,6 @@ function test() {
 }
 var_dump(test());
 ?>
---EXPECTF--
+--EXPECT--
 float(1)
 float(1)
diff --git a/ext/opcache/tests/preload_001.phpt b/ext/opcache/tests/preload_001.phpt
index 56ed196e99..25f0d01230 100644
--- a/ext/opcache/tests/preload_001.phpt
+++ b/ext/opcache/tests/preload_001.phpt
@@ -20,7 +20,7 @@ include(__DIR__ . "/preload.inc");
 var_dump(function_exists("f2"));
 ?>
 OK
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
 bool(true)
diff --git a/ext/opcache/tests/preload_004.phpt b/ext/opcache/tests/preload_004.phpt
index be83c45369..5e36488ee8 100644
--- a/ext/opcache/tests/preload_004.phpt
+++ b/ext/opcache/tests/preload_004.phpt
@@ -14,7 +14,7 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 <?php
 var_dump(class_exists('Foo'));
 ?>
---EXPECTF--
+--EXPECT--
 Fatal error: Undefined class constant 'self::DOES_NOT_EXIST' in Unknown on line 0
 
 Fatal error: Failed to resolve initializers of class Foo during preloading in Unknown on line 0
diff --git a/ext/opcache/tests/preload_007.phpt b/ext/opcache/tests/preload_007.phpt
index 79c2a6737a..7a8e011acc 100644
--- a/ext/opcache/tests/preload_007.phpt
+++ b/ext/opcache/tests/preload_007.phpt
@@ -14,5 +14,5 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 <?php
 echo "Foobar";
 ?>
---EXPECTF--
+--EXPECT--
 Foobar
diff --git a/ext/opcache/tests/preload_009.phpt b/ext/opcache/tests/preload_009.phpt
index 9422295814..b50e921c07 100644
--- a/ext/opcache/tests/preload_009.phpt
+++ b/ext/opcache/tests/preload_009.phpt
@@ -15,7 +15,7 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 var_dump(trait_exists('T'));
 var_dump(class_exists('Foo'));
 ?>
---EXPECTF--
+--EXPECT--
 Fatal error: Undefined constant 'UNDEF' in Unknown on line 0
 
 Fatal error: Failed to resolve initializers of class Foo during preloading in Unknown on line 0
diff --git a/ext/opcache/tests/preload_bug79114.phpt b/ext/opcache/tests/preload_bug79114.phpt
index 345a6bd83a..e5251da18d 100644
--- a/ext/opcache/tests/preload_bug79114.phpt
+++ b/ext/opcache/tests/preload_bug79114.phpt
@@ -19,7 +19,7 @@ var_dump(class_parents('Bar'));
 new Foo();
 f3();
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 array(1) {
diff --git a/ext/opcache/tests/preload_loadable_classes_2.phpt b/ext/opcache/tests/preload_loadable_classes_2.phpt
index c1f873ec47..1c34ebc5c0 100644
--- a/ext/opcache/tests/preload_loadable_classes_2.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_2.phpt
@@ -12,7 +12,7 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 ?>
 --FILE--
 Unreachable
---EXPECTF--
+--EXPECT--
 Fatal error: Undefined constant 'UNDEF' in Unknown on line 0
 
 Fatal error: Failed to resolve initializers of class Test during preloading in Unknown on line 0
diff --git a/ext/opcache/tests/preload_loadable_classes_3.phpt b/ext/opcache/tests/preload_loadable_classes_3.phpt
index 78efb16804..f63d19567c 100644
--- a/ext/opcache/tests/preload_loadable_classes_3.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_3.phpt
@@ -12,5 +12,5 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 ?>
 --FILE--
 Unreachable
---EXPECTF--
+--EXPECT--
 Fatal error: Failed to load class Foo used by typed property Test::$prop during preloading in Unknown on line 0
diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt
index b6b3f4c609..971fba71c2 100644
--- a/ext/openssl/tests/bug38261.phpt
+++ b/ext/openssl/tests/bug38261.phpt
@@ -25,7 +25,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/openssl/tests/openssl_cms_encrypt_basic.phpt b/ext/openssl/tests/openssl_cms_encrypt_basic.phpt
index fd37e72fc7..f1a0c6af8b 100644
--- a/ext/openssl/tests/openssl_cms_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_cms_encrypt_basic.phpt
@@ -42,7 +42,7 @@ if (file_exists($outfile2)) {
     unlink($outfile2);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/openssl/tests/openssl_cms_encrypt_der.phpt b/ext/openssl/tests/openssl_cms_encrypt_der.phpt
index ddbf50adc8..e7aa8f4dad 100644
--- a/ext/openssl/tests/openssl_cms_encrypt_der.phpt
+++ b/ext/openssl/tests/openssl_cms_encrypt_der.phpt
@@ -41,7 +41,7 @@ if (file_exists($decryptfile)) {
 }
 unlink($tname);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 Now is the winter of our discontent.
 true
diff --git a/ext/openssl/tests/openssl_cms_encrypt_pem.phpt b/ext/openssl/tests/openssl_cms_encrypt_pem.phpt
index 4b99b65465..929f3f2e02 100644
--- a/ext/openssl/tests/openssl_cms_encrypt_pem.phpt
+++ b/ext/openssl/tests/openssl_cms_encrypt_pem.phpt
@@ -41,7 +41,7 @@ if (file_exists($decryptfile)) {
 }
 unlink($tname);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 Now is the winter of our discontent.
 true
diff --git a/ext/openssl/tests/openssl_cms_sign_der.phpt b/ext/openssl/tests/openssl_cms_sign_der.phpt
index aa7f64d965..3fbe7ecf0f 100644
--- a/ext/openssl/tests/openssl_cms_sign_der.phpt
+++ b/ext/openssl/tests/openssl_cms_sign_der.phpt
@@ -26,7 +26,7 @@ if (file_exists($outfile)) {
     unlink($outfile);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 true
diff --git a/ext/openssl/tests/openssl_cms_sign_verify_basic.phpt b/ext/openssl/tests/openssl_cms_sign_verify_basic.phpt
index f2a2a79208..544441ceff 100644
--- a/ext/openssl/tests/openssl_cms_sign_verify_basic.phpt
+++ b/ext/openssl/tests/openssl_cms_sign_verify_basic.phpt
@@ -35,7 +35,7 @@ if (file_exists($vout)) {
     unlink($vout);
 }
 ?>
---EXPECTF--
+--EXPECT--
 Plain text:
 Now is the winter of our discontent.
 bool(true)
diff --git a/ext/openssl/tests/openssl_cms_sign_verify_nodetached_pem.phpt b/ext/openssl/tests/openssl_cms_sign_verify_nodetached_pem.phpt
index 7576e4abef..baf8c28023 100644
--- a/ext/openssl/tests/openssl_cms_sign_verify_nodetached_pem.phpt
+++ b/ext/openssl/tests/openssl_cms_sign_verify_nodetached_pem.phpt
@@ -72,7 +72,7 @@ if (file_exists($vout)) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 S/MIME attached
 Plain text:
 Now is the winter of our discontent.
diff --git a/ext/openssl/tests/openssl_cms_verify_basic.phpt b/ext/openssl/tests/openssl_cms_verify_basic.phpt
index 22dbf2a811..8c4ddabcd8 100644
--- a/ext/openssl/tests/openssl_cms_verify_basic.phpt
+++ b/ext/openssl/tests/openssl_cms_verify_basic.phpt
@@ -40,7 +40,7 @@ if (file_exists($contentfile)) {
 <?php
 unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify__pkcsfile.tmp');
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/openssl/tests/openssl_cms_verify_der.phpt b/ext/openssl/tests/openssl_cms_verify_der.phpt
index e00aa030cd..938812853d 100644
--- a/ext/openssl/tests/openssl_cms_verify_der.phpt
+++ b/ext/openssl/tests/openssl_cms_verify_der.phpt
@@ -47,7 +47,7 @@ if (file_exists($contentfile)) {
 <?php
 unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify__pkcsfile.tmp');
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/pcntl/tests/pcntl_alarm.phpt b/ext/pcntl/tests/pcntl_alarm.phpt
index 337ba3ad4b..d0164f856b 100644
--- a/ext/pcntl/tests/pcntl_alarm.phpt
+++ b/ext/pcntl/tests/pcntl_alarm.phpt
@@ -14,7 +14,7 @@ var_dump(pcntl_alarm(1) > 0);
 $siginfo = array();
 var_dump(pcntl_sigtimedwait(array(SIGALRM),$siginfo,2) === SIGALRM);
 ?>
---EXPECTF--
+--EXPECT--
 int(0)
 bool(true)
 bool(true)
diff --git a/ext/pcntl/tests/pcntl_wait.phpt b/ext/pcntl/tests/pcntl_wait.phpt
index 346ca019fb..5616d5b9c0 100644
--- a/ext/pcntl/tests/pcntl_wait.phpt
+++ b/ext/pcntl/tests/pcntl_wait.phpt
@@ -25,7 +25,7 @@ if ($pid == -1) {
     exit(42);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/pdo/tests/pdo_dsn_containing_credentials.phpt b/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
index 94859e5360..7c67bc3227 100644
--- a/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
+++ b/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
@@ -46,6 +46,6 @@ PDOTest::skip();
         putenv("PDOTEST_PASS=$orgPass");
     }
 ?>
---EXPECTF--
+--EXPECT--
 using credentials in dsn: done
 ignoring credentials in dsn: done
diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 8abd5a9b2d..a271ffc924 100644
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -73,7 +73,7 @@ var_dump($b->decompress());
 --CLEAN--
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
---EXPECTF--
+--EXPECT--
 Unknown compression type specified
 Unknown compression type specified
 Cannot compress with Gzip compression, not possible with tar-based phar archives
diff --git a/ext/pspell/tests/002.phpt b/ext/pspell/tests/002.phpt
index 34913ae826..4cea0cf7bd 100644
--- a/ext/pspell/tests/002.phpt
+++ b/ext/pspell/tests/002.phpt
@@ -25,7 +25,7 @@ if ($res) {
     echo "bool(false)\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(true)
diff --git a/ext/readline/tests/readline_add_history_001.phpt b/ext/readline/tests/readline_add_history_001.phpt
index fe7c8c406e..7b6b4112db 100644
--- a/ext/readline/tests/readline_add_history_001.phpt
+++ b/ext/readline/tests/readline_add_history_001.phpt
@@ -12,7 +12,7 @@ var_dump(readline_list_history());
 var_dump(readline_clear_history());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 array(1) {
   [0]=>
diff --git a/ext/readline/tests/readline_clear_history_001.phpt b/ext/readline/tests/readline_clear_history_001.phpt
index 8dea376ccf..332b13eafc 100644
--- a/ext/readline/tests/readline_clear_history_001.phpt
+++ b/ext/readline/tests/readline_clear_history_001.phpt
@@ -8,5 +8,5 @@ readline_clear_history(): Basic test
 var_dump(readline_clear_history());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/readline/tests/readline_list_history_001.phpt b/ext/readline/tests/readline_list_history_001.phpt
index 37e1b0af17..c7abb64953 100644
--- a/ext/readline/tests/readline_list_history_001.phpt
+++ b/ext/readline/tests/readline_list_history_001.phpt
@@ -8,6 +8,6 @@ readline_list_history(): Basic test
 var_dump(readline_list_history());
 
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
diff --git a/ext/reflection/tests/ReflectionZendExtension.phpt b/ext/reflection/tests/ReflectionZendExtension.phpt
index 0c5a8e6121..67595a1e06 100644
--- a/ext/reflection/tests/ReflectionZendExtension.phpt
+++ b/ext/reflection/tests/ReflectionZendExtension.phpt
@@ -13,7 +13,7 @@ var_dump($reflection->getName());
 var_dump($reflection->getURL());
 var_dump($reflection->getVersion() === PHP_VERSION);
 ?>
---EXPECTF--
+--EXPECT--
 string(17) "Zend Technologies"
 string(13) "Copyright (c)"
 string(12) "Zend OPcache"
diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt
index ed92119080..e1a1ca4050 100644
--- a/ext/snmp/tests/snmp_set_enum_print.phpt
+++ b/ext/snmp/tests/snmp_set_enum_print.phpt
@@ -15,7 +15,7 @@ echo "Checking working\n";
 var_dump(snmp_set_enum_print(0));
 var_dump(snmp_set_enum_print(1));
 ?>
---EXPECTF--
+--EXPECT--
 Checking working
 bool(true)
 bool(true)
diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt
index c653d5e2f3..4cf3a6332c 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -38,7 +38,7 @@ EOF;
 $server->handle($HTTP_RAW_POST_DATA);
 echo "ok\n";
 ?>
---EXPECTF--
+--EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>fopen() expects at least 2 parameters, 0 given</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
 ok
diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt
index a5f2cb9dad..4d6cf7e089 100644
--- a/ext/standard/tests/file/basename-win32.phpt
+++ b/ext/standard/tests/file/basename-win32.phpt
@@ -116,7 +116,7 @@ check_basename( $file_path_variations );
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing basic operations ***
 
 --Iteration 1--
diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt
index f47b178d2f..e951ebe633 100644
--- a/ext/standard/tests/general_functions/is_float.phpt
+++ b/ext/standard/tests/general_functions/is_float.phpt
@@ -128,7 +128,7 @@ fclose($fp);
 closedir($dfp);
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing is_float(), is_double() with float values***
 -- Iteration 1 --
 bool(true)
diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt
index b47590d235..6dfcf9e1b4 100644
--- a/ext/standard/tests/general_functions/is_int.phpt
+++ b/ext/standard/tests/general_functions/is_int.phpt
@@ -135,7 +135,7 @@ fclose($fp);
 closedir($dfp);
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing is_int(), is_integer() & is_long()  with valid integer values ***
 --Iteration 1--
 bool(true)
diff --git a/ext/standard/tests/general_functions/var_export-locale_32.phpt b/ext/standard/tests/general_functions/var_export-locale_32.phpt
index 96b34f4b35..4033eff5c3 100644
--- a/ext/standard/tests/general_functions/var_export-locale_32.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale_32.phpt
@@ -302,7 +302,7 @@ echo "\nDone";
 
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing var_export() with integer values ***
 
 *** Output for integer values ***
diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt
index 0d5d44626f..01cee28b18 100644
--- a/ext/standard/tests/math/deg2rad_variation.phpt
+++ b/ext/standard/tests/math/deg2rad_variation.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 float(0.40142572795869574)
 float(-0.40142572795869574)
 float(0.40927970959267024)
diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt
index 26801750f5..84c5b60c7b 100644
--- a/ext/standard/tests/math/sin_variation.phpt
+++ b/ext/standard/tests/math/sin_variation.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 float(-0.8462204042)
 float(0.8462204042)
 float(-0.9937407102)
diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt
index 9f5c393c4a..4a26efb50a 100644
--- a/ext/standard/tests/math/sinh_variation.phpt
+++ b/ext/standard/tests/math/sinh_variation.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 float(4872401723)
 float(-4872401723)
 float(7641446995)
diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt
index 6486b00724..b0683b701a 100644
--- a/ext/standard/tests/math/sqrt_variation.phpt
+++ b/ext/standard/tests/math/sqrt_variation.phpt
@@ -32,7 +32,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sqrt() : usage variations ***
 float(4.795831523312719)
 float(NAN)
diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt
index bd2fc1e80c..602db48e49 100644
--- a/ext/standard/tests/math/tan_variation.phpt
+++ b/ext/standard/tests/math/tan_variation.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 float(1.588153083)
 float(-1.588153083)
 float(8.895619796)
diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt
index 97e06b3187..b6ac49d5df 100644
--- a/ext/standard/tests/network/ip.phpt
+++ b/ext/standard/tests/network/ip.phpt
@@ -29,7 +29,7 @@ var_dump(long2ip(-110000));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(2130706433)
 string(9) "127.0.0.1"
 int(167772161)
diff --git a/ext/standard/tests/streams/bug77680.phpt b/ext/standard/tests/streams/bug77680.phpt
index 7fe8062e6e..421d222002 100644
--- a/ext/standard/tests/streams/bug77680.phpt
+++ b/ext/standard/tests/streams/bug77680.phpt
@@ -15,7 +15,7 @@ $path = "ftp://localhost:" . $port."/one/two/three/";
 mkdir($path, 0755, true);
 
 ?>
---EXPECTF--
+--EXPECT--
 string(20) "CWD /one/two/three
 "
 string(14) "CWD /one/two
diff --git a/ext/standard/tests/streams/bug77765.phpt b/ext/standard/tests/streams/bug77765.phpt
index e048db53e4..c580e9c0ea 100644
--- a/ext/standard/tests/streams/bug77765.phpt
+++ b/ext/standard/tests/streams/bug77765.phpt
@@ -14,7 +14,7 @@ $path = "ftp://localhost:" . $port."/www";
 
 var_dump(stat($path)['mode']);
 ?>
---EXPECTF--
+--EXPECT--
 string(11) "SIZE /www
 "
 int(16877)
diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt
index ed82fddf81..b16e55cc50 100644
--- a/ext/standard/tests/strings/strtolower-win32.phpt
+++ b/ext/standard/tests/strings/strtolower-win32.phpt
diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt
index ac5b0e5013..de26ca5400 100644
--- a/ext/standard/tests/strings/strtoupper1-win32.phpt
+++ b/ext/standard/tests/strings/strtoupper1-win32.phpt
diff --git a/ext/sysvmsg/tests/003.phpt b/ext/sysvmsg/tests/003.phpt
index d447bf8f72..97ad32b2f3 100644
--- a/ext/sysvmsg/tests/003.phpt
+++ b/ext/sysvmsg/tests/003.phpt
@@ -16,7 +16,7 @@ var_dump(msg_remove_queue($res));
 var_dump(msg_queue_exists($id));
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 object(SysvMessageQueue)#1 (0) {
 }
diff --git a/ext/sysvsem/tests/nowait.phpt b/ext/sysvsem/tests/nowait.phpt
index 892a3757b5..b52d2d7e20 100644
--- a/ext/sysvsem/tests/nowait.phpt
+++ b/ext/sysvsem/tests/nowait.phpt
@@ -118,7 +118,7 @@ if ($pid) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 P: parent process running.
 P: got semaphore.
 P: acquired semaphore.
diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt
index 3e8aeeaee6..14270ee608 100644
--- a/ext/sysvsem/tests/sysv.phpt
+++ b/ext/sysvsem/tests/sysv.phpt
@@ -91,13 +91,8 @@ if (sem_remove($sem_id)) {
     echo "Fail to remove semaphore from SysV.\n";
 }
 echo "End.\n";
-/* NOTE: assigned semids differ depending on the kernel, since
- *       there are actually 3 semaphores per PHP-created
- *       semaphores in effect, to keep state information.
- *       That's the reason for EXPECTF.
- */
 ?>
---EXPECTF--
+--EXPECT--
 Start.
 Got semaphore.
 Success acquire semaphore.
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index a24e468d74..0186b55e7e 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -22,7 +22,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 Shared memory block has already been destroyed
 Done
diff --git a/ext/zip/tests/oo_add_encoding.phpt b/ext/zip/tests/oo_add_encoding.phpt
index a04894f482..3493f11e49 100644
--- a/ext/zip/tests/oo_add_encoding.phpt
+++ b/ext/zip/tests/oo_add_encoding.phpt
@@ -39,7 +39,7 @@ $dirname = __DIR__ . '/oo_add_encoding_dir/';
 unlink($dirname . 'tmp.zip');
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 0 foo/
 1 é/
 2 è/
diff --git a/ext/zip/tests/oo_add_from_string.phpt b/ext/zip/tests/oo_add_from_string.phpt
index 9124650add..7227e6539f 100644
--- a/ext/zip/tests/oo_add_from_string.phpt
+++ b/ext/zip/tests/oo_add_from_string.phpt
@@ -44,7 +44,7 @@ $dirname = __DIR__ . '/oo_add_from_string_dir/';
 unlink($dirname . 'tmp.zip');
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(false)
diff --git a/ext/zip/tests/oo_addemptydir_error.phpt b/ext/zip/tests/oo_addemptydir_error.phpt
index 92c220066f..1ee4c6e006 100644
--- a/ext/zip/tests/oo_addemptydir_error.phpt
+++ b/ext/zip/tests/oo_addemptydir_error.phpt
@@ -25,6 +25,6 @@ if ($zip->status == ZipArchive::ER_RDONLY) {
 }
 $zip->close();
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 OK
diff --git a/ext/zip/tests/oo_addglob2.phpt b/ext/zip/tests/oo_addglob2.phpt
index 9a37e1d1b8..55a1260752 100644
--- a/ext/zip/tests/oo_addglob2.phpt
+++ b/ext/zip/tests/oo_addglob2.phpt
@@ -60,6 +60,6 @@ $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
 rmdir_rf(__DIR__ . '/__tmp_oo_addglob2/');
 ?>
---EXPECTF--
+--EXPECT--
 0: foo.txt, comp=8, enc=0
 1: bar.txt, comp=0, enc=259
diff --git a/ext/zip/tests/oo_progress.phpt b/ext/zip/tests/oo_progress.phpt
index c4641653ed..747111c673 100644
--- a/ext/zip/tests/oo_progress.phpt
+++ b/ext/zip/tests/oo_progress.phpt
@@ -31,7 +31,7 @@ var_dump($zip->close());
 unlink($file);
 ?>
 Done
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 start
diff --git a/ext/zip/tests/oo_setmtime.phpt b/ext/zip/tests/oo_setmtime.phpt
index 628f5ac8bb..40f57915cd 100644
--- a/ext/zip/tests/oo_setmtime.phpt
+++ b/ext/zip/tests/oo_setmtime.phpt
@@ -63,7 +63,7 @@ $zip->close();
 @unlink($file);
 
 ?>
---EXPECTF--
+--EXPECT--
 Set 1
 bool(true)
 bool(true)