Nikita Popov
b03cafd19c
Fix bug #77966 : Cannot alias a method named "namespace"
...
This is a bit tricky: In this cases we have "namespace as", which
means that we will only recognize "namespace" as an identifier when
the lookahead token is already at the "as". This means that
zend_lex_tstring picks up the wrong identifier.
We solve this by actually assigning the identifier as the semantic
value on the parser stack -- as in almost all cases we will not
actually need the identifier, this is just an (offset, size)
reference, not a copy of the string.
Additionally, we need to teach the lexer feedback mechanism used
by tokenizer TOKEN_PARSE mode to apply feedback to something
other than the very last token. To that purpose we pass through
the token text and check the tokens in reverse order to find the
right one.
Closes GH-5668.
2020-06-08 12:55:14 +02:00
Nikita Popov
26ce32c45a
%d out token IDs in test
...
Avoid having to update this test any time token numbers shift.
2020-06-03 09:57:22 +02:00
Gabriel Caruso
5dafd7b4fe
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run tests is considerable, so lets avoid it
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch tests/use-simpler-expect-section
# Your branch is behind 'fork/tests/use-simpler-expect-section' by 1 commit, and can be fast-forwarded.
# (use "git pull" to update your local branch)
#
# Changes to be committed:
# modified: Zend/tests/005.phpt
# modified: Zend/tests/bug27669.phpt
# modified: Zend/tests/bug51827.phpt
# modified: Zend/tests/bug63206.phpt
# modified: Zend/tests/bug63206_1.phpt
# modified: Zend/tests/bug63206_2.phpt
# modified: Zend/tests/incompat_ctx_user.phpt
# modified: Zend/tests/instanceof_001.phpt
# modified: Zend/tests/unexpected_ref_bug.phpt
# modified: ext/date/tests/012.phpt
# modified: ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
# modified: ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
# modified: ext/date/tests/date_parse_001.phpt
# modified: ext/date/tests/date_parse_error.phpt
# modified: ext/date/tests/gmmktime_basic.phpt
# modified: ext/date/tests/mktime_error.phpt
# modified: ext/date/tests/timezone_abbreviations_list_basic1.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic.phpt
# modified: ext/filter/tests/007.phpt
# modified: ext/filter/tests/008.phpt
# modified: ext/filter/tests/010.phpt
# modified: ext/hash/tests/hash_hkdf_edges.phpt
# modified: ext/hash/tests/hash_hmac_file_basic.phpt
# modified: ext/json/tests/json_last_error_msg_error.phpt
# modified: ext/libxml/tests/bug76777.phpt
# modified: ext/pcre/tests/preg_replace_error2.phpt
# modified: ext/pcre/tests/split2.phpt
# modified: ext/phar/tests/phar_isvalidpharfilename.phpt
# modified: ext/phar/tests/pharfileinfo_chmod.phpt
# modified: ext/phar/tests/pharfileinfo_setmetadata.phpt
# modified: ext/phar/tests/stat2_5.3.phpt
# modified: ext/posix/tests/posix_getgrgid_error.phpt
# modified: ext/posix/tests/posix_getpgid_error.phpt
# modified: ext/posix/tests/posix_getpwuid_error.phpt
# modified: ext/posix/tests/posix_getsid_error.phpt
# modified: ext/posix/tests/posix_initgroups.phpt
# modified: ext/posix/tests/posix_kill_error.phpt
# modified: ext/posix/tests/posix_strerror_error.phpt
# modified: ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
# modified: ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
# modified: ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
# modified: ext/reflection/tests/ReflectionObject_getName_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_setValue_error.phpt
# modified: ext/session/tests/bug79221.phpt
# modified: ext/session/tests/session_cache_limiter_error.phpt
# modified: ext/spl/tests/bug61347.phpt
# modified: ext/spl/tests/fileobject_005.phpt
# modified: ext/spl/tests/iterator_045.phpt
# modified: ext/spl/tests/regexIterator_setMode_error.phpt
# modified: ext/spl/tests/spl_heap_is_empty_basic.phpt
# modified: ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
# modified: ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
# modified: ext/standard/tests/array/005.phpt
# modified: ext/standard/tests/array/009.phpt
# modified: ext/standard/tests/array/array_diff_assoc_error.phpt
# modified: ext/standard/tests/array/array_diff_error.phpt
# modified: ext/standard/tests/array/array_diff_key_error.phpt
# modified: ext/standard/tests/array/array_filter.phpt
# modified: ext/standard/tests/array/array_filter_variation10.phpt
# modified: ext/standard/tests/array/array_key_exists_variation3.phpt
# modified: ext/standard/tests/array/array_map_error.phpt
# modified: ext/standard/tests/array/array_merge.phpt
# modified: ext/standard/tests/array/array_push.phpt
# modified: ext/standard/tests/array/array_slice.phpt
# modified: ext/standard/tests/array/array_unshift.phpt
# modified: ext/standard/tests/array/array_walk.phpt
# modified: ext/standard/tests/array/array_walk_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive1.phpt
# modified: ext/standard/tests/array/array_walk_recursive_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive_variation7.phpt
# modified: ext/standard/tests/array/array_walk_variation7.phpt
# modified: ext/standard/tests/array/uasort_variation8.phpt
# modified: ext/standard/tests/array/usort_variation8.phpt
# modified: ext/standard/tests/assert/assert_variation.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_1.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_2.phpt
# modified: ext/standard/tests/file/basename.phpt
# modified: ext/standard/tests/file/fscanf.phpt
# modified: ext/standard/tests/file/fscanf_variation10.phpt
# modified: ext/standard/tests/file/is_dir_variation3.phpt
# modified: ext/standard/tests/file/is_executable_error.phpt
# modified: ext/standard/tests/file/is_executable_variation3.phpt
# modified: ext/standard/tests/file/is_file_variation3.phpt
# modified: ext/standard/tests/file/is_readable_error.phpt
# modified: ext/standard/tests/file/is_readable_variation3.phpt
# modified: ext/standard/tests/file/is_uploaded_file_basic.phpt
# modified: ext/standard/tests/file/is_writable_error.phpt
# modified: ext/standard/tests/file/is_writable_variation3.phpt
# modified: ext/standard/tests/file/move_uploaded_file_basic.phpt
# modified: ext/standard/tests/general_functions/get_include_path_basic.phpt
# modified: ext/standard/tests/general_functions/include_path.phpt
# modified: ext/standard/tests/general_functions/is_array.phpt
# modified: ext/standard/tests/general_functions/is_bool.phpt
# modified: ext/standard/tests/general_functions/is_float_64bit.phpt
# modified: ext/standard/tests/general_functions/is_int_64bit.phpt
# modified: ext/standard/tests/general_functions/is_null.phpt
# modified: ext/standard/tests/general_functions/is_numeric.phpt
# modified: ext/standard/tests/general_functions/is_object.phpt
# modified: ext/standard/tests/general_functions/is_scalar.phpt
# modified: ext/standard/tests/general_functions/is_string.phpt
# modified: ext/standard/tests/general_functions/ob_get_length_basic.phpt
# modified: ext/standard/tests/general_functions/php_uname_error.phpt
# modified: ext/standard/tests/general_functions/print_r.phpt
# modified: ext/standard/tests/general_functions/print_r_64bit.phpt
# modified: ext/standard/tests/general_functions/var_dump_64bit.phpt
# modified: ext/standard/tests/general_functions/var_export-locale.phpt
# modified: ext/standard/tests/image/image_type_to_extension.phpt
# modified: ext/standard/tests/math/lcg_value_basic.phpt
# modified: ext/standard/tests/network/inet.phpt
# modified: ext/standard/tests/network/ip_x86_64.phpt
# modified: ext/standard/tests/random/random_int.phpt
# modified: ext/standard/tests/serialize/bug45706.phpt
# modified: ext/standard/tests/streams/bug61115.phpt
# modified: ext/standard/tests/streams/bug78662.phpt
# modified: ext/standard/tests/streams/stream_set_timeout_error.phpt
# modified: ext/standard/tests/strings/chr_error.phpt
# modified: ext/standard/tests/strings/fprintf_error.phpt
# modified: ext/standard/tests/strings/htmlentities24.phpt
# modified: ext/standard/tests/strings/htmlspecialchars.phpt
# modified: ext/standard/tests/strings/ltrim.phpt
# modified: ext/standard/tests/strings/metaphone.phpt
# modified: ext/standard/tests/strings/parse_str_basic1.phpt
# modified: ext/standard/tests/strings/parse_str_basic3.phpt
# modified: ext/standard/tests/strings/printf_error.phpt
# modified: ext/standard/tests/strings/rtrim.phpt
# modified: ext/standard/tests/strings/soundex.phpt
# modified: ext/standard/tests/strings/sprintf_variation15.phpt
# modified: ext/standard/tests/strings/sscanf_error.phpt
# modified: ext/standard/tests/strings/str_ireplace.phpt
# modified: ext/standard/tests/strings/stristr.phpt
# modified: ext/standard/tests/strings/strrchr_variation1.phpt
# modified: ext/standard/tests/strings/strrchr_variation2.phpt
# modified: ext/standard/tests/strings/strtolower.phpt
# modified: ext/standard/tests/strings/strtoupper1.phpt
# modified: ext/standard/tests/strings/strval_error.phpt
# modified: ext/standard/tests/strings/substr.phpt
# modified: ext/standard/tests/strings/trim1.phpt
# modified: ext/standard/tests/strings/vfprintf_error1.phpt
# modified: ext/standard/tests/time/strptime_error.phpt
# modified: ext/tokenizer/tests/001.phpt
# modified: ext/xmlreader/tests/static.phpt
# modified: ext/xmlwriter/tests/bug41326.phpt
# modified: tests/output/stream_isatty_err.phpt
# modified: tests/output/stream_isatty_in-err.phpt
# modified: tests/output/stream_isatty_in-out-err.phpt
# modified: tests/output/stream_isatty_in-out.phpt
# modified: tests/output/stream_isatty_out-err.phpt
# modified: tests/output/stream_isatty_out.phpt
#
# Changes not staged for commit:
# modified: run-tests.php
#
# ------------------------ >8 ------------------------
# Do not modify or remove the line above.
# Everything below it will be ignored.
diff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt
index f4abfb6c51..413f3205ad 100644
--- a/Zend/tests/005.phpt
+++ b/Zend/tests/005.phpt
@@ -13,7 +13,7 @@ var_dump(strcasecmp("01", "01"));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
int(0)
int(-3)
int(-1)
diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt
index 7067c23e0d..9cd845e337 100644
--- a/Zend/tests/bug27669.phpt
+++ b/Zend/tests/bug27669.phpt
@@ -10,5 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy
$y[0] = 'hello';
A::{$y[0]}();
?>
---EXPECTF--
+--EXPECT--
Hello World
diff --git a/Zend/tests/bug51827.phpt b/Zend/tests/bug51827.phpt
index 6c3d721716..1a2d9bdf39 100644
--- a/Zend/tests/bug51827.phpt
+++ b/Zend/tests/bug51827.phpt
@@ -13,7 +13,7 @@ register_shutdown_function('ABC');
register_shutdown_function('exploDe');
?>
---EXPECTF--
+--EXPECT--
int(1)
Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0
diff --git a/Zend/tests/bug63206.phpt b/Zend/tests/bug63206.phpt
index dc7bb1fd1d..6aba55eca1 100644
--- a/Zend/tests/bug63206.phpt
+++ b/Zend/tests/bug63206.phpt
@@ -22,7 +22,7 @@ set_error_handler(function() {
$triggerNotice1++;
$triggerNotice2++;
?>
---EXPECTF--
+--EXPECT--
Second handler
Internal handler
Second handler
diff --git a/Zend/tests/bug63206_1.phpt b/Zend/tests/bug63206_1.phpt
index f08f913824..d054211638 100644
--- a/Zend/tests/bug63206_1.phpt
+++ b/Zend/tests/bug63206_1.phpt
@@ -22,5 +22,5 @@ restore_error_handler();
$triggerNotice++;
?>
---EXPECTF--
+--EXPECT--
Second handler
diff --git a/Zend/tests/bug63206_2.phpt b/Zend/tests/bug63206_2.phpt
index 7a2bf38543..a4a67f577e 100644
--- a/Zend/tests/bug63206_2.phpt
+++ b/Zend/tests/bug63206_2.phpt
@@ -22,5 +22,5 @@ restore_exception_handler();
throw new Exception();
?>
---EXPECTF--
+--EXPECT--
Second handler
diff --git a/Zend/tests/incompat_ctx_user.phpt b/Zend/tests/incompat_ctx_user.phpt
index 8c7461e4f7..3fe0456175 100644
--- a/Zend/tests/incompat_ctx_user.phpt
+++ b/Zend/tests/incompat_ctx_user.phpt
@@ -16,5 +16,5 @@ try {
echo "Exception: " . $e->getMessage() . "\n";
}
?>
---EXPECTF--
+--EXPECT--
Exception: Non-static method A::foo() cannot be called statically
diff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt
index 27170420f0..02b7d59baf 100644
--- a/Zend/tests/instanceof_001.phpt
+++ b/Zend/tests/instanceof_001.phpt
@@ -17,7 +17,7 @@ var_dump($c[0] instanceof stdClass);
var_dump(@$inexistent instanceof stdClass);
?>
---EXPECTF--
+--EXPECT--
bool(true)
bool(true)
bool(true)
diff --git a/Zend/tests/unexpected_ref_bug.phpt b/Zend/tests/unexpected_ref_bug.phpt
index 0d78410d1a..172b1e6224 100644
--- a/Zend/tests/unexpected_ref_bug.phpt
+++ b/Zend/tests/unexpected_ref_bug.phpt
@@ -15,5 +15,5 @@ $my_var = str_repeat("A", 64);
$data = call_user_func_array("str_replace", array(&$my_var, new Test(), "foo"));
echo "Done.\n";
?>
---EXPECTF--
+--EXPECT--
Done.
diff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt
index ee8faf1c00..0997ef047c 100644
--- a/ext/date/tests/012.phpt
+++ b/ext/date/tests/012.phpt
@@ -13,7 +13,7 @@ var_dump(date_isodate_set($dto, 2006, 100, 15));
var_dump($dto->format("Y/m/d H:i:s"));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
object(DateTime)#1 (3) {
["date"]=>
string(26) "2006-01-23 00:00:00.000000"
diff --git a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
index 715ea63dc9..f96753b019 100644
--- a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
+++ b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
@@ -14,6 +14,6 @@ try {
echo $exception->getMessage(), "\n";
}
?>
---EXPECTF--
+--EXPECT--
DatePeriod::__construct(): The recurrence count '0' is invalid. Needs to be > 0
DatePeriod::__construct(): The recurrence count '-1' is invalid. Needs to be > 0
diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
index cb948e9df5..670dcb2ee3 100644
--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";
var_dump( $abbr["acst"] );
?>
---EXPECTF--
+--EXPECT--
*** Testing DateTimeZone::listAbbreviations() : basic functionality ***
string(5) "array"
int(144)
diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt
index 0d58c1f8e9..36f8d9bbdd 100644
--- a/ext/date/tests/date_parse_001.phpt
+++ b/ext/date/tests/date_parse_001.phpt
@@ -14,7 +14,7 @@ Test basic date_parse()
var_dump(date_parse(""));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
array(12) {
["year"]=>
int(2006)
diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt
index 24b0094c9e..6a5180fdfb 100644
--- a/ext/date/tests/date_parse_error.phpt
+++ b/ext/date/tests/date_parse_error.phpt
@@ -17,7 +17,7 @@ $invalid_date = "2OO9-02--27 10:00?00.5";
var_dump( date_parse($invalid_date) );
?>
---EXPECTF--
+--EXPECT--
*** Testing date_parse() : error conditions ***
-- Testing date_parse() function with unexpected characters in $date argument --
diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt
index 303bd9b010..f96b635c08 100644
--- a/ext/date/tests/gmmktime_basic.phpt
+++ b/ext/date/tests/gmmktime_basic.phpt
@@ -22,6 +22,6 @@ $year = 2008;
var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) );
?>
---EXPECTF--
+--EXPECT--
*** Testing gmmktime() : basic functionality ***
int(1218182888)
diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt
index e40e40f38d..8bdb61df7b 100644
--- a/ext/date/tests/mktime_error.phpt
+++ b/ext/date/tests/mktime_error.phpt
@@ -35,7 +35,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing mktime() : error conditions ***
-- Testing mktime() function with Zero arguments --
diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
index b3bf7c84a1..0640b8a83d 100644
--- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt
+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";
var_dump( $abbr["acst"] );
?>
---EXPECTF--
+--EXPECT--
*** Testing timezone_abbreviations_list() : basic functionality ***
string(5) "array"
int(144)
diff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
index 50a1559f58..855acaaed8 100644
--- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
+++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );
var_dump( $finfo->set_flags( FILEINFO_MIME ) );
?>
---EXPECTF--
+--EXPECT--
*** Testing finfo_set_flags() : basic functionality ***
bool(true)
bool(true)
diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
index 95f2648f51..fe2921b560 100644
--- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt
+++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );
var_dump( $finfo->set_flags( FILEINFO_MIME ) );
?>
---EXPECTF--
+--EXPECT--
*** Testing finfo_set_flags() : basic functionality ***
bool(true)
bool(true)
diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index dc966b8cc9..b5f285342b 100644
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -23,7 +23,7 @@ var_dump(filter_has_var(INPUT_POST, ""));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
bool(true)
bool(true)
bool(false)
diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt
index 75e0968c62..1d4d64529d 100644
--- a/ext/filter/tests/008.phpt
+++ b/ext/filter/tests/008.phpt
@@ -9,7 +9,7 @@ var_dump(filter_list());
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
array(21) {
[0]=>
string(3) "int"
diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index 14f8db01af..46b6044668 100644
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -17,7 +17,7 @@ var_dump(filter_var(1, 0, array()));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
array(7) {
[0]=>
int(1)
diff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt
index cee86ae82e..ceb21631d1 100644
--- a/ext/hash/tests/hash_hkdf_edges.phpt
+++ b/ext/hash/tests/hash_hkdf_edges.phpt
@@ -25,7 +25,7 @@ catch (\Error $e) {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing hash_hkdf(): edge cases ***
Length < digestSize: 98b16391063ece
Length % digestSize != 0: 98b16391063ecee006a3ca8ee5776b1e5f
diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt
index 4569c46c35..11b9d05738 100644
--- a/ext/hash/tests/hash_hmac_file_basic.phpt
+++ b/ext/hash/tests/hash_hmac_file_basic.phpt
@@ -57,7 +57,7 @@ echo "sha256(raw): " . bin2hex(hash_hmac_file('sha256', $file, $key, TRUE)). "\n
unlink($file);
?>
---EXPECTF--
+--EXPECT--
*** Testing hash_hmac_file() : basic functionality ***
gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918
haval128,3: f1cea637451097d790354a86de3f54a3
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index 75b06f72a2..0eb55c4c66 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -14,6 +14,6 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
string(8) "No error"
json_last_error_msg() expects exactly 0 parameters, 1 given
diff --git a/ext/libxml/tests/bug76777.phpt b/ext/libxml/tests/bug76777.phpt
index 5e15024b81..c50e52203f 100644
--- a/ext/libxml/tests/bug76777.phpt
+++ b/ext/libxml/tests/bug76777.phpt
@@ -29,7 +29,7 @@ libxml_set_external_entity_loader(function($p,$s,$c) {
$dom=new DOMDocument($xml);
$dom->schemaValidateSource($xsd);
?>
---EXPECTF--
+--EXPECT--
NULL
string(15) "nonexistent.xsd"
array(4) {
diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt
index 2401e0bb49..d7748bf954 100644
--- a/ext/pcre/tests/preg_replace_error2.phpt
+++ b/ext/pcre/tests/preg_replace_error2.phpt
@@ -29,7 +29,7 @@ try {
}
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing preg_replace() : error conditions ***
Arg value is: this is a string
diff --git a/ext/pcre/tests/split2.phpt b/ext/pcre/tests/split2.phpt
index 5fafee3b87..3d9714a420 100644
--- a/ext/pcre/tests/split2.phpt
+++ b/ext/pcre/tests/split2.phpt
@@ -19,7 +19,7 @@ var_dump(preg_split('/(\d*)/', 'ab2c3u'));
var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);
?>
---EXPECTF--
+--EXPECT--
array(15) {
[0]=>
string(0) ""
diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt
index 8b9088b9b3..d44c0603e9 100644
--- a/ext/phar/tests/phar_isvalidpharfilename.phpt
+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt
@@ -72,7 +72,7 @@ var_dump(Phar::isValidPharFilename('dir.phar.php', false));
--CLEAN--
<?php
rmdir(__DIR__ . '/.phar');
---EXPECTF--
+--EXPECT--
bool(false)
bool(false)
bool(false)
diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index 822b5ac628..26d7257602 100644
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -24,5 +24,5 @@ $b->chmod(0666);
?>
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
---EXPECTF--
+--EXPECT--
Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod
diff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt
index 38e23f706d..8b4385ad5f 100644
--- a/ext/phar/tests/pharfileinfo_setmetadata.phpt
+++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt
@@ -40,7 +40,7 @@ echo $e->getMessage(), "\n";
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
---EXPECTF--
+--EXPECT--
Phar entry is a temporary directory (not an actual entry in the archive), cannot set metadata
Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata
Write operations disabled by the php.ini setting phar.readonly
diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt
index 19acc3ba99..9e9e158602 100644
--- a/ext/phar/tests/stat2_5.3.phpt
+++ b/ext/phar/tests/stat2_5.3.phpt
@@ -35,7 +35,7 @@ include $fname3;
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
---EXPECTF--
+--EXPECT--
bool(true)
is_link
bool(false)
diff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt
index e9dbe2a6ce..36ffcf4952 100644
--- a/ext/posix/tests/posix_getgrgid_error.phpt
+++ b/ext/posix/tests/posix_getgrgid_error.phpt
@@ -20,7 +20,7 @@ var_dump( posix_getgrgid($gid));
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing posix_getgrgid() : error conditions ***
-- Testing posix_getgrgid() function with a negative group id --
diff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt
index 19e306b2ee..85f12d4917 100644
--- a/ext/posix/tests/posix_getpgid_error.phpt
+++ b/ext/posix/tests/posix_getpgid_error.phpt
@@ -22,7 +22,7 @@ var_dump( posix_getpgid($pid) );
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing posix_getpgid() : error conditions ***
-- Testing posix_getpgid() with negative pid --
diff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt
index 365033b689..b4ec515e74 100644
--- a/ext/posix/tests/posix_getpwuid_error.phpt
+++ b/ext/posix/tests/posix_getpwuid_error.phpt
@@ -20,7 +20,7 @@ var_dump( posix_getpwuid($uid) );
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing posix_getpwuid() : error conditions ***
-- Testing posix_getpwuid() function negative uid --
diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 8e05a23496..08080230aa 100644
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -15,5 +15,5 @@ PHP Testfest Berlin 2009-05-10
<?php
var_dump( posix_getsid(-1) );
?>
---EXPECTF--
+--EXPECT--
bool(false)
diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index 20cf8cef8b..c77acfe3a4 100644
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -11,5 +11,5 @@ if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found
var_dump(posix_initgroups(NULL, NULL));
?>
---EXPECTF--
+--EXPECT--
bool(false)
diff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt
index 89474c4994..ea9b4f45dc 100644
--- a/ext/posix/tests/posix_kill_error.phpt
+++ b/ext/posix/tests/posix_kill_error.phpt
@@ -28,7 +28,7 @@ var_dump( posix_kill($pid, 999) );
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing posix_kill() : error conditions ***
-- Testing posix_kill() function with invalid signal --
diff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt
index 60b096656a..2792ff5b3b 100644
--- a/ext/posix/tests/posix_strerror_error.phpt
+++ b/ext/posix/tests/posix_strerror_error.phpt
@@ -20,7 +20,7 @@ echo gettype( posix_strerror($errno) )."\n";
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing posix_strerror() : error conditions ***
-- Testing posix_strerror() function with invalid error number --
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
index a135939052..607fead65c 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
@@ -16,7 +16,7 @@ var_dump($rc->hasProperty(1));
var_dump($rc->hasProperty(1.5));
var_dump($rc->hasProperty(true));
?>
---EXPECTF--
+--EXPECT--
Check invalid params:
bool(false)
bool(false)
diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
index 728ddf9265..7e45eec411 100644
--- a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
@@ -43,7 +43,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing ReflectionMethod::getClosure() : error conditions ***
-- Testing ReflectionMethod::getClosure() function with invalid object --
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
index 113cabbbeb..c3bab48d6f 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
@@ -69,7 +69,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
Non-instance:
string(72) "Given object is not an instance of the class this method was declared in"
diff --git a/ext/reflection/tests/ReflectionObject_getName_basic.phpt b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
index 1885695cb1..94ad1e2c7b 100644
--- a/ext/reflection/tests/ReflectionObject_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
@@ -15,7 +15,7 @@ $r3 = new ReflectionObject($r2);
var_dump($r3->getName());
?>
---EXPECTF--
+--EXPECT--
string(8) "stdClass"
string(1) "C"
string(16) "ReflectionObject"
diff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
index 1472615178..7defcb76e0 100644
--- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
@@ -25,7 +25,7 @@ reflectProperty("TestClass", "prot");
reflectProperty("TestClass", "priv");
?>
---EXPECTF--
+--EXPECT--
**********************************
Reflecting on property TestClass::pub
diff --git a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
index f58590b3ea..1f0c2b5f2b 100644
--- a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
@@ -32,7 +32,7 @@ $propInfo = new ReflectionProperty('TestClass', 'pub2');
var_dump($propInfo->setValue($instanceWithNoProperties, "NewValue"));
var_dump($instanceWithNoProperties->pub2);
?>
---EXPECTF--
+--EXPECT--
Protected property:
Cannot access non-public member TestClass::$prot
diff --git a/ext/session/tests/bug79221.phpt b/ext/session/tests/bug79221.phpt
index b0972c4697..0813457035 100644
--- a/ext/session/tests/bug79221.phpt
+++ b/ext/session/tests/bug79221.phpt
@@ -40,6 +40,6 @@ session_start();
var_dump($_SESSION);
session_destroy();
---EXPECTF--
+--EXPECT--
array(0) {
}
diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt
index 284649e277..d291d531c0 100644
--- a/ext/session/tests/session_cache_limiter_error.phpt
+++ b/ext/session/tests/session_cache_limiter_error.phpt
@@ -89,7 +89,7 @@ fclose($fp);
echo "Done";
ob_end_flush();
?>
---EXPECTF--
+--EXPECT--
*** Testing session_cache_limiter() : error functionality ***
-- Iteration 1 --
diff --git a/ext/spl/tests/bug61347.phpt b/ext/spl/tests/bug61347.phpt
index b83f48f7ff..4b4f9eaedf 100644
--- a/ext/spl/tests/bug61347.phpt
+++ b/ext/spl/tests/bug61347.phpt
@@ -21,7 +21,7 @@ var_dump(isset($b[37])); //true
var_dump(isset($b['no_exists'])); //false
var_dump(empty($b['b'])); //true
var_dump(empty($b[37])); //true
---EXPECTF--
+--EXPECT--
bool(false)
bool(false)
bool(false)
diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt
index e26a8d7aea..cce4a7d6a6 100644
--- a/ext/spl/tests/fileobject_005.phpt
+++ b/ext/spl/tests/fileobject_005.phpt
@@ -27,6 +27,6 @@ $fo->fwrite("blahlubba");
$path = __DIR__.DIRECTORY_SEPARATOR.'fileobject_005.txt';
unlink($path);
?>
---EXPECTF--
+--EXPECT--
bool(true)
string(4) "blah"
diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt
index 63d78cc78e..e245b95688 100644
--- a/ext/spl/tests/iterator_045.phpt
+++ b/ext/spl/tests/iterator_045.phpt
@@ -88,7 +88,7 @@ $it->testUnset($unsets);
$it->show();
?>
---EXPECTF--
+--EXPECT--
Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)
Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)
MyCachingIterator::testSet()
diff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt
index 4816896d8a..3b0eaf1d66 100644
--- a/ext/spl/tests/regexIterator_setMode_error.phpt
+++ b/ext/spl/tests/regexIterator_setMode_error.phpt
@@ -18,7 +18,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
int(0)
string(14) "Illegal mode 7"
int(0)
diff --git a/ext/spl/tests/spl_heap_is_empty_basic.phpt b/ext/spl/tests/spl_heap_is_empty_basic.phpt
index 4a90734ad4..abf64f8d9d 100644
--- a/ext/spl/tests/spl_heap_is_empty_basic.phpt
+++ b/ext/spl/tests/spl_heap_is_empty_basic.phpt
@@ -22,7 +22,7 @@ var_dump($heap->isEmpty());
$heap->extract();
var_dump($heap->isEmpty());
?>
---EXPECTF--
+--EXPECT--
bool(true)
bool(false)
bool(true)
diff --git a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
index 994c67e0c3..459beeca53 100644
--- a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
+++ b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
@@ -69,7 +69,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
int(1)
Unable to prepare statement: 23, not authorized
bool(true)
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
index 3f9fe84130..9a893c590d 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
@@ -44,7 +44,7 @@ var_dump($db->close());
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
Getting expanded SQL statement
string(21) "SELECT 42, 'php', 43;"
Execute statement
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index c51e98a67b..ed9f0458c4 100644
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -69,7 +69,7 @@ var_dump( current($mixed_array[1]) );
echo"Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing Error Conditions ***
NULL
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index c62be0d27c..fc10d293ff 100644
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -71,7 +71,7 @@ foreach ($varient_arrays as $sub_array ) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing basic operations ***
-- Iteration 1 --
int(0)
diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt
index 6aa7864ee9..69015289e2 100644
--- a/ext/standard/tests/array/array_diff_assoc_error.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_error.phpt
@@ -33,7 +33,7 @@ try {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_diff_assoc() : error conditions ***
-- Testing array_diff_assoc() function with zero arguments --
diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt
index d269f010b8..889c5ce1b2 100644
--- a/ext/standard/tests/array/array_diff_error.phpt
+++ b/ext/standard/tests/array/array_diff_error.phpt
@@ -33,7 +33,7 @@ try {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_diff() : error conditions ***
-- Testing array_diff() function with zero arguments --
diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt
index e957abce1c..80ff5728fe 100644
--- a/ext/standard/tests/array/array_diff_key_error.phpt
+++ b/ext/standard/tests/array/array_diff_key_error.phpt
@@ -28,7 +28,7 @@ try {
echo $e->getMessage(), "\n";
}
?>
---EXPECTF--
+--EXPECT--
*** Testing array_diff_key() : error conditions ***
-- Testing array_diff_key() function with less than expected no. of arguments --
diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt
index a1b18bd234..2cb21ca609 100644
--- a/ext/standard/tests/array/array_filter.phpt
+++ b/ext/standard/tests/array/array_filter.phpt
@@ -28,7 +28,7 @@ var_dump(array_filter($array3, "even"));
var_dump(array_filter(array()));
?>
---EXPECTF--
+--EXPECT--
Odd :
array(3) {
["a"]=>
diff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt
index 265daf1fb4..ff88d7a7f8 100644
--- a/ext/standard/tests/array/array_filter_variation10.phpt
+++ b/ext/standard/tests/array/array_filter_variation10.phpt
@@ -56,7 +56,7 @@ try {
echo "Done"
?>
---EXPECTF--
+--EXPECT--
*** Testing array_filter() : usage variations - using array keys in 'callback' ***
0 = 0
1 = 1
diff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt
index 4a6409bb1f..ef6cf45139 100644
--- a/ext/standard/tests/array/array_key_exists_variation3.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation3.phpt
@@ -34,7 +34,7 @@ foreach($keys as $key) {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_key_exists() : usage variations ***
-- Iteration 1 --
diff --git a/ext/standard/tests/array/array_map_error.phpt b/ext/standard/tests/array/array_map_error.phpt
index 4739bbf663..b41871e1c4 100644
--- a/ext/standard/tests/array/array_map_error.phpt
+++ b/ext/standard/tests/array/array_map_error.phpt
@@ -38,7 +38,7 @@ var_dump( array_map('callback2', $arr1, $arr2, $arr3) );
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_map() : error conditions ***
-- Testing array_map() function with one less than expected no. of arguments --
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index 08ecbf7147..75007779fa 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -83,7 +83,7 @@ var_dump(array_merge());
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_merge() basic functionality ***
--- Iteration 0 ---
diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
index 227a520ac1..78076b8fc4 100644
--- a/ext/standard/tests/array/array_push.phpt
+++ b/ext/standard/tests/array/array_push.phpt
@@ -60,7 +60,7 @@ var_dump( $mixed_array[2] );
echo"\nDone";
?>
---EXPECTF--
+--EXPECT--
*** Testing Edge Conditions ***
int(11)
int(1)
diff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt
index d19f5195d6..a76277883a 100644
--- a/ext/standard/tests/array/array_slice.phpt
+++ b/ext/standard/tests/array/array_slice.phpt
@@ -68,7 +68,7 @@ foreach ($var_array as $sub_array)
var_dump (array_slice($var_array[2], -3, -2, false) );
?>
---EXPECTF--
+--EXPECT--
*** Iteration 1 ***
*** Variation with first two Arguments ***
diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt
index 9ebe83391e..265de4e846 100644
--- a/ext/standard/tests/array/array_unshift.phpt
+++ b/ext/standard/tests/array/array_unshift.phpt
@@ -12,7 +12,7 @@ var_dump($a);
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
int(1)
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 1f5457c9f7..151c9c70d0 100644
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -24,7 +24,7 @@ try {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
int(1)
int(0)
string(4) "data"
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index dfc95d3af8..e5aeadcdc0 100644
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -54,7 +54,7 @@ try {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_walk() : error conditions - callback parameters ***
Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected
Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected
diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index 472cb1032d..d4d3e7d8eb 100644
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -24,7 +24,7 @@ try {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
int(1)
int(0)
string(4) "data"
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index f1686d7acd..2509c95f60 100644
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -54,7 +54,7 @@ try {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing array_walk_recursive() : error conditions - callback parameters ***
Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected
Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected
diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
index a0c159d71d..a1cbdad2bd 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";
var_dump( array_walk_recursive( $input, function() { echo "1\n"; }));
echo "Done"
?>
---EXPECTF--
+--EXPECT--
*** Testing array_walk_recursive() : anonymous function as callback ***
-- Anonymous function with one argument --
int(2)
diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt
index 0354782eda..3689f8a798 100644
--- a/ext/standard/tests/array/array_walk_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_variation7.phpt
@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";
var_dump( array_walk( $input, function() { echo "1\n"; }));
echo "Done"
?>
---EXPECTF--
+--EXPECT--
*** Testing array_walk() : anonymous function as callback ***
-- Anonymous function with one argument --
int(2)
diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt
index d27cd569c0..b6abdeaef3 100644
--- a/ext/standard/tests/array/uasort_variation8.phpt
+++ b/ext/standard/tests/array/uasort_variation8.phpt
@@ -29,7 +29,7 @@ var_dump($array_arg);
echo "Done"
?>
---EXPECTF--
+--EXPECT--
*** Testing uasort() : built in function as 'cmp_function' ***
-- Testing uasort() with built-in 'cmp_function': strcasecmp() --
bool(true)
diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt
index 55ff362d41..4a750ccefa 100644
--- a/ext/standard/tests/array/usort_variation8.phpt
+++ b/ext/standard/tests/array/usort_variation8.phpt
@@ -31,7 +31,7 @@ var_dump( usort($temp_array2, 'strcmp') );
var_dump($temp_array2);
?>
---EXPECTF--
+--EXPECT--
*** Testing usort() : usage variation ***
-- Testing usort() with built-in 'cmp_function': strcasecmp() --
diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index a28ea58d5a..7b550b36d1 100644
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -67,7 +67,7 @@ var_dump($rao=assert_options(ASSERT_CALLBACK));
echo "ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n";
var_dump($r2=assert(0 != 0));
echo"\n";
---EXPECTF--
+--EXPECT--
Initial values: assert_options(ASSERT_CALLBACK) => [f1]
Initial values: ini.get("assert.callback") => [f1]
f1 called
diff --git a/ext/standard/tests/file/auto_detect_line_endings_1.phpt b/ext/standard/tests/file/auto_detect_line_endings_1.phpt
index c79082ecdb..5a4ff0a10f 100644
--- a/ext/standard/tests/file/auto_detect_line_endings_1.phpt
+++ b/ext/standard/tests/file/auto_detect_line_endings_1.phpt
@@ -15,7 +15,7 @@ var_dump(fgets(STDIN));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(1) "1"
string(8) "fooBar1
"
string(8) "fooBar2
"
diff --git a/ext/standard/tests/file/auto_detect_line_endings_2.phpt b/ext/standard/tests/file/auto_detect_line_endings_2.phpt
index f33a055e08..3994f1ee3b 100644
--- a/ext/standard/tests/file/auto_detect_line_endings_2.phpt
+++ b/ext/standard/tests/file/auto_detect_line_endings_2.phpt
@@ -16,7 +16,7 @@ var_dump(fgets($stdin));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(2) "on"
string(8) "fooBar1
"
string(8) "fooBar2
"
diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt
index 8352f4da4b..7a98e833a3 100644
--- a/ext/standard/tests/file/basename.phpt
+++ b/ext/standard/tests/file/basename.phpt
@@ -138,7 +138,7 @@ check_basename( $file_path_variations );
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing basic operations ***
--Iteration 1--
diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt
index 6605b795ff..4acadc6169 100644
--- a/ext/standard/tests/file/fscanf.phpt
+++ b/ext/standard/tests/file/fscanf.phpt
@@ -75,7 +75,7 @@ echo "Done\n";
$filename = __DIR__."/fscanf.dat";
unlink($filename);
?>
---EXPECTF--
+--EXPECT--
int(0)
NULL
int(1)
diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt
index f657c07005..507ed8e22d 100644
--- a/ext/standard/tests/file/fscanf_variation10.phpt
+++ b/ext/standard/tests/file/fscanf_variation10.phpt
@@ -82,7 +82,7 @@ $file_path = __DIR__;
$filename = "$file_path/fscanf_variation10.tmp";
unlink($filename);
?>
---EXPECTF--
+--EXPECT--
*** Test fscanf(): different float format types with resource ***
-- iteration 1 --
diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index e82d9ae034..1cf1f25138 100644
--- a/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@ -30,7 +30,7 @@ foreach($dirnames as $dirname) {
var_dump( is_dir($dirname) );
}
?>
---EXPECTF--
+--EXPECT--
*** Testing is_dir() with Invalid arguments: expected bool(false) ***
bool(false)
bool(false)
diff --git a/ext/standard/tests/file/is_executable_error.phpt b/ext/standard/tests/file/is_executable_error.phpt
index ad90d64435..e77ca86349 100644
--- a/ext/standard/tests/file/is_executable_error.phpt
+++ b/ext/standard/tests/file/is_executable_error.phpt
@@ -10,7 +10,7 @@ echo "\n*** Testing is_exceutable() on non-existent directory ***\n";
var_dump( is_executable(__DIR__."/is_executable") );
echo "Done\n";
---EXPECTF--
+--EXPECT--
*** Testing is_exceutable() on non-existent directory ***
bool(false)
Done
diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt
index 92ad3320d3..802dbfdf7e 100644
--- a/ext/standard/tests/file/is_executable_variation3.phpt
+++ b/ext/standard/tests/file/is_executable_variation3.phpt
@@ -40,7 +40,7 @@ foreach( $invalid_files as $invalid_file ) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_executable(): usage variations ***
*** Testing is_executable() on invalid files ***
diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index d33b01dfb3..5bdb63e37c 100644
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -39,7 +39,7 @@ foreach([
clearstatcache();
}
?>
---EXPECTF--
+--EXPECT--
float(-2.34555): 0
string(1) " ": 0
string(0) "": 0
diff --git a/ext/standard/tests/file/is_readable_error.phpt b/ext/standard/tests/file/is_readable_error.phpt
index 1520eb4d20..c8a6c34fa0 100644
--- a/ext/standard/tests/file/is_readable_error.phpt
+++ b/ext/standard/tests/file/is_readable_error.phpt
@@ -11,7 +11,7 @@ var_dump( is_readable(__DIR__."/is_readable.tmp") );
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_readable() on non-existent file ***
bool(false)
Done
diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt
index 97c794d1b7..f7eebdc2b8 100644
--- a/ext/standard/tests/file/is_readable_variation3.phpt
+++ b/ext/standard/tests/file/is_readable_variation3.phpt
@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_readable(): usage variations ***
*** Testing is_readable() on miscellaneous filenames ***
diff --git a/ext/standard/tests/file/is_uploaded_file_basic.phpt b/ext/standard/tests/file/is_uploaded_file_basic.phpt
index d053244a79..3e5bf6320c 100644
--- a/ext/standard/tests/file/is_uploaded_file_basic.phpt
+++ b/ext/standard/tests/file/is_uploaded_file_basic.phpt
@@ -30,7 +30,7 @@ var_dump(is_uploaded_file('random_filename.txt'));
var_dump(is_uploaded_file('__FILE__'));
?>
---EXPECTF--
+--EXPECT--
bool(true)
bool(false)
bool(false)
diff --git a/ext/standard/tests/file/is_writable_error.phpt b/ext/standard/tests/file/is_writable_error.phpt
index e2a38412cd..f01e69b13d 100644
--- a/ext/standard/tests/file/is_writable_error.phpt
+++ b/ext/standard/tests/file/is_writable_error.phpt
@@ -14,7 +14,7 @@ var_dump( is_writeable(__DIR__."/is_writable") );
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_writable() on non-existent file ***
bool(false)
bool(false)
diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt
index c5843a5abf..167d874ac2 100644
--- a/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {
clearstatcache();
}
?>
---EXPECTF--
+--EXPECT--
*** Testing is_writable(): usage variations ***
*** Testing is_writable() with invalid filenames ***
diff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt
index 7af8748fe2..b80c052691 100644
--- a/ext/standard/tests/file/move_uploaded_file_basic.phpt
+++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt
@@ -50,7 +50,7 @@ var_dump(move_uploaded_file($_FILES['file2']['tmp_name'], $destination4));
unlink($destination4);
?>
---EXPECTF--
+--EXPECT--
Valid move
bool(true)
bool(true)
diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt
index bb7ccf542b..c17d5d3e71 100644
--- a/ext/standard/tests/general_functions/get_include_path_basic.phpt
+++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt
@@ -20,7 +20,7 @@ if (ini_get("include_path") == get_include_path()) {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing get_include_path()
string(1) "."
PASSED
diff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt
index 56327500ea..06e806b3a2 100644
--- a/ext/standard/tests/general_functions/include_path.phpt
+++ b/ext/standard/tests/general_functions/include_path.phpt
@@ -31,7 +31,7 @@ var_dump(get_include_path());
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(1) "."
NULL
string(1) "."
diff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt
index 200ecbd6ac..37de6d5a5b 100644
--- a/ext/standard/tests/general_functions/is_array.phpt
+++ b/ext/standard/tests/general_functions/is_array.phpt
@@ -103,7 +103,7 @@ echo "Done\n";
fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_array() on different type of arrays ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt
index 7c8d693a1b..70aaed9c3f 100644
--- a/ext/standard/tests/general_functions/is_bool.phpt
+++ b/ext/standard/tests/general_functions/is_bool.phpt
@@ -134,7 +134,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_bool() with valid boolean values ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt
index dc6df0f109..1815e53c00 100644
--- a/ext/standard/tests/general_functions/is_float_64bit.phpt
+++ b/ext/standard/tests/general_functions/is_float_64bit.phpt
@@ -131,7 +131,7 @@ foreach ($not_floats as $value ) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_float(), is_double() and is_real() with float values***
-- Iteration 1 --
bool(false)
diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt
index e5c6ce77e0..8e5e9332c0 100644
--- a/ext/standard/tests/general_functions/is_int_64bit.phpt
+++ b/ext/standard/tests/general_functions/is_int_64bit.phpt
@@ -136,7 +136,7 @@ foreach ($not_int_types as $type ) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing is_int(), is_integer() & is_long() with valid integer values ***
--Iteration 1--
bool(true)
diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt
index 4fc325c744..6560707e57 100644
--- a/ext/standard/tests/general_functions/is_null.phpt
+++ b/ext/standard/tests/general_functions/is_null.phpt
@@ -134,7 +134,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_null() with valid null values ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt
index 491aa5d15b..8883c57ac2 100644
--- a/ext/standard/tests/general_functions/is_numeric.phpt
+++ b/ext/standard/tests/general_functions/is_numeric.phpt
@@ -152,7 +152,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_numeric() with valid numeric values ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt
index dd0e7689fd..8a5ac1bcbe 100644
--- a/ext/standard/tests/general_functions/is_object.phpt
+++ b/ext/standard/tests/general_functions/is_object.phpt
@@ -145,7 +145,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_object() with valid objects ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt
index f7ef3f5317..6a89da9f56 100644
--- a/ext/standard/tests/general_functions/is_scalar.phpt
+++ b/ext/standard/tests/general_functions/is_scalar.phpt
@@ -112,7 +112,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing basic operations ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt
index 7760f79831..a4ef7a47b1 100644
--- a/ext/standard/tests/general_functions/is_string.phpt
+++ b/ext/standard/tests/general_functions/is_string.phpt
@@ -147,7 +147,7 @@ fclose($fp);
closedir($dfp);
?>
---EXPECTF--
+--EXPECT--
*** Testing is_string() with valid string values ***
-- Iteration 1 --
bool(true)
diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt
index 46d5d2d0f6..0eb1adf9ee 100644
--- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt
+++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt
@@ -32,7 +32,7 @@ dump_string_length( '' );
dump_string_length( null );
?>
---EXPECTF--
+--EXPECT--
*** Testing ob_get_length() : basic functionality ***
bool(false)
int(26)
diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt
index 23859a33ac..c64c15b404 100644
--- a/ext/standard/tests/general_functions/php_uname_error.phpt
+++ b/ext/standard/tests/general_functions/php_uname_error.phpt
@@ -13,7 +13,7 @@ echo "\n-- Testing php_uname() function with invalid mode --\n";
var_dump( php_uname('z') == php_uname('z') );
?>
---EXPECTF--
+--EXPECT--
*** Testing php_uname() - error test
-- Testing php_uname() function with invalid mode --
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index 3f24a5bc9d..d2ec63f5b4 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -276,7 +276,7 @@ closedir($dir_handle);
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing print_r() on integer variables ***
-- Iteration 1 --
diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt
index a0e9e148c6..5df1637dbd 100644
--- a/ext/standard/tests/general_functions/print_r_64bit.phpt
+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt
@@ -280,7 +280,7 @@ closedir($dir_handle);
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing print_r() on integer variables ***
-- Iteration 1 --
diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt
index 0600775f58..7b74761586 100644
--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt
+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt
@@ -279,7 +279,7 @@ closedir($dir_handle);
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing var_dump() on integer variables ***
-- Iteration 1 --
int(0)
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt
index bdc61d9928..9f9cd0e896 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -307,7 +307,7 @@ echo "\nDone";
?>
---EXPECTF--
+--EXPECT--
*** Testing var_export() with integer values ***
*** Output for integer values ***
diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt
index 249df57943..448aac4e99 100644
--- a/ext/standard/tests/image/image_type_to_extension.phpt
+++ b/ext/standard/tests/image/image_type_to_extension.phpt
@@ -33,7 +33,7 @@ image_type_to_extension()
var_dump(image_type_to_extension(0));
?>
Done
---EXPECTF--
+--EXPECT--
Constant: IMAGETYPE_GIF
With dot: .gif
Without dot: gif
diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt
index 95811c6f3c..ca76b5c836 100644
--- a/ext/standard/tests/math/lcg_value_basic.phpt
+++ b/ext/standard/tests/math/lcg_value_basic.phpt
@@ -24,7 +24,7 @@ if ($i != 100) {
echo "MATHS test script completed\n";
?>
---EXPECTF--
+--EXPECT--
MATHS test script started
lcg_value tests...
diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 29b4aa0e6b..b25265446f 100644
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -35,7 +35,7 @@ foreach ($array as $val) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(9) "127.0.0.1"
string(13) "255.255.255.0"
bool(false)
diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index c659eb70fb..dd81bde55c 100644
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -29,7 +29,7 @@ var_dump(long2ip(-110000));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
int(2130706433)
string(9) "127.0.0.1"
int(167772161)
diff --git a/ext/standard/tests/random/random_int.phpt b/ext/standard/tests/random/random_int.phpt
index 94654a7f72..6fd04420ee 100644
--- a/ext/standard/tests/random/random_int.phpt
+++ b/ext/standard/tests/random/random_int.phpt
@@ -15,7 +15,7 @@ var_dump(is_int(random_int(PHP_INT_MIN, PHP_INT_MAX)));
var_dump(random_int(42,42));
?>
---EXPECTF--
+--EXPECT--
bool(true)
bool(true)
bool(true)
diff --git a/ext/standard/tests/serialize/bug45706.phpt b/ext/standard/tests/serialize/bug45706.phpt
index cc71dec4e6..c29081cab7 100644
--- a/ext/standard/tests/serialize/bug45706.phpt
+++ b/ext/standard/tests/serialize/bug45706.phpt
@@ -12,7 +12,7 @@ $s = serialize($x);
$s = str_replace("Foo", "Bar", $s);
$y = unserialize($s);
var_dump($y);
---EXPECTF--
+--EXPECT--
array(2) {
[0]=>
object(__PHP_Incomplete_Class)#3 (5) {
diff --git a/ext/standard/tests/streams/bug61115.phpt b/ext/standard/tests/streams/bug61115.phpt
index 3caffde232..ce6b57651c 100644
--- a/ext/standard/tests/streams/bug61115.phpt
+++ b/ext/standard/tests/streams/bug61115.phpt
@@ -13,5 +13,5 @@ try {
echo $e->getMessage(), "\n";
}
?>
---EXPECTF--
+--EXPECT--
Object of class Closure could not be converted to string
diff --git a/ext/standard/tests/streams/bug78662.phpt b/ext/standard/tests/streams/bug78662.phpt
index e874d5aef6..2ea00b67b1 100644
--- a/ext/standard/tests/streams/bug78662.phpt
+++ b/ext/standard/tests/streams/bug78662.phpt
@@ -26,7 +26,7 @@ var_dump(fwrite($f, "bar"));
var_dump(fread($f, 100));
?>
Done
---EXPECTF--
+--EXPECT--
bool(false)
bool(false)
Done
diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt
index 7dcc645422..64e9aa5773 100644
--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt
+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt
@@ -41,7 +41,7 @@ fclose($server);
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing stream_set_timeout() : error conditions ***
-- Testing stream_set_timeout() function with a closed socket --
diff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt
index 2603b69210..b6bd9973b6 100644
--- a/ext/standard/tests/strings/chr_error.phpt
+++ b/ext/standard/tests/strings/chr_error.phpt
@@ -26,7 +26,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing chr() : error conditions ***
-- Testing chr() function with no arguments --
diff --git a/ext/standard/tests/strings/fprintf_error.phpt b/ext/standard/tests/strings/fprintf_error.phpt
index 1ffc188051..bfef30a75b 100644
--- a/ext/standard/tests/strings/fprintf_error.phpt
+++ b/ext/standard/tests/strings/fprintf_error.phpt
@@ -29,7 +29,7 @@ try {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing Error Conditions ***
Wrong parameter count for fprintf()
Wrong parameter count for fprintf()
diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt
index f2abfd5ba8..2a04bd345e 100644
--- a/ext/standard/tests/strings/htmlentities24.phpt
+++ b/ext/standard/tests/strings/htmlentities24.phpt
@@ -37,7 +37,7 @@ var_dump( htmlentities($str, ENT_COMPAT) );
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Retrieving htmlentities for 256 characters ***
string(12) "636872283029"
string(12) "636872283129"
diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt
index 6e5c5fac36..5677da6fe2 100644
--- a/ext/standard/tests/strings/htmlspecialchars.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars.phpt
@@ -37,7 +37,7 @@ var_dump( htmlspecialchars($str, ENT_COMPAT) );
echo "Done\n"
?>
---EXPECTF--
+--EXPECT--
*** Retrieving htmlspecialchars for 256 characters ***
string(12) "636872283029"
string(12) "636872283129"
diff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt
index 51287e04d7..8ac57ca92e 100644
--- a/ext/standard/tests/strings/ltrim.phpt
+++ b/ext/standard/tests/strings/ltrim.phpt
@@ -41,7 +41,7 @@ var_dump( ltrim($str, "\nusi") );
echo "\nDone\n";
?>
---EXPECTF--
+--EXPECT--
*** Output for Error Conditions ***
*** Using heredoc string ***
diff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt
index 2bc16b3248..a6b52e3934 100644
--- a/ext/standard/tests/strings/metaphone.phpt
+++ b/ext/standard/tests/strings/metaphone.phpt
@@ -24,7 +24,7 @@ foreach($array as $str) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(0) ""
string(0) ""
bool(false)
diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt
index 60277fa184..38652ba0fa 100644
--- a/ext/standard/tests/strings/parse_str_basic1.phpt
+++ b/ext/standard/tests/strings/parse_str_basic1.phpt
@@ -27,7 +27,7 @@ var_dump(parse_str($s1, $res3_array));
var_dump($res3_array);
?>
---EXPECTF--
+--EXPECT--
*** Testing parse_str() : basic functionality ***
Basic test WITH undefined var for result arg
diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt
index 25b5f8745d..0ea88a365b 100644
--- a/ext/standard/tests/strings/parse_str_basic3.phpt
+++ b/ext/standard/tests/strings/parse_str_basic3.phpt
@@ -73,7 +73,7 @@ var_dump(parse_str($str, $res));
var_dump($res);
?>
---EXPECTF--
+--EXPECT--
*** Testing parse_str() : basic functionality ***
Test string with array values and results array
diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt
index 62591e9e6f..e9fc0a4383 100644
--- a/ext/standard/tests/strings/printf_error.phpt
+++ b/ext/standard/tests/strings/printf_error.phpt
@@ -61,7 +61,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing printf() : error conditions ***
-- Testing printf() function with Zero arguments --
diff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt
index 223a839f58..2fc531faad 100644
--- a/ext/standard/tests/strings/rtrim.phpt
+++ b/ext/standard/tests/strings/rtrim.phpt
@@ -42,7 +42,7 @@ var_dump( rtrim($str, "ing") );
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Output for Normal Behaviour ***
string(10) "rtrim test"
string(13) "rtrim test "
diff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt
index ef61ac495e..c4acc2ff68 100644
--- a/ext/standard/tests/strings/soundex.phpt
+++ b/ext/standard/tests/strings/soundex.phpt
@@ -30,7 +30,7 @@ foreach ($array as $str) {
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
bool(false)
string(4) "0000"
string(4) "F650"
diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt
index 07774a92ec..66d85647ff 100644
--- a/ext/standard/tests/strings/sprintf_variation15.phpt
+++ b/ext/standard/tests/strings/sprintf_variation15.phpt
@@ -74,7 +74,7 @@ foreach($string_values as $string_value) {
echo "Done";
?>
---EXPECTF--
+--EXPECT--
*** Testing sprintf() : string formats with string values ***
-- Iteration 1 --
diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt
index ffaefb8418..0af8f9ed14 100644
--- a/ext/standard/tests/strings/sscanf_error.phpt
+++ b/ext/standard/tests/strings/sscanf_error.phpt
@@ -20,7 +20,7 @@ try {
echo $exception->getMessage() . "\n";
}
?>
---EXPECTF--
+--EXPECT--
*** Testing sscanf() : error conditions ***
-- Testing sscanf() function with more than expected no. of arguments --
diff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt
index a5a35769e4..c360004a14 100644
--- a/ext/standard/tests/strings/str_ireplace.phpt
+++ b/ext/standard/tests/strings/str_ireplace.phpt
@@ -44,7 +44,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(0) ""
string(8) "aaaaaaaT"
string(8) "aaaaaaaT"
diff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt
index 7b1b5312a1..09e6cff53c 100644
--- a/ext/standard/tests/strings/stristr.phpt
+++ b/ext/standard/tests/strings/stristr.phpt
@@ -14,7 +14,7 @@ stristr() function
var_dump(md5(stristr("\\\\a\\", "\\a")));
var_dump(stristr("tEsT sTrInG", " "));
?>
---EXPECTF--
+--EXPECT--
string(11) "tEsT sTrInG"
string(6) "sTrInG"
string(6) "sTrInG"
diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt
index a75dd96bbf..f28571ba7f 100644
--- a/ext/standard/tests/strings/strrchr_variation1.phpt
+++ b/ext/standard/tests/strings/strrchr_variation1.phpt
@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {
}
echo "*** Done ***";
?>
---EXPECTF--
+--EXPECT--
*** Testing strrchr() function: with various double quoted strings ***
-- Iteration 1 --
string(16) "lo123456he #4 A "
diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt
index 2ff6720fb9..e6e510dd55 100644
--- a/ext/standard/tests/strings/strrchr_variation2.phpt
+++ b/ext/standard/tests/strings/strrchr_variation2.phpt
@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {
}
echo "*** Done ***";
?>
---EXPECTF--
+--EXPECT--
*** Testing strrchr() function: with various single quoted strings ***
-- Iteration 1 --
string(22) "lo123456he \x234 \101 "
diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt
index 7c7e2bb4c7..041b66a00c 100644
--- a/ext/standard/tests/strings/strtolower.phpt
+++ b/ext/standard/tests/strings/strtolower.phpt
@@ -65,7 +65,7 @@ else
echo "*** Done ***";
?>
---EXPECTF--
+--EXPECT--
*** Testing strtolower() with 128 chars ***
00 => 00
01 => 01
diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt
index c243ff10c7..6c7434ba16 100644
--- a/ext/standard/tests/strings/strtoupper1.phpt
+++ b/ext/standard/tests/strings/strtoupper1.phpt
@@ -65,7 +65,7 @@ else
echo "*** Done ***";
?>
---EXPECTF--
+--EXPECT--
*** Testing strtoupper() with 128 chars ***
00 => 00
01 => 01
diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt
index a363e26f24..88cca824a6 100644
--- a/ext/standard/tests/strings/strval_error.phpt
+++ b/ext/standard/tests/strings/strval_error.phpt
@@ -25,7 +25,7 @@ try {
}
?>
---EXPECTF--
+--EXPECT--
*** Testing strval() : error conditions ***
-- Testing strval() function with object which has not toString() method --
diff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt
index fe687ed1ae..6028c17008 100644
--- a/ext/standard/tests/strings/substr.phpt
+++ b/ext/standard/tests/strings/substr.phpt
@@ -66,7 +66,7 @@ var_dump (substr("abcdef" , 2, NULL) );
echo"\nDone";
?>
---EXPECTF--
+--EXPECT--
--- Iteration 1 ---
-- Variations for two arguments --
diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt
index 1ad504c61d..a31d7213a1 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
@@ -49,7 +49,7 @@ var_dump( trim($str, "us\ning") );
echo "\nDone";
?>
---EXPECTF--
+--EXPECT--
string(0) ""
string(0) ""
string(1) "0"
diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt
index f2057ea388..fdaecd6fb3 100644
--- a/ext/standard/tests/strings/vfprintf_error1.phpt
+++ b/ext/standard/tests/strings/vfprintf_error1.phpt
@@ -42,7 +42,7 @@ $file = 'vfprintf_error1.txt';
unlink( $file );
?>
---EXPECTF--
+--EXPECT--
-- Testing vfprintf() function with more than expected no. of arguments --
Wrong parameter count for vfprintf()
Wrong parameter count for vfprintf()
diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt
index d7eb11fc55..87965cd1a2 100644
--- a/ext/standard/tests/time/strptime_error.phpt
+++ b/ext/standard/tests/time/strptime_error.phpt
@@ -24,7 +24,7 @@ $format = '%b %d %Y %H:%M:%S';
var_dump( strptime('foo', $format) );
?>
---EXPECTF--
+--EXPECT--
*** Testing strptime() : error conditions ***
-- Testing strptime() function on failure --
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index 8e58c81891..006377d5e9 100644
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -129,7 +129,7 @@ echo token_name(0x8000000F), "\n";
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
T_INCLUDE
T_INCLUDE_ONCE
T_EVAL
diff --git a/ext/xmlreader/tests/static.phpt b/ext/xmlreader/tests/static.phpt
index 1c6cb5b870..a722e31105 100644
--- a/ext/xmlreader/tests/static.phpt
+++ b/ext/xmlreader/tests/static.phpt
@@ -22,7 +22,7 @@ while ($reader->read()) {
echo $reader->name, "\n";
}
?>
---EXPECTF--
+--EXPECT--
books
books
books
diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt
index 886e149261..c04ffe3167 100644
--- a/ext/xmlwriter/tests/bug41326.phpt
+++ b/ext/xmlwriter/tests/bug41326.phpt
@@ -35,7 +35,7 @@ $xw->endElement();
$xw->endDocument();
print $xw->flush(true);
?>
---EXPECTF--
+--EXPECT--
<?xml version="1.0"?>
<test>
<foo/>
diff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt
index 55a25f1c9f..e7c1038350 100644
--- a/tests/output/stream_isatty_err.phpt
+++ b/tests/output/stream_isatty_err.phpt
@@ -13,7 +13,7 @@ STDERR
require __DIR__.'/stream_isatty.inc';
testToStdErr();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(true)
STDIN (fopen): bool(true)
STDIN (php://fd/0): bool(true)
diff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt
index 2554eb4689..73514955d4 100644
--- a/tests/output/stream_isatty_in-err.phpt
+++ b/tests/output/stream_isatty_in-err.phpt
@@ -13,7 +13,7 @@ STDIN STDERR
require __DIR__.'/stream_isatty.inc';
testToStdErr();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(false)
STDIN (fopen): bool(false)
STDIN (php://fd/0): bool(false)
diff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt
index 496bdd100e..9b65e8861b 100644
--- a/tests/output/stream_isatty_in-out-err.phpt
+++ b/tests/output/stream_isatty_in-out-err.phpt
@@ -13,7 +13,7 @@ STDIN STDOUT STDERR
require __DIR__.'/stream_isatty.inc';
testToStdOut();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(false)
STDIN (fopen): bool(false)
STDIN (php://fd/0): bool(false)
diff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt
index d58e9aa05c..c2bb346854 100644
--- a/tests/output/stream_isatty_in-out.phpt
+++ b/tests/output/stream_isatty_in-out.phpt
@@ -13,7 +13,7 @@ STDIN STDOUT
require __DIR__.'/stream_isatty.inc';
testToStdOut();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(false)
STDIN (fopen): bool(false)
STDIN (php://fd/0): bool(false)
diff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt
index e3ec1237bc..dc113a9720 100644
--- a/tests/output/stream_isatty_out-err.phpt
+++ b/tests/output/stream_isatty_out-err.phpt
@@ -13,7 +13,7 @@ STDOUT STDERR
require __DIR__.'/stream_isatty.inc';
testToStdOut();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(true)
STDIN (fopen): bool(true)
STDIN (php://fd/0): bool(true)
diff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt
index 3ea4996ac4..f18c986c5a 100644
--- a/tests/output/stream_isatty_out.phpt
+++ b/tests/output/stream_isatty_out.phpt
@@ -13,7 +13,7 @@ STDOUT
require __DIR__.'/stream_isatty.inc';
testToStdOut();
?>
---EXPECTF--
+--EXPECT--
STDIN (constant): bool(true)
STDIN (fopen): bool(true)
STDIN (php://fd/0): bool(true)
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Mon Apr 27 21:01:47 2020 +0200
#
# On branch tests/use-simpler-expect-section
# Your branch and 'fork/tests/use-simpler-expect-section' have diverged,
# and have 1 and 1 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# Changes to be committed:
# modified: Zend/tests/005.phpt
# modified: Zend/tests/bug27669.phpt
# modified: Zend/tests/bug51827.phpt
# modified: Zend/tests/bug63206.phpt
# modified: Zend/tests/bug63206_1.phpt
# modified: Zend/tests/bug63206_2.phpt
# modified: Zend/tests/incompat_ctx_user.phpt
# modified: Zend/tests/instanceof_001.phpt
# modified: Zend/tests/unexpected_ref_bug.phpt
# modified: ext/date/tests/012.phpt
# modified: ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
# modified: ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
# modified: ext/date/tests/date_parse_001.phpt
# modified: ext/date/tests/date_parse_error.phpt
# modified: ext/date/tests/gmmktime_basic.phpt
# modified: ext/date/tests/mktime_error.phpt
# modified: ext/date/tests/timezone_abbreviations_list_basic1.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic.phpt
# modified: ext/filter/tests/007.phpt
# modified: ext/filter/tests/008.phpt
# modified: ext/filter/tests/010.phpt
# modified: ext/hash/tests/hash_hkdf_edges.phpt
# modified: ext/hash/tests/hash_hmac_file_basic.phpt
# modified: ext/json/tests/json_last_error_msg_error.phpt
# modified: ext/libxml/tests/bug76777.phpt
# modified: ext/pcre/tests/preg_replace_error2.phpt
# modified: ext/pcre/tests/split2.phpt
# modified: ext/phar/tests/phar_isvalidpharfilename.phpt
# modified: ext/phar/tests/pharfileinfo_chmod.phpt
# modified: ext/phar/tests/pharfileinfo_setmetadata.phpt
# modified: ext/phar/tests/stat2_5.3.phpt
# modified: ext/posix/tests/posix_getgrgid_error.phpt
# modified: ext/posix/tests/posix_getpgid_error.phpt
# modified: ext/posix/tests/posix_getpwuid_error.phpt
# modified: ext/posix/tests/posix_getsid_error.phpt
# modified: ext/posix/tests/posix_initgroups.phpt
# modified: ext/posix/tests/posix_kill_error.phpt
# modified: ext/posix/tests/posix_strerror_error.phpt
# modified: ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
# modified: ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
# modified: ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
# modified: ext/reflection/tests/ReflectionObject_getName_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_setValue_error.phpt
# modified: ext/session/tests/bug79221.phpt
# modified: ext/session/tests/session_cache_limiter_error.phpt
# modified: ext/spl/tests/bug61347.phpt
# modified: ext/spl/tests/fileobject_005.phpt
# modified: ext/spl/tests/iterator_045.phpt
# modified: ext/spl/tests/regexIterator_setMode_error.phpt
# modified: ext/spl/tests/spl_heap_is_empty_basic.phpt
# modified: ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
# modified: ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
# modified: ext/standard/tests/array/005.phpt
# modified: ext/standard/tests/array/009.phpt
# modified: ext/standard/tests/array/array_diff_assoc_error.phpt
# modified: ext/standard/tests/array/array_diff_error.phpt
# modified: ext/standard/tests/array/array_diff_key_error.phpt
# modified: ext/standard/tests/array/array_filter.phpt
# modified: ext/standard/tests/array/array_filter_variation10.phpt
# modified: ext/standard/tests/array/array_key_exists_variation3.phpt
# modified: ext/standard/tests/array/array_map_error.phpt
# modified: ext/standard/tests/array/array_merge.phpt
# modified: ext/standard/tests/array/array_push.phpt
# modified: ext/standard/tests/array/array_slice.phpt
# modified: ext/standard/tests/array/array_unshift.phpt
# modified: ext/standard/tests/array/array_walk.phpt
# modified: ext/standard/tests/array/array_walk_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive1.phpt
# modified: ext/standard/tests/array/array_walk_recursive_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive_variation7.phpt
# modified: ext/standard/tests/array/array_walk_variation7.phpt
# modified: ext/standard/tests/array/uasort_variation8.phpt
# modified: ext/standard/tests/array/usort_variation8.phpt
# modified: ext/standard/tests/assert/assert_variation.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_1.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_2.phpt
# modified: ext/standard/tests/file/basename.phpt
# modified: ext/standard/tests/file/fscanf.phpt
# modified: ext/standard/tests/file/fscanf_variation10.phpt
# modified: ext/standard/tests/file/is_dir_variation3.phpt
# modified: ext/standard/tests/file/is_executable_error.phpt
# modified: ext/standard/tests/file/is_executable_variation3.phpt
# modified: ext/standard/tests/file/is_file_variation3.phpt
# modified: ext/standard/tests/file/is_readable_error.phpt
# modified: ext/standard/tests/file/is_readable_variation3.phpt
# modified: ext/standard/tests/file/is_uploaded_file_basic.phpt
# modified: ext/standard/tests/file/is_writable_error.phpt
# modified: ext/standard/tests/file/is_writable_variation3.phpt
# modified: ext/standard/tests/file/move_uploaded_file_basic.phpt
# modified: ext/standard/tests/general_functions/get_include_path_basic.phpt
# modified: ext/standard/tests/general_functions/include_path.phpt
# modified: ext/standard/tests/general_functions/is_array.phpt
# modified: ext/standard/tests/general_functions/is_bool.phpt
# modified: ext/standard/tests/general_functions/is_float_64bit.phpt
# modified: ext/standard/tests/general_functions/is_int_64bit.phpt
# modified: ext/standard/tests/general_functions/is_null.phpt
# modified: ext/standard/tests/general_functions/is_numeric.phpt
# modified: ext/standard/tests/general_functions/is_object.phpt
# modified: ext/standard/tests/general_functions/is_scalar.phpt
# modified: ext/standard/tests/general_functions/is_string.phpt
# modified: ext/standard/tests/general_functions/ob_get_length_basic.phpt
# modified: ext/standard/tests/general_functions/php_uname_error.phpt
# modified: ext/standard/tests/general_functions/print_r.phpt
# modified: ext/standard/tests/general_functions/print_r_64bit.phpt
# modified: ext/standard/tests/general_functions/var_dump_64bit.phpt
# modified: ext/standard/tests/general_functions/var_export-locale.phpt
# modified: ext/standard/tests/image/image_type_to_extension.phpt
# modified: ext/standard/tests/math/lcg_value_basic.phpt
# modified: ext/standard/tests/network/inet.phpt
# modified: ext/standard/tests/network/ip_x86_64.phpt
# modified: ext/standard/tests/random/random_int.phpt
# modified: ext/standard/tests/serialize/bug45706.phpt
# modified: ext/standard/tests/streams/bug61115.phpt
# modified: ext/standard/tests/streams/bug78662.phpt
# modified: ext/standard/tests/streams/stream_set_timeout_error.phpt
# modified: ext/standard/tests/strings/chr_error.phpt
# modified: ext/standard/tests/strings/fprintf_error.phpt
# modified: ext/standard/tests/strings/htmlentities24.phpt
# modified: ext/standard/tests/strings/htmlspecialchars.phpt
# modified: ext/standard/tests/strings/ltrim.phpt
# modified: ext/standard/tests/strings/metaphone.phpt
# modified: ext/standard/tests/strings/parse_str_basic1.phpt
# modified: ext/standard/tests/strings/parse_str_basic3.phpt
# modified: ext/standard/tests/strings/printf_error.phpt
# modified: ext/standard/tests/strings/rtrim.phpt
# modified: ext/standard/tests/strings/soundex.phpt
# modified: ext/standard/tests/strings/sprintf_variation15.phpt
# modified: ext/standard/tests/strings/sscanf_error.phpt
# modified: ext/standard/tests/strings/str_ireplace.phpt
# modified: ext/standard/tests/strings/stristr.phpt
# modified: ext/standard/tests/strings/strrchr_variation1.phpt
# modified: ext/standard/tests/strings/strrchr_variation2.phpt
# modified: ext/standard/tests/strings/strtolower.phpt
# modified: ext/standard/tests/strings/strtoupper1.phpt
# modified: ext/standard/tests/strings/strval_error.phpt
# modified: ext/standard/tests/strings/substr.phpt
# modified: ext/standard/tests/strings/trim1.phpt
# modified: ext/standard/tests/strings/vfprintf_error1.phpt
# modified: ext/standard/tests/time/strptime_error.phpt
# modified: ext/tokenizer/tests/001.phpt
# modified: ext/xmlreader/tests/static.phpt
# modified: ext/xmlwriter/tests/bug41326.phpt
# modified: tests/output/stream_isatty_err.phpt
# modified: tests/output/stream_isatty_in-err.phpt
# modified: tests/output/stream_isatty_in-out-err.phpt
# modified: tests/output/stream_isatty_in-out.phpt
# modified: tests/output/stream_isatty_out-err.phpt
# modified: tests/output/stream_isatty_out.phpt
#
# Changes not staged for commit:
# modified: run-tests.php
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Mon Apr 27 21:01:47 2020 +0200
#
# On branch tests/use-simpler-expect-section
# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.
#
# Changes to be committed:
# modified: Zend/tests/005.phpt
# modified: Zend/tests/bug27669.phpt
# modified: Zend/tests/bug51827.phpt
# modified: Zend/tests/bug63206.phpt
# modified: Zend/tests/bug63206_1.phpt
# modified: Zend/tests/bug63206_2.phpt
# modified: Zend/tests/incompat_ctx_user.phpt
# modified: Zend/tests/instanceof_001.phpt
# modified: Zend/tests/unexpected_ref_bug.phpt
# modified: ext/date/tests/012.phpt
# modified: ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
# modified: ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
# modified: ext/date/tests/date_parse_001.phpt
# modified: ext/date/tests/date_parse_error.phpt
# modified: ext/date/tests/gmmktime_basic.phpt
# modified: ext/date/tests/mktime_error.phpt
# modified: ext/date/tests/timezone_abbreviations_list_basic1.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic.phpt
# modified: ext/filter/tests/007.phpt
# modified: ext/filter/tests/008.phpt
# modified: ext/filter/tests/010.phpt
# modified: ext/hash/tests/hash_hkdf_edges.phpt
# modified: ext/hash/tests/hash_hmac_file_basic.phpt
# modified: ext/json/tests/json_last_error_msg_error.phpt
# modified: ext/libxml/tests/bug76777.phpt
# modified: ext/pcre/tests/preg_replace_error2.phpt
# modified: ext/pcre/tests/split2.phpt
# modified: ext/phar/tests/phar_isvalidpharfilename.phpt
# modified: ext/phar/tests/pharfileinfo_chmod.phpt
# modified: ext/phar/tests/pharfileinfo_setmetadata.phpt
# modified: ext/phar/tests/stat2_5.3.phpt
# modified: ext/posix/tests/posix_getgrgid_error.phpt
# modified: ext/posix/tests/posix_getpgid_error.phpt
# modified: ext/posix/tests/posix_getpwuid_error.phpt
# modified: ext/posix/tests/posix_getsid_error.phpt
# modified: ext/posix/tests/posix_initgroups.phpt
# modified: ext/posix/tests/posix_kill_error.phpt
# modified: ext/posix/tests/posix_strerror_error.phpt
# modified: ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
# modified: ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
# modified: ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
# modified: ext/reflection/tests/ReflectionObject_getName_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_setValue_error.phpt
# modified: ext/session/tests/bug79221.phpt
# modified: ext/session/tests/session_cache_limiter_error.phpt
# modified: ext/spl/tests/bug61347.phpt
# modified: ext/spl/tests/fileobject_005.phpt
# modified: ext/spl/tests/iterator_045.phpt
# modified: ext/spl/tests/regexIterator_setMode_error.phpt
# modified: ext/spl/tests/spl_heap_is_empty_basic.phpt
# modified: ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
# modified: ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
# modified: ext/standard/tests/array/005.phpt
# modified: ext/standard/tests/array/009.phpt
# modified: ext/standard/tests/array/array_diff_assoc_error.phpt
# modified: ext/standard/tests/array/array_diff_error.phpt
# modified: ext/standard/tests/array/array_diff_key_error.phpt
# modified: ext/standard/tests/array/array_filter.phpt
# modified: ext/standard/tests/array/array_filter_variation10.phpt
# modified: ext/standard/tests/array/array_key_exists_variation3.phpt
# modified: ext/standard/tests/array/array_map_error.phpt
# modified: ext/standard/tests/array/array_merge.phpt
# modified: ext/standard/tests/array/array_push.phpt
# modified: ext/standard/tests/array/array_slice.phpt
# modified: ext/standard/tests/array/array_unshift.phpt
# modified: ext/standard/tests/array/array_walk.phpt
# modified: ext/standard/tests/array/array_walk_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive1.phpt
# modified: ext/standard/tests/array/array_walk_recursive_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive_variation7.phpt
# modified: ext/standard/tests/array/array_walk_variation7.phpt
# modified: ext/standard/tests/array/uasort_variation8.phpt
# modified: ext/standard/tests/array/usort_variation8.phpt
# modified: ext/standard/tests/assert/assert_variation.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_1.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_2.phpt
# modified: ext/standard/tests/file/basename.phpt
# modified: ext/standard/tests/file/fscanf.phpt
# modified: ext/standard/tests/file/fscanf_variation10.phpt
# modified: ext/standard/tests/file/is_dir_variation3.phpt
# modified: ext/standard/tests/file/is_executable_error.phpt
# modified: ext/standard/tests/file/is_executable_variation3.phpt
# modified: ext/standard/tests/file/is_file_variation3.phpt
# modified: ext/standard/tests/file/is_readable_error.phpt
# modified: ext/standard/tests/file/is_readable_variation3.phpt
# modified: ext/standard/tests/file/is_uploaded_file_basic.phpt
# modified: ext/standard/tests/file/is_writable_error.phpt
# modified: ext/standard/tests/file/is_writable_variation3.phpt
# modified: ext/standard/tests/file/move_uploaded_file_basic.phpt
# modified: ext/standard/tests/general_functions/get_include_path_basic.phpt
# modified: ext/standard/tests/general_functions/include_path.phpt
# modified: ext/standard/tests/general_functions/is_array.phpt
# modified: ext/standard/tests/general_functions/is_bool.phpt
# modified: ext/standard/tests/general_functions/is_float_64bit.phpt
# modified: ext/standard/tests/general_functions/is_int_64bit.phpt
# modified: ext/standard/tests/general_functions/is_null.phpt
# modified: ext/standard/tests/general_functions/is_numeric.phpt
# modified: ext/standard/tests/general_functions/is_object.phpt
# modified: ext/standard/tests/general_functions/is_scalar.phpt
# modified: ext/standard/tests/general_functions/is_string.phpt
# modified: ext/standard/tests/general_functions/ob_get_length_basic.phpt
# modified: ext/standard/tests/general_functions/php_uname_error.phpt
# modified: ext/standard/tests/general_functions/print_r.phpt
# modified: ext/standard/tests/general_functions/print_r_64bit.phpt
# modified: ext/standard/tests/general_functions/var_dump_64bit.phpt
# modified: ext/standard/tests/general_functions/var_export-locale.phpt
# modified: ext/standard/tests/image/image_type_to_extension.phpt
# modified: ext/standard/tests/math/lcg_value_basic.phpt
# modified: ext/standard/tests/network/inet.phpt
# modified: ext/standard/tests/network/ip_x86_64.phpt
# modified: ext/standard/tests/random/random_int.phpt
# modified: ext/standard/tests/serialize/bug45706.phpt
# modified: ext/standard/tests/streams/bug61115.phpt
# modified: ext/standard/tests/streams/bug78662.phpt
# modified: ext/standard/tests/streams/stream_set_timeout_error.phpt
# modified: ext/standard/tests/strings/chr_error.phpt
# modified: ext/standard/tests/strings/fprintf_error.phpt
# modified: ext/standard/tests/strings/htmlentities24.phpt
# modified: ext/standard/tests/strings/htmlspecialchars.phpt
# modified: ext/standard/tests/strings/ltrim.phpt
# modified: ext/standard/tests/strings/metaphone.phpt
# modified: ext/standard/tests/strings/parse_str_basic1.phpt
# modified: ext/standard/tests/strings/parse_str_basic3.phpt
# modified: ext/standard/tests/strings/printf_error.phpt
# modified: ext/standard/tests/strings/rtrim.phpt
# modified: ext/standard/tests/strings/soundex.phpt
# modified: ext/standard/tests/strings/sprintf_variation15.phpt
# modified: ext/standard/tests/strings/sscanf_error.phpt
# modified: ext/standard/tests/strings/str_ireplace.phpt
# modified: ext/standard/tests/strings/stristr.phpt
# modified: ext/standard/tests/strings/strrchr_variation1.phpt
# modified: ext/standard/tests/strings/strrchr_variation2.phpt
# modified: ext/standard/tests/strings/strtolower.phpt
# modified: ext/standard/tests/strings/strtoupper1.phpt
# modified: ext/standard/tests/strings/strval_error.phpt
# modified: ext/standard/tests/strings/substr.phpt
# modified: ext/standard/tests/strings/trim1.phpt
# modified: ext/standard/tests/strings/vfprintf_error1.phpt
# modified: ext/standard/tests/time/strptime_error.phpt
# modified: ext/tokenizer/tests/001.phpt
# modified: ext/xmlreader/tests/static.phpt
# modified: ext/xmlwriter/tests/bug41326.phpt
# modified: tests/output/stream_isatty_err.phpt
# modified: tests/output/stream_isatty_in-err.phpt
# modified: tests/output/stream_isatty_in-out-err.phpt
# modified: tests/output/stream_isatty_in-out.phpt
# modified: tests/output/stream_isatty_out-err.phpt
# modified: tests/output/stream_isatty_out.phpt
#
# Changes not staged for commit:
# modified: run-tests.php
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Mon Apr 27 21:01:47 2020 +0200
#
# On branch tests/use-simpler-expect-section
# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.
#
# Changes to be committed:
# modified: Zend/tests/005.phpt
# modified: Zend/tests/bug27669.phpt
# modified: Zend/tests/bug51827.phpt
# modified: Zend/tests/bug63206.phpt
# modified: Zend/tests/bug63206_1.phpt
# modified: Zend/tests/bug63206_2.phpt
# modified: Zend/tests/incompat_ctx_user.phpt
# modified: Zend/tests/instanceof_001.phpt
# modified: Zend/tests/unexpected_ref_bug.phpt
# modified: ext/date/tests/012.phpt
# modified: ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
# modified: ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
# modified: ext/date/tests/date_parse_001.phpt
# modified: ext/date/tests/date_parse_error.phpt
# modified: ext/date/tests/gmmktime_basic.phpt
# modified: ext/date/tests/mktime_error.phpt
# modified: ext/date/tests/timezone_abbreviations_list_basic1.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
# modified: ext/fileinfo/tests/finfo_set_flags_basic.phpt
# modified: ext/filter/tests/007.phpt
# modified: ext/filter/tests/008.phpt
# modified: ext/filter/tests/010.phpt
# modified: ext/hash/tests/hash_hkdf_edges.phpt
# modified: ext/hash/tests/hash_hmac_file_basic.phpt
# modified: ext/json/tests/json_last_error_msg_error.phpt
# modified: ext/libxml/tests/bug76777.phpt
# modified: ext/pcre/tests/preg_replace_error2.phpt
# modified: ext/pcre/tests/split2.phpt
# modified: ext/phar/tests/phar_isvalidpharfilename.phpt
# modified: ext/phar/tests/pharfileinfo_chmod.phpt
# modified: ext/phar/tests/pharfileinfo_setmetadata.phpt
# modified: ext/phar/tests/stat2_5.3.phpt
# modified: ext/posix/tests/posix_getgrgid_error.phpt
# modified: ext/posix/tests/posix_getpgid_error.phpt
# modified: ext/posix/tests/posix_getpwuid_error.phpt
# modified: ext/posix/tests/posix_getsid_error.phpt
# modified: ext/posix/tests/posix_initgroups.phpt
# modified: ext/posix/tests/posix_kill_error.phpt
# modified: ext/posix/tests/posix_strerror_error.phpt
# modified: ext/reflection/tests/ReflectionClass_hasProperty_002.phpt
# modified: ext/reflection/tests/ReflectionMethod_getClosure_error.phpt
# modified: ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
# modified: ext/reflection/tests/ReflectionObject_getName_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
# modified: ext/reflection/tests/ReflectionProperty_setValue_error.phpt
# modified: ext/session/tests/bug79221.phpt
# modified: ext/session/tests/session_cache_limiter_error.phpt
# modified: ext/spl/tests/bug61347.phpt
# modified: ext/spl/tests/fileobject_005.phpt
# modified: ext/spl/tests/iterator_045.phpt
# modified: ext/spl/tests/regexIterator_setMode_error.phpt
# modified: ext/spl/tests/spl_heap_is_empty_basic.phpt
# modified: ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
# modified: ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
# modified: ext/standard/tests/array/005.phpt
# modified: ext/standard/tests/array/009.phpt
# modified: ext/standard/tests/array/array_diff_assoc_error.phpt
# modified: ext/standard/tests/array/array_diff_error.phpt
# modified: ext/standard/tests/array/array_diff_key_error.phpt
# modified: ext/standard/tests/array/array_filter.phpt
# modified: ext/standard/tests/array/array_filter_variation10.phpt
# modified: ext/standard/tests/array/array_key_exists_variation3.phpt
# modified: ext/standard/tests/array/array_map_error.phpt
# modified: ext/standard/tests/array/array_merge.phpt
# modified: ext/standard/tests/array/array_push.phpt
# modified: ext/standard/tests/array/array_slice.phpt
# modified: ext/standard/tests/array/array_unshift.phpt
# modified: ext/standard/tests/array/array_walk.phpt
# modified: ext/standard/tests/array/array_walk_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive1.phpt
# modified: ext/standard/tests/array/array_walk_recursive_error2.phpt
# modified: ext/standard/tests/array/array_walk_recursive_variation7.phpt
# modified: ext/standard/tests/array/array_walk_variation7.phpt
# modified: ext/standard/tests/array/uasort_variation8.phpt
# modified: ext/standard/tests/array/usort_variation8.phpt
# modified: ext/standard/tests/assert/assert_variation.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_1.phpt
# modified: ext/standard/tests/file/auto_detect_line_endings_2.phpt
# modified: ext/standard/tests/file/basename.phpt
# modified: ext/standard/tests/file/fscanf.phpt
# modified: ext/standard/tests/file/fscanf_variation10.phpt
# modified: ext/standard/tests/file/is_dir_variation3.phpt
# modified: ext/standard/tests/file/is_executable_error.phpt
# modified: ext/standard/tests/file/is_executable_variation3.phpt
# modified: ext/standard/tests/file/is_file_variation3.phpt
# modified: ext/standard/tests/file/is_readable_error.phpt
# modified: ext/standard/tests/file/is_readable_variation3.phpt
# modified: ext/standard/tests/file/is_uploaded_file_basic.phpt
# modified: ext/standard/tests/file/is_writable_error.phpt
# modified: ext/standard/tests/file/is_writable_variation3.phpt
# modified: ext/standard/tests/file/move_uploaded_file_basic.phpt
# modified: ext/standard/tests/general_functions/get_include_path_basic.phpt
# modified: ext/standard/tests/general_functions/include_path.phpt
# modified: ext/standard/tests/general_functions/is_array.phpt
# modified: ext/standard/tests/general_functions/is_bool.phpt
# modified: ext/standard/tests/general_functions/is_float_64bit.phpt
# modified: ext/standard/tests/general_functions/is_int_64bit.phpt
# modified: ext/standard/tests/general_functions/is_null.phpt
# modified: ext/standard/tests/general_functions/is_numeric.phpt
# modified: ext/standard/tests/general_functions/is_object.phpt
# modified: ext/standard/tests/general_functions/is_scalar.phpt
# modified: ext/standard/tests/general_functions/is_string.phpt
# modified: ext/standard/tests/general_functions/ob_get_length_basic.phpt
# modified: ext/standard/tests/general_functions/php_uname_error.phpt
# modified: ext/standard/tests/general_functions/print_r.phpt
# modified: ext/standard/tests/general_functions/print_r_64bit.phpt
# modified: ext/standard/tests/general_functions/var_dump_64bit.phpt
# modified: ext/standard/tests/general_functions/var_export-locale.phpt
# modified: ext/standard/tests/image/image_type_to_extension.phpt
# modified: ext/standard/tests/math/lcg_value_basic.phpt
# modified: ext/standard/tests/network/inet.phpt
# modified: ext/standard/tests/network/ip_x86_64.phpt
# modified: ext/standard/tests/random/random_int.phpt
# modified: ext/standard/tests/serialize/bug45706.phpt
# modified: ext/standard/tests/streams/bug61115.phpt
# modified: ext/standard/tests/streams/bug78662.phpt
# modified: ext/standard/tests/streams/stream_set_timeout_error.phpt
# modified: ext/standard/tests/strings/chr_error.phpt
# modified: ext/standard/tests/strings/fprintf_error.phpt
# modified: ext/standard/tests/strings/htmlentities24.phpt
# modified: ext/standard/tests/strings/htmlspecialchars.phpt
# modified: ext/standard/tests/strings/ltrim.phpt
# modified: ext/standard/tests/strings/metaphone.phpt
# modified: ext/standard/tests/strings/parse_str_basic1.phpt
# modified: ext/standard/tests/strings/parse_str_basic3.phpt
# modified: ext/standard/tests/strings/printf_error.phpt
# modified: ext/standard/tests/strings/rtrim.phpt
# modified: ext/standard/tests/strings/soundex.phpt
# modified: ext/standard/tests/strings/sprintf_variation15.phpt
# modified: ext/standard/tests/strings/sscanf_error.phpt
# modified: ext/standard/tests/strings/str_ireplace.phpt
# modified: ext/standard/tests/strings/stristr.phpt
# modified: ext/standard/tests/strings/strrchr_variation1.phpt
# modified: ext/standard/tests/strings/strrchr_variation2.phpt
# modified: ext/standard/tests/strings/strtolower.phpt
# modified: ext/standard/tests/strings/strtoupper1.phpt
# modified: ext/standard/tests/strings/strval_error.phpt
# modified: ext/standard/tests/strings/substr.phpt
# modified: ext/standard/tests/strings/trim1.phpt
# modified: ext/standard/tests/strings/vfprintf_error1.phpt
# modified: ext/standard/tests/time/strptime_error.phpt
# modified: ext/tokenizer/tests/001.phpt
# modified: ext/xmlreader/tests/static.phpt
# modified: ext/xmlwriter/tests/bug41326.phpt
# modified: tests/output/stream_isatty_err.phpt
# modified: tests/output/stream_isatty_in-err.phpt
# modified: tests/output/stream_isatty_in-out-err.phpt
# modified: tests/output/stream_isatty_in-out.phpt
# modified: tests/output/stream_isatty_out-err.phpt
# modified: tests/output/stream_isatty_out.phpt
#
# Changes not staged for commit:
# modified: run-tests.php
#
2020-04-27 21:04:41 +02:00
Ilija Tovilo
0810fcd0d0
Make throw statement an expression
...
RFC: https://wiki.php.net/rfc/throw_expression
This has an open issue with temporaries that are live at the time
of the throw being leaked. Landing this now for easier testing and
will revert if we cannot resolve the issue.
Closes GH-5279.
2020-04-23 12:51:23 +02:00
Máté Kocsis
1f48feebb9
Improve some TypeError and ValueError messages
...
Closes GH-5377
2020-04-14 14:38:45 +02:00
Máté Kocsis
c5fb4f0794
Generate function entries from stubs for a couple of extensions
...
Migrates ext/standard, ext/tidy, ext/tokenizer,
ext/xml, ext/xml_reader, and ext/xml_writer. Closes GH-5381.
2020-04-14 11:49:02 +02:00
Alex Dowad
80598f1250
Syntax errors caused by unclosed {, [, ( mention specific location
...
Aside from a few very specific syntax errors for which detailed exceptions are
thrown, generally PHP just emits the default error messages generated by bison on syntax
error. These messages are very uninformative; they just say "Unexpected ... at line ...".
This is most problematic with constructs which can span an arbitrary number of lines, such
as blocks of code delimited by { }, 'if' conditions delimited by ( ), and so on. If a closing
delimiter is missed, the block will run for the entire remainder of the source file (which
could be thousands of lines), and then at the end, a parse error will be thrown with the
dreaded words: "Unexpected end of file".
Therefore, track the positions of opening and closing delimiters and ensure that they match
up correctly. If any mismatch or missing delimiter is detected, immediately throw a parse
error which points the user to the offending line. This is best done in the *lexer* and not
in the parser.
Thanks to Nikita Popov and George Peter Banyard for suggesting improvements.
Fixes bug #79368 .
Closes GH-5364.
2020-04-14 11:22:23 +02:00
Máté Kocsis
3709e74b5e
Store default parameter values of internal functions in arg info
...
Closes GH-5353. From now on, PHP will have reflection information
about default values of parameters of internal functions.
Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
2020-04-08 18:37:51 +02:00
Nikita Popov
5a09b9fb0f
Add PhpToken class
...
RFC: https://wiki.php.net/rfc/token_as_object
Relative to the RFC, this also adds a __toString() method,
as discussed on list.
Closes GH-5176.
2020-03-26 11:09:18 +01:00
George Peter Banyard
c9db32271a
Remove deprecated (real) cast
...
Closes GH-5220
2020-03-12 15:40:21 +01:00
Tyson Andre
3d8342aa3c
[skip ci] Skip 2 tokenizer tests if tokenizer isn't loaded
...
`./configure --disable-tokenizer` can disable tokenizer
Closes GH-5184
2020-02-16 19:22:22 -05:00
Nikita Popov
8a4068988b
Clarify that token_get_all() never returns false
...
It can only fail in TOKEN_PARSE mode, in which case it will throw.
2020-02-14 16:50:12 +01:00
Nikita Popov
f8d795820e
Reindent phpt files
2020-02-03 22:52:20 +01:00
Máté Kocsis
2015c7a48e
Fix another batch of indentation in tests
2020-02-02 23:33:40 +01:00
Máté Kocsis
8b36be268d
Fix indentation and whitespaces in tests
...
In preparation for GH-5074
2020-01-31 17:47:14 +01:00
Christoph M. Becker
dabc28d182
Fix #78880 : Spelling error report
...
We fix the most often occuring typos according to a recent codespell
report[1] in tests, code comments and documentation.
[1] <https://fossies.org/linux/test/php-src-master-f8f48ce.191129.tar.gz/codespell.html >.
2019-12-21 11:58:00 +01:00
Máté Kocsis
27e83d0fb8
Add union return types for function stubs
2019-11-11 14:54:55 +01:00
Nikita Popov
4e563e6c95
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix handling of overflowing invalid octal in tokenizer
2019-10-14 16:37:27 +02:00
Nikita Popov
641f9615cc
Fix handling of overflowing invalid octal in tokenizer
...
If token_get_all() is used, we still need to correctly distinguish
LNUMBER vs DNUMBER here for backwards compatibility.
2019-10-14 16:36:27 +02:00
Nikita Popov
d44cf9b539
Replace "unexpected character" warning with ParseError
...
Closes GH-4767.
2019-10-04 11:28:58 +02:00
Nikita Popov
7e77617533
Merge branch 'PHP-7.4'
2019-09-30 10:42:47 +02:00
Nikita Popov
19e7e4b197
Fixed bug #78604
...
<?php followed by EOF is valid since PHP 7.4.
2019-09-30 10:41:14 +02:00
Nikita Popov
1593f79ecd
Merge branch 'PHP-7.4'
2019-09-28 21:30:15 +02:00
Tyson Andre
7e0f7b7677
Reduce memory used by token_get_all()
...
Around a quarter of all strings in array tokens would have a string that's one
character long (e.g. ` `, `\`, `1`)
For parsing a large number of php files,
The memory increase dropped from 378374248 to 369535688 (2.5%)
Closes GH-4753.
2019-09-28 21:29:58 +02:00
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers
...
Closes GH-4732.
2019-09-25 14:51:43 +02:00
Nikita Popov
3372a24b99
Merge branch 'PHP-7.4'
2019-09-14 12:10:15 +02:00
Nikita Popov
3f76f9416f
Fix double-free on invalid large octal with separators
...
To clean up the mess here a bit, check for invalid octal digits
with an explicit loop instead of mixing this into the string to
number conversion.
Also clean up some type usage.
2019-09-14 12:10:06 +02:00
Christoph M. Becker
68edbbfe76
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add the last missing SKIPIF
2019-09-04 08:54:07 +02:00
Fabien Villepinte
ced5bb7d88
Add the last missing SKIPIF
2019-09-04 08:53:35 +02:00
Nikita Popov
a8792887d9
Merge branch 'PHP-7.4'
2019-08-27 22:01:59 +02:00
Nikita Popov
e5c7f71004
Don't specify precedence for T_INC/T_DEC
...
As these do not operate on expressions, precedence is meaningless
for them.
2019-08-27 21:59:56 +02:00
Stephen Reay
cfbcd4caef
Arginfo stubs for tokenizer
2019-08-11 19:03:04 +02:00
Nikita Popov
ce972ba349
Merge branch 'PHP-7.4'
2019-07-16 11:54:40 +02:00
Nikita Popov
c9acc90186
Support <?php followed by EOF
...
This is an annoying edge-case for canonicalization.
2019-07-16 11:53:48 +02:00
Nikita Popov
193bcf9650
Merge branch 'PHP-7.4'
2019-07-15 12:52:18 +02:00
Nikita Popov
9ad094e371
Emit T_BAD_CHARACTER for unexpected characters
...
Avoid having holes in the token stream which are annoying and
inefficient to reconstruct on the consumer side.
2019-07-15 12:51:01 +02:00
Nikita Popov
a89b959320
Merge branch 'PHP-7.4'
2019-07-12 17:22:58 +02:00
Nikita Popov
0d568b9fd5
Don't split T_INLINE_HTML at partial PHP tag
...
If <?php occurs without required trailing whitespace, we should keep
it as part of a single T_INLINE_HTML region.
2019-07-12 17:22:11 +02:00
Nikita Popov
dc18af96f9
Merge branch 'PHP-7.4'
2019-06-17 12:44:42 +02:00
George Peter Banyard
b2d6d29632
Remove unnecessary short_open_tags use in tokenizer test
2019-06-17 12:43:00 +02:00
Nikita Popov
d570620917
Merge branch 'PHP-7.4'
2019-06-11 16:21:57 +02:00
George Peter Banyard
7f5f277cf2
Remove unnecessary short_open_tag INI directive in tests
...
Closes GH-4249.
2019-06-11 16:14:10 +02:00
Peter Kokot
4251600203
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Enhance the tokenizer data generator script
2019-05-14 21:51:51 +02:00
Peter Kokot
b4dec0e11d
Enhance the tokenizer data generator script
...
Changes:
- executable from any location (for example, project root)
- some minor common shell scripts CS fixes
- error reporting done based on the presence of the parser file
2019-05-14 21:50:29 +02:00
Peter Kokot
2cf90bb2f0
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Normalize comments in *nix build system m4 files
2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d
Normalize comments in *nix build system m4 files
...
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
2019-05-12 18:43:03 +02:00
Nikita Popov
79f41944ba
Merge branch 'PHP-7.4'
2019-05-02 15:07:04 +02:00
Nikita Popov
f3e5bbe6f3
Implement arrow functions
...
Per RFC: https://wiki.php.net/rfc/arrow_functions_v2
Co-authored-by: Levi Morrison <levim@php.net>
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
2019-05-02 15:04:03 +02:00
Nikita Popov
0720313bd4
Merge branch 'PHP-7.4'
2019-03-28 09:31:18 +01:00
Nikita Popov
7f72d771e8
Revert "Switch to bison location tracking"
...
This reverts commit e528762c1ce528762c1c
2019-03-28 09:29:08 +01:00
Peter Kokot
90b70b2626
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix tokenizer_data_gen.sh for non-posix bison
2019-03-24 01:54:46 +01:00
Guilliam Xavier
516d27775d
Fix tokenizer_data_gen.sh for non-posix bison
...
And run it to update tokenizer_data.c after recent changes in
zend_language_parser.y that reordered some tokens
2019-03-24 01:53:59 +01:00
Nikita Popov
6b7545c225
Merge branch 'PHP-7.4'
2019-03-21 16:28:19 +01:00
Nikita Popov
e528762c1c
Switch to bison location tracking
...
Locations for AST nodes are now tracked with the help of bison
location tracking. This is more accurate than what we currently do
and easier to extend with more information.
A zend_ast_loc structure is introduced, which is used for the location
stack. Currently it only holds the start lineno, but can be extended
to also hold end lineno and offset/column information in the future.
All AST constructors now accept a zend_ast_loc* as first argument, and
will use it to determine their lineno. Previously this used either the
CG(zend_lineno), or the smallest AST lineno of child nodes.
On the parser side, the location structure for a whole rule can be
obtained using the &@$ character salad.
2019-03-21 16:27:48 +01:00
Dmitry Stogov
c56bd7e220
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Cleanup unused module globals
2019-03-12 13:44:25 +03:00
Dmitry Stogov
5aa1176238
Cleanup unused module globals
2019-03-12 13:44:05 +03:00
Nikita Popov
852485d8ec
Adjust tests for zpp TypeError change
2019-03-11 11:32:20 +01:00
Nikita Popov
59dd1979ef
More zpp error/variation test removals
2019-03-08 13:46:39 +01:00
Peter Kokot
f5fa9ddbd5
Clean *nix build system
...
- remove some outdated and not used macro calls
- remove some unused variables
- Remove not needed comment from tokenizer config.m4
- Remove not needed comment
- remove not needed local variables for editors and syntax highlighting
2019-03-07 20:58:14 +01:00
Peter Kokot
9df6a1e4dd
Add AS_HELP_STRING to *nix build configure options
...
The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.
[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
2019-03-07 20:36:59 +01:00
Nikita Popov
8bc663f43b
Remove zpp variation tests
2019-02-05 09:38:55 +01:00
Peter Kokot
92ac598aab
Remove local variables
...
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.
A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.
This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.
With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.
Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files. All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
2019-02-03 21:03:00 +01:00
Zeev Suraski
0cf7de1c70
Remove yearly range from copyright notice
2019-01-30 11:03:12 +02:00
Nikita Popov
a50198d0fe
Implement ??= operator
...
RFC: https://wiki.php.net/rfc/null_coalesce_equal_operator
$a ??= $b is $a ?? ($a = $b), with the difference that $a is only
evaluated once, to the degree that this is possible. In particular
in $a[foo()] ?? $b function foo() is only ever called once.
However, the variable access themselves will be reevaluated.
2019-01-22 11:12:04 +01:00
Nikita Popov
50ddff94b9
Make tokenizer test robust against token renumbering
2019-01-22 11:12:04 +01:00
Peter Kokot
d679f02295
Sync leading and final newlines in *.phpt sections
...
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-15 04:33:09 +02:00
Peter Kokot
d7a3edd45d
Trim trailing whitespace in *.phpt
2018-10-14 19:46:15 +02:00
Gabriel Caruso
9c144e0d82
Trim trailing whitespace in tests
2018-10-14 12:07:20 -03:00
Peter Kokot
1ad08256f3
Sync leading and final newlines in source code files
...
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-14 12:56:38 +02:00
Nikita Popov
01948f20b8
Fixed bug #76991
...
Back up exceptions while the scan-ahead loop, to avoid an early
bail out.
2018-10-10 15:00:18 +02:00
Gabriel Caruso
a61756252a
Run tokenizer_data_gen.sh to reorganize tokens
...
This will help us in future PRs, reducing the numbers of changed lines
2018-07-29 13:21:33 -03:00
Peter Kokot
8d3f8ca12a
Remove unused Git attributes ident
...
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Dmitry Stogov
4a475a4976
Replace legacy zval_dtor() by zval_ptr_dtor_nogc() or even more specialized destructors.
...
zval_dtor() doesn't make a lot of sense in PHP-7.* and it's used incorrectly in some places.
Its occurances should be replaced by zval_ptr_dtor() or zval_ptr_dtor_nogc(), or even more specialized destructors.
2018-07-04 19:22:24 +03:00
Nikita Popov
ce7fc2e308
Fix typos...
2018-06-27 23:22:29 +02:00
Nikita Popov
9b02ee0bba
Fixed bug #76538
2018-06-27 23:06:25 +02:00
Xinchen Hui
83a77f5a28
Fixed typo
2018-06-18 12:14:17 +08:00
Xinchen Hui
4d69bbeee7
Fixed bug #76437 (token_get_all with TOKEN_PARSE flag fails to recognise close tag)
2018-06-18 11:33:48 +08:00
Thomas Punt
4887357269
Implement flexible heredoc/nowdoc syntax
...
RFC: https://wiki.php.net/rfc/flexible_heredoc_nowdoc_syntaxes
* The ending label no longer has to be followed by a semicolon or
newline. Any non-label character is fine.
* The ending label may be indented. The indentation will be stripped
from all lines in the heredoc/nowdoc string.
Lexing of heredoc strings performs a scan-ahead to determine the
indentation of the ending label, so that the correct amount of
indentation can be removed when calculting the semantic values for
use by the parser. This makes the implementation quite a bit more
complicated than we would like :/
2018-04-13 21:35:37 +02:00
Dmitry Stogov
8afb91cdad
PHP scanner optimization
2018-03-14 01:48:17 +03:00
Dmitry Stogov
d1585a9e3f
Revert "Handle scanner error in first place (don't hide them from ext/tokenizer) and cheaper whitespace handlig."
...
This reverts commit 0d6da03f5c
2018-03-14 01:08:03 +03:00
Dmitry Stogov
0d6da03f5c
Handle scanner error in first place (don't hide them from ext/tokenizer) and cheaper whitespace handlig.
2018-03-13 18:42:09 +03:00
Gabriel Caruso
ded3d984c6
Use EXPECT instead of EXPECTF when possible
...
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Gabriel Caruso
ce1d69a1f6
Use int instead of integer in type errors
...
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08:00
Dmitry Stogov
9e709e2fa0
Move constants into read-only data segment
2017-12-14 18:43:44 +03:00
Peter Kokot
7f4722a42f
Remove tokenizer PHP example script
...
The tokenizer extension is best presented in the PHP manual with some
code snippets. Also the script includes old PHP dl() function.
2017-10-19 12:06:10 +01:00
Kalle Sommer Nielsen
c34ba92782
Get rid of all these old package[2].xml files, most of these had no had a release since PHP4, or any release at all in close to 10 years, some even did not have a package registered at pecl
...
OCI, PDO_OCI and zip are left as they are actively developed and released there
2017-08-17 22:09:29 +02:00
Nikita Popov
0d834c6922
Use ZSTR_CHAR in token_get_all()
2017-03-22 22:38:07 +01:00
Nikita Popov
fec708f518
Simplify increment_lineno handling
2017-03-22 22:33:05 +01:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Sara Golemon
8bbfe174a8
Use new param API in tokenizer
2016-12-31 09:01:20 -08:00
Nikita Popov
07af6ba898
Make sure TOKEN_PARSE mode is thread safe
...
Introduce an on_event_context passed to the on_event hook. Use this
context to pass along the token array. Previously this was stored
in a non-tls global :/
2016-07-23 00:00:13 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Daniel Axtens
2ea924fffc
Fix #70831 : Compile fails on system with 160 CPUs
...
This fixes the following build issue on 160-CPU POWER8 machines
ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory
#include <zend_language_parser.h>
It is fixed by introducing an explicit dependency on the header file.
Signed-off-by: Daniel Axtens <dja@axtens.net>
2015-12-06 12:37:08 +01:00
Márcio Almada
c08b3922dd
adds missing tokens to list of semi-reserved words and regenerates test suite
2015-09-04 15:02:50 +02:00
Nikita Popov
a49ce7bb91
Don't return T_ERROR from token_get_all()
...
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
2015-07-09 23:02:21 +02:00
Nikita Popov
d91aad5966
Fix bug #69430
...
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
2015-07-09 19:11:48 +02:00
Nikita Popov
8abc3022b0
Update token_get_all() arginfo
2015-07-09 18:19:12 +02:00
Kalle Sommer Nielsen
db22946b25
Remove these old references to the DSP files we don't use anymore
2015-06-22 13:29:42 +02:00
