Use EXPECT instead of EXPECTF when possible

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

118 files changed, 118 insertions, 118 deletions

diff --git a/tests/basic/bug31875.phpt b/tests/basic/bug31875.phpt
index 78085d766b..65f68b9af3 100644
--- a/tests/basic/bug31875.phpt
+++ b/tests/basic/bug31875.phpt
@@ -17,7 +17,7 @@ var_dump(in_array($disabled_function, $functions['internal']));
 $functions = get_defined_functions(true);
 var_dump(in_array($disabled_function, $functions['internal']));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(false)
diff --git a/tests/basic/bug61000.phpt b/tests/basic/bug61000.phpt
index 8149d68e94..01e27bfd9b 100644
--- a/tests/basic/bug61000.phpt
+++ b/tests/basic/bug61000.phpt
@@ -10,7 +10,7 @@ a[a][]=foo&a[a][b][c]=bar
 <?php
 print_r($_GET);
 print_r($_POST);
---EXPECTF--
+--EXPECT--
 Array
 (
 )
diff --git a/tests/basic/bug71273.phpt b/tests/basic/bug71273.phpt
index d0cd72577e..3db4454605 100644
--- a/tests/basic/bug71273.phpt
+++ b/tests/basic/bug71273.phpt
@@ -16,6 +16,6 @@ Bug #71273 A wrong ext directory setup in php.ini leads to crash
 	var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out));
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 int(1)
 ==DONE==
diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt
index bea825e797..014bae897e 100644
--- a/tests/basic/rfc1867_boundary_1.phpt
+++ b/tests/basic/rfc1867_boundary_1.phpt
@@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar"
 var_dump($_FILES);
 var_dump($_POST);
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
 array(1) {
diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt
index b59fc6db98..775488999e 100644
--- a/tests/basic/rfc1867_boundary_2.phpt
+++ b/tests/basic/rfc1867_boundary_2.phpt
@@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar"
 var_dump($_FILES);
 var_dump($_POST);
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
 array(1) {
diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt
index 1e1a747372..ab6ddc1861 100644
--- a/tests/basic/rfc1867_file_upload_disabled.phpt
+++ b/tests/basic/rfc1867_file_upload_disabled.phpt
@@ -23,7 +23,7 @@ foo
 var_dump($_FILES);
 var_dump($_POST);
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
 array(2) {
diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt
index 98ed47ca20..333e8894c5 100644
--- a/tests/basic/rfc1867_malicious_input.phpt
+++ b/tests/basic/rfc1867_malicious_input.phpt
@@ -16,7 +16,7 @@ Content-Type: text/plain-file1
 var_dump($_FILES);
 var_dump($_POST);
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
 array(0) {
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index c7aa95cb04..9ecc0701f0 100644
--- a/tests/classes/__call_003.phpt
+++ b/tests/classes/__call_003.phpt
@@ -21,7 +21,7 @@ Force pass-by-reference to __call
   
   var_dump($a, $b);
 ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   string(8) "original"
diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt
index 0c1f378b8a..a9997bf132 100644
--- a/tests/classes/__call_004.phpt
+++ b/tests/classes/__call_004.phpt
@@ -26,7 +26,7 @@ class B extends A {
 $b = new B();
 $b->test();
 ?>
---EXPECTF--
+--EXPECT--
 In B::__call(test1, array(1,a))
 object(B)#1 (0) {
 }
diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index 523cccee1e..86fc094f87 100644
--- a/tests/classes/__set__get_004.phpt
+++ b/tests/classes/__set__get_004.phpt
@@ -31,7 +31,7 @@ var_dump($foo->bar->baz);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(5) "Check"
 string(5) "Check"
 ===DONE===
diff --git a/tests/classes/array_conversion_keys.phpt b/tests/classes/array_conversion_keys.phpt
index e3bd7e0331..6c642f1f85 100644
--- a/tests/classes/array_conversion_keys.phpt
+++ b/tests/classes/array_conversion_keys.phpt
@@ -10,7 +10,7 @@ class foo
 }
 var_export((array) new foo);
 ?>
---EXPECTF--
+--EXPECT--
 array (
   '' . "\0" . 'foo' . "\0" . 'private' => 'private',
   '' . "\0" . '*' . "\0" . 'protected' => 'protected',
diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt
index ba542a1450..4ea1f6de17 100644
--- a/tests/classes/autoload_007.phpt
+++ b/tests/classes/autoload_007.phpt
@@ -10,5 +10,5 @@ spl_autoload_register(function ($name) {
 $a = new stdClass;
 var_dump($a instanceof UndefC);
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/tests/classes/autoload_008.phpt b/tests/classes/autoload_008.phpt
index 1f3f075843..905fcaadf4 100644
--- a/tests/classes/autoload_008.phpt
+++ b/tests/classes/autoload_008.phpt
@@ -21,5 +21,5 @@ catch (Exception $e) {
   echo "In Exception catch block. Autoload should not have been triggered.\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 In Exception catch block. Autoload should not have been triggered.
diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt
index 5349a7b1f7..c85c18ec15 100644
--- a/tests/classes/autoload_013.phpt
+++ b/tests/classes/autoload_013.phpt
@@ -14,6 +14,6 @@ catch (ReflectionException $e) {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 In autoload: string(6) "UndefC"
 Class UndefC does not exist
diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt
index 1903c38ab8..827224aaa5 100644
--- a/tests/classes/autoload_014.phpt
+++ b/tests/classes/autoload_014.phpt
@@ -14,6 +14,6 @@ catch (ReflectionException $e) {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 In autoload: string(6) "UndefC"
 Class UndefC does not exist
diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt
index 6f9e9322ea..9f023d5be5 100644
--- a/tests/classes/autoload_015.phpt
+++ b/tests/classes/autoload_015.phpt
@@ -14,6 +14,6 @@ catch (ReflectionException $e) {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 In autoload: string(6) "UndefC"
 Class UndefC does not exist
diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt
index 239a770a97..ceb8ce6bbc 100644
--- a/tests/classes/autoload_016.phpt
+++ b/tests/classes/autoload_016.phpt
@@ -15,6 +15,6 @@ $rc->getProperty("UndefC::p");
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 In autoload: string(6) "undefc"
 Class undefc does not exist
diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt
index 14c4c2a677..a1485f3aeb 100644
--- a/tests/classes/autoload_017.phpt
+++ b/tests/classes/autoload_017.phpt
@@ -15,6 +15,6 @@ try {
   echo $e->getMessage();
 }
 ?>
---EXPECTF--
+--EXPECT--
 In autoload: string(6) "UndefI"
 Interface UndefI does not exist
diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt
index 2099499e11..53792d6f6b 100644
--- a/tests/classes/autoload_018.phpt
+++ b/tests/classes/autoload_018.phpt
@@ -18,7 +18,7 @@ spl_autoload_register(function ($name) {
 
 var_dump(class_exists('UndefinedClass0'));
 ?>
---EXPECTF--
+--EXPECT--
 IN:  autoload(UndefinedClass0)
 IN:  autoload(UndefinedClass1)
 IN:  autoload(UndefinedClass2)
diff --git a/tests/classes/autoload_019.phpt b/tests/classes/autoload_019.phpt
index b9bcd6e6d1..aefb6f8253 100644
--- a/tests/classes/autoload_019.phpt
+++ b/tests/classes/autoload_019.phpt
@@ -9,5 +9,5 @@ spl_autoload_register(function ($name) {
 
 class_exists("unDefinedClass");
 ?>
---EXPECTF--
+--EXPECT--
 autoload unDefinedClass
diff --git a/tests/classes/class_stdclass.phpt b/tests/classes/class_stdclass.phpt
index 5e3422aeae..a8c12715e2 100644
--- a/tests/classes/class_stdclass.phpt
+++ b/tests/classes/class_stdclass.phpt
@@ -9,6 +9,6 @@ echo get_class($obj)."\n";
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 stdClass
 Done
diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt
index 052af8573e..cceabd8d7d 100644
--- a/tests/classes/constants_basic_003.phpt
+++ b/tests/classes/constants_basic_003.phpt
@@ -21,7 +21,7 @@ Ensure class properties and constants can be defined in terms of constants that
   var_dump(B::ca);
   var_dump(B::cc);
 ?>
---EXPECTF--
+--EXPECT--
 string(12) "hello from A"
 string(12) "hello from C"
 string(12) "hello from A"
diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt
index c840f5385a..a97be1004a 100644
--- a/tests/classes/constants_basic_005.phpt
+++ b/tests/classes/constants_basic_005.phpt
@@ -10,7 +10,7 @@ Test constants with default values based on other constants.
   }
   var_dump(C::CONST_1, C::CONST_2);
 ?>
---EXPECTF--
+--EXPECT--
 string(5) "hello"
 string(5) "hello"
 
diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt
index 73cf0ef3a9..904593ea9b 100644
--- a/tests/classes/constants_basic_006.phpt
+++ b/tests/classes/constants_basic_006.phpt
@@ -19,7 +19,7 @@ Ensure class constants are not evaluated when a class is looked up to resolve in
   
   var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a);
 ?>
---EXPECTF--
+--EXPECT--
 string(5) "hello"
 array(2) {
   ["nasty"]=>
diff --git a/tests/classes/constants_error_002.phpt b/tests/classes/constants_error_002.phpt
index 63aa22109c..c6b3b7b6b3 100644
--- a/tests/classes/constants_error_002.phpt
+++ b/tests/classes/constants_error_002.phpt
@@ -8,5 +8,5 @@ Error case: class constant as an array
   }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/tests/classes/constants_visibility_001.phpt b/tests/classes/constants_visibility_001.phpt
index 37a0154d92..a5eeb47f37 100644
--- a/tests/classes/constants_visibility_001.phpt
+++ b/tests/classes/constants_visibility_001.phpt
@@ -17,7 +17,7 @@ A::staticConstDump();
 (new A())->constDump();
 
 ?>
---EXPECTF--
+--EXPECT--
 string(11) "publicConst"
 string(11) "publicConst"
 string(11) "publicConst"
diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt
index 3f57a312e4..bcac143025 100644
--- a/tests/classes/ctor_dtor.phpt
+++ b/tests/classes/ctor_dtor.phpt
@@ -29,7 +29,7 @@ $t = new late();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 early::__construct
 early::__construct
 early::__destruct
diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt
index fc43727d2a..78d4efb32f 100644
--- a/tests/classes/ctor_dtor_inheritance.phpt
+++ b/tests/classes/ctor_dtor_inheritance.phpt
@@ -52,7 +52,7 @@ unset($t);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Testing class base
 base::__construct
 base Object
diff --git a/tests/classes/destructor_and_exceptions.phpt b/tests/classes/destructor_and_exceptions.phpt
index 8100c92465..0da6e642af 100644
--- a/tests/classes/destructor_and_exceptions.phpt
+++ b/tests/classes/destructor_and_exceptions.phpt
@@ -51,7 +51,7 @@ catch(FatalException $e)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 FailClass::__destruct
 Caught: FailClass
 FatalException::__construct
diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt
index 4f75166940..c0235cd1e3 100644
--- a/tests/classes/destructor_visibility_003.phpt
+++ b/tests/classes/destructor_visibility_003.phpt
@@ -21,6 +21,6 @@ unset($obj); // Derived::__destruct is being called not Base::__destruct
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Derived::__destruct
 ===DONE===
diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt
index 9134245a17..c1cfcbdcdf 100644
--- a/tests/classes/factory_and_singleton_009.phpt
+++ b/tests/classes/factory_and_singleton_009.phpt
@@ -13,7 +13,7 @@ $obj = new test;
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
 
 Warning: Call to protected test::__destruct() from context '' during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt
index bd7e7e32b7..9466fe55e4 100644
--- a/tests/classes/factory_and_singleton_010.phpt
+++ b/tests/classes/factory_and_singleton_010.phpt
@@ -13,7 +13,7 @@ $obj = new test;
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
 
 Warning: Call to private test::__destruct() from context '' during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt
index f82087749b..0e100d2304 100644
--- a/tests/classes/final.phpt
+++ b/tests/classes/final.phpt
@@ -23,7 +23,7 @@ $t2->show();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Call to function first::show()
 Call to function second::show()
 Done
diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt
index f055929578..7f2d3e514f 100644
--- a/tests/classes/interface_constant_inheritance_004.phpt
+++ b/tests/classes/interface_constant_inheritance_004.phpt
@@ -14,5 +14,5 @@ class C implements IA, IB {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt
index bcf2fbda8f..e36a3c4553 100644
--- a/tests/classes/interface_doubled.phpt
+++ b/tests/classes/interface_doubled.phpt
@@ -153,7 +153,7 @@ echo $t->test('if_e');
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 class_a
 is_a(class_a, if_a) yes
 is_a(class_a, if_b) no
diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt
index f0507dea1c..fd303e0913 100644
--- a/tests/classes/interface_implemented.phpt
+++ b/tests/classes/interface_implemented.phpt
@@ -59,7 +59,7 @@ $t = new derived_d();
 $t->test();
 
 ?>
---EXPECTF--
+--EXPECT--
 is_a(base, base) = yes
 is_a(base, derived_a) = no
 is_a(base, derived_b) = no
diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt
index ece436b484..8685e3d0f1 100644
--- a/tests/classes/interface_optional_arg_003.phpt
+++ b/tests/classes/interface_optional_arg_003.phpt
@@ -13,5 +13,5 @@ class C implements I {
 $c = new C;
 $c->f();
 ?>
---EXPECTF--
+--EXPECT--
 int(2)
diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt
index df76c7fe31..dc5a07a603 100644
--- a/tests/classes/iterators_004.phpt
+++ b/tests/classes/iterators_004.phpt
@@ -51,7 +51,7 @@ foreach($obj as $v => $w) {
 
 print "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 1st try
 2nd try
 object:max=>3
diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt
index da59ec3aaa..13a8b165cd 100644
--- a/tests/classes/iterators_008.phpt
+++ b/tests/classes/iterators_008.phpt
@@ -34,7 +34,7 @@ class D extends C implements Iterator {
 
 foreach (new D as $x) {}
 ?>
---EXPECTF--
+--EXPECT--
 D::rewind(2)
 D::valid(2)
 D::current(2)
diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt
index 7950b7deb3..e4e269f070 100644
--- a/tests/classes/method_call_variation_001.phpt
+++ b/tests/classes/method_call_variation_001.phpt
@@ -20,7 +20,7 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun
   $c->functions[0](5, 6);
   $c->functions[1][2][3][4](7, 8);
 ?>
---EXPECTF--
+--EXPECT--
 Called global foo(1, 2)
 Called global foo(3, 4)
 Called global foo(5, 6)
diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt
index a51c9e70dc..9b90c9c1a7 100644
--- a/tests/classes/private_006.phpt
+++ b/tests/classes/private_006.phpt
@@ -32,7 +32,7 @@ class fail extends third {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Call show()
 Call show()
 Call show()
diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt
index 22c3cfd80b..272a334bfa 100644
--- a/tests/classes/private_006b.phpt
+++ b/tests/classes/private_006b.phpt
@@ -33,7 +33,7 @@ $t3->do_show();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Call show()
 Call show()
 Done
diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt
index f773cc8ed2..53bc7be059 100644
--- a/tests/classes/private_007.phpt
+++ b/tests/classes/private_007.phpt
@@ -22,7 +22,7 @@ Foo::priv();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Bar::priv()
 Foo::priv()
 Done
diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt
index cbd0e756de..62a65f4cee 100644
--- a/tests/classes/private_007b.phpt
+++ b/tests/classes/private_007b.phpt
@@ -23,7 +23,7 @@ $obj->priv();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Bar::priv()
 Foo::priv()
 Done
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index 7ee6d69cf8..5ab448e437 100644
--- a/tests/classes/private_members.phpt
+++ b/tests/classes/private_members.phpt
@@ -51,7 +51,7 @@ unset($t);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 derived::__construct(begin)
 base::__construct(begin)
 base::test
diff --git a/tests/classes/private_members_serialization.phpt b/tests/classes/private_members_serialization.phpt
index c8dd3ab248..c196f7d8f9 100644
--- a/tests/classes/private_members_serialization.phpt
+++ b/tests/classes/private_members_serialization.phpt
@@ -19,5 +19,5 @@ class bar extends foo
 
 var_dump(str_replace("\0", '\0', serialize(new bar())));
 ?>
---EXPECTF--
+--EXPECT--
 string(114) "O:3:"bar":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"
diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt
index ddd2e5d1ac..b2985add7d 100644
--- a/tests/classes/property_override_privateStatic_private.phpt
+++ b/tests/classes/property_override_privateStatic_private.phpt
@@ -27,7 +27,7 @@ Redeclare inherited private static property as private.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p
diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt
index d7d645fd0a..f435516a3f 100644
--- a/tests/classes/property_override_privateStatic_privateStatic.phpt
+++ b/tests/classes/property_override_privateStatic_privateStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited private static property as private static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt
index d4732166c6..fac66c32bb 100644
--- a/tests/classes/property_override_privateStatic_protected.phpt
+++ b/tests/classes/property_override_privateStatic_protected.phpt
@@ -27,7 +27,7 @@ Redeclare inherited private static property as protected.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p
diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt
index 169ff9a377..08c0b22704 100644
--- a/tests/classes/property_override_privateStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited private static property as protected static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt
index 033eb75231..7242371003 100644
--- a/tests/classes/property_override_privateStatic_public.phpt
+++ b/tests/classes/property_override_privateStatic_public.phpt
@@ -27,7 +27,7 @@ Redeclare inherited private static property as public.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p
diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt
index 5f2b6bf4a8..1fe43fb619 100644
--- a/tests/classes/property_override_privateStatic_publicStatic.phpt
+++ b/tests/classes/property_override_privateStatic_publicStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited private static property as public static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt
index 2b263eeb67..2d45f33430 100644
--- a/tests/classes/property_override_private_private.phpt
+++ b/tests/classes/property_override_private_private.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as private.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p
diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt
index 606ed21d08..1bc3c9fe52 100644
--- a/tests/classes/property_override_private_privateStatic.phpt
+++ b/tests/classes/property_override_private_privateStatic.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as private static.
   $b->showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p (static)
diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt
index b84ed6787e..d284272d02 100644
--- a/tests/classes/property_override_private_protected.phpt
+++ b/tests/classes/property_override_private_protected.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as protected.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p
diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt
index 1bb303dab7..c7c54eab95 100644
--- a/tests/classes/property_override_private_protectedStatic.phpt
+++ b/tests/classes/property_override_private_protectedStatic.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as protected static.
   $b->showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p (static)
diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt
index badbe91d50..6468432d18 100644
--- a/tests/classes/property_override_private_public.phpt
+++ b/tests/classes/property_override_private_public.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as public.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p
diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt
index 9fc58ece4a..4057f83390 100644
--- a/tests/classes/property_override_private_publicStatic.phpt
+++ b/tests/classes/property_override_private_publicStatic.phpt
@@ -28,7 +28,7 @@ Redeclare inherited private property as public static.
   $b->showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 A::p
 B::p (static)
diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt
index 16f1100947..d2d1c0c379 100644
--- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited protected static property as protected static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt
index e437c5f30f..29b67655ff 100644
--- a/tests/classes/property_override_protectedStatic_publicStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited protected static property as public static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt
index c4b0d438c0..096f53d515 100644
--- a/tests/classes/property_override_protected_protected.phpt
+++ b/tests/classes/property_override_protected_protected.phpt
@@ -28,7 +28,7 @@ Redeclare inherited protected property as protected.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 B::p
 B::p
diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt
index 4702f9a0cf..c2db91b14c 100644
--- a/tests/classes/property_override_protected_public.phpt
+++ b/tests/classes/property_override_protected_public.phpt
@@ -28,7 +28,7 @@ Redeclare inherited protected property as public.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 B::p
 B::p
diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt
index 9a86867040..8d0f9ad079 100644
--- a/tests/classes/property_override_publicStatic_publicStatic.phpt
+++ b/tests/classes/property_override_publicStatic_publicStatic.phpt
@@ -26,7 +26,7 @@ Redeclare inherited public static property as public static.
   B::showA();
   B::showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p (static)
 A::p (static)
 B::p (static)
diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt
index 893fe5d048..3abfe24e29 100644
--- a/tests/classes/property_override_public_public.phpt
+++ b/tests/classes/property_override_public_public.phpt
@@ -28,7 +28,7 @@ Redeclare inherited public property as public.
   $b->showA();
   $b->showB();
 ?>
---EXPECTF--
+--EXPECT--
 A::p
 B::p
 B::p
diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt
index e14d87d7ab..e5e545fa22 100644
--- a/tests/classes/static_properties_001.phpt
+++ b/tests/classes/static_properties_001.phpt
@@ -15,7 +15,7 @@ var_dump(test::$ar);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }
 array(1) {
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index b0fc2ccebc..7d5363f9fc 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -19,7 +19,7 @@ D::$p =& $ref;
 var_dump(C::$p, D::$p, E::$p);
 ?>
 ==Done==
---EXPECTF--
+--EXPECT--
 Inherited static properties refer to the same value across classes:
 string(8) "original"
 string(8) "original"
diff --git a/tests/classes/static_properties_undeclared_isset.phpt b/tests/classes/static_properties_undeclared_isset.phpt
index 83fb7711c5..c8097f6e10 100644
--- a/tests/classes/static_properties_undeclared_isset.phpt
+++ b/tests/classes/static_properties_undeclared_isset.phpt
@@ -5,5 +5,5 @@ Issetting a non-existent static property
 Class C {}
 var_dump(isset(C::$p));
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt
index eb1bea5447..627cbb359c 100644
--- a/tests/classes/tostring_002.phpt
+++ b/tests/classes/tostring_002.phpt
@@ -23,7 +23,7 @@ $o = new Test;
 
 ?>
 ====DONE====
---EXPECTF--
+--EXPECT--
 Hello
 ====DONE====
 Hello
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt
index 48e8668235..fffc1f8635 100644
--- a/tests/classes/tostring_004.phpt
+++ b/tests/classes/tostring_004.phpt
@@ -34,7 +34,7 @@ echo "\nTry 2:\n";
 printf($obj . "\n");
 
 ?>
---EXPECTF--
+--EXPECT--
 Object with no __toString():
 Try 1:
 Error: 4096 - Object of class stdClass could not be converted to string
diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt
index 264e720c9e..8683155e35 100644
--- a/tests/classes/unset_properties.phpt
+++ b/tests/classes/unset_properties.phpt
@@ -127,7 +127,7 @@ echo "\n\n";
 
 ?>
 
---EXPECTF--
+--EXPECT--
 publicProperty set
 true
 __isset "publicProperty"
diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt
index c651b05d75..d1a7c9f1e1 100644
--- a/tests/classes/visibility_000c.phpt
+++ b/tests/classes/visibility_000c.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n"; // shouldn't be displayed
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt
index a9a5896695..956c6762df 100644
--- a/tests/classes/visibility_001c.phpt
+++ b/tests/classes/visibility_001c.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n"; // shouldn't be displayed
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt
index 308c9057db..64560171cc 100644
--- a/tests/classes/visibility_002c.phpt
+++ b/tests/classes/visibility_002c.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n"; // shouldn't be displayed
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt
index 176cc4a906..17f5b49eb9 100644
--- a/tests/classes/visibility_003a.phpt
+++ b/tests/classes/visibility_003a.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt
index 27e2bc2bf5..7ac3239f59 100644
--- a/tests/classes/visibility_003c.phpt
+++ b/tests/classes/visibility_003c.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt
index 717f971999..a6acb40569 100644
--- a/tests/classes/visibility_004a.phpt
+++ b/tests/classes/visibility_004a.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt
index 1ede33450a..9e416fc6ae 100644
--- a/tests/classes/visibility_004b.phpt
+++ b/tests/classes/visibility_004b.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n"; // shouldn't be displayed
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt
index e4f94a3567..abe25b1b39 100644
--- a/tests/classes/visibility_004c.phpt
+++ b/tests/classes/visibility_004c.phpt
@@ -27,5 +27,5 @@ class fail extends same {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/tests/func/bug64523.phpt b/tests/func/bug64523.phpt
index e0092ada64..88adc43959 100644
--- a/tests/func/bug64523.phpt
+++ b/tests/func/bug64523.phpt
@@ -6,5 +6,5 @@ error_reporting = E_ALL ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED
 <?php
 echo ini_get('error_reporting');
 ?>
---EXPECTF--
+--EXPECT--
 22519
diff --git a/tests/lang/038.phpt b/tests/lang/038.phpt
index 195050b2fb..8e06bdd354 100644
--- a/tests/lang/038.phpt
+++ b/tests/lang/038.phpt
@@ -35,7 +35,7 @@ catch (Exception $e)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 string(15) "Error2Exception"
 string(5) "fopen"
 ===DONE===
diff --git a/tests/lang/039.phpt b/tests/lang/039.phpt
index aa4b591649..b353e0fa4b 100644
--- a/tests/lang/039.phpt
+++ b/tests/lang/039.phpt
@@ -40,6 +40,6 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Catchable
 ===DONE===
diff --git a/tests/lang/bug35382.phpt b/tests/lang/bug35382.phpt
index 69190d4c95..c2295c3440 100644
--- a/tests/lang/bug35382.phpt
+++ b/tests/lang/bug35382.phpt
@@ -5,5 +5,5 @@ Bug #35382 (Comment in end of file produces fatal error)
 eval("echo 'Hello'; // comment");
 echo " World";
 //last line comment
---EXPECTF--
+--EXPECT--
 Hello World
diff --git a/tests/lang/bug73172.phpt b/tests/lang/bug73172.phpt
index 369d293cac..34435e5058 100644
--- a/tests/lang/bug73172.phpt
+++ b/tests/lang/bug73172.phpt
@@ -9,5 +9,5 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug73172.inc";
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 ==DONE==
diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt
index 7e4786cd28..e822f1e4ee 100644
--- a/tests/lang/compare_objects_basic2.phpt
+++ b/tests/lang/compare_objects_basic2.phpt
@@ -18,7 +18,7 @@ $obj2 = new DateTime(("2009-02-12 12:47:41 GMT"));
 var_dump($obj1 == $obj2);
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Simple test comparing two objects with different compare callback handler
 bool(false)
 ===DONE===
diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt
index 51966e01f8..d66773f024 100644
--- a/tests/lang/engine_assignExecutionOrder_007.phpt
+++ b/tests/lang/engine_assignExecutionOrder_007.phpt
@@ -11,7 +11,7 @@ $o->a = new $a[$i=2][++$i];
 $o->a->b = new $a[$i=2][++$i];
 print_r($o);
 ?>
---EXPECTF--
+--EXPECT--
 Array
 (
     [2] => Array
diff --git a/tests/lang/engine_assignExecutionOrder_009.phpt b/tests/lang/engine_assignExecutionOrder_009.phpt
index e1d5b71c69..62b3327e06 100644
--- a/tests/lang/engine_assignExecutionOrder_009.phpt
+++ b/tests/lang/engine_assignExecutionOrder_009.phpt
@@ -22,7 +22,7 @@ var_dump($a[$i=1][++$i] <= $a[++$i][++$i]);
 var_dump($a[$i=1][++$i] > $a[++$i][++$i]); 
 var_dump($a[$i=1][++$i] >= $a[++$i][++$i]);
 ?>
---EXPECTF--
+--EXPECT--
 Function call args:
 f(0) f(1) bool(true)
 f(0) f(1) bool(true)
diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt
index c021a80c39..2ff0a7b61f 100644
--- a/tests/lang/foreachLoop.010.phpt
+++ b/tests/lang/foreachLoop.010.phpt
@@ -34,7 +34,7 @@ foreach ($a as $v) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 int(3)
diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt
index 6ceebd8a50..eeb08596cb 100644
--- a/tests/lang/foreachLoop.011.phpt
+++ b/tests/lang/foreachLoop.011.phpt
@@ -21,7 +21,7 @@ foreach ($a as $v) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 
 Change from array to non iterable:
 int(1)
diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt
index 3652a71aed..be72ae0e30 100644
--- a/tests/lang/foreachLoop.012.phpt
+++ b/tests/lang/foreachLoop.012.phpt
@@ -68,7 +68,7 @@ withRefValue(3, $transform);
 withRefValue(4, $transform);
 
 ?>
---EXPECTF--
+--EXPECT--
 
 Popping elements off end of an unreferenced array
 ---( Array with 1 element(s): )---
diff --git a/tests/lang/foreachLoop.014.phpt b/tests/lang/foreachLoop.014.phpt
index 770ee9f92e..9d45eb8244 100644
--- a/tests/lang/foreachLoop.014.phpt
+++ b/tests/lang/foreachLoop.014.phpt
@@ -70,7 +70,7 @@ withRefValue(3, $transform);
 withRefValue(4, $transform);
 
 ?>
---EXPECTF--
+--EXPECT--
 Popping elements off end of a referenced array
 ---( Array with 1 element(s): )---
 --> State of referenced array before loop:
diff --git a/tests/lang/foreachLoop.017.phpt b/tests/lang/foreachLoop.017.phpt
index 987fe3cb27..bbc21adaa3 100644
--- a/tests/lang/foreachLoop.017.phpt
+++ b/tests/lang/foreachLoop.017.phpt
@@ -6,6 +6,6 @@ $a = array ( "\x90" => 10 );
 foreach ($a as $val=>$key) echo $key;
 echo "\nDone\n";
 ?> 
---EXPECTF--
+--EXPECT--
 10
 Done
diff --git a/tests/lang/foreachLoopIteratorAggregate.002.phpt b/tests/lang/foreachLoopIteratorAggregate.002.phpt
index 6cad8e29b6..23f04feed2 100644
--- a/tests/lang/foreachLoopIteratorAggregate.002.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.002.phpt
@@ -45,7 +45,7 @@ f("bad4");
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 30: Objects returned by bad1::getIterator() must be traversable or implement interface Iterator
 30: Objects returned by bad2::getIterator() must be traversable or implement interface Iterator
 30: Objects returned by bad3::getIterator() must be traversable or implement interface Iterator
diff --git a/tests/lang/foreachLoopIteratorAggregate.003.phpt b/tests/lang/foreachLoopIteratorAggregate.003.phpt
index 0a0e23c51a..cb3586c005 100644
--- a/tests/lang/foreachLoopIteratorAggregate.003.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.003.phpt
@@ -73,7 +73,7 @@ foreach (new A3 as $k=>$v) {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 -----( A1: )-----
 --> EnglishMealIterator::rewind (0)
 --> EnglishMealIterator::valid (0)
diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt
index da025a537f..985a00784a 100644
--- a/tests/lang/foreachLoopObjects.001.phpt
+++ b/tests/lang/foreachLoopObjects.001.phpt
@@ -34,7 +34,7 @@ foreach (new C as $k => $v) {
 echo "\nCheck key and value after the loop.\n";
 var_dump($k, $v);
 ?>
---EXPECTF--
+--EXPECT--
 
 
 Simple loop.
diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt
index 31f5ffce70..9da14eb6f3 100644
--- a/tests/lang/func_get_arg.005.phpt
+++ b/tests/lang/func_get_arg.005.phpt
@@ -14,6 +14,6 @@ $a = "original.a";
 $ref =& $a;
 refVal($a);
 ?>
---EXPECTF--
+--EXPECT--
 string(10) "original.a"
 string(10) "original.a"
diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt
index 384d99a818..bafd9539ea 100644
--- a/tests/lang/func_get_args.004.phpt
+++ b/tests/lang/func_get_args.004.phpt
@@ -29,7 +29,7 @@ $b = 'original.b';
 refVal($b, $b);
 var_dump($b);
 ?>
---EXPECTF--
+--EXPECT--
 
 -- Val, Ref --
 string(10) "original.a"
diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt
index 8bdc6f07f6..d8142c9e7e 100644
--- a/tests/lang/func_num_args.004.phpt
+++ b/tests/lang/func_num_args.004.phpt
@@ -29,7 +29,7 @@ $b = 'original.b';
 refVal($b, $b);
 var_dump($b);
 ?>
---EXPECTF--
+--EXPECT--
 
 
 -- Val, Ref --
diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt
index 31f0260c5d..c7623fb73a 100644
--- a/tests/lang/passByReference_008.phpt
+++ b/tests/lang/passByReference_008.phpt
@@ -25,7 +25,7 @@ $b = 'original.b';
 refVal($b, $b);
 var_dump($b);
 ?>
---EXPECTF--
+--EXPECT--
 
 
 -- Val, Ref --
diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt
index 941c361dbc..b1b0c358ee 100644
--- a/tests/lang/passByReference_009.phpt
+++ b/tests/lang/passByReference_009.phpt
@@ -20,5 +20,5 @@ Assignement as argument
     foo2($x, $x, $x = 1);
     echo $x; // 2
 ?>
---EXPECTF--
+--EXPECT--
 1012
diff --git a/tests/lang/static_variation_001.phpt b/tests/lang/static_variation_001.phpt
index a08c53fef7..3c540368ed 100644
--- a/tests/lang/static_variation_001.phpt
+++ b/tests/lang/static_variation_001.phpt
@@ -45,7 +45,7 @@ eval(' function f3() { static $c = array(1,2,3); var_dump($c); }');
 f3();
 
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(1)
diff --git a/tests/lang/static_variation_002.phpt b/tests/lang/static_variation_002.phpt
index 54567de768..2be680822e 100644
--- a/tests/lang/static_variation_002.phpt
+++ b/tests/lang/static_variation_002.phpt
@@ -33,7 +33,7 @@ $e = new E;
 $e->f();
 
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(1)
diff --git a/tests/lang/string/unicode_escape_legacy.phpt b/tests/lang/string/unicode_escape_legacy.phpt
index 7b4bc299ea..9d3f40215e 100644
--- a/tests/lang/string/unicode_escape_legacy.phpt
+++ b/tests/lang/string/unicode_escape_legacy.phpt
@@ -8,7 +8,7 @@ var_dump("\u");
 var_dump("\u202e");
 var_dump("\ufoobar");
 
---EXPECTF--
+--EXPECT--
 string(2) "\u"
 string(6) "\u202e"
 string(8) "\ufoobar"
diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt
index daa063bb26..8313a66369 100644
--- a/tests/lang/string_decimals_001.phpt
+++ b/tests/lang/string_decimals_001.phpt
@@ -16,7 +16,7 @@ test("9.9.");
 test("9.9.9");
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 
 --> Testing ..9:
 int(0)
diff --git a/tests/output/ob_010.phpt b/tests/output/ob_010.phpt
index 7e362cabe1..c5581a860e 100644
--- a/tests/output/ob_010.phpt
+++ b/tests/output/ob_010.phpt
@@ -9,5 +9,5 @@ function obh($s)
 ob_start("obh");
 echo "foo\n";
 ?>
---EXPECTF--
+--EXPECT--
 foo
diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt
index 635b58abf9..7e1c475c63 100644
--- a/tests/output/ob_get_clean_basic_001.phpt
+++ b/tests/output/ob_get_clean_basic_001.phpt
@@ -13,6 +13,6 @@ ob_start();
 echo "Hello World";
 var_dump(ob_get_clean());
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(11) "Hello World"
diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt
index a2c70d790a..8d324e5d61 100644
--- a/tests/output/ob_get_contents_basic_001.phpt
+++ b/tests/output/ob_get_contents_basic_001.phpt
@@ -49,7 +49,7 @@ var_dump(ob_get_contents());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_get_contents() : basic functionality ***
 
 -- Testing ob_get_contents() function with Zero arguments --
diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt
index 88d6d27850..ef52044c0c 100644
--- a/tests/output/ob_get_length_basic_001.phpt
+++ b/tests/output/ob_get_length_basic_001.phpt
@@ -25,7 +25,7 @@ ob_end_flush();
 echo "No output buffers\n";
 var_dump(ob_get_length());
 ?>
---EXPECTF--
+--EXPECT--
 No output buffers
 bool(false)
 int(0)
diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt
index ab6f6a7a6e..2bbf8fd45a 100644
--- a/tests/output/ob_implicit_flush_basic_001.phpt
+++ b/tests/output/ob_implicit_flush_basic_001.phpt
@@ -16,7 +16,7 @@ var_dump(ob_implicit_flush(false));
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_implicit_flush() : check return value ***
 NULL
 NULL
diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt
index ad278e34bd..df985a49b9 100644
--- a/tests/output/ob_implicit_flush_basic_002.phpt
+++ b/tests/output/ob_implicit_flush_basic_002.phpt
@@ -24,6 +24,6 @@ ob_end_clean();
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_implicit_flush() : ensure implicit flushing does not apply to user buffers. ***
 Done
diff --git a/tests/output/ob_start_basic_002.phpt b/tests/output/ob_start_basic_002.phpt
index eac69aa8a6..2412ae57f0 100644
--- a/tests/output/ob_start_basic_002.phpt
+++ b/tests/output/ob_start_basic_002.phpt
@@ -36,7 +36,7 @@ foreach ($callbacks as $callback) {
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 --> Use callback 'return_empty_string':
 
 
diff --git a/tests/output/ob_start_basic_003.phpt b/tests/output/ob_start_basic_003.phpt
index 6fd7fe798c..23f0bfb274 100644
--- a/tests/output/ob_start_basic_003.phpt
+++ b/tests/output/ob_start_basic_003.phpt
@@ -14,5 +14,5 @@ ob_end_flush();
 echo "done (you shouldn't see this)";
 
 ?>
---EXPECTF--
+--EXPECT--
 I have stolen your output
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index c71ac068c4..9fe19e9b0f 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -33,7 +33,7 @@ for ($cs=-1; $cs<10; $cs++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 
 ----( chunk_size: -1, output append size: 1 )----
 f[call:1; len:8]12345678
diff --git a/tests/output/ob_start_basic_unerasable_001.phpt b/tests/output/ob_start_basic_unerasable_001.phpt
index 229ba084cf..e97fd45420 100644
--- a/tests/output/ob_start_basic_unerasable_001.phpt
+++ b/tests/output/ob_start_basic_unerasable_001.phpt
@@ -15,7 +15,7 @@ $str = ob_get_contents();
 var_dump($str);
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 [callback:1]This call will obtain the content:
 string(35) "This call will obtain the content:
 "
diff --git a/tests/run-test/test009.phpt b/tests/run-test/test009.phpt
index 650686f690..f3d0491e7c 100644
--- a/tests/run-test/test009.phpt
+++ b/tests/run-test/test009.phpt
@@ -6,7 +6,7 @@ class Foo {}
 $foo = new Foo;
 print_r($foo);
 ?>
---EXPECTF--
+--EXPECT--
 Foo Object
 (
 )
diff --git a/tests/strings/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt
index eecdfb9637..040a0970a9 100644
--- a/tests/strings/offsets_chaining_1.phpt
+++ b/tests/strings/offsets_chaining_1.phpt
@@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED
 $string = "foobar";
 var_dump($string[0][0][0][0]);
 ?>
---EXPECTF--
+--EXPECT--
 string(1) "f"
 
diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt
index 07f67f0fd0..a7dbdcd9df 100644
--- a/tests/strings/offsets_chaining_2.phpt
+++ b/tests/strings/offsets_chaining_2.phpt
@@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED
 $string = "foobar";
 var_dump($string{0}{0}[0][0]);
 ?>
---EXPECTF--
+--EXPECT--
 string(1) "f"
 
diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt
index 23b8e70179..2d43451cb1 100644
--- a/tests/strings/offsets_chaining_3.phpt
+++ b/tests/strings/offsets_chaining_3.phpt
@@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED
 $string = "foobar";
 var_dump(isset($string[0][0][0][0]));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 
diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt
index 79b95c135b..f612c40671 100644
--- a/tests/strings/offsets_chaining_4.phpt
+++ b/tests/strings/offsets_chaining_4.phpt
@@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED
 $string = "foobar";
 var_dump(isset($string{0}{0}[0][0]));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)