Prefer EXPECT over EXPECTF

patrickallaert · patrickallaert · commit ac18dd0dc7f0 · 2021-06-29T17:13:02.000+02:00
diff --git a/Zend/tests/constant_arrays.phpt b/Zend/tests/constant_arrays.phpt
@@ -40,7 +40,7 @@ try {
     echo $exception->getMessage() . "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 array(4) {
   [0]=>
   int(7)
diff --git a/Zend/tests/fibers/fast-finish-fiber.phpt b/Zend/tests/fibers/fast-finish-fiber.phpt
@@ -10,7 +10,7 @@ var_dump($fiber->getReturn());
 var_dump($fiber->isTerminated());
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 NULL
 string(4) "test"
diff --git a/Zend/tests/fibers/suspend-in-force-close-fiber-catching-exception.phpt b/Zend/tests/fibers/suspend-in-force-close-fiber-catching-exception.phpt
@@ -22,6 +22,6 @@ try {
 echo "done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Cannot suspend in a force-closed fiber
 done
diff --git a/Zend/tests/fibers/unfinished-fiber-with-suspend-in-finally.phpt b/Zend/tests/fibers/unfinished-fiber-with-suspend-in-finally.phpt
@@ -29,7 +29,7 @@ unset($fiber); // Destroy fiber object, executing finally block.
 echo "done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 fiber
 inner finally
 outer finally
diff --git a/ext/bcmath/tests/str2num_formatting.phpt b/ext/bcmath/tests/str2num_formatting.phpt
@@ -93,7 +93,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 3
 3.10
 2.00
@@ -117,4 +117,4 @@ bccomp(): Argument #1 ($num1) is not well-formed
 bccomp(): Argument #1 ($num1) is not well-formed
 bccomp(): Argument #1 ($num1) is not well-formed
 bccomp(): Argument #1 ($num1) is not well-formed
-bccomp(): Argument #1 ($num1) is not well-formed
+bccomp(): Argument #1 ($num1) is not well-formed
diff --git a/ext/calendar/tests/bug80185.phpt b/ext/calendar/tests/bug80185.phpt
@@ -16,7 +16,7 @@ try {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(2170713600)
 int(9223372036854720000)
 jday must be between 2440588 and 106751993607888
diff --git a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt
@@ -19,6 +19,6 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY
 timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY
diff --git a/ext/dom/tests/bug66783.phpt b/ext/dom/tests/bug66783.phpt
@@ -13,5 +13,5 @@ try {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
---EXPECTF--
+--EXPECT--
 Hierarchy Request Error
diff --git a/ext/dom/tests/bug80600.phpt b/ext/dom/tests/bug80600.phpt
@@ -9,5 +9,5 @@ $doc = new \DOMDocument();
 $doc->loadXML('<a><!-- foo --></a>');
 $doc->documentElement->firstChild->remove();
 echo $doc->saveXML($doc->documentElement);
---EXPECTF--
+--EXPECT--
 <a/>
diff --git a/ext/exif/tests/bug75785/bug75785.phpt b/ext/exif/tests/bug75785/bug75785.phpt
@@ -11,7 +11,7 @@ echo $tags['GPS']['GPSLatitude'][0] . PHP_EOL;
 echo $tags['GPS']['GPSLongitude'][0] . PHP_EOL;
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 38/1
 122/1
 ===DONE===
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
@@ -21,6 +21,6 @@ try {
     echo $e->getMessage() . \PHP_EOL;
 }
 ?>
---EXPECTF--
+--EXPECT--
 IntlCalendar::roll(): Argument #1 ($field) must be a valid field
 intlcal_roll(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/ldap/tests/ldap_count_references_basic.phpt b/ext/ldap/tests/ldap_count_references_basic.phpt
@@ -33,5 +33,5 @@ ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'isc
 ldap_delete($link, "cn=userref2,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
 ?>
---EXPECTF--
+--EXPECT--
 int(2)
diff --git a/ext/libxml/tests/libxml_entity_loading_disabled_by_default.phpt b/ext/libxml/tests/libxml_entity_loading_disabled_by_default.phpt
@@ -44,7 +44,7 @@ var_dump(strpos(parseXML4($xml), 'SECRET_DATA') === false);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/mysqli/tests/bug77956.phpt b/ext/mysqli/tests/bug77956.phpt
@@ -55,6 +55,6 @@ if (!$link->query('DROP TABLE IF EXISTS test')) {
 $link->close();
 unlink('bug77956.data');
 ?>
---EXPECTF--
+--EXPECT--
 [006] [2000] LOAD DATA LOCAL INFILE is forbidden, check related settings like mysqli.allow_local_infile|mysqli.local_infile_directory or PDO::MYSQL_ATTR_LOCAL_INFILE|PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
-done
+done
diff --git a/ext/mysqli/tests/bug80837.phpt b/ext/mysqli/tests/bug80837.phpt
@@ -35,5 +35,5 @@ $mysqli->close();
 <?php
 require_once "clean_table.inc";
 ?>
---EXPECTF--
+--EXPECT--
 Commands out of sync; you can't run this command now
diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt
@@ -129,5 +129,5 @@ max_execution_time=240
 	mysqli_query($link, 'DROP USER pamtest');
 	mysqli_query($link, 'DROP USER pamtest@localhost');
 ?>
---EXPECTF--
+--EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
@@ -307,7 +307,7 @@ require_once('skipifconnectfailure.inc');
 <?php
     require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 [005]
 array(2) {
   [0]=>
diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt
@@ -287,7 +287,7 @@ require_once('skipifconnectfailure.inc');
 
     print "done!";
 ?>
---EXPECTF--
+--EXPECT--
 [005]
 array(4) {
   [0]=>
diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
@@ -283,7 +283,7 @@ require_once('skipifconnectfailure.inc');
 <?php
     require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 [005]
 array(4) {
   [0]=>
diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
@@ -85,7 +85,7 @@ require_once('skipifconnectfailure.inc');
 <?php
     require_once("clean_table.inc");
 ?>
---EXPECTF--
+--EXPECT--
 mysqli_stmt object is not fully initialized
 int(3)
 int(1)
diff --git a/ext/oci8/tests/define1.phpt b/ext/oci8/tests/define1.phpt
@@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
 oci_define_by_name(): Argument #2 ($column) cannot be empty
diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt
@@ -71,7 +71,7 @@ $statement = oci_parse($c, $drop);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 
 OCILob::save(): Argument #2 ($offset) must be greater than or equal to 0
 string(4) "data"
diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt
@@ -37,7 +37,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1: Import
 OCILob::savefile(): Argument #1 ($filename) must not contain any null bytes
 Test 2: Export
diff --git a/ext/pcntl/tests/pcntl_rfork.phpt b/ext/pcntl/tests/pcntl_rfork.phpt
@@ -17,6 +17,6 @@ if ($pid == 0) {
   exit;
 }
 ?>
---EXPECTF--
+--EXPECT--
 *** Test with no flags ***
 child
diff --git a/ext/pdo_mysql/tests/bug_64705.phpt b/ext/pdo_mysql/tests/bug_64705.phpt
@@ -11,5 +11,5 @@ try {
   var_dump(!empty($e->errorInfo) && is_array($e->errorInfo));
 }
 ?>
---EXPECTF--
-bool(true)
+--EXPECT--
+bool(true)
diff --git a/ext/pdo_pgsql/tests/bug_64705.phpt b/ext/pdo_pgsql/tests/bug_64705.phpt
@@ -11,5 +11,5 @@ try {
   var_dump(!empty($e->errorInfo) && is_array($e->errorInfo));
 }
 ?>
---EXPECTF--
-bool(true)
+--EXPECT--
+bool(true)
diff --git a/ext/pdo_sqlite/tests/bug_64705.phpt b/ext/pdo_sqlite/tests/bug_64705.phpt
@@ -11,5 +11,5 @@ try {
   var_dump(!empty($e->errorInfo) && is_array($e->errorInfo));
 }
 ?>
---EXPECTF--
-bool(true)
+--EXPECT--
+bool(true)
diff --git a/ext/session/tests/sessionhandler_open_001.phpt b/ext/session/tests/sessionhandler_open_001.phpt
@@ -37,7 +37,7 @@ try {
 print "Done!\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Session is not active
 Session is not active
 Session is not active
diff --git a/ext/soap/tests/bug80672.phpt b/ext/soap/tests/bug80672.phpt
@@ -11,5 +11,5 @@ try {
     print $e->getMessage();
 }
 ?>
---EXPECTF--
-SOAP-ERROR: Parsing WSDL: Unexpected WSDL element <>
+--EXPECT--
+SOAP-ERROR: Parsing WSDL: Unexpected WSDL element <>
diff --git a/ext/sockets/tests/socket_defer_acp.phpt b/ext/sockets/tests/socket_defer_acp.phpt
@@ -24,7 +24,7 @@ $rounded_up_val = socket_get_option( $socket, SOL_TCP, TCP_DEFER_ACCEPT);
 socket_close($socket);
 var_dump($rounded_up_val > $initial_val); // Value rounded up by the kernel, might differ from kernel version/setting
 ?>
---EXPECTF--
+--EXPECT--
 *** Test with TCP_DEFER_ACCEPT with initial SYN/ACK 'timeout' value to rounded up one ***
 bool(true)
 bool(true)
diff --git a/ext/sockets/tests/socket_select-wrongparams-2.phpt b/ext/sockets/tests/socket_select-wrongparams-2.phpt
@@ -15,7 +15,7 @@ try {
     echo $exception->getMessage() . "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 socket_select(): At least one array argument must be passed
 --CREDITS--
 Till Klampaeckel, till@php.net
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
@@ -88,7 +88,7 @@ var_dump(count($arr, COUNT_RECURSIVE));
 fclose( $resource1 );
 closedir( $resource2 );
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing basic functionality of count() function ***
 -- Testing arrays --
 COUNT_NORMAL: should be 2, is 2
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
@@ -79,7 +79,7 @@ $dirname = __DIR__."/symlink_link_linkinfo_is_link_basic1";
 unlink("$dirname/symlink_link_linkinfo_is_link_basic1.tmp");
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing symlink(), linkinfo(), link() and is_link() : basic functionality ***
 
 -- Iteration 1 --
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
@@ -101,7 +101,7 @@ rmdir("$dirname/test/home");
 rmdir("$dirname/test");
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing symlink(), link(), linkinfo() and is_link() with linknames stored as members in an object ***
 
 -- Working with soft links --
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
@@ -89,7 +89,7 @@ $filename = "$dirname/symlink_link_linkinfo_is_link_variation9.tmp";
 unlink($filename);
 rmdir($dirname);
 ?>
---EXPECTF--
+--EXPECT--
 *** Checking lstat() on soft link ***
 bool(true)
 linkinfo() returns integer !== -1: bool(true)
diff --git a/ext/standard/tests/general_functions/proc_open_sockets1.phpt b/ext/standard/tests/general_functions/proc_open_sockets1.phpt
@@ -48,7 +48,7 @@ while ($pipes) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 PIPE 1 << hello
diff --git a/ext/standard/tests/general_functions/proc_open_sockets2.phpt b/ext/standard/tests/general_functions/proc_open_sockets2.phpt
@@ -59,7 +59,7 @@ fclose($pipes[0]);
 printf("STDOUT << %s\n", read_pipe($pipes[1]));
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 STDOUT << hello
diff --git a/ext/standard/tests/general_functions/proc_open_sockets3.phpt b/ext/standard/tests/general_functions/proc_open_sockets3.phpt
@@ -48,7 +48,7 @@ fclose($pipes[0]);
 printf("STDOUT << %s\n", read_pipe($pipes[1]));
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 STDOUT << hello
 STDOUT << world
diff --git a/ext/standard/tests/http/bug78719.phpt b/ext/standard/tests/http/bug78719.phpt
@@ -21,6 +21,6 @@ var_dump(stream_get_meta_data($stream)['wrapper_data'][1] === "Location: $url");
 
 http_server_kill($pid);
 ?>
---EXPECTF--
+--EXPECT--
 string(4) "Body"
 bool(true)
diff --git a/ext/standard/tests/strings/pack64_32.phpt b/ext/standard/tests/strings/pack64_32.phpt
@@ -51,7 +51,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 64-bit format codes are not available for 32-bit versions of PHP
 64-bit format codes are not available for 32-bit versions of PHP
 64-bit format codes are not available for 32-bit versions of PHP
diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt
@@ -27,7 +27,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 Current Value of 'tidy-mark': bool(false)
 Current Value of 'error-file': string(0) ""
 Current Value of 'tab-size': int(8)
diff --git a/ext/xmlwriter/tests/010.phpt b/ext/xmlwriter/tests/010.phpt
@@ -41,7 +41,7 @@ var_dump(file_get_contents($file));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/zend_test/tests/fiber_test_01.phpt b/ext/zend_test/tests/fiber_test_01.phpt
@@ -20,7 +20,7 @@ var_dump($value); // NULL
 var_dump($fiber->getReturn()); // int(1)
 
 ?>
---EXPECTF--
+--EXPECT--
 int(123)
 int(246)
 NULL
diff --git a/ext/zend_test/tests/fiber_test_02.phpt b/ext/zend_test/tests/fiber_test_02.phpt
@@ -16,7 +16,7 @@ var_dump($test->start()); // int(1)
 var_dump($test->resume(2)); // NULL
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 NULL
diff --git a/ext/zend_test/tests/fiber_test_04.phpt b/ext/zend_test/tests/fiber_test_04.phpt
@@ -29,7 +29,7 @@ var_dump($value); // NULL
 var_dump($fiber->getReturn()); // int(-1)
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 int(3)
diff --git a/ext/zend_test/tests/fiber_test_05.phpt b/ext/zend_test/tests/fiber_test_05.phpt
diff --git a/ext/zend_test/tests/fiber_test_06.phpt b/ext/zend_test/tests/fiber_test_06.phpt
diff --git a/ext/zend_test/tests/fiber_test_07.phpt b/ext/zend_test/tests/fiber_test_07.phpt

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ try {`
`40`	`40`	`echo $exception->getMessage() . "\n";`
`41`	`41`	`}`
`42`	`42`	`?>`
`43`		`---EXPECTF--`
	`43`	`+--EXPECT--`
`44`	`44`	`array(4) {`
`45`	`45`	`[0]=>`
`46`	`46`	`int(7)`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ try {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`?>`
`96`		`---EXPECTF--`
	`96`	`+--EXPECT--`
`97`	`97`	`3`
`98`	`98`	`3.10`
`99`	`99`	`2.00`
`@@ -117,4 +117,4 @@ bccomp(): Argument #1 ($num1) is not well-formed`
`117`	`117`	`bccomp(): Argument #1 ($num1) is not well-formed`
`118`	`118`	`bccomp(): Argument #1 ($num1) is not well-formed`
`119`	`119`	`bccomp(): Argument #1 ($num1) is not well-formed`
`120`		`-bccomp(): Argument #1 ($num1) is not well-formed`
	`120`	`+bccomp(): Argument #1 ($num1) is not well-formed`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ try {`
`16`	`16`	`echo $ex->getMessage(), PHP_EOL;`
`17`	`17`	`}`
`18`	`18`	`?>`
`19`		`---EXPECTF--`
	`19`	`+--EXPECT--`
`20`	`20`	`int(2170713600)`
`21`	`21`	`int(9223372036854720000)`
`22`	`22`	`jday must be between 2440588 and 106751993607888`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ try {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`?>`
`22`		`---EXPECTF--`
	`22`	`+--EXPECT--`
`23`	`23`	`timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY`
`24`	`24`	`timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ try {`
`13`	`13`	`echo $ex->getMessage(), PHP_EOL;`
`14`	`14`	`}`
`15`	`15`	`?>`
`16`		`---EXPECTF--`
	`16`	`+--EXPECT--`
`17`	`17`	`Hierarchy Request Error`