170 files changed, 169 insertions, 169 deletions
diff --git a/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt b/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt
index 4c446c82b9..d2c75f7f09 100644
--- a/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt
+++ b/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt
@@ -9,5 +9,5 @@ $a = new ArrayObject(array());
 $a->unserialize("");
 ?>
 Done
---EXPECTF--
+--EXPECT--
 Done
diff --git a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt
index d4f22f68a1..520f65e9cb 100644
--- a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt
+++ b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt
@@ -19,5 +19,5 @@ PHPNW Testfest 2009 - Adrian Hardy
    unlink($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt');
    rmdir($targetDir);
 ?>
---EXPECTF--
+--EXPECT--
 getBasename_test
diff --git a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
index 7398d4b9d2..a35a524f35 100644
--- a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
@@ -40,7 +40,7 @@ foreach ($files as $file) {
 }
 rmdir($dir);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 array(5) {
   [0]=>
diff --git a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
index 0c75bf4c00..81ab6c0921 100644
--- a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt
@@ -25,5 +25,5 @@ var_dump($expected == $actual);
 $dirname = 'DirectoryIterator_getGroup_basic';
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
index a1092c2fea..709510d7cf 100644
--- a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt
@@ -25,5 +25,5 @@ var_dump($expected == $actual);
 $dirname = 'DirectoryIterator_getOwner_basic';
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt
index b94b067f4d..fa38d93425 100644
--- a/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt
@@ -9,5 +9,5 @@ try {
 	echo "Exception: ".$e->getMessage()."\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Exception: Offset invalid or out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt
index 396f89b491..b14c9ab013 100644
--- a/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt
@@ -9,5 +9,5 @@ try {
 	echo "Exception: ".$e->getMessage()."\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Exception: Offset invalid or out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt
index 0399b4948d..fc8c4b7dcd 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt
@@ -25,7 +25,7 @@ if($list->offsetExists(2) === false) {
 	echo "PASS\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 PASS
 PASS
 PASS
diff --git a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
index b47b6bb4d0..72597ef12d 100644
--- a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
@@ -18,7 +18,7 @@ foreach ($exts as $ext) {
     unlink($file . $ext);
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "txt"
 string(3) "txt"
 string(9) "extension"
diff --git a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
index d279935637..fcfafefdb4 100644
--- a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
@@ -22,5 +22,5 @@ var_dump($expected == $actual);
 $filename = __DIR__ . "/SplFileInfo_getGroup_basic";
 unlink($filename);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/SplFileInfo_getInode_basic.phpt b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
index 9ee2c6ee51..5e2a110879 100644
--- a/ext/spl/tests/SplFileInfo_getInode_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
@@ -26,5 +26,5 @@ var_dump($fileInfo->getInode() == $result);
 <?php
 unlink('SplFileInfo_getInode_basic.txt');
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
index 3df8e4858b..97932b10ad 100644
--- a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
@@ -22,5 +22,5 @@ var_dump($expected == $actual);
 $filename = __DIR__ . "/SplFileInfo_getOwner_basic";
 unlink($filename);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
index af09907605..f6eb4104fe 100644
--- a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
@@ -26,5 +26,5 @@ var_dump($fileInfo->getPerms() == 0100557);
 <?php
 unlink('SplFileInfo_getPerms_basic.txt');
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
index aa884b30a0..a280a6e147 100644
--- a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
+++ b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
@@ -12,5 +12,5 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 SplFileInfo::setInfoClass() expects parameter 1 to be a class name derived from SplFileInfo, 'stdClass' given
diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
index 2d8a9c8044..e4ea7fe8f1 100644
--- a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
+++ b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
@@ -33,6 +33,6 @@ $obj = New SplFileObject("SPLtest://ftruncate_test");
 var_dump($obj->fflush());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
index 84b5403698..28901050d3 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
@@ -18,7 +18,7 @@ var_dump($fo->fgetcsv());
 <?php
 unlink('SplFileObject__fgetcsv1.csv');
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   string(6) "field1"
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
index a8125a0257..585e0b6e39 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
@@ -18,7 +18,7 @@ var_dump($fo->fgetcsv('|'));
 <?php
 unlink('SplFileObject__fgetcsv2.csv');
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   string(6) "field1"
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
index efe765cbf8..32527a9238 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
@@ -18,7 +18,7 @@ var_dump($fo->fgetcsv(',', '"'));
 <?php
 unlink('SplFileObject__fgetcsv4.csv');
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   string(6) "field1"
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
index 960f36d63f..f6a68ff1fa 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
@@ -13,7 +13,7 @@ var_dump($fo->fgetcsv(',', '"', '"'));
 <?php
 unlink('SplFileObject__fgetcsv6.csv');
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   string(3) "aaa"
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
index 69089636c1..9614f91d41 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
@@ -13,7 +13,7 @@ var_dump($fo->fgetcsv());
 <?php
 unlink('SplFileObject__fgetcsv7.csv');
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   string(4) "aa\""
diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
index 57832e7c30..89983c377e 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
@@ -12,5 +12,5 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Ok - SplFixedArray::__construct() expects parameter 1 to be int, array given
diff --git a/ext/spl/tests/SplFixedArray__construct_param_null.phpt b/ext/spl/tests/SplFixedArray__construct_param_null.phpt
index 3b1543d4dc..4685c20b29 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_null.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_null.phpt
@@ -10,7 +10,7 @@ $array = new SplFixedArray( NULL );
 print_r( $array );
 
 ?>
---EXPECTF--
+--EXPECT--
 SplFixedArray Object
 (
 )
 \ No newline at end of file
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index c10edbddc2..bfec39de32 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -12,5 +12,5 @@ try {
 
 
 ?>
---EXPECTF--
+--EXPECT--
 Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index d8daca9a33..af9f5f3ee8 100644
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -11,5 +11,5 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given
diff --git a/ext/spl/tests/SplFixedArray_setSize_param_float.phpt b/ext/spl/tests/SplFixedArray_setSize_param_float.phpt
index c65686c61d..7e76485885 100644
--- a/ext/spl/tests/SplFixedArray_setSize_param_float.phpt
+++ b/ext/spl/tests/SplFixedArray_setSize_param_float.phpt
@@ -8,7 +8,7 @@ $fixed_array = new SplFixedArray(2);
 $fixed_array->setSize(3.14159);
 var_dump($fixed_array);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (3) {
   [0]=>
   NULL
diff --git a/ext/spl/tests/SplHeap_isEmpty.phpt b/ext/spl/tests/SplHeap_isEmpty.phpt
index e179dbc8ec..c3f79c6882 100644
--- a/ext/spl/tests/SplHeap_isEmpty.phpt
+++ b/ext/spl/tests/SplHeap_isEmpty.phpt
@@ -10,6 +10,6 @@ $h = new SplMaxHeap();
 var_dump($h->isEmpty());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
index 617f85e63c..bc9f78a1ca 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
@@ -15,5 +15,5 @@ try {
 
 ?>
 Done
---EXPECTF--
+--EXPECT--
 Done
diff --git a/ext/spl/tests/SplQueue_setIteratorMode.phpt b/ext/spl/tests/SplQueue_setIteratorMode.phpt
index 172a1d97a4..5ad1d9258a 100644
--- a/ext/spl/tests/SplQueue_setIteratorMode.phpt
+++ b/ext/spl/tests/SplQueue_setIteratorMode.phpt
@@ -11,5 +11,5 @@ try {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen
diff --git a/ext/spl/tests/SplStack_setIteratorMode.phpt b/ext/spl/tests/SplStack_setIteratorMode.phpt
index d70105e034..342a6b8bb2 100644
--- a/ext/spl/tests/SplStack_setIteratorMode.phpt
+++ b/ext/spl/tests/SplStack_setIteratorMode.phpt
@@ -11,5 +11,5 @@ try {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen
diff --git a/ext/spl/tests/SplTempFileObject_constructor_basic.phpt b/ext/spl/tests/SplTempFileObject_constructor_basic.phpt
index b2e640c7ac..2692b2c48d 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_basic.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_basic.phpt
@@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when pass 0 arguments
 <?php
 var_dump(new SplTempFileObject());
 ?>
---EXPECTF--
+--EXPECT--
 object(SplTempFileObject)#1 (5) {
   ["pathName":"SplFileInfo":private]=>
   string(10) "php://temp"
diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index 338aa4b0b0..37b00991ff 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -8,5 +8,5 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 SplTempFileObject::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt b/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt
index 2ef1b2cd1a..765635f530 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt
@@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct values when passed fixed memory s
 <?php
 var_dump(new SplTempFileObject(1024));
 ?>
---EXPECTF--
+--EXPECT--
 object(SplTempFileObject)#1 (5) {
   ["pathName":"SplFileInfo":private]=>
   string(25) "php://temp/maxmemory:1024"
diff --git a/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt b/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt
index 9fe5892113..0984acccbf 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt
@@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when passed a negative v
 <?php
 var_dump(new SplTempFileObject(-1));
 ?>
---EXPECTF--
+--EXPECT--
 object(SplTempFileObject)#1 (5) {
   ["pathName":"SplFileInfo":private]=>
   string(12) "php://memory"
diff --git a/ext/spl/tests/arrayObject___construct_basic1.phpt b/ext/spl/tests/arrayObject___construct_basic1.phpt
index f192ccab45..a14166c35e 100644
--- a/ext/spl/tests/arrayObject___construct_basic1.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic1.phpt
@@ -16,7 +16,7 @@ var_dump(new ArrayObject(array('key1' => 'val1')));
 echo "--> Nested ArrayObject argument:\n";
 var_dump(new ArrayObject(new ArrayObject($a)));
 ?>
---EXPECTF--
+--EXPECT--
 --> No arguments:
 object(ArrayObject)#1 (1) {
   ["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/arrayObject___construct_basic6.phpt b/ext/spl/tests/arrayObject___construct_basic6.phpt
index 1c7ec36363..58ba46061b 100644
--- a/ext/spl/tests/arrayObject___construct_basic6.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic6.phpt
@@ -21,7 +21,7 @@ var_dump($ao);
 $ao = new MyArrayObject(array(1,2,3), ArrayObject::STD_PROP_LIST);
 var_dump($ao);
 ?>
---EXPECTF--
+--EXPECT--
 object(ArrayObject)#1 (2) {
   ["p"]=>
   int(1)
diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt
index f0e1107d51..aaf38ac499 100644
--- a/ext/spl/tests/arrayObject___construct_error1.phpt
+++ b/ext/spl/tests/arrayObject___construct_error1.phpt
@@ -18,7 +18,7 @@ try {
   echo $e->getMessage() . "(" . $e->getLine() .  ")\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Bad iterator type:
 ArrayObject::__construct() expects parameter 3 to be a class name derived from Iterator, 'Exception' given(6)
 Non-existent class:
diff --git a/ext/spl/tests/arrayObject___construct_error2.phpt b/ext/spl/tests/arrayObject___construct_error2.phpt
index 35ba83d09f..ec01f57e34 100644
--- a/ext/spl/tests/arrayObject___construct_error2.phpt
+++ b/ext/spl/tests/arrayObject___construct_error2.phpt
@@ -17,6 +17,6 @@ try {
   echo $e->getMessage() . "(" . $e->getLine() .  ")\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Too many arguments:
 ArrayObject::__construct() expects at most 3 parameters, 4 given(12)
diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt
index d481d0c4ed..7c506e1214 100644
--- a/ext/spl/tests/arrayObject_asort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic2.phpt
@@ -23,7 +23,7 @@ var_dump($ao1->asort());
 var_dump($ao1, $c);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::asort() : basic functionality ***
 bool(true)
 object(ArrayObject)#2 (1) {
diff --git a/ext/spl/tests/arrayObject_clone_basic1.phpt b/ext/spl/tests/arrayObject_clone_basic1.phpt
index dd4abf3ffb..67876330f5 100644
--- a/ext/spl/tests/arrayObject_clone_basic1.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic1.phpt
@@ -13,7 +13,7 @@ $aa1['new.aa1'] = 'new element added to aa1';
 $aa2['new.aa2'] = 'new element added to aa2';
 var_dump($a, $aa1, $aa2);
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   int(1)
diff --git a/ext/spl/tests/arrayObject_clone_basic2.phpt b/ext/spl/tests/arrayObject_clone_basic2.phpt
index 932eaed712..dccd26492f 100644
--- a/ext/spl/tests/arrayObject_clone_basic2.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic2.phpt
@@ -15,7 +15,7 @@ $ao1['new.ao1'] = 'new element added to ao1';
 $ao2['new.ao2'] = 'new element added to ao2';
 var_dump($c, $ao1, $ao2);
 ?>
---EXPECTF--
+--EXPECT--
 object(C)#1 (3) {
   ["p1"]=>
   string(32) "new prop added to c before clone"
diff --git a/ext/spl/tests/arrayObject_clone_basic3.phpt b/ext/spl/tests/arrayObject_clone_basic3.phpt
index f7ac89442e..53afecb58f 100644
--- a/ext/spl/tests/arrayObject_clone_basic3.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic3.phpt
@@ -21,7 +21,7 @@ $clonedOuterArrayObject['new.coAO'] = 'new element added to $clonedOuterArrayObj
 
 var_dump($wrappedObject, $innerArrayObject, $outerArrayObject, $clonedOuterArrayObject);
 ?>
---EXPECTF--
+--EXPECT--
 object(C)#1 (5) {
   ["p"]=>
   string(9) "C::p.orig"
diff --git a/ext/spl/tests/arrayObject_getFlags_basic1.phpt b/ext/spl/tests/arrayObject_getFlags_basic1.phpt
index b078c51ab2..b9445d4119 100644
--- a/ext/spl/tests/arrayObject_getFlags_basic1.phpt
+++ b/ext/spl/tests/arrayObject_getFlags_basic1.phpt
@@ -17,7 +17,7 @@ var_dump($ao->getFlags());
 $cao = clone $ao;
 var_dump($cao->getFlags());
 ?>
---EXPECTF--
+--EXPECT--
 int(0)
 int(1)
 int(2)
diff --git a/ext/spl/tests/arrayObject_getFlags_basic2.phpt b/ext/spl/tests/arrayObject_getFlags_basic2.phpt
index f7d56eaf88..651c240303 100644
--- a/ext/spl/tests/arrayObject_getFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_getFlags_basic2.phpt
@@ -16,7 +16,7 @@ $ao2 = new ArrayObject($ao, 0);
 var_dump($ao2->getFlags());
 
 ?>
---EXPECTF--
+--EXPECT--
 int(3)
 int(3)
 int(3)
diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
index b23c196224..2b67093da2 100644
--- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
+++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
@@ -58,7 +58,7 @@ foreach($ao as $key=>$value) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 --> Access using MyIterator:
 string(10) "MyIterator"
 object(MyIterator)#2 (1) {
diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt
index 1464e73761..cd1020c0cb 100644
--- a/ext/spl/tests/arrayObject_ksort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt
@@ -23,7 +23,7 @@ var_dump($ao1->ksort());
 var_dump($ao1, $c);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::ksort() : basic functionality ***
 bool(true)
 object(ArrayObject)#2 (1) {
diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt
index 023086d83a..78f0adbdd1 100644
--- a/ext/spl/tests/arrayObject_magicMethods5.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods5.phpt
@@ -70,7 +70,7 @@ var_dump($obj);
 echo "  Wrapping ArrayObject:\n";
 var_dump($ao);
 ?>
---EXPECTF--
+--EXPECT--
 --> Write existent, non-existent and dynamic:
 In UsesMagic::__set(a,changed)
 In UsesMagic::__set(dynamic,new)
diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
index 62ad2ed482..c959fb88e2 100644
--- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
@@ -19,7 +19,7 @@ var_dump($ao2->natcasesort('blah'));
 var_dump($ao2);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::natcasesort() : basic functionality ***
 bool(true)
 object(ArrayObject)#1 (1) {
diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt
index 1b4fd60f55..d23e819f1d 100644
--- a/ext/spl/tests/arrayObject_natsort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt
@@ -19,7 +19,7 @@ var_dump($ao2->natsort('blah'));
 var_dump($ao2);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::natsort() : basic functionality ***
 bool(true)
 object(ArrayObject)#1 (1) {
diff --git a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
index 1953643c84..e20e9918d7 100644
--- a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
+++ b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
@@ -6,5 +6,5 @@ $ao = new ArrayObject(array('foo' => null));
 var_dump($ao->offsetExists('foo'));
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 \ No newline at end of file
diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt
index 203edb6fb8..6e447b6a63 100644
--- a/ext/spl/tests/arrayObject_uasort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt
@@ -28,7 +28,7 @@ $ao->uasort('cmp');
 var_dump($ao);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::uasort() : basic functionality ***
 object(ArrayObject)#1 (1) {
   ["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt
index d7306c9c88..74e3d65089 100644
--- a/ext/spl/tests/arrayObject_uasort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_error1.phpt
@@ -24,7 +24,7 @@ try {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Function expects exactly one argument
 Function expects exactly one argument
 ===DONE===
diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt
index 1581589e43..825c4d747c 100644
--- a/ext/spl/tests/arrayObject_uksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt
@@ -27,7 +27,7 @@ $ao->uksort('cmp');
 var_dump($ao);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ArrayObject::uksort() : basic functionality ***
 object(ArrayObject)#1 (1) {
   ["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt
index d019fc4400..ec699eb67d 100644
--- a/ext/spl/tests/arrayObject_uksort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_error1.phpt
@@ -24,7 +24,7 @@ try {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Function expects exactly one argument
 Function expects exactly one argument
 ===DONE===
diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt
index de4ce30f91..204387da04 100644
--- a/ext/spl/tests/array_003.phpt
+++ b/ext/spl/tests/array_003.phpt
@@ -36,7 +36,7 @@ foreach($test as $key => $val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 test Object
 (
     [pub] => public
diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt
index 0b80e5c89f..c976bdd87b 100644
--- a/ext/spl/tests/array_004.phpt
+++ b/ext/spl/tests/array_004.phpt
@@ -17,7 +17,7 @@ foreach($obj as $ak=>$av) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 0=>0 - 0=>0
 0=>0 - 1=>1
 0=>0 - 2=>2
diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt
index 49f2838f77..2735432e26 100644
--- a/ext/spl/tests/array_006.phpt
+++ b/ext/spl/tests/array_006.phpt
@@ -22,7 +22,7 @@ foreach($obj as $ak=>$av) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ==Normal==
 0=>0 - 0=>0
 0=>0 - 1=>1
diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt
index 7d9bf6afc1..edf2a922d6 100644
--- a/ext/spl/tests/array_007.phpt
+++ b/ext/spl/tests/array_007.phpt
@@ -40,7 +40,7 @@ foreach($test as $key => $val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 test Object
 (
     [pub] => public
diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt
index e7a618dda5..01b2290e50 100644
--- a/ext/spl/tests/array_008.phpt
+++ b/ext/spl/tests/array_008.phpt
@@ -18,7 +18,7 @@ foreach($obj as $ak=>&$av) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 0=>modify - 0=>modify
 0=>modify - 1=>1
 0=>modify - 2=>2
diff --git a/ext/spl/tests/array_014.phpt b/ext/spl/tests/array_014.phpt
index 1ac9d4f956..4bf0b83c9c 100644
--- a/ext/spl/tests/array_014.phpt
+++ b/ext/spl/tests/array_014.phpt
@@ -39,7 +39,7 @@ foreach($it as $v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(11)
 int(5)
 int(4)
diff --git a/ext/spl/tests/array_016.phpt b/ext/spl/tests/array_016.phpt
index 8637c5c886..0a6edea01c 100644
--- a/ext/spl/tests/array_016.phpt
+++ b/ext/spl/tests/array_016.phpt
@@ -20,7 +20,7 @@ foreach(new IteratorIterator($it) as $v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(0)
 int(1)
 int(2)
diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt
index 7c68a6280e..9d20ae47a9 100644
--- a/ext/spl/tests/array_018.phpt
+++ b/ext/spl/tests/array_018.phpt
diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt
index 4c6fe0df25..3258c7f16c 100644
--- a/ext/spl/tests/array_020.phpt
+++ b/ext/spl/tests/array_020.phpt
@@ -46,7 +46,7 @@ foreach($ar as $k => $v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ArrayIteratorEx::rewind
 ArrayIteratorEx::valid
 ArrayIteratorEx::current
diff --git a/ext/spl/tests/bug31346.phpt b/ext/spl/tests/bug31346.phpt
index e3bf51f57f..b2d29905ac 100644
--- a/ext/spl/tests/bug31346.phpt
+++ b/ext/spl/tests/bug31346.phpt
@@ -14,5 +14,5 @@ $i->next();
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt
index e66fa4d6ed..188d2fba81 100644
--- a/ext/spl/tests/bug37457.phpt
+++ b/ext/spl/tests/bug37457.phpt
@@ -69,7 +69,7 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Collection::__construct
 Collection::rewind
 Collection::valid
diff --git a/ext/spl/tests/bug38618.phpt b/ext/spl/tests/bug38618.phpt
index 17439b4973..95a3da83cc 100644
--- a/ext/spl/tests/bug38618.phpt
+++ b/ext/spl/tests/bug38618.phpt
@@ -88,7 +88,7 @@ test_array($array, 'Protected Property New', RecursiveArrayIterator::CHILD_ARRAY
 <?php exit(0); ?>
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===Default with array===
 1 => apple
 1 => grape
diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt
index 3cf3d8780c..11fe80817c 100644
--- a/ext/spl/tests/bug41691.phpt
+++ b/ext/spl/tests/bug41691.phpt
@@ -17,7 +17,7 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1)));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {
   ["a"]=>
   NULL
diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt
index 5c52763cd6..4b3e4675cc 100644
--- a/ext/spl/tests/bug42703.phpt
+++ b/ext/spl/tests/bug42703.phpt
@@ -35,7 +35,7 @@ catch (Exception $e) {
 var_dump($itit->current());
 var_dump($itit->key());
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "boo"
 NULL
 NULL
diff --git a/ext/spl/tests/bug44615.phpt b/ext/spl/tests/bug44615.phpt
index 1fd3d199dc..0b9aa82bc3 100644
--- a/ext/spl/tests/bug44615.phpt
+++ b/ext/spl/tests/bug44615.phpt
@@ -20,7 +20,7 @@ foreach (new RecursiveIteratorIterator($rai) as $t) {
     var_dump($t);
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(1) "z"
 object(stdClass)#1 (0) {
 }
diff --git a/ext/spl/tests/bug45216.phpt b/ext/spl/tests/bug45216.phpt
index b3c4aa51bf..0c4ab93ff3 100644
--- a/ext/spl/tests/bug45216.phpt
+++ b/ext/spl/tests/bug45216.phpt
@@ -17,6 +17,6 @@ var_dump(fgetss($handle));
 <?php
 unlink(dirname(__FILE__) . '/foo.html');
 ?>
---EXPECTF--
+--EXPECT--
 string(12) "text 0text 1"
 string(12) "text 0text 1"
diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt
index e32262a743..8672f86eea 100644
--- a/ext/spl/tests/bug50579.phpt
+++ b/ext/spl/tests/bug50579.phpt
@@ -31,7 +31,7 @@ foreach ($i as $name=>$value) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 test1=>[test888]
 test3=>[test999]
 test1=>888
diff --git a/ext/spl/tests/bug52573.phpt b/ext/spl/tests/bug52573.phpt
index 54587fae1d..8817da0f1e 100644
--- a/ext/spl/tests/bug52573.phpt
+++ b/ext/spl/tests/bug52573.phpt
@@ -9,7 +9,7 @@ var_dump($f->fscanf('<?php // %s', $result));
 var_dump($result);
 var_dump($f->fscanf('<?php // %s'));
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 string(4) "test"
 array(1) {
diff --git a/ext/spl/tests/bug53071.phpt b/ext/spl/tests/bug53071.phpt
index a2983ed2b2..ca394f5434 100644
--- a/ext/spl/tests/bug53071.phpt
+++ b/ext/spl/tests/bug53071.phpt
@@ -22,6 +22,6 @@ var_dump(gc_collect_cycles());
 echo "Done.\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 int(4)
 Done.
diff --git a/ext/spl/tests/bug53144.phpt b/ext/spl/tests/bug53144.phpt
index 7cf179b3eb..8fb86e8204 100644
--- a/ext/spl/tests/bug53144.phpt
+++ b/ext/spl/tests/bug53144.phpt
@@ -15,6 +15,6 @@ $b->removeAll($b);
 var_dump(count($b));
 
 ?>
---EXPECTF--
+--EXPECT--
 int(2)
 int(0)
 \ No newline at end of file
diff --git a/ext/spl/tests/bug53362.phpt b/ext/spl/tests/bug53362.phpt
index 70ba6e2036..7ae74ce559 100644
--- a/ext/spl/tests/bug53362.phpt
+++ b/ext/spl/tests/bug53362.phpt
@@ -16,7 +16,7 @@ $obj[]=2;
 $obj[]=2;
 
 ?>
---EXPECTF--
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt
index 288f49a4ec..ffbbcc3220 100644
--- a/ext/spl/tests/bug54292.phpt
+++ b/ext/spl/tests/bug54292.phpt
@@ -10,5 +10,5 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 string(74) "SplFileObject::__construct() expects parameter 2 to be string, array given"
diff --git a/ext/spl/tests/bug61527.phpt b/ext/spl/tests/bug61527.phpt
index 03dbbe346b..fa8291228c 100644
--- a/ext/spl/tests/bug61527.phpt
+++ b/ext/spl/tests/bug61527.phpt
@@ -64,7 +64,7 @@ var_dump($ai4->getChildren());
 ?>
 ==DONE==
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 NULL
 NULL
 int(4)
diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt
index 8cd38289ef..458bba6663 100644
--- a/ext/spl/tests/bug61697.phpt
+++ b/ext/spl/tests/bug61697.phpt
@@ -18,7 +18,7 @@ foreach (spl_autoload_functions() AS $func)
 
 print_r(spl_autoload_functions());
 ?>
---EXPECTF--
+--EXPECT--
 Array
 (
 )
diff --git a/ext/spl/tests/bug62616.phpt b/ext/spl/tests/bug62616.phpt
index 4e4be94491..6fc17828ba 100644
--- a/ext/spl/tests/bug62616.phpt
+++ b/ext/spl/tests/bug62616.phpt
@@ -10,6 +10,6 @@ $ii = new IteratorIterator($ai);
 
 var_dump($ii->count());
 ?>
---EXPECTF--
+--EXPECT--
 int(2)
 int(2)
diff --git a/ext/spl/tests/bug62672.phpt b/ext/spl/tests/bug62672.phpt
index d0d6a62451..d255762254 100644
--- a/ext/spl/tests/bug62672.phpt
+++ b/ext/spl/tests/bug62672.phpt
@@ -27,5 +27,5 @@ class ObjB extends ObjA
 $obj = new ObjB(new ArrayObject());
 
 var_dump($obj == unserialize(serialize($obj)));
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt
index 8ce0d7bc79..9a31cc5e94 100644
--- a/ext/spl/tests/bug62904.phpt
+++ b/ext/spl/tests/bug62904.phpt
@@ -13,6 +13,6 @@ $x = new foo(2);
 $z = clone $x;
 echo "No crash.";
 
---EXPECTF--
+--EXPECT--
 No crash.
 
diff --git a/ext/spl/tests/bug64264.phpt b/ext/spl/tests/bug64264.phpt
index e7b695bd82..e02fb775c4 100644
--- a/ext/spl/tests/bug64264.phpt
+++ b/ext/spl/tests/bug64264.phpt
@@ -21,7 +21,7 @@ $myFixedArr->setSize(2);
 
 print_r($myFixedArr->toArray());
 ?>
---EXPECTF--
+--EXPECT--
 Array
 (
     [0] => foo
diff --git a/ext/spl/tests/bug66702.phpt b/ext/spl/tests/bug66702.phpt
index fedfc869a8..3e4df51abe 100644
--- a/ext/spl/tests/bug66702.phpt
+++ b/ext/spl/tests/bug66702.phpt
@@ -18,7 +18,7 @@ print_r(iterator_to_array($it2));
 $it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::USE_KEY | \RegexIterator::INVERT_MATCH);
 print_r(iterator_to_array($it2));
 
---EXPECTF--
+--EXPECT--
 Array
 (
     [1] => bar
diff --git a/ext/spl/tests/bug67359.phpt b/ext/spl/tests/bug67359.phpt
index e2e61133f3..e97a403717 100644
--- a/ext/spl/tests/bug67359.phpt
+++ b/ext/spl/tests/bug67359.phpt
@@ -24,5 +24,5 @@ catch(Exception $e)
 }
 echo "okey"
 ?>
---EXPECTF--
+--EXPECT--
 okey
diff --git a/ext/spl/tests/bug67538.phpt b/ext/spl/tests/bug67538.phpt
index b6f3848c36..33d95f04c7 100644
--- a/ext/spl/tests/bug67538.phpt
+++ b/ext/spl/tests/bug67538.phpt
@@ -13,5 +13,5 @@ $list->offsetUnset(0);
 $list->next();
 echo "okey";
 ?>
---EXPECTF--
+--EXPECT--
 okey
diff --git a/ext/spl/tests/bug67805.phpt b/ext/spl/tests/bug67805.phpt
index ba07b3da92..1f64f0fcac 100644
--- a/ext/spl/tests/bug67805.phpt
+++ b/ext/spl/tests/bug67805.phpt
@@ -10,6 +10,6 @@ $line = $splFileObject->getCurrentLine();
 var_dump($line === '<?p');
 var_dump(strlen($line) === 3);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt
index e4e7976a9b..031857e774 100644
--- a/ext/spl/tests/bug68479.phpt
+++ b/ext/spl/tests/bug68479.phpt
@@ -9,7 +9,7 @@ var_dump($params);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   object(ReflectionParameter)#2 (1) {
diff --git a/ext/spl/tests/bug68557.phpt b/ext/spl/tests/bug68557.phpt
index c1ac95257b..ff58c7a046 100644
--- a/ext/spl/tests/bug68557.phpt
+++ b/ext/spl/tests/bug68557.phpt
@@ -35,7 +35,7 @@ unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'a');
 unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b');
 rmdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/spl/tests/bug69335.phpt b/ext/spl/tests/bug69335.phpt
index 41f03efcb0..3b065b6473 100644
--- a/ext/spl/tests/bug69335.phpt
+++ b/ext/spl/tests/bug69335.phpt
@@ -12,7 +12,7 @@ foreach ($a as $k => $v) {
 	}
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(6) "1 => 1"
 string(6) "3 => 3"
 string(6) "5 => 5"
diff --git a/ext/spl/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt
index d3dd76354a..a253927d1d 100644
--- a/ext/spl/tests/bug70868.phpt
+++ b/ext/spl/tests/bug70868.phpt
@@ -24,7 +24,7 @@ foreach ($iterator as $foo) {
 echo "Done", PHP_EOL;
 
 ?>
---EXPECTF--
+--EXPECT--
 
 string(6) "A.phpt"
 string(6) "B.phpt"
diff --git a/ext/spl/tests/bug70959.phpt b/ext/spl/tests/bug70959.phpt
index 3fd500736d..541807ae16 100644
--- a/ext/spl/tests/bug70959.phpt
+++ b/ext/spl/tests/bug70959.phpt
@@ -19,6 +19,6 @@ $obj->setTest('test');
 var_dump($obj->getTest());
 $obj2 = unserialize(serialize($obj));
 var_dump($obj2->getTest());
---EXPECTF--
+--EXPECT--
 string(4) "test"
 string(4) "test"
diff --git a/ext/spl/tests/bug73029.phpt b/ext/spl/tests/bug73029.phpt
index a379f8005e..8789e91df2 100644
--- a/ext/spl/tests/bug73029.phpt
+++ b/ext/spl/tests/bug73029.phpt
@@ -11,6 +11,6 @@ $x = $m[2];
 }
 ?>
 DONE
---EXPECTF--
+--EXPECT--
 Error at offset 10 of 19 bytes
 DONE
diff --git a/ext/spl/tests/bug73629.phpt b/ext/spl/tests/bug73629.phpt
index 5b6587c685..29b9dfc061 100644
--- a/ext/spl/tests/bug73629.phpt
+++ b/ext/spl/tests/bug73629.phpt
@@ -15,6 +15,6 @@ try {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 expected exception: Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen
 ===DONE===
diff --git a/ext/spl/tests/bug75049.phpt b/ext/spl/tests/bug75049.phpt
index 2f03a3b031..eafdb84541 100644
--- a/ext/spl/tests/bug75049.phpt
+++ b/ext/spl/tests/bug75049.phpt
@@ -12,5 +12,5 @@ foreach (spl_autoload_functions() as $loader) {
 	echo (int)spl_autoload_unregister($loader);
 }
 echo (int)count(spl_autoload_functions());
---EXPECTF--
+--EXPECT--
 11110
diff --git a/ext/spl/tests/dit_003.phpt b/ext/spl/tests/dit_003.phpt
index 4ffc2921e0..507ed49f0e 100644
--- a/ext/spl/tests/dit_003.phpt
+++ b/ext/spl/tests/dit_003.phpt
@@ -10,6 +10,6 @@ foreach(new FilesystemIterator(__DIR__) as $ent)
 var_dump($count > 0);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 bool(true)
 ===DONE===
diff --git a/ext/spl/tests/dit_004.phpt b/ext/spl/tests/dit_004.phpt
index 4ad0e4b772..d9f1912283 100644
--- a/ext/spl/tests/dit_004.phpt
+++ b/ext/spl/tests/dit_004.phpt
@@ -14,7 +14,7 @@ var_dump((string)$c == (string)$a);
 var_dump($a->key(), $c->key());
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 bool(true)
 int(0)
 int(0)
diff --git a/ext/spl/tests/dit_005.phpt b/ext/spl/tests/dit_005.phpt
index 52a335172f..9278a115a3 100644
--- a/ext/spl/tests/dit_005.phpt
+++ b/ext/spl/tests/dit_005.phpt
@@ -14,7 +14,7 @@ var_dump((string)$c == (string)$a);
 var_dump($a->key() == $c->key());
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/spl/tests/dllist_001.phpt b/ext/spl/tests/dllist_001.phpt
index e27f23ca44..4a18cf2322 100644
--- a/ext/spl/tests/dllist_001.phpt
+++ b/ext/spl/tests/dllist_001.phpt
@@ -48,7 +48,7 @@ echo count($dll)."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't pop from an empty datastructure
 Exception: Can't shift from an empty datastructure
 2
diff --git a/ext/spl/tests/dllist_002.phpt b/ext/spl/tests/dllist_002.phpt
index e956de60fd..e1287718de 100644
--- a/ext/spl/tests/dllist_002.phpt
+++ b/ext/spl/tests/dllist_002.phpt
@@ -35,7 +35,7 @@ foreach($dll2 as $k=>$v) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 0=>2
 ->0=>2
 ->1=>3
diff --git a/ext/spl/tests/dllist_003.phpt b/ext/spl/tests/dllist_003.phpt
index 9a9556840f..53dd7cb752 100644
--- a/ext/spl/tests/dllist_003.phpt
+++ b/ext/spl/tests/dllist_003.phpt
@@ -28,7 +28,7 @@ var_dump($dll->count());
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 2=>4
 1=>3
 0=>2
diff --git a/ext/spl/tests/dllist_004.phpt b/ext/spl/tests/dllist_004.phpt
index 44d9611fca..0a74d59892 100644
--- a/ext/spl/tests/dllist_004.phpt
+++ b/ext/spl/tests/dllist_004.phpt
@@ -46,7 +46,7 @@ echo count($stack)."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't pop from an empty datastructure
 Exception: Can't shift from an empty datastructure
 2
diff --git a/ext/spl/tests/dllist_005.phpt b/ext/spl/tests/dllist_005.phpt
index 33161ba17d..2e2058f76a 100644
--- a/ext/spl/tests/dllist_005.phpt
+++ b/ext/spl/tests/dllist_005.phpt
@@ -46,7 +46,7 @@ echo count($queue)."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't shift from an empty datastructure
 Exception: Can't shift from an empty datastructure
 2
diff --git a/ext/spl/tests/dllist_006.phpt b/ext/spl/tests/dllist_006.phpt
index b4055dcb9c..d5590642ea 100644
--- a/ext/spl/tests/dllist_006.phpt
+++ b/ext/spl/tests/dllist_006.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 int(3)
diff --git a/ext/spl/tests/dllist_007.phpt b/ext/spl/tests/dllist_007.phpt
index 38f801fde7..d15e064ac4 100644
--- a/ext/spl/tests/dllist_007.phpt
+++ b/ext/spl/tests/dllist_007.phpt
@@ -14,7 +14,7 @@ while ($a->valid()) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(1)
 NULL
 int(2)
diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt
index b60f063924..b9a4ef7648 100644
--- a/ext/spl/tests/dllist_013.phpt
+++ b/ext/spl/tests/dllist_013.phpt
@@ -32,7 +32,7 @@ echo $dll->pop()."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Offset invalid or out of range
 7
 7
diff --git a/ext/spl/tests/dllist_memleak.phpt b/ext/spl/tests/dllist_memleak.phpt
index 9bae68bf2e..a52d2887d0 100644
--- a/ext/spl/tests/dllist_memleak.phpt
+++ b/ext/spl/tests/dllist_memleak.phpt
@@ -18,7 +18,7 @@ echo $dll->current()."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 1
 3
 ===DONE===
diff --git a/ext/spl/tests/fixedarray_001.phpt b/ext/spl/tests/fixedarray_001.phpt
index 8276333e10..c85d9e8dcc 100644
--- a/ext/spl/tests/fixedarray_001.phpt
+++ b/ext/spl/tests/fixedarray_001.phpt
@@ -45,7 +45,7 @@ $a[0] = "valueNew";
 var_dump($b[0]);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Exception: Index invalid or out of range
 Exception: Index invalid or out of range
 Exception: Index invalid or out of range
diff --git a/ext/spl/tests/fixedarray_002.phpt b/ext/spl/tests/fixedarray_002.phpt
index 2521516c14..ade6b7decf 100644
--- a/ext/spl/tests/fixedarray_002.phpt
+++ b/ext/spl/tests/fixedarray_002.phpt
@@ -68,7 +68,7 @@ var_dump($a[0], $a[2], $a[3], $a[4]);
 var_dump(count($a), $a->getSize(), count($a) == $a->getSize());
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 A::offsetSet
 Exception: Index invalid or out of range
 A::offsetGet
diff --git a/ext/spl/tests/fixedarray_003.phpt b/ext/spl/tests/fixedarray_003.phpt
index 69cec7528e..33043a80e3 100644
--- a/ext/spl/tests/fixedarray_003.phpt
+++ b/ext/spl/tests/fixedarray_003.phpt
@@ -50,7 +50,7 @@ foreach ($a as $k => $v) {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ==Direct instance==
 0 => a
 1 => c
diff --git a/ext/spl/tests/fixedarray_004.phpt b/ext/spl/tests/fixedarray_004.phpt
index cb62e0c2c9..fb32c2fd52 100644
--- a/ext/spl/tests/fixedarray_004.phpt
+++ b/ext/spl/tests/fixedarray_004.phpt
@@ -13,6 +13,6 @@ try {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(29) "Index invalid or out of range"
 ===DONE===
diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
index 4d2624528b..185b9d1acc 100644
--- a/ext/spl/tests/fixedarray_009.phpt
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -9,5 +9,5 @@ try {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 ?>
---EXPECTF--
+--EXPECT--
 Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index 9468d9626c..a25e1dc669 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -11,6 +11,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
 Done
diff --git a/ext/spl/tests/heap_001.phpt b/ext/spl/tests/heap_001.phpt
index da4dde8ad2..f9cfd68710 100644
--- a/ext/spl/tests/heap_001.phpt
+++ b/ext/spl/tests/heap_001.phpt
@@ -38,7 +38,7 @@ echo $h2->extract()."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't extract from an empty heap
 5
 3
diff --git a/ext/spl/tests/heap_002.phpt b/ext/spl/tests/heap_002.phpt
index 387510f766..578d15b21c 100644
--- a/ext/spl/tests/heap_002.phpt
+++ b/ext/spl/tests/heap_002.phpt
@@ -36,7 +36,7 @@ echo $h->extract()."\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't extract from an empty heap
 5
 1
diff --git a/ext/spl/tests/heap_003.phpt b/ext/spl/tests/heap_003.phpt
index 87f95e9a2b..4a4bcff5ff 100644
--- a/ext/spl/tests/heap_003.phpt
+++ b/ext/spl/tests/heap_003.phpt
@@ -29,7 +29,7 @@ foreach ($h as $out) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 10
 9
 8
diff --git a/ext/spl/tests/heap_004.phpt b/ext/spl/tests/heap_004.phpt
index 7b00ebfbff..e493d20fac 100644
--- a/ext/spl/tests/heap_004.phpt
+++ b/ext/spl/tests/heap_004.phpt
@@ -55,7 +55,7 @@ try {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 inserted 1
 Exception: foo
 Exception: Heap is corrupted, heap properties are no longer ensured.
diff --git a/ext/spl/tests/heap_005.phpt b/ext/spl/tests/heap_005.phpt
index 1291cda770..8621f09aa4 100644
--- a/ext/spl/tests/heap_005.phpt
+++ b/ext/spl/tests/heap_005.phpt
@@ -17,7 +17,7 @@ foreach ($h as $k => $o) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 99 => 1
 98 => 2
 97 => 3
diff --git a/ext/spl/tests/heap_006.phpt b/ext/spl/tests/heap_006.phpt
index 3218bdfb16..41c7b84638 100644
--- a/ext/spl/tests/heap_006.phpt
+++ b/ext/spl/tests/heap_006.phpt
@@ -17,7 +17,7 @@ foreach ($h as $k => $o) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 99 => 100
 98 => 99
 97 => 98
diff --git a/ext/spl/tests/heap_007.phpt b/ext/spl/tests/heap_007.phpt
index e8d5c9997c..27bd66edf1 100644
--- a/ext/spl/tests/heap_007.phpt
+++ b/ext/spl/tests/heap_007.phpt
@@ -22,7 +22,7 @@ while ($h->valid()) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 count($h) = 4
 $h->count() = 4
 3=>5
diff --git a/ext/spl/tests/heap_008.phpt b/ext/spl/tests/heap_008.phpt
index 178f5462e4..3a746b2e6f 100644
--- a/ext/spl/tests/heap_008.phpt
+++ b/ext/spl/tests/heap_008.phpt
@@ -13,7 +13,7 @@ var_dump($h);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 object(SplMaxHeap)#1 (3) {
   ["flags":"SplHeap":private]=>
   int(0)
diff --git a/ext/spl/tests/heap_top_variation_002.phpt b/ext/spl/tests/heap_top_variation_002.phpt
index cd6a8d0ad9..4d6bdd593a 100644
--- a/ext/spl/tests/heap_top_variation_002.phpt
+++ b/ext/spl/tests/heap_top_variation_002.phpt
@@ -27,5 +27,5 @@ try {
 	echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 Heap is corrupted, heap properties are no longer ensured.
diff --git a/ext/spl/tests/heap_top_variation_003.phpt b/ext/spl/tests/heap_top_variation_003.phpt
index 7a91a9c000..c2ea2bcd95 100644
--- a/ext/spl/tests/heap_top_variation_003.phpt
+++ b/ext/spl/tests/heap_top_variation_003.phpt
@@ -12,5 +12,5 @@ try {
 	echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 Can't peek at an empty heap
diff --git a/ext/spl/tests/iterator_005.phpt b/ext/spl/tests/iterator_005.phpt
index 640ca9f9c2..cacf006c5a 100644
--- a/ext/spl/tests/iterator_005.phpt
+++ b/ext/spl/tests/iterator_005.phpt
@@ -38,7 +38,7 @@ foreach(new IteratorIterator($it) as $v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ArrayIteratorEx::rewind
 int(0)
 int(1)
diff --git a/ext/spl/tests/iterator_010.phpt b/ext/spl/tests/iterator_010.phpt
index 39d1000f62..b8013d7311 100644
--- a/ext/spl/tests/iterator_010.phpt
+++ b/ext/spl/tests/iterator_010.phpt
@@ -13,6 +13,6 @@ foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val)
 ?>
 ===DONE===
 <?php exit(0);
---EXPECTF--
+--EXPECT--
 ===EmptyIterator===
 ===DONE===
diff --git a/ext/spl/tests/iterator_011.phpt b/ext/spl/tests/iterator_011.phpt
index fca159a20f..62b8ed8ea9 100644
--- a/ext/spl/tests/iterator_011.phpt
+++ b/ext/spl/tests/iterator_011.phpt
@@ -34,7 +34,7 @@ foreach($it as $val=>$key)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===EmptyIterator===
 ===InfiniteIterator===
 2=>C
diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt
index 81bc02f69c..63a3fce8bf 100644
--- a/ext/spl/tests/iterator_012.phpt
+++ b/ext/spl/tests/iterator_012.phpt
@@ -23,7 +23,7 @@ foreach($it as $key=>$val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===Current===
 0=>A
 ===Next===
diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt
index 119631c000..6da31e391d 100644
--- a/ext/spl/tests/iterator_013.phpt
+++ b/ext/spl/tests/iterator_013.phpt
@@ -47,7 +47,7 @@ foreach($it as $key=>$val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===Empty===
 ===Append===
 0=>A
diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt
index aa30f79e1f..bce00ae4d5 100644
--- a/ext/spl/tests/iterator_015.phpt
+++ b/ext/spl/tests/iterator_015.phpt
@@ -39,7 +39,7 @@ foreach($rit as $k=>$v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 <ul>
   0=>a
   <ul>
diff --git a/ext/spl/tests/iterator_016.phpt b/ext/spl/tests/iterator_016.phpt
index f231c6eb34..77ffae83b0 100644
--- a/ext/spl/tests/iterator_016.phpt
+++ b/ext/spl/tests/iterator_016.phpt
@@ -52,7 +52,7 @@ foreach($rit as $k=>$v)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Menu::getIterator
 <ul>
   0=>a
diff --git a/ext/spl/tests/iterator_017.phpt b/ext/spl/tests/iterator_017.phpt
index 39d1000f62..b8013d7311 100644
--- a/ext/spl/tests/iterator_017.phpt
+++ b/ext/spl/tests/iterator_017.phpt
@@ -13,6 +13,6 @@ foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val)
 ?>
 ===DONE===
 <?php exit(0);
---EXPECTF--
+--EXPECT--
 ===EmptyIterator===
 ===DONE===
diff --git a/ext/spl/tests/iterator_018.phpt b/ext/spl/tests/iterator_018.phpt
index 9c234bb11d..618988630d 100644
--- a/ext/spl/tests/iterator_018.phpt
+++ b/ext/spl/tests/iterator_018.phpt
@@ -34,7 +34,7 @@ foreach($it as $val=>$key)
 ?>
 ===DONE===
 <?php exit(0);
---EXPECTF--
+--EXPECT--
 ===EmptyIterator===
 ===InfiniteIterator===
 2=>C
diff --git a/ext/spl/tests/iterator_019.phpt b/ext/spl/tests/iterator_019.phpt
index 81bc02f69c..63a3fce8bf 100644
--- a/ext/spl/tests/iterator_019.phpt
+++ b/ext/spl/tests/iterator_019.phpt
@@ -23,7 +23,7 @@ foreach($it as $key=>$val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===Current===
 0=>A
 ===Next===
diff --git a/ext/spl/tests/iterator_020.phpt b/ext/spl/tests/iterator_020.phpt
index 119631c000..6da31e391d 100644
--- a/ext/spl/tests/iterator_020.phpt
+++ b/ext/spl/tests/iterator_020.phpt
@@ -47,7 +47,7 @@ foreach($it as $key=>$val)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===Empty===
 ===Append===
 0=>A
diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt
index 2aa61bb03f..a95cbee77c 100644
--- a/ext/spl/tests/iterator_037.phpt
+++ b/ext/spl/tests/iterator_037.phpt
@@ -89,7 +89,7 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECT--	
 ===1===
 int(1)
 string(1) "1"
diff --git a/ext/spl/tests/iterator_041b.phpt b/ext/spl/tests/iterator_041b.phpt
index e7ea8b8008..8f55ade319 100644
--- a/ext/spl/tests/iterator_041b.phpt
+++ b/ext/spl/tests/iterator_041b.phpt
@@ -96,7 +96,7 @@ MyArrayIterator::test('iterator_count', array(3 => 6));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===iterator_to_array===
 State 0: __construct()
 State 1: __construct()
diff --git a/ext/spl/tests/iterator_043.phpt b/ext/spl/tests/iterator_043.phpt
index 301a593ba2..6dbbfdd97b 100644
--- a/ext/spl/tests/iterator_043.phpt
+++ b/ext/spl/tests/iterator_043.phpt
@@ -12,7 +12,7 @@ var_dump($it->getChildren());
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 NULL
 NULL
 ===DONE===
diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt
index f57415a3b2..b31e3bc533 100644
--- a/ext/spl/tests/iterator_046.phpt
+++ b/ext/spl/tests/iterator_046.phpt
@@ -42,7 +42,7 @@ $it->show();
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 MyCachingIterator::fill()
 MyCachingIterator::show()
 string(1) "0"
diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt
index 64ca97f4d6..de13e5b6b2 100644
--- a/ext/spl/tests/iterator_048.phpt
+++ b/ext/spl/tests/iterator_048.phpt
@@ -23,7 +23,7 @@ $it->show();
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(0)
 string(3) "Bar"
 int(2)
diff --git a/ext/spl/tests/iterator_070.phpt b/ext/spl/tests/iterator_070.phpt
index bbb518e074..fadd88185a 100644
--- a/ext/spl/tests/iterator_070.phpt
+++ b/ext/spl/tests/iterator_070.phpt
@@ -14,7 +14,7 @@ var_dump($recItIt->nextElement());
 
 ?>
 
---EXPECTF--
+--EXPECT--
 NULL
 NULL
 NULL
 \ No newline at end of file
diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt
index 8370906abb..5fc65edf9c 100644
--- a/ext/spl/tests/iterator_071.phpt
+++ b/ext/spl/tests/iterator_071.phpt
@@ -21,7 +21,7 @@ $recItIt = new MyRecursiveIteratorIterator($recArrIt, RecursiveIteratorIterator:
 foreach ($recItIt as $key => $val) echo "$key\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 MyRecursiveIteratorIterator::nextelement
 0
 MyRecursiveIteratorIterator::nextelement
diff --git a/ext/spl/tests/observer_007.phpt b/ext/spl/tests/observer_007.phpt
index e494f19796..4525edc693 100644
--- a/ext/spl/tests/observer_007.phpt
+++ b/ext/spl/tests/observer_007.phpt
@@ -14,7 +14,7 @@ var_dump($a == $b);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
 bool(true)
diff --git a/ext/spl/tests/observer_008.phpt b/ext/spl/tests/observer_008.phpt
index 56a3c892c0..65f3e4da52 100644
--- a/ext/spl/tests/observer_008.phpt
+++ b/ext/spl/tests/observer_008.phpt
@@ -28,7 +28,7 @@ var_dump($a->count());
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 int(3)
 int(2)
 int(1)
diff --git a/ext/spl/tests/observer_009.phpt b/ext/spl/tests/observer_009.phpt
index 6ac676c492..c55660fa29 100644
--- a/ext/spl/tests/observer_009.phpt
+++ b/ext/spl/tests/observer_009.phpt
@@ -24,7 +24,7 @@ echo "\n";
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Count storage A: 2 x  x 
 Count storage B: 2 x  x 
 ===DONE===
diff --git a/ext/spl/tests/observer_010.phpt b/ext/spl/tests/observer_010.phpt
index 5cedff8c7c..5cb9b799ee 100644
--- a/ext/spl/tests/observer_010.phpt
+++ b/ext/spl/tests/observer_010.phpt
@@ -10,6 +10,6 @@ $map = new SplObjectStorage();
 $map[$a] = 'foo';
 var_dump($map[$b] ?? null);
 var_dump($map[$a] ?? null);
---EXPECTF--
+--EXPECT--
 NULL
 string(3) "foo"
diff --git a/ext/spl/tests/pqueue_001.phpt b/ext/spl/tests/pqueue_001.phpt
index de164e549a..c9338484b5 100644
--- a/ext/spl/tests/pqueue_001.phpt
+++ b/ext/spl/tests/pqueue_001.phpt
@@ -61,7 +61,7 @@ foreach ($pq3 as $k=>$v) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Can't extract from an empty heap
 2=>b
 1=>a
diff --git a/ext/spl/tests/pqueue_002.phpt b/ext/spl/tests/pqueue_002.phpt
index eaab2cf809..5e3767f2fd 100644
--- a/ext/spl/tests/pqueue_002.phpt
+++ b/ext/spl/tests/pqueue_002.phpt
@@ -55,7 +55,7 @@ try {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 inserted 1
 Exception: foo
 Exception: Heap is corrupted, heap properties are no longer ensured.
diff --git a/ext/spl/tests/pqueue_003.phpt b/ext/spl/tests/pqueue_003.phpt
index 9c0b5a5147..c90585767f 100644
--- a/ext/spl/tests/pqueue_003.phpt
+++ b/ext/spl/tests/pqueue_003.phpt
@@ -21,7 +21,7 @@ while ($h->valid()) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 count($h) = 4
 $h->count() = 4
 3=>5
diff --git a/ext/spl/tests/pqueue_004.phpt b/ext/spl/tests/pqueue_004.phpt
index 3a86f9e4a3..172cc8e218 100644
--- a/ext/spl/tests/pqueue_004.phpt
+++ b/ext/spl/tests/pqueue_004.phpt
@@ -13,7 +13,7 @@ var_dump($pq);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 object(SplPriorityQueue)#1 (3) {
   ["flags":"SplPriorityQueue":private]=>
   int(1)
diff --git a/ext/spl/tests/pqueue_compare_basic.phpt b/ext/spl/tests/pqueue_compare_basic.phpt
index 1544add469..bc4085e8dd 100644
--- a/ext/spl/tests/pqueue_compare_basic.phpt
+++ b/ext/spl/tests/pqueue_compare_basic.phpt
@@ -12,7 +12,7 @@ var_dump($h->compare(5, 4) > 0);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/spl/tests/recursive_tree_iterator_001.phpt b/ext/spl/tests/recursive_tree_iterator_001.phpt
index f70186cdd8..ac9f281388 100644
--- a/ext/spl/tests/recursive_tree_iterator_001.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_001.phpt
@@ -48,7 +48,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 -- flags = BYPASS_KEY --
 [0] => |-Array
 [0] => | |-a
diff --git a/ext/spl/tests/recursive_tree_iterator_002.phpt b/ext/spl/tests/recursive_tree_iterator_002.phpt
index 1aae288e63..7d82b191e2 100644
--- a/ext/spl/tests/recursive_tree_iterator_002.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_002.phpt
@@ -11,6 +11,6 @@ try {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 InvalidArgumentException thrown
 ===DONE===
diff --git a/ext/spl/tests/recursive_tree_iterator_004.phpt b/ext/spl/tests/recursive_tree_iterator_004.phpt
index ad3ba6cd0a..9435db8bbd 100644
--- a/ext/spl/tests/recursive_tree_iterator_004.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_004.phpt
@@ -30,7 +30,7 @@ foreach($it as $k => $v) {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 [0] => |-Array
 [0] => | |-a
 [1] => | \-1
diff --git a/ext/spl/tests/recursive_tree_iterator_006.phpt b/ext/spl/tests/recursive_tree_iterator_006.phpt
index 17f51b6d0c..1d1891e4a4 100644
--- a/ext/spl/tests/recursive_tree_iterator_006.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_006.phpt
@@ -58,7 +58,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 -- flags = BYPASS_KEY --
 [0] => |-Array
 [0] => | |-a
diff --git a/ext/spl/tests/recursive_tree_iterator_007.phpt b/ext/spl/tests/recursive_tree_iterator_007.phpt
index 6a8ff8425a..7374a066fa 100644
--- a/ext/spl/tests/recursive_tree_iterator_007.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_007.phpt
@@ -28,6 +28,6 @@ try {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 UnexpectedValueException thrown
 ===DONE===
diff --git a/ext/spl/tests/recursive_tree_iterator_008.phpt b/ext/spl/tests/recursive_tree_iterator_008.phpt
index a0349800fb..6ce555007d 100644
--- a/ext/spl/tests/recursive_tree_iterator_008.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_008.phpt
@@ -31,7 +31,7 @@ try {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 [a] => 035Array
 [0] => 0145b
 [c] => 045Array
diff --git a/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt b/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt
index d59e278fd6..b363c1dd4b 100644
--- a/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt
@@ -55,7 +55,7 @@ foreach($it as $k => $v) {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ----
 
 
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
index b114a9022d..83d2caa2a8 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
@@ -17,7 +17,7 @@ $iterator->next();
 var_dump(get_class($iterator->getSubIterator()));
 var_dump($iterator->getSubIterator()->getArrayCopy());
 ?>
---EXPECTF--
+--EXPECT--
 string(22) "RecursiveArrayIterator"
 array(3) {
   [0]=>
diff --git a/ext/spl/tests/regexiterator_getpregflags.phpt b/ext/spl/tests/regexiterator_getpregflags.phpt
index 58a4dc4a3b..9c4d8eaecb 100644
--- a/ext/spl/tests/regexiterator_getpregflags.phpt
+++ b/ext/spl/tests/regexiterator_getpregflags.phpt
@@ -29,5 +29,5 @@ $r->setPregFlags(PREG_OFFSET_CAPTURE);
 echo is_long($r->getPregFlags());
 
 ?>
---EXPECTF--
+--EXPECT--
 1
 \ No newline at end of file
diff --git a/ext/spl/tests/regexiterator_setpregflags.phpt b/ext/spl/tests/regexiterator_setpregflags.phpt
index ea1b455488..ffccdca7fd 100644
--- a/ext/spl/tests/regexiterator_setpregflags.phpt
+++ b/ext/spl/tests/regexiterator_setpregflags.phpt
@@ -30,5 +30,5 @@ echo $r->getPregFlags();
 
 
 ?>
---EXPECTF--
+--EXPECT--
 256
 \ No newline at end of file
diff --git a/ext/spl/tests/spl_autoload_003.phpt b/ext/spl/tests/spl_autoload_003.phpt
index 00fdd2734f..6fe7a38b30 100644
--- a/ext/spl/tests/spl_autoload_003.phpt
+++ b/ext/spl/tests/spl_autoload_003.phpt
@@ -37,7 +37,7 @@ catch(Exception $e)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 TestFunc1(TestClass)
 TestFunc2(TestClass)
 Exception: Class TestClass missing
diff --git a/ext/spl/tests/spl_autoload_004.phpt b/ext/spl/tests/spl_autoload_004.phpt
index 1f26521b90..7dac3abcea 100644
--- a/ext/spl/tests/spl_autoload_004.phpt
+++ b/ext/spl/tests/spl_autoload_004.phpt
@@ -28,7 +28,7 @@ var_dump(class_exists("TestClass", true));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   array(2) {
diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index f4db521d52..90fd63d88b 100644
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -47,7 +47,7 @@ catch(Exception $e)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Exception: Passed array specifies a non static method but no object (non-static method MyAutoLoader::autoLoad() should not be called statically)
 MyAutoLoader::autoLoad(TestClass)
 MyAutoLoader::autoThrow(TestClass)
diff --git a/ext/spl/tests/spl_autoload_006.phpt b/ext/spl/tests/spl_autoload_006.phpt
index 21a6084eb4..a8d6619b19 100644
--- a/ext/spl/tests/spl_autoload_006.phpt
+++ b/ext/spl/tests/spl_autoload_006.phpt
@@ -22,7 +22,7 @@ var_dump(class_exists("TestClass", true));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   array(2) {
diff --git a/ext/spl/tests/spl_autoload_010.phpt b/ext/spl/tests/spl_autoload_010.phpt
index cd70bdccf0..239b8366ec 100644
--- a/ext/spl/tests/spl_autoload_010.phpt
+++ b/ext/spl/tests/spl_autoload_010.phpt
@@ -23,7 +23,7 @@ new C;
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 B -> C
 A -> C
 C -> C
diff --git a/ext/spl/tests/spl_autoload_011.phpt b/ext/spl/tests/spl_autoload_011.phpt
index 5a992550e5..f2bc9496f7 100644
--- a/ext/spl/tests/spl_autoload_011.phpt
+++ b/ext/spl/tests/spl_autoload_011.phpt
@@ -24,7 +24,7 @@ var_dump(class_exists("C", true));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 var:2
 bool(false)
 ===DONE===
diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
index dcb4287c45..544c7602a0 100644
--- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
+++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
@@ -20,6 +20,6 @@ $test = new CachingIterator($arrayIterator, 3); // this throws an exception
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER
 ===DONE===
diff --git a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt
index 57ca5152ed..91948c80b4 100644
--- a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt
+++ b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt
@@ -12,5 +12,5 @@ var_dump(
 $ci->__toString() // if conversion to string is done by echo, for example, an exeption is thrown. Invoking __toString explicitly covers different code.
 );
 ?>
---EXPECTF--
+--EXPECT--
 string(0) ""
diff --git a/ext/spl/tests/spl_iterator_getcallchildren.phpt b/ext/spl/tests/spl_iterator_getcallchildren.phpt
index 77b03b6b7f..2178db7c96 100644
--- a/ext/spl/tests/spl_iterator_getcallchildren.phpt
+++ b/ext/spl/tests/spl_iterator_getcallchildren.phpt
@@ -24,7 +24,7 @@ var_dump($output);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
   array(3) {
   [0]=>
   int(7)
diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
index 4c3fae25a2..bbdcc34f0a 100644
--- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt
+++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
@@ -21,6 +21,6 @@ try {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 IteratorIterator::__construct() expects at most 2 parameters, 3 given
 ===DONE===
diff --git a/ext/spl/tests/spl_limit_iterator_check_limits.phpt b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
index ae1bc85e89..03bdb787ae 100644
--- a/ext/spl/tests/spl_limit_iterator_check_limits.phpt
+++ b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
@@ -31,7 +31,7 @@ try {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Parameter offset must be >= 0
 Parameter count must either be -1 or a value greater than or equal 0
 ===DONE===
diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
index a34b5577d9..d07e7a1421 100644
--- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
+++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
@@ -14,7 +14,7 @@ TestFest London May 2009
     var_dump($k);
   }
 ?>
---EXPECTF--
+--EXPECT--
 one=>1
 string(3) "one"
 two=>2