Use EXPECT when possible

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

20 files changed, 20 insertions, 20 deletions

diff --git a/Zend/tests/runtime_compile_time_binary_operands.phpt b/Zend/tests/runtime_compile_time_binary_operands.phpt
index 31366cd9e4..7caec412bc 100644
--- a/Zend/tests/runtime_compile_time_binary_operands.phpt
+++ b/Zend/tests/runtime_compile_time_binary_operands.phpt
@@ -151,6 +151,6 @@ if($c === 0) {
 $fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'compare_binary_operands_temp.php';
 @unlink($fl);
 ?>
---EXPECTF--
+--EXPECT--
 Failed: 0
 ===DONE===
diff --git a/Zend/tests/type_declarations/typed_properties_047.phpt b/Zend/tests/type_declarations/typed_properties_047.phpt
index 7f1e573cd3..0b48cd1cd4 100644
--- a/Zend/tests/type_declarations/typed_properties_047.phpt
+++ b/Zend/tests/type_declarations/typed_properties_047.phpt
@@ -28,7 +28,7 @@ try {
 	echo $e->getMessage()."\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 object(Foo)#1 (1) {
   ["foo"]=>
   NULL
diff --git a/ext/date/tests/bug77097.phpt b/ext/date/tests/bug77097.phpt
index effaad4900..080982d681 100644
--- a/ext/date/tests/bug77097.phpt
+++ b/ext/date/tests/bug77097.phpt
@@ -17,7 +17,7 @@ var_dump($diff->invert, $diff->s, $diff->f);
 $diff = $ago->diff($now, true);
 var_dump($diff->invert, $diff->s, $diff->f);
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(0)
 float(0.781751)
diff --git a/ext/date/tests/date_time_immutable001.phpt b/ext/date/tests/date_time_immutable001.phpt
index d6ac1d33af..14eb2a986c 100644
--- a/ext/date/tests/date_time_immutable001.phpt
+++ b/ext/date/tests/date_time_immutable001.phpt
@@ -6,5 +6,5 @@ Mark Niebergall mbniebergall@gmail.com UPHPU TestFest 2017
 <?php
 var_dump(date_create_immutable('Invalid'));
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/ext/exif/tests/bug77184/bug77184.phpt b/ext/exif/tests/bug77184/bug77184.phpt
index bbe7c93b61..e118d2f677 100644
--- a/ext/exif/tests/bug77184/bug77184.phpt
+++ b/ext/exif/tests/bug77184/bug77184.phpt
@@ -13,7 +13,7 @@ echo $tags['GPSLatitude'][2], PHP_EOL;
 echo $tags['GPSLongitude'][2], PHP_EOL;
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 156691934/70000000
 2672193571/70000000
 ===DONE===
diff --git a/ext/exif/tests/bug77540.phpt b/ext/exif/tests/bug77540.phpt
index a284e1f263..26e64db658 100644
--- a/ext/exif/tests/bug77540.phpt
+++ b/ext/exif/tests/bug77540.phpt
@@ -10,7 +10,7 @@ echo "Width ".$width."\n";
 echo "Height ".$height."\n";
 ?>
 DONE
---EXPECTF--
+--EXPECT--
 Width 0
 Height 0
 DONE
\ No newline at end of file
diff --git a/ext/mysqli/tests/bug76386.phpt b/ext/mysqli/tests/bug76386.phpt
index 4182c651b7..2f5ded1de4 100644
--- a/ext/mysqli/tests/bug76386.phpt
+++ b/ext/mysqli/tests/bug76386.phpt
@@ -78,7 +78,7 @@ if ($stmt) {
 }
 $link->close();
 ?>
---EXPECTF--
+--EXPECT--
 string(19) "2018-01-01 11:22:33"
 string(22) "2018-02-02 11:22:33.77"
 string(22) "2018-01-01 03:04:05.06"
diff --git a/ext/openssl/tests/openssl_pkey_derive-dh.phpt b/ext/openssl/tests/openssl_pkey_derive-dh.phpt
index 5d65afbed4..f5d615e9a8 100644
--- a/ext/openssl/tests/openssl_pkey_derive-dh.phpt
+++ b/ext/openssl/tests/openssl_pkey_derive-dh.phpt
@@ -40,5 +40,5 @@ dtlkbGbtoDOnxeNnN93gwQZngGYZYciu
 echo bin2hex(openssl_pkey_derive($pub,$priv));
 echo "\n";
 ?>
---EXPECTF--
+--EXPECT--
 10aed66ad96a65f50543aa9adbc18ea169bf98521c682c49fb8b7daeb9e8fbe6b9a800199ffe1123cc36fc358829cbbc5d21bf1eb8ce3cf644538b357f478361a284c27fbe31fc94d431562786dd7314613cd70e6d76ca1ab3c1f31556ed07162f243dcc1a43ea98c454fb6e891eaec7a14158d54cd33d3fbbbc75f1ea8ff5deaab25d5deb657c7c43004252df301b195207d01614e7cb833e0e8d785ba2ecfe16ad7a9634784fdb8db8afe049476b58743575725ee99c761a59a7d7b9e709fff84c8d427e2bc07953a7c2408eb3f8f7e0ebc2f901c6889955874ae79a3de19921757d69424145a35dbe5af778b080dada55bdfce8fb0319f2de39110f58e05d
diff --git a/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt b/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt
index 387992423e..701c51d861 100644
--- a/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt
+++ b/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt
@@ -25,5 +25,5 @@ N2IRPU2MF6S0S6i44MU=
 echo bin2hex(openssl_pkey_derive($pub,$priv));
 echo "\n";
 ?>
---EXPECTF--
+--EXPECT--
 01171967cc0ddc553b46c6a821502aaea44aa04e6933d897ea11222efa0556f2d5d972816676c9ccf4e2430a26e07193ad39373050f6e54e4059f17720d7dd667635
diff --git a/ext/openssl/tests/openssl_random_pseudo_bytes_error.phpt b/ext/openssl/tests/openssl_random_pseudo_bytes_error.phpt
index 2fb0ca6ed8..ee3f1d032c 100644
--- a/ext/openssl/tests/openssl_random_pseudo_bytes_error.phpt
+++ b/ext/openssl/tests/openssl_random_pseudo_bytes_error.phpt
@@ -10,5 +10,5 @@ try {
     echo $e->getMessage().PHP_EOL;
 }
 ?>
---EXPECTF--
+--EXPECT--
 Length must be greater than 0
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
index 5a0b5f67e0..a47bbbed31 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
@@ -21,6 +21,6 @@ $db = new PDO($dsn, $user, $pass);
 echo var_export($db->getAttribute(PDO::MYSQL_ATTR_LOCAL_INFILE)), "\n";
 echo "done!\n";
 ?>
---EXPECTF--
+--EXPECT--
 false
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
index 4394bc0576..3b942a4d2e 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
@@ -21,6 +21,6 @@ $db = new PDO($dsn, $user, $pass, array(PDO::MYSQL_ATTR_LOCAL_INFILE => true));
 echo var_export($db->getAttribute(PDO::MYSQL_ATTR_LOCAL_INFILE)), "\n";
 echo "done!\n";
 ?>
---EXPECTF--
+--EXPECT--
 true
 done!
diff --git a/ext/pgsql/tests/bug76548.phpt b/ext/pgsql/tests/bug76548.phpt
index 3a0b8922e1..00940dcec0 100644
--- a/ext/pgsql/tests/bug76548.phpt
+++ b/ext/pgsql/tests/bug76548.phpt
@@ -16,7 +16,7 @@ while ($value = pg_fetch_result($result, 0)) {
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
diff --git a/ext/reflection/tests/bug74454.phpt b/ext/reflection/tests/bug74454.phpt
index d2d6e88649..9e0332d893 100644
--- a/ext/reflection/tests/bug74454.phpt
+++ b/ext/reflection/tests/bug74454.phpt
@@ -14,6 +14,6 @@ function load_file() {
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ParseError: syntax error, unexpected 'if' (T_IF), expecting function (T_FUNCTION) or const (T_CONST)
 ===DONE===
diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt
index f9a68304b8..44a2b74b8e 100644
--- a/ext/soap/tests/bug48557.phpt
+++ b/ext/soap/tests/bug48557.phpt
@@ -54,7 +54,7 @@ $y->handle($request);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 array(6) {
   [1]=>
   int(123)
diff --git a/ext/sqlite3/tests/bug77051.phpt b/ext/sqlite3/tests/bug77051.phpt
index 98e45ae88a..10c51fe7f1 100644
--- a/ext/sqlite3/tests/bug77051.phpt
+++ b/ext/sqlite3/tests/bug77051.phpt
@@ -43,7 +43,7 @@ echo "Statement result\n";
 var_dump($res->fetchArray(SQLITE3_NUM));
 
 ?>
---EXPECTF--
+--EXPECT--
 Execute statement
 object(SQLite3Result)#3 (0) {
 }
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
index ef9e76b519..76618de3b0 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
@@ -29,7 +29,7 @@ var_dump($db->close());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Getting non-expanded SQL statement
 string(17) "SELECT :a, :b, ?;"
 Execute statement
diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt
index c30f29dc3f..ee7d5c6cbc 100644
--- a/ext/standard/tests/strings/strip_tags_variation2.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation2.phpt
@@ -85,7 +85,7 @@ foreach($values as $value) {
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing strip_tags() : usage variations ***
 -- Iteration 1 --
 string(10) "helloworld"
diff --git a/ext/xsl/tests/xsltprocessor_getParameter.phpt b/ext/xsl/tests/xsltprocessor_getParameter.phpt
index 8f2974ec0f..b4031db975 100644
--- a/ext/xsl/tests/xsltprocessor_getParameter.phpt
+++ b/ext/xsl/tests/xsltprocessor_getParameter.phpt
@@ -12,7 +12,7 @@ include dirname(__FILE__) .'/prepare.inc';
 $proc->importStylesheet($xsl);
 $proc->setParameter('', 'key', 'value');
 var_dump($proc->getParameter('', 'key'));
---EXPECTF--
+--EXPECT--
 string(5) "value"
 --CREDITS--
 Christian Weiske, cweiske@php.net
diff --git a/tests/classes/constants_visibility_008.phpt b/tests/classes/constants_visibility_008.phpt
index f24b70cf59..fe1b0237f1 100644
--- a/tests/classes/constants_visibility_008.phpt
+++ b/tests/classes/constants_visibility_008.phpt
@@ -8,5 +8,5 @@ class Foo
     private const BAR = 1;
 }
 echo (int)defined('Foo::BAR');
---EXPECTF--
+--EXPECT--
 0