Use EXPECT instead of EXPECTF when possible

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

17 files changed, 17 insertions, 17 deletions

diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt
index b562b616c8..48ecdc5d7b 100644
--- a/ext/json/tests/002.phpt
+++ b/ext/json/tests/002.phpt
@@ -22,7 +22,7 @@ var_dump(json_encode("руссиш"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(2) """"
 string(4) "null"
 string(4) "true"
diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt
index 01a307f4a3..48c4b38830 100644
--- a/ext/json/tests/005.phpt
+++ b/ext/json/tests/005.phpt
@@ -13,7 +13,7 @@ var_dump(json_encode($a));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   array(0) {
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 4f30b25901..f3af6b92ce 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]'));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(1) {
   [0]=>
   float(2,1)
diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt
index 48bd7ad524..97ca58e07d 100644
--- a/ext/json/tests/bug43941.phpt
+++ b/ext/json/tests/bug43941.phpt
@@ -12,7 +12,7 @@ var_dump(json_encode(array("ab\xE0", "ab\xE0c", "abc"), JSON_PARTIAL_OUTPUT_ON_E
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(5) ""abc""
 bool(false)
 string(4) "null"
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index 111438ddc4..b8d3fcc3e4 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -9,7 +9,7 @@ var_dump(json_encode("latin 1234 -/    russian мама мыла раму  speci
 var_dump(json_encode("ab\xE0"));
 var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE));
 ?>
---EXPECTF--
+--EXPECT--
 string(156) ""latin 1234 -\/    russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443  specialchars \u0002   \b \n   U+1D11E >\ud834\udd1e<""
 string(100) ""latin 1234 -\/    russian мама мыла раму  specialchars \u0002   \b \n   U+1D11E >𝄞<""
 bool(false)
diff --git a/ext/json/tests/bug54058.phpt b/ext/json/tests/bug54058.phpt
index 4b8773f93d..ccb6389110 100644
--- a/ext/json/tests/bug54058.phpt
+++ b/ext/json/tests/bug54058.phpt
@@ -29,7 +29,7 @@ json_encode($c);
 var_dump(json_last_error(), json_last_error_msg());
 
 ?>
---EXPECTF--
+--EXPECT--
 int(5)
 string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
 int(5)
diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt
index 80ed051c9a..03a61d8645 100644
--- a/ext/json/tests/bug61537.phpt
+++ b/ext/json/tests/bug61537.phpt
@@ -23,7 +23,7 @@ var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR));
 var_dump(json_last_error(), json_last_error_msg());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 int(5)
 string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt
index d4d1748f29..68df624de1 100644
--- a/ext/json/tests/bug61978.phpt
+++ b/ext/json/tests/bug61978.phpt
@@ -37,7 +37,7 @@ $obj2 = new JsonTest2();
 var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR));
 
 ?>
---EXPECTF--
+--EXPECT--
 string(24) "{"test":"123","me":null}"
 ==
 string(24) "{"test":"123","me":null}"
diff --git a/ext/json/tests/bug62010.phpt b/ext/json/tests/bug62010.phpt
index ddac8963c3..6b5c72589b 100644
--- a/ext/json/tests/bug62010.phpt
+++ b/ext/json/tests/bug62010.phpt
@@ -9,7 +9,7 @@ var_dump(json_decode('"\ud834"'));
 var_dump(json_last_error() === JSON_ERROR_UTF16);
 var_dump(json_last_error_msg());
 ?>
---EXPECTF--
+--EXPECT--
 NULL
 bool(true)
 string(50) "Single unpaired UTF-16 surrogate in unicode escape"
diff --git a/ext/json/tests/bug62369.phpt b/ext/json/tests/bug62369.phpt
index cf254bfc18..6d9f58b967 100644
--- a/ext/json/tests/bug62369.phpt
+++ b/ext/json/tests/bug62369.phpt
@@ -29,6 +29,6 @@ switch (json_last_error()) {
 		echo 'ERROR' . PHP_EOL;
 	break;
 }
---EXPECTF--
+--EXPECT--
 OK
 ERROR
diff --git a/ext/json/tests/bug68546.phpt b/ext/json/tests/bug68546.phpt
index f8c8d135f3..4994ecf4b0 100644
--- a/ext/json/tests/bug68546.phpt
+++ b/ext/json/tests/bug68546.phpt
@@ -16,7 +16,7 @@ var_dump(json_last_error_msg());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 NULL
 bool(true)
 NULL
diff --git a/ext/json/tests/bug68567.phpt b/ext/json/tests/bug68567.phpt
index 6d4082c2b7..064efa76ae 100644
--- a/ext/json/tests/bug68567.phpt
+++ b/ext/json/tests/bug68567.phpt
@@ -9,6 +9,6 @@ var_dump(json_encode(array("\x80" => 1), JSON_PARTIAL_OUTPUT_ON_ERROR));
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(6) "{"":1}"
 ===DONE===
diff --git a/ext/json/tests/bug68817.phpt b/ext/json/tests/bug68817.phpt
index aa9a63f93d..99fc5f7954 100644
--- a/ext/json/tests/bug68817.phpt
+++ b/ext/json/tests/bug68817.phpt
@@ -9,7 +9,7 @@ var_dump(json_decode('[""]'));
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 array(1) {
   [0]=>
   string(0) ""
diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt
index b1d70bc4c7..d45e51f683 100644
--- a/ext/json/tests/bug73113.phpt
+++ b/ext/json/tests/bug73113.phpt
@@ -20,5 +20,5 @@ try {
 } catch (\Exception $e) {
 	echo $e->getMessage();
 }
---EXPECTF--
+--EXPECT--
 This error is expected
diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt
index f9deecc469..bb60a104ad 100644
--- a/ext/json/tests/inf_nan_error.phpt
+++ b/ext/json/tests/inf_nan_error.phpt
@@ -27,7 +27,7 @@ var_dump(json_last_error(), json_last_error_msg());
 var_dump(json_encode($nan, JSON_PARTIAL_OUTPUT_ON_ERROR));
 var_dump(json_last_error(), json_last_error_msg());
 ?>
---EXPECTF--
+--EXPECT--
 float(INF)
 bool(false)
 int(7)
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 7fe855d1dc..265d67299c 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -87,7 +87,7 @@ foreach($inputs as $input) {
 
 ?>
 ===Done===
---EXPECTF-- 
+--EXPECT-- 
 *** Testing json_encode() : basic functionality ***
 -- Iteration 1 --
 string(1) "0"
diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt
index d03e83a8a9..7330a56a2a 100644
--- a/ext/json/tests/json_encode_basic_utf8.phpt
+++ b/ext/json/tests/json_encode_basic_utf8.phpt
@@ -11,7 +11,7 @@ var_dump(json_encode($utf8_string));
 
 ?>
 ===Done===
---EXPECTF-- 
+--EXPECT-- 
 *** Testing json_encode() : basic functionality with UTF-8 input***
 string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002""
 ===Done===