Use EXPECT instead of EXPECTF when possible

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

24 files changed, 24 insertions, 24 deletions

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)