Use EXPECT instead of EXPECTF when possible

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

62 files changed, 62 insertions, 62 deletions

diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt
index cbd7319731..3a51990cf6 100644
--- a/ext/reflection/tests/002.phpt
+++ b/ext/reflection/tests/002.phpt
@@ -48,7 +48,7 @@ var_dump($r->bar);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ReflectionMethodEx::__construct
 string(26) "ReflectionFunctionAbstract"
 string(7) "getName"
diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt
index 2abdcdb57b..a5c3ef13e1 100644
--- a/ext/reflection/tests/008.phpt
+++ b/ext/reflection/tests/008.phpt
@@ -26,7 +26,7 @@ foreach ($a as $key=>$val) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(20) "Invalid method name "
 string(21) "Invalid method name 1"
 string(21) "Class  does not exist"
diff --git a/ext/reflection/tests/027.phpt b/ext/reflection/tests/027.phpt
index 06db60b8ec..e750682ab6 100644
--- a/ext/reflection/tests/027.phpt
+++ b/ext/reflection/tests/027.phpt
@@ -18,5 +18,5 @@ try {
 	echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 Cannot fetch information from a terminated Generator
diff --git a/ext/reflection/tests/028.phpt b/ext/reflection/tests/028.phpt
index 5f1e7a2faa..ed6950fce3 100644
--- a/ext/reflection/tests/028.phpt
+++ b/ext/reflection/tests/028.phpt
@@ -16,5 +16,5 @@ try {
 	echo "Done!\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Done!
diff --git a/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
index 6e051113d5..cbed1252fa 100644
--- a/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
@@ -23,7 +23,7 @@ foreach($classes as $class) {
 	var_dump($rc->getConstant('doesntexist'));
 }
 ?>
---EXPECTF--
+--EXPECT--
 Reflecting on class C: 
 string(12) "hello from C"
 bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
index 9abdcc801a..a9c0cd4225 100644
--- a/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
@@ -22,7 +22,7 @@ foreach($classes as $class) {
 	var_dump($rc->getConstants());
 }
 ?>
---EXPECTF--
+--EXPECT--
 Constants from class C: 
 array(1) {
   ["a"]=>
diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
index e19db81188..d29436b734 100644
--- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
@@ -73,7 +73,7 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 ---- Static properties in A ----
 Array
 (
diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
index 42136003e7..147d868c94 100644
--- a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
@@ -42,7 +42,7 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 ---( Interfaces implemented by A0 )---
  Array
 (
diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt
index 328a7c3e69..8fa08869da 100644
--- a/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt
@@ -17,7 +17,7 @@ $rc = new ReflectionClass('I7');
 $interfaces = $rc->getInterfaces();
 print_r($interfaces);
 ?>
---EXPECTF--
+--EXPECT--
 Array
 (
     [I6] => ReflectionClass Object
diff --git a/ext/reflection/tests/ReflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
index 158413f158..e99d30840b 100644
--- a/ext/reflection/tests/ReflectionClass_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
@@ -19,7 +19,7 @@ $r3 = new ReflectionClass("TrickClass");
 var_dump($r1->getName(), $r2->getName(), $r3->getName());
 
 ?> 
---EXPECTF--
+--EXPECT--
 string(8) "stdClass"
 string(8) "stdClass"
 string(10) "TrickClass"
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
index 6e6d4341c8..1c4cfc6106 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
@@ -28,7 +28,7 @@ var_dump($rd->hasConstant("myConst"));
 echo "Check absent constant: ";
 var_dump($rd->hasConstant("doesntExist"));
 ?>
---EXPECTF--
+--EXPECT--
 Check existing constant: bool(true)
 Check existing constant, different case: bool(false)
 Check absent constant: bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
index 0ff2523d6f..aa3af85c1e 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
@@ -18,6 +18,6 @@ Class C {
   const foo=1;
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
index 81614bd9f8..9a8e252cc7 100644
--- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
@@ -41,7 +41,7 @@ foreach($classes as $class) {
 	var_dump($rc->hasMethod("doesntExist"));
 }
 ?>
---EXPECTF--
+--EXPECT--
 Reflecting on class pubf: 
   --> Check for f(): bool(true)
   --> Check for s(): bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
index fa4ee482b2..1c8d08175d 100644
--- a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
@@ -48,7 +48,7 @@ Class C {
   }
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
index 88c4cd509a..3101a7a6ae 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
@@ -41,7 +41,7 @@ foreach($classes as $class) {
 	var_dump($rc->hasProperty("doesntExist"));
 }
 ?>
---EXPECTF--
+--EXPECT--
 Reflecting on class pubf: 
   --> Check for s: bool(true)
   --> Check for a: bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
index d6dda7c2a3..e21656b7b2 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
@@ -30,7 +30,7 @@ Class C {
   public static $staticFoo;
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
index 2da09449ff..8bf2841043 100644
--- a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
@@ -28,7 +28,7 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 is myA a A? bool(true)
 is myB a A? bool(true)
 is myC a A? bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
index 6ebcfa99a9..5b8c92010e 100644
--- a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
@@ -32,7 +32,7 @@ foreach($classes  as $class ) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Is C instantiable?  bool(true)
 Is iface instantiable?  bool(false)
 Is ifaceImpl instantiable?  bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
index 2eaacb67f8..7d7e61335d 100644
--- a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
@@ -14,7 +14,7 @@ $r5 = new ReflectionClass("C");
 var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), 
 		 $r4->isInternal(), $r5->isInternal());
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
index 94fcf00ece..538a26c5a5 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
@@ -25,7 +25,7 @@ foreach ($rcs as $childName => $child) {
 	}
 }
 ?>
---EXPECTF--
+--EXPECT--
 Is A a subclass of A? 
    - Using object argument: bool(false)
    - Using string argument: bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
index af43fcefa4..5babb546ae 100644
--- a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
@@ -14,7 +14,7 @@ $r5 = new ReflectionClass("C");
 var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), 
 		 $r4->isUserDefined(), $r5->isUserDefined());
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt
index a1464a5ab9..d82519e4f4 100644
--- a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt
@@ -21,7 +21,7 @@ foreach ($classes as $class) {
 	var_dump($rc->getModifiers());
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(true)
diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
index fab6387e05..cafdd2e37c 100644
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -8,7 +8,7 @@ Steve Seear <stevseea@php.net>
 $rc = new ReflectionClass("ReflectionClass");
 echo $rc;
 ?>
---EXPECTF--
+--EXPECT--
 Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
 
   - Constants [3] {
diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
index 0e2e8a3681..eab542e005 100644
--- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
@@ -34,7 +34,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Ok - ReflectionFunction::__construct() expects parameter 1 to be string, array given
 Function nonExistentFunction() does not exist
 Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 0 given
diff --git a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
index 367de45fff..ee44f24cdf 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
@@ -7,6 +7,6 @@ $rf = new ReflectionFunction($closure);
 var_dump($rf->getClosureThis());
 echo "Done!\n";
 ?>
---EXPECTF--
+--EXPECT--
 NULL
 Done!
diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
index 786be050c1..e78a28a551 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
@@ -30,7 +30,7 @@ $closure( 'succeeded' );
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ReflectionFunction::getClosure() : basic functionality ***
 string(19) "Inside foo function"
 string(16) "Arg is succeeded"
diff --git a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
index 7c36b8e63b..ae546b40f3 100644
--- a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
@@ -9,5 +9,5 @@ $closure = function($param) { return "this is a closure"; };
 $rc = new ReflectionFunction($closure);
 var_dump($rc->isClosure());
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
index 7b37b939e4..f8d476ae46 100644
--- a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
@@ -8,5 +8,5 @@ TestFest PHP|Tek
 // We currently don't have any deprecated functions :/
 $rc = new ReflectionFunction('var_dump');
 var_dump($rc->isDeprecated());
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
index d6d2c24b85..220c16f9cb 100644
--- a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
@@ -10,5 +10,5 @@ disable_functions=is_file
 $rc = new ReflectionFunction('is_file');
 var_dump($rc->isDisabled());
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
diff --git a/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt b/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt
index c4889b12bc..8bbbfa516f 100644
--- a/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt
@@ -43,7 +43,7 @@ foreach($rc->getMethods() as $m) {
 	var_dump($m->isGenerator());
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(true)
 bool(false)
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
index 98125cba65..bb0543d098 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
@@ -50,7 +50,7 @@ try{
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Too few arguments:
 Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 0 given
 
diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
index c97c41c738..c7d63446e5 100644
--- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
@@ -47,7 +47,7 @@ $closure();
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing ReflectionMethod::getClosure() : basic functionality ***
 string(34) "Static Example class, Hello World!"
 string(22) "Example class, bar: 42"
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt
index 4719571124..94fbc3daec 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt
@@ -30,7 +30,7 @@ $reflection = new ReflectionProperty('\X', 'z');
 echo 'X::z', PHP_EOL;
 var_dump($reflection->getDocComment());
 ?>
---EXPECTF--
+--EXPECT--
 X::x
 string(24) "/**
      * doc 1
diff --git a/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
index 3d151bc7d5..7f9bc1f35c 100644
--- a/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
@@ -23,7 +23,7 @@ foreach($classes as $class) {
 	var_dump($rc->getConstant('doesntexist'));
 }
 ?>
---EXPECTF--
+--EXPECT--
 Reflecting on instance of class C: 
 string(12) "hello from C"
 bool(false)
diff --git a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
index 6479ec90ed..8a56c9f64e 100644
--- a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
@@ -23,7 +23,7 @@ foreach($classes as $class) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Reflecting on instance of class C: 
 array(1) {
   ["a"]=>
diff --git a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
index ef605aad84..48778f83c2 100644
--- a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
@@ -21,7 +21,7 @@ foreach ($classes as $class) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 is myA a A? bool(true)
 is myB a A? bool(true)
 is myX a A? bool(false)
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
index 4b8a6ec221..c362704b1c 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
@@ -30,7 +30,7 @@ foreach($classes  as $class ) {
 	var_dump($ro->IsInstantiable()); 
 }
 ?>
---EXPECTF--
+--EXPECT--
 Is C instantiable?  bool(true)
 Is ifaceImpl instantiable?  bool(true)
 Is D instantiable?  bool(true)
diff --git a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
index 066bca70ee..60a95dc886 100644
--- a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
@@ -15,7 +15,7 @@ var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(),
 		 $r4->isInternal(), $r5->isInternal());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
index e89066a7ea..59832c2d02 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
@@ -37,7 +37,7 @@ foreach ($ros as $childName => $child) {
 	}
 }
 ?>
---EXPECTF--
+--EXPECT--
 Is A a subclass of A? 
    - Using ReflectionClass object argument: bool(false)
    - Using ReflectionObject object argument: bool(false)
diff --git a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
index 4cb08fcb67..390df504db 100644
--- a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
@@ -15,7 +15,7 @@ var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(),
 		 $r4->isUserDefined(), $r5->isUserDefined());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
index 942bea2dc2..da08cc6288 100644
--- a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
+++ b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
@@ -34,7 +34,7 @@ aux('ufunc');
 echo "Done.\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 => array_multisort:
 
 Name: arr1
diff --git a/ext/reflection/tests/ReflectionParameter_export_error2.phpt b/ext/reflection/tests/ReflectionParameter_export_error2.phpt
index 8bdbc6ad86..aa0bc0aa7c 100644
--- a/ext/reflection/tests/ReflectionParameter_export_error2.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error2.phpt
@@ -26,6 +26,6 @@ catch (ReflectionException $e) {
 	echo $e->getMessage() . "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Method ReflectionFunction::__invoke() does not exist
 The parameter class is expected to be either a string, an array(class, method) or a callable object
diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
index 6c154558e9..654a76aae0 100644
--- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
+++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
@@ -39,7 +39,7 @@ catch(ReflectionException $e) {
 echo "Done.\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Class A does not exist
 Method C::b() does not exist
 Method C::b() does not exist
diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
index d61480377c..65339e308a 100644
--- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
@@ -44,7 +44,7 @@ D::testFromC();
 echo "\n\n--> Reflect inherited private from subclass:\n";
 D::testFromD();
 ?>
---EXPECTF--
+--EXPECT--
 --> Reflect inherited private from global scope:
 Property D::$p does not exist
 
diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
index 38137551fc..4c99444e30 100644
--- a/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
@@ -31,7 +31,7 @@ for ($i = 1;$i <= 6;$i++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 C::a1: int(256)
 D::a1: int(256)
 C::a2: int(512)
diff --git a/ext/reflection/tests/ReflectionType_possible_types.phpt b/ext/reflection/tests/ReflectionType_possible_types.phpt
index 3b486a60fd..ccb8725466 100644
--- a/ext/reflection/tests/ReflectionType_possible_types.phpt
+++ b/ext/reflection/tests/ReflectionType_possible_types.phpt
@@ -21,7 +21,7 @@ foreach ($functions as $function) {
     var_dump($returnType->getName());
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(4) "void"
 string(3) "int"
 string(5) "float"
diff --git a/ext/reflection/tests/bug30209.phpt b/ext/reflection/tests/bug30209.phpt
index 2735a741e2..bc1f6c7e86 100644
--- a/ext/reflection/tests/bug30209.phpt
+++ b/ext/reflection/tests/bug30209.phpt
@@ -25,7 +25,7 @@ $foo = new Foo;
 $foo->testBAR();
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(7) "testBAR"
 string(7) "testBAR"
 ===DONE===
diff --git a/ext/reflection/tests/bug37816.phpt b/ext/reflection/tests/bug37816.phpt
index 18a49046dc..f919b7424a 100644
--- a/ext/reflection/tests/bug37816.phpt
+++ b/ext/reflection/tests/bug37816.phpt
@@ -23,6 +23,6 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Caught: Cannot access non-public member TestClass::p
 ===DONE===
diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt
index 68781d2aba..09a309e67c 100644
--- a/ext/reflection/tests/bug38653.phpt
+++ b/ext/reflection/tests/bug38653.phpt
@@ -20,7 +20,7 @@ var_dump($foo->getConstant("no such const"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(10)
 string(0) ""
 string(4) "test"
diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt
index 1ed675f029..79d2d8352e 100644
--- a/ext/reflection/tests/bug39001.phpt
+++ b/ext/reflection/tests/bug39001.phpt
@@ -21,7 +21,7 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(7) "CParent"
 string(7) "CParent"
 Done
diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt
index 8a7a6044e1..20fdb68ddd 100644
--- a/ext/reflection/tests/bug39067.phpt
+++ b/ext/reflection/tests/bug39067.phpt
@@ -37,7 +37,7 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(1) "C"
 string(1) "B"
 string(1) "A"
diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt
index bb93b91280..ea3e3967ca 100644
--- a/ext/reflection/tests/bug40794.phpt
+++ b/ext/reflection/tests/bug40794.phpt
@@ -20,7 +20,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {
   ["prop1"]=>
   string(1) "1"
diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt
index f8c0a0a2bc..31aa7c94e3 100644
--- a/ext/reflection/tests/bug41884.phpt
+++ b/ext/reflection/tests/bug41884.phpt
@@ -15,7 +15,7 @@ var_dump($class->getDefaultProperties());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(2) {
   ["fooStatic"]=>
   string(3) "foo"
diff --git a/ext/reflection/tests/bug60357.phpt b/ext/reflection/tests/bug60357.phpt
index a5ddd4096c..731e25996f 100644
--- a/ext/reflection/tests/bug60357.phpt
+++ b/ext/reflection/tests/bug60357.phpt
@@ -6,5 +6,5 @@ function foo( array $x = array( 'a', 'b' ) ) {}
 $r = new ReflectionParameter( 'foo', 0 );
 echo $r->__toString();
 ?>
---EXPECTF--
+--EXPECT--
 Parameter #0 [ <optional> array $x = Array ]
diff --git a/ext/reflection/tests/bug60367.phpt b/ext/reflection/tests/bug60367.phpt
index 5c4a098979..3834445733 100644
--- a/ext/reflection/tests/bug60367.phpt
+++ b/ext/reflection/tests/bug60367.phpt
@@ -24,5 +24,5 @@ $method->invokeArgs(null, array());
 $method = new ReflectionMethod("A::call");
 $method->invoke(null);
 $method->invokeArgs(null, array());
---EXPECTF--
+--EXPECT--
 BBAA
diff --git a/ext/reflection/tests/bug71767.phpt b/ext/reflection/tests/bug71767.phpt
index 8c4059abf4..ed83e486d8 100644
--- a/ext/reflection/tests/bug71767.phpt
+++ b/ext/reflection/tests/bug71767.phpt
@@ -37,7 +37,7 @@ echo $reflectionClosure->getDocComment() . PHP_EOL;
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 /** Correct docblock */
 /** Correct docblock */
 /** Correct docblock */
diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt
index 6cc7e6755c..c79f20f79c 100644
--- a/ext/reflection/tests/closures_001.phpt
+++ b/ext/reflection/tests/closures_001.phpt
@@ -48,7 +48,7 @@ var_dump($rp->isOptional());
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 int(2)
 int(1)
 int(2)
diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt
index e8b080f5cb..65eb5c86f7 100644
--- a/ext/reflection/tests/closures_002.phpt
+++ b/ext/reflection/tests/closures_002.phpt
@@ -20,7 +20,7 @@ var_dump($rp->isOptional());
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(8) "__invoke"
 int(2)
 int(1)
diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt
index 4483dc06e3..6e8dc71fcb 100644
--- a/ext/reflection/tests/closures_003.phpt
+++ b/ext/reflection/tests/closures_003.phpt
@@ -19,7 +19,7 @@ echo $method->getName ()."\n";
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 __invoke
 __invoke
 ===DONE===
diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt
index 1b8e1c4d0a..c67d9571e1 100644
--- a/ext/reflection/tests/closures_003_v1.phpt
+++ b/ext/reflection/tests/closures_003_v1.phpt
@@ -19,7 +19,7 @@ echo $method->getName ()."\n";
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 {closure}
 {closure}
 ===DONE===
diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt
index 807aea1f38..a09447bc05 100644
--- a/ext/reflection/tests/closures_004.phpt
+++ b/ext/reflection/tests/closures_004.phpt
@@ -31,7 +31,7 @@ $closure2->__invoke ();
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Invoked!
 Invoked!
 Invoked!
diff --git a/ext/reflection/tests/static_properties_002.phpt b/ext/reflection/tests/static_properties_002.phpt
index 218c629cdb..204c5e0e15 100644
--- a/ext/reflection/tests/static_properties_002.phpt
+++ b/ext/reflection/tests/static_properties_002.phpt
@@ -47,7 +47,7 @@ echo 'Number of properties: '. count($r->getStaticProperties()) . "\n";
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 base::show(2)
 derived::show(2)
 base::inc()