Remove persistent allocators from libmbfl

These functions are not used, and I don't think we have any plans
to ever use them.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79561: dns_get_record() fails with DNS_ALL

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79561: dns_get_record() fails with DNS_ALL

Fix #79561: dns_get_record() fails with DNS_ALL

Since Windows has its own definitions of the `PHP_DNS_*` macros, we
have to use these when registering the PHP constants.

Change the default PDO error mode to exceptions

According to <https://www.php.net/manual/en/pdo.error-handling.php>.

Perform isupper check using sse2 as well

Rather than just vectorizing the lowering, also vectorize the
check for uppercase characters, using the same method.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79548

Fixed bug #79548

When duplicating user functions with static variables, make sure
that we init a new map ptr slot for the static variables.

Extract one more function from proc_open() implementation

Clean up proc_open() implementation

Closes GH-5507.

Remove unused is_persistent flag

I dropped the assignment to it before, but did not drop the
struct member.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79535

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79535

Fixed bug #79535

We did not allocate a cache slot for FETCH_CLASS. This is already
fixed on newer PHP versions.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix i386 build on Azure

Fix i386 build on Azure

Disabling postgresql entirely for now, because I can't figure out
how to fix it. Something broke big time with i386 packages on
Azure pipelines.

Use ZPP int|string and add ValueError for Windows codepages

Closes GH-5517

Merge branch 'PHP-7.4'

* PHP-7.4:
  Add basic sapi_windows_cp_conv() test

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add basic sapi_windows_cp_conv() test

Add basic sapi_windows_cp_conv() test

This function is lacking any tests so far.

Use libenchant2 if available on Windows

This is basically the same as commit 3427545[1], but for Windows.

[1] <http://git.php.net/?p=php-src.git;a=commitdiff;h=342754575237da912874f781a24eefe76434ce5a>

Use libenchant-2 when available

Fix #79467: data:// wrappers are writable

Despite the docs claiming that data: wrappers would not be writable[1],
they are implemented as writing to a memory stream.  That does not seem
to be particularly sensible, so we disallow writing altogether.

[1] <https://www.php.net/manual/en/wrappers.data.php#refsect1-wrappers.data-options>

Use ZPP check for string|int|null arguments in array_column()

Add Fast ZPP string|int type check

Don't raise bogus warning if writing completely failed

Remove is_persistent flag from proc_open implementation

We don't support persistent proc_open handles and have no plan
to suppor them. The mixture of persistent and non-persistent
allocations functions in this code is somewhat confusing to read.

Convert UNKNOWN default values to null in ext/date

Closes GH-5509

Convert UNKNOWN default values to null in ext/calendar

Convert UNKNOWN default values to null in ext/bcmath

Fix miscellaneous typos in code comments/var names

Closes GH-5501

Remove the deprecated is_real() function

Closes GH-5506

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4

Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4

Revert "Fix #61597: SXE properties may lack attributes and content"

This reverts commit 7c081db885756d7b176a55b90b8746f664d1e042.

Avoid spurious failures of MySQL INSERT packet overflow test

This test creates a MySQL table called 'test'. In several cases, I have seen a spurious
test failure (in CI) with an error message saying: "table 'test' already exists".

It may be that another test had used a table with the same name and not cleaned it out
correctly. Or maybe we have multiple tests running in parallel in some CI environments,
or the same test DB being used for multiple runs of the test suite.

In any case, change the table name so it is exclusive to this test case only. Also, if
the test table exists at the beginning of the test, drop it.

Closes GH-5479

Try to make regression test for Bug #69900 consistent

It has been observed that in rare cases, this regression test has spurious failures in CI.
Try increasing the threshold for failure a bit and see if this makes it pass consistently.

Fix other typos in param name/code comments

Closes GH-5502

[skip ci] Fix a typo in UPGRADING

Confirmed that php_zip.c checks for `"enc_password"`

Closes GH-5503

Better handling of IS_UNDEF variables

Replace ZEND_ASSERT() by conditional compilation abort.
Prevent endless loop through ESCAPE code.

Use ascii lowercase if locale is default C

Do not inherit LC_CTYPE locale from environment

Treatment of locales in PHP is currently inconsistent: The LC_ALL
locale is set to "C", as is standard behavior on program startup.
The LC_CTYPE locale is set to "", which will inherit it from the
environment. However, the inherited LC_CTYPE locale will only be
used in some cases, while in other cases it is necessary to perform
an explicit setlocale() call in PHP first. This is the case for
the locale-sensitive handling in the PCRE extension.

Make things consistent by *never* inheriting any locales from the
environment. LC_ALL, including LC_CTYPE will be "C" on startup.
A locale can be set or inherited through an explicit setlocale()
call, at which point the behavior will be fully consistent and
predictable.

Closes GH-5488.

Revert "Insert one more debug output"

This reverts commit 45cb42166d4a53fe0154be08097f112d6ec72a27.

Completely remove disabled functions from function table

Currently, disabling a function only replaces the internal
function handler with one that throws a warning, and a few
places in the engine special-case such functions, such as
function_exists. This leaves us with a Schrödinger's function,
which both does not exist (function_exists returns false) and
does exist (you cannot define a function with the same name).
In particular, this prevents the implementation of robust
polyfills, as reported in https://bugs.php.net/bug.php?id=79382:

    if (!function_exists('getallheaders')) {
        function getallheaders(...) { ... }
    }

If getallheaders() is a disabled function, this code will break.

This patch changes disable_functions to remove the functions from
the function table completely. For all intents and purposes, it
will look like the function does not exist.

This also renders two bits of PHP functionality obsolete and thus
deprecated:

 * ReflectionFunction::isDisabled(), as it will no longer be
   possible to construct the ReflectionFunction of a disabled
   function in the first place.
 * get_defined_functions() with $exclude_disabled=false, as
   get_defined_functions() now never returns disabled functions.

Fixed bug #79382.

Closes GH-5473.

Revert "Show eventual output of clean sections"

This reverts commit 5eb4ab07f27c82336d337afa01d02a7bf574adaf.
The temporary hack has served its purpose.

doc enchant changes

remove deprecated call and deprecate function to be removed in libenchant v2
add LIBENCHANT_VERSION constant

Code tweaks: Remove unneeded semicolons

Treat invalid characters in basename() consistently

Always simply ignore (pass through) them. Previously the behavior
depended on where the invalid character occurred, as it messed
up the state management.

Clean up naming in basename() implementation

Improved tracing JIT for nested calls

Merge branch 'PHP-7.4'

* PHP-7.4:
  Reduce test parallelism on ARM64 CI

Reduce test parallelism on ARM64 CI

Let's go from 32 to 16 parallel jobs. We can reduce this further
if necessary.

Closes GH-5426.

manage ZEND_DEP_FALIAS in gen_stub

Merge branch 'PHP-7.4'

* PHP-7.4:
  Pass worker ID to clean scripts

Pass worker ID to clean scripts

On Windows, reusing/sharing of OPcache instances with different
configuration is not necessarily supported, so we have to make that it
does not happen for the clean scripts, by using `$orig_ini_settings`
instead of `$clean_params`.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79536 (zend_clear_exception prevent exception's destructor to be called).

Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4

* 'PHP-7.4' of git.php.net:/php-src:
  Fix #79532: sizeof off_t can be wrong
  Make 045.phpt busy wait
  Revert "Fix #79065: DOM classes do not expose properties to Reflection"
  Bump version
  Fix #79065: DOM classes do not expose properties to Reflection
  Fix #79470: PHP incompatible with 3rd party file system on demand

Fixed bug #79536 (zend_clear_exception prevent exception's destructor to be called).

white space fixes

JIT: Save opline before calling zend_timeout

tests/045.phpt started segfaulting, because the opline is not set
when zend_timeout is invoked.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79532: sizeof off_t can be wrong

Fix #79532: sizeof off_t can be wrong

We have to actually determine the proper `SIZEOF_OFF_T`.
Interestingly, it is `4` on Windows x64.

We also have to prevent the redefinition in pg_config.h.  The clean
solution would likely be to not include pg_config.h at all, but that's
out of scope for BC reasons for now.

Remove redundant addref+dtor

Remove dead code

As pointed out by Girgias, index is always non-NULL here.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Make 045.phpt busy wait

Make 045.phpt busy wait

The timeout is only real-time based on Windows. Make this use
a busy wait loop instead. If hard_timeout is broken, this will
fail with a run-tests enforced timeout instead.

Revert "Merge branch 'sse2_strtolower' of https://github.com/laruence/php-src"

This reverts commit 5a6373f904c6497551cd53baf323ddb854a553e1, reversing
changes made to 45cb42166d4a53fe0154be08097f112d6ec72a27.

This breaks strtolower-win32.phpt.

Enclose contents of CLEAN sections in PHP tags

We also place the CLEAN sections before EXPECT(F), and remove
extraneous clean-ups.

Merge branch 'sse2_strtolower' of https://github.com/laruence/php-src

* 'sse2_strtolower' of https://github.com/laruence/php-src:
  Use ascii lowercase if locale is default C

Insert one more debug output

Check `__set_state` structure

Fix Bug #79521.

Closes GH-5462.

Allow optional trailing comma in parameter list

RFC: https://wiki.php.net/rfc/trailing_comma_in_parameter_list

Closes GH-5306.

Show eventual output of clean sections

This is a hack to investigate why mysqli_insert_packet_overflow.phpt
intermittently fails on AppVeyor, and will be reverted in due time.
See <https://github.com/php/php-src/pull/5447#issuecomment-620508790>.

Less conservative fix

I think it's reasonable to assume that the only possible types
are those that are declared, and null, because null is what
return_value is initialized to.

Fix JIT segfaults in FFI tests

Conservative fix that just disables this optimization.

Fix ifunc resolver return type warning

Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Fix #79065: DOM classes do not expose properties to Reflection"

Revert "Fix #79065: DOM classes do not expose properties to Reflection"

This reverts commit 6bc8f7e5a9949b2ba79376abd1ed13d0b4d0ae3c.

This causes an assertion failure in PHPUnit.

Clarify that FFI::cdef() does not return NULL

Merge branch 'libtool-fix'

* libtool-fix:
  Fix libtool to provide a simple way to generate only "shared" object files or libraries.

Improve JIT code for FCALL with "fake" INIT and avoid fcall_guard if possible.

Merge branch 'PHP-7.4'

* PHP-7.4:
  Bump version

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Bump version

Bump version

Fixed bug #79526 (`__sleep` error message doesn't include the name of the class)

Merge branch 'filesize/value-errors' of https://github.com/carusogabriel/php-src

* 'filesize/value-errors' of https://github.com/carusogabriel/php-src:
  Reduce code duplication using for loop

Merge branch 'tests/use-simpler-expect-section' of https://github.com/carusogabriel/php-src

* 'tests/use-simpler-expect-section' of https://github.com/carusogabriel/php-src:
  Use EXPECT instead of EXPECTF when possible\r\rEXPECTF logic in run tests is considerable, so lets avoid it\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is behind 'fork/tests/use-simpler-expect-section' by 1 commit, and can be fast-forwarded.\r#   (use "git pull" to update your local branch)\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r# ------------------------ >8 ------------------------\r# Do not modify or remove the line above.\r# Everything below it will be ignored.\rdiff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt\rindex f4abfb6c51..413f3205ad 100644\r--- a/Zend/tests/005.phpt\r+++ b/Zend/tests/005.phpt\r@@ -13,7 +13,7 @@ var_dump(strcasecmp("01", "01"));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r int(-3)\r int(-1)\rdiff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt\rindex 7067c23e0d..9cd845e337 100644\r--- a/Zend/tests/bug27669.phpt\r+++ b/Zend/tests/bug27669.phpt\r@@ -10,5 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy\r     $y[0] = 'hello';\r     A::{$y[0]}();\r ?>\r---EXPECTF--\r+--EXPECT--\r Hello World\rdiff --git a/Zend/tests/bug51827.phpt b/Zend/tests/bug51827.phpt\rindex 6c3d721716..1a2d9bdf39 100644\r--- a/Zend/tests/bug51827.phpt\r+++ b/Zend/tests/bug51827.phpt\r@@ -13,7 +13,7 @@ register_shutdown_function('ABC');\r register_shutdown_function('exploDe');\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r \r Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0\rdiff --git a/Zend/tests/bug63206.phpt b/Zend/tests/bug63206.phpt\rindex dc7bb1fd1d..6aba55eca1 100644\r--- a/Zend/tests/bug63206.phpt\r+++ b/Zend/tests/bug63206.phpt\r@@ -22,7 +22,7 @@ set_error_handler(function() {\r $triggerNotice1++;\r $triggerNotice2++;\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\r Internal handler\r Second handler\rdiff --git a/Zend/tests/bug63206_1.phpt b/Zend/tests/bug63206_1.phpt\rindex f08f913824..d054211638 100644\r--- a/Zend/tests/bug63206_1.phpt\r+++ b/Zend/tests/bug63206_1.phpt\r@@ -22,5 +22,5 @@ restore_error_handler();\r \r $triggerNotice++;\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\rdiff --git a/Zend/tests/bug63206_2.phpt b/Zend/tests/bug63206_2.phpt\rindex 7a2bf38543..a4a67f577e 100644\r--- a/Zend/tests/bug63206_2.phpt\r+++ b/Zend/tests/bug63206_2.phpt\r@@ -22,5 +22,5 @@ restore_exception_handler();\r \r throw new Exception();\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\rdiff --git a/Zend/tests/incompat_ctx_user.phpt b/Zend/tests/incompat_ctx_user.phpt\rindex 8c7461e4f7..3fe0456175 100644\r--- a/Zend/tests/incompat_ctx_user.phpt\r+++ b/Zend/tests/incompat_ctx_user.phpt\r@@ -16,5 +16,5 @@ try {\r     echo "Exception: " . $e->getMessage() . "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r Exception: Non-static method A::foo() cannot be called statically\rdiff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt\rindex 27170420f0..02b7d59baf 100644\r--- a/Zend/tests/instanceof_001.phpt\r+++ b/Zend/tests/instanceof_001.phpt\r@@ -17,7 +17,7 @@ var_dump($c[0] instanceof stdClass);\r var_dump(@$inexistent instanceof stdClass);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(true)\rdiff --git a/Zend/tests/unexpected_ref_bug.phpt b/Zend/tests/unexpected_ref_bug.phpt\rindex 0d78410d1a..172b1e6224 100644\r--- a/Zend/tests/unexpected_ref_bug.phpt\r+++ b/Zend/tests/unexpected_ref_bug.phpt\r@@ -15,5 +15,5 @@ $my_var = str_repeat("A", 64);\r $data = call_user_func_array("str_replace", array(&$my_var, new Test(), "foo"));\r echo "Done.\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r Done.\rdiff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt\rindex ee8faf1c00..0997ef047c 100644\r--- a/ext/date/tests/012.phpt\r+++ b/ext/date/tests/012.phpt\r@@ -13,7 +13,7 @@ var_dump(date_isodate_set($dto, 2006, 100, 15));\r var_dump($dto->format("Y/m/d H:i:s"));\r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r object(DateTime)#1 (3) {\r   ["date"]=>\r   string(26) "2006-01-23 00:00:00.000000"\rdiff --git a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\rindex 715ea63dc9..f96753b019 100644\r--- a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r+++ b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r@@ -14,6 +14,6 @@ try {\r     echo $exception->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r DatePeriod::__construct(): The recurrence count '0' is invalid. Needs to be > 0\r DatePeriod::__construct(): The recurrence count '-1' is invalid. Needs to be > 0\rdiff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\rindex cb948e9df5..670dcb2ee3 100644\r--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";\r var_dump( $abbr["acst"] );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing DateTimeZone::listAbbreviations() : basic functionality ***\r string(5) "array"\r int(144)\rdiff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt\rindex 0d58c1f8e9..36f8d9bbdd 100644\r--- a/ext/date/tests/date_parse_001.phpt\r+++ b/ext/date/tests/date_parse_001.phpt\r@@ -14,7 +14,7 @@ Test basic date_parse()\r     var_dump(date_parse(""));\r     echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(12) {\r   ["year"]=>\r   int(2006)\rdiff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt\rindex 24b0094c9e..6a5180fdfb 100644\r--- a/ext/date/tests/date_parse_error.phpt\r+++ b/ext/date/tests/date_parse_error.phpt\r@@ -17,7 +17,7 @@ $invalid_date = "2OO9-02--27 10:00?00.5";\r var_dump( date_parse($invalid_date) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing date_parse() : error conditions ***\r \r -- Testing date_parse() function with unexpected characters in $date argument --\rdiff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt\rindex 303bd9b010..f96b635c08 100644\r--- a/ext/date/tests/gmmktime_basic.phpt\r+++ b/ext/date/tests/gmmktime_basic.phpt\r@@ -22,6 +22,6 @@ $year = 2008;\r var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing gmmktime() : basic functionality ***\r int(1218182888)\rdiff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt\rindex e40e40f38d..8bdb61df7b 100644\r--- a/ext/date/tests/mktime_error.phpt\r+++ b/ext/date/tests/mktime_error.phpt\r@@ -35,7 +35,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing mktime() : error conditions ***\r \r -- Testing mktime() function with Zero arguments --\rdiff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt\rindex b3bf7c84a1..0640b8a83d 100644\r--- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt\r+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt\r@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";\r var_dump( $abbr["acst"] );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing timezone_abbreviations_list() : basic functionality ***\r string(5) "array"\r int(144)\rdiff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\rindex 50a1559f58..855acaaed8 100644\r--- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r+++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );\r var_dump( $finfo->set_flags( FILEINFO_MIME ) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing finfo_set_flags() : basic functionality ***\r bool(true)\r bool(true)\rdiff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt\rindex 95f2648f51..fe2921b560 100644\r--- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt\r+++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt\r@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );\r var_dump( $finfo->set_flags( FILEINFO_MIME ) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing finfo_set_flags() : basic functionality ***\r bool(true)\r bool(true)\rdiff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt\rindex dc966b8cc9..b5f285342b 100644\r--- a/ext/filter/tests/007.phpt\r+++ b/ext/filter/tests/007.phpt\r@@ -23,7 +23,7 @@ var_dump(filter_has_var(INPUT_POST, ""));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(false)\rdiff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt\rindex 75e0968c62..1d4d64529d 100644\r--- a/ext/filter/tests/008.phpt\r+++ b/ext/filter/tests/008.phpt\r@@ -9,7 +9,7 @@ var_dump(filter_list());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(21) {\r   [0]=>\r   string(3) "int"\rdiff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt\rindex 14f8db01af..46b6044668 100644\r--- a/ext/filter/tests/010.phpt\r+++ b/ext/filter/tests/010.phpt\r@@ -17,7 +17,7 @@ var_dump(filter_var(1, 0, array()));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(7) {\r   [0]=>\r   int(1)\rdiff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt\rindex cee86ae82e..ceb21631d1 100644\r--- a/ext/hash/tests/hash_hkdf_edges.phpt\r+++ b/ext/hash/tests/hash_hkdf_edges.phpt\r@@ -25,7 +25,7 @@ catch (\Error $e) {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing hash_hkdf(): edge cases ***\r Length < digestSize: 98b16391063ece\r Length % digestSize != 0: 98b16391063ecee006a3ca8ee5776b1e5f\rdiff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt\rindex 4569c46c35..11b9d05738 100644\r--- a/ext/hash/tests/hash_hmac_file_basic.phpt\r+++ b/ext/hash/tests/hash_hmac_file_basic.phpt\r@@ -57,7 +57,7 @@ echo "sha256(raw): " . bin2hex(hash_hmac_file('sha256', $file, $key, TRUE)). "\n\r unlink($file);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing hash_hmac_file() : basic functionality ***\r gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918\r haval128,3: f1cea637451097d790354a86de3f54a3\rdiff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt\rindex 75b06f72a2..0eb55c4c66 100644\r--- a/ext/json/tests/json_last_error_msg_error.phpt\r+++ b/ext/json/tests/json_last_error_msg_error.phpt\r@@ -14,6 +14,6 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r string(8) "No error"\r json_last_error_msg() expects exactly 0 parameters, 1 given\rdiff --git a/ext/libxml/tests/bug76777.phpt b/ext/libxml/tests/bug76777.phpt\rindex 5e15024b81..c50e52203f 100644\r--- a/ext/libxml/tests/bug76777.phpt\r+++ b/ext/libxml/tests/bug76777.phpt\r@@ -29,7 +29,7 @@ libxml_set_external_entity_loader(function($p,$s,$c) {\r $dom=new DOMDocument($xml);\r $dom->schemaValidateSource($xsd);\r ?>\r---EXPECTF--\r+--EXPECT--\r NULL\r string(15) "nonexistent.xsd"\r array(4) {\rdiff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt\rindex 2401e0bb49..d7748bf954 100644\r--- a/ext/pcre/tests/preg_replace_error2.phpt\r+++ b/ext/pcre/tests/preg_replace_error2.phpt\r@@ -29,7 +29,7 @@ try {\r }\r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing preg_replace() : error conditions ***\r \r Arg value is: this is a string\rdiff --git a/ext/pcre/tests/split2.phpt b/ext/pcre/tests/split2.phpt\rindex 5fafee3b87..3d9714a420 100644\r--- a/ext/pcre/tests/split2.phpt\r+++ b/ext/pcre/tests/split2.phpt\r@@ -19,7 +19,7 @@ var_dump(preg_split('/(\d*)/', 'ab2c3u'));\r var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r array(15) {\r   [0]=>\r   string(0) ""\rdiff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt\rindex 8b9088b9b3..d44c0603e9 100644\r--- a/ext/phar/tests/phar_isvalidpharfilename.phpt\r+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt\r@@ -72,7 +72,7 @@ var_dump(Phar::isValidPharFilename('dir.phar.php', false));\r --CLEAN--\r <?php\r rmdir(__DIR__ . '/.phar');\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r bool(false)\rdiff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt\rindex 822b5ac628..26d7257602 100644\r--- a/ext/phar/tests/pharfileinfo_chmod.phpt\r+++ b/ext/phar/tests/pharfileinfo_chmod.phpt\r@@ -24,5 +24,5 @@ $b->chmod(0666);\r ?>\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>\r---EXPECTF--\r+--EXPECT--\r Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod\rdiff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt\rindex 38e23f706d..8b4385ad5f 100644\r--- a/ext/phar/tests/pharfileinfo_setmetadata.phpt\r+++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt\r@@ -40,7 +40,7 @@ echo $e->getMessage(), "\n";\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>\r---EXPECTF--\r+--EXPECT--\r Phar entry is a temporary directory (not an actual entry in the archive), cannot set metadata\r Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata\r Write operations disabled by the php.ini setting phar.readonly\rdiff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt\rindex 19acc3ba99..9e9e158602 100644\r--- a/ext/phar/tests/stat2_5.3.phpt\r+++ b/ext/phar/tests/stat2_5.3.phpt\r@@ -35,7 +35,7 @@ include $fname3;\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r is_link\r bool(false)\rdiff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt\rindex e9dbe2a6ce..36ffcf4952 100644\r--- a/ext/posix/tests/posix_getgrgid_error.phpt\r+++ b/ext/posix/tests/posix_getgrgid_error.phpt\r@@ -20,7 +20,7 @@ var_dump( posix_getgrgid($gid));\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getgrgid() : error conditions ***\r \r -- Testing posix_getgrgid() function with a negative group id --\rdiff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt\rindex 19e306b2ee..85f12d4917 100644\r--- a/ext/posix/tests/posix_getpgid_error.phpt\r+++ b/ext/posix/tests/posix_getpgid_error.phpt\r@@ -22,7 +22,7 @@ var_dump( posix_getpgid($pid) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getpgid() : error conditions ***\r \r -- Testing posix_getpgid() with negative pid  --\rdiff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt\rindex 365033b689..b4ec515e74 100644\r--- a/ext/posix/tests/posix_getpwuid_error.phpt\r+++ b/ext/posix/tests/posix_getpwuid_error.phpt\r@@ -20,7 +20,7 @@ var_dump( posix_getpwuid($uid) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getpwuid() : error conditions ***\r \r -- Testing posix_getpwuid() function negative uid --\rdiff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt\rindex 8e05a23496..08080230aa 100644\r--- a/ext/posix/tests/posix_getsid_error.phpt\r+++ b/ext/posix/tests/posix_getsid_error.phpt\r@@ -15,5 +15,5 @@ PHP Testfest Berlin 2009-05-10\r <?php\r var_dump( posix_getsid(-1) );\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\rdiff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt\rindex 20cf8cef8b..c77acfe3a4 100644\r--- a/ext/posix/tests/posix_initgroups.phpt\r+++ b/ext/posix/tests/posix_initgroups.phpt\r@@ -11,5 +11,5 @@ if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found\r var_dump(posix_initgroups(NULL, NULL));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\rdiff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt\rindex 89474c4994..ea9b4f45dc 100644\r--- a/ext/posix/tests/posix_kill_error.phpt\r+++ b/ext/posix/tests/posix_kill_error.phpt\r@@ -28,7 +28,7 @@ var_dump( posix_kill($pid, 999) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_kill() : error conditions ***\r \r -- Testing posix_kill() function with invalid signal --\rdiff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt\rindex 60b096656a..2792ff5b3b 100644\r--- a/ext/posix/tests/posix_strerror_error.phpt\r+++ b/ext/posix/tests/posix_strerror_error.phpt\r@@ -20,7 +20,7 @@ echo gettype( posix_strerror($errno) )."\n";\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_strerror() : error conditions ***\r \r -- Testing posix_strerror() function with invalid error number --\rdiff --git a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\rindex a135939052..607fead65c 100644\r--- a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r+++ b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r@@ -16,7 +16,7 @@ var_dump($rc->hasProperty(1));\r var_dump($rc->hasProperty(1.5));\r var_dump($rc->hasProperty(true));\r ?>\r---EXPECTF--\r+--EXPECT--\r Check invalid params:\r bool(false)\r bool(false)\rdiff --git a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\rindex 728ddf9265..7e45eec411 100644\r--- a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r+++ b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r@@ -43,7 +43,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing ReflectionMethod::getClosure() : error conditions ***\r \r -- Testing ReflectionMethod::getClosure() function with invalid object --\rdiff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\rindex 113cabbbeb..c3bab48d6f 100644\r--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r@@ -69,7 +69,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Non-instance:\r string(72) "Given object is not an instance of the class this method was declared in"\r \rdiff --git a/ext/reflection/tests/ReflectionObject_getName_basic.phpt b/ext/reflection/tests/ReflectionObject_getName_basic.phpt\rindex 1885695cb1..94ad1e2c7b 100644\r--- a/ext/reflection/tests/ReflectionObject_getName_basic.phpt\r+++ b/ext/reflection/tests/ReflectionObject_getName_basic.phpt\r@@ -15,7 +15,7 @@ $r3 = new ReflectionObject($r2);\r var_dump($r3->getName());\r \r ?>\r---EXPECTF--\r+--EXPECT--\r string(8) "stdClass"\r string(1) "C"\r string(16) "ReflectionObject"\rdiff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\rindex 1472615178..7defcb76e0 100644\r--- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r+++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r@@ -25,7 +25,7 @@ reflectProperty("TestClass", "prot");\r reflectProperty("TestClass", "priv");\r \r ?>\r---EXPECTF--\r+--EXPECT--\r **********************************\r Reflecting on property TestClass::pub\r \rdiff --git a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\rindex f58590b3ea..1f0c2b5f2b 100644\r--- a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r@@ -32,7 +32,7 @@ $propInfo = new ReflectionProperty('TestClass', 'pub2');\r var_dump($propInfo->setValue($instanceWithNoProperties, "NewValue"));\r var_dump($instanceWithNoProperties->pub2);\r ?>\r---EXPECTF--\r+--EXPECT--\r Protected property:\r Cannot access non-public member TestClass::$prot\r \rdiff --git a/ext/session/tests/bug79221.phpt b/ext/session/tests/bug79221.phpt\rindex b0972c4697..0813457035 100644\r--- a/ext/session/tests/bug79221.phpt\r+++ b/ext/session/tests/bug79221.phpt\r@@ -40,6 +40,6 @@ session_start();\r var_dump($_SESSION);\r session_destroy();\r \r---EXPECTF--\r+--EXPECT--\r array(0) {\r }\rdiff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt\rindex 284649e277..d291d531c0 100644\r--- a/ext/session/tests/session_cache_limiter_error.phpt\r+++ b/ext/session/tests/session_cache_limiter_error.phpt\r@@ -89,7 +89,7 @@ fclose($fp);\r echo "Done";\r ob_end_flush();\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing session_cache_limiter() : error functionality ***\r \r -- Iteration 1 --\rdiff --git a/ext/spl/tests/bug61347.phpt b/ext/spl/tests/bug61347.phpt\rindex b83f48f7ff..4b4f9eaedf 100644\r--- a/ext/spl/tests/bug61347.phpt\r+++ b/ext/spl/tests/bug61347.phpt\r@@ -21,7 +21,7 @@ var_dump(isset($b[37])); //true\r var_dump(isset($b['no_exists'])); //false\r var_dump(empty($b['b'])); //true\r var_dump(empty($b[37])); //true\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r bool(false)\rdiff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt\rindex e26a8d7aea..cce4a7d6a6 100644\r--- a/ext/spl/tests/fileobject_005.phpt\r+++ b/ext/spl/tests/fileobject_005.phpt\r@@ -27,6 +27,6 @@ $fo->fwrite("blahlubba");\r $path = __DIR__.DIRECTORY_SEPARATOR.'fileobject_005.txt';\r unlink($path);\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r string(4) "blah"\rdiff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt\rindex 63d78cc78e..e245b95688 100644\r--- a/ext/spl/tests/iterator_045.phpt\r+++ b/ext/spl/tests/iterator_045.phpt\r@@ -88,7 +88,7 @@ $it->testUnset($unsets);\r $it->show();\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)\r Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)\r MyCachingIterator::testSet()\rdiff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt\rindex 4816896d8a..3b0eaf1d66 100644\r--- a/ext/spl/tests/regexIterator_setMode_error.phpt\r+++ b/ext/spl/tests/regexIterator_setMode_error.phpt\r@@ -18,7 +18,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r string(14) "Illegal mode 7"\r int(0)\rdiff --git a/ext/spl/tests/spl_heap_is_empty_basic.phpt b/ext/spl/tests/spl_heap_is_empty_basic.phpt\rindex 4a90734ad4..abf64f8d9d 100644\r--- a/ext/spl/tests/spl_heap_is_empty_basic.phpt\r+++ b/ext/spl/tests/spl_heap_is_empty_basic.phpt\r@@ -22,7 +22,7 @@ var_dump($heap->isEmpty());\r $heap->extract();\r var_dump($heap->isEmpty());\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(false)\r bool(true)\rdiff --git a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\rindex 994c67e0c3..459beeca53 100644\r--- a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r+++ b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r@@ -69,7 +69,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r Unable to prepare statement: 23, not authorized\r bool(true)\rdiff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\rindex 3f9fe84130..9a893c590d 100644\r--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r@@ -44,7 +44,7 @@ var_dump($db->close());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r Getting expanded SQL statement\r string(21) "SELECT 42, 'php', 43;"\r Execute statement\rdiff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt\rindex c51e98a67b..ed9f0458c4 100644\r--- a/ext/standard/tests/array/005.phpt\r+++ b/ext/standard/tests/array/005.phpt\r@@ -69,7 +69,7 @@ var_dump( current($mixed_array[1]) );\r \r echo"Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Error Conditions ***\r NULL\r \rdiff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt\rindex c62be0d27c..fc10d293ff 100644\r--- a/ext/standard/tests/array/009.phpt\r+++ b/ext/standard/tests/array/009.phpt\r@@ -71,7 +71,7 @@ foreach ($varient_arrays as $sub_array )  {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r -- Iteration 1 --\r int(0)\rdiff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt\rindex 6aa7864ee9..69015289e2 100644\r--- a/ext/standard/tests/array/array_diff_assoc_error.phpt\r+++ b/ext/standard/tests/array/array_diff_assoc_error.phpt\r@@ -33,7 +33,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff_assoc() : error conditions ***\r \r -- Testing array_diff_assoc() function with zero arguments --\rdiff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt\rindex d269f010b8..889c5ce1b2 100644\r--- a/ext/standard/tests/array/array_diff_error.phpt\r+++ b/ext/standard/tests/array/array_diff_error.phpt\r@@ -33,7 +33,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff() : error conditions ***\r \r -- Testing array_diff() function with zero arguments --\rdiff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt\rindex e957abce1c..80ff5728fe 100644\r--- a/ext/standard/tests/array/array_diff_key_error.phpt\r+++ b/ext/standard/tests/array/array_diff_key_error.phpt\r@@ -28,7 +28,7 @@ try {\r     echo $e->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff_key() : error conditions ***\r \r -- Testing array_diff_key() function with less than expected no. of arguments --\rdiff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt\rindex a1b18bd234..2cb21ca609 100644\r--- a/ext/standard/tests/array/array_filter.phpt\r+++ b/ext/standard/tests/array/array_filter.phpt\r@@ -28,7 +28,7 @@ var_dump(array_filter($array3, "even"));\r var_dump(array_filter(array()));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Odd :\r array(3) {\r   ["a"]=>\rdiff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt\rindex 265daf1fb4..ff88d7a7f8 100644\r--- a/ext/standard/tests/array/array_filter_variation10.phpt\r+++ b/ext/standard/tests/array/array_filter_variation10.phpt\r@@ -56,7 +56,7 @@ try {\r \r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_filter() : usage variations - using array keys in 'callback' ***\r 0 = 0\r 1 = 1\rdiff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt\rindex 4a6409bb1f..ef6cf45139 100644\r--- a/ext/standard/tests/array/array_key_exists_variation3.phpt\r+++ b/ext/standard/tests/array/array_key_exists_variation3.phpt\r@@ -34,7 +34,7 @@ foreach($keys as $key) {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_key_exists() : usage variations ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/array/array_map_error.phpt b/ext/standard/tests/array/array_map_error.phpt\rindex 4739bbf663..b41871e1c4 100644\r--- a/ext/standard/tests/array/array_map_error.phpt\r+++ b/ext/standard/tests/array/array_map_error.phpt\r@@ -38,7 +38,7 @@ var_dump( array_map('callback2', $arr1, $arr2, $arr3) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_map() : error conditions ***\r \r -- Testing array_map() function with one less than expected no. of arguments --\rdiff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt\rindex 08ecbf7147..75007779fa 100644\r--- a/ext/standard/tests/array/array_merge.phpt\r+++ b/ext/standard/tests/array/array_merge.phpt\r@@ -83,7 +83,7 @@ var_dump(array_merge());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_merge() basic functionality ***\r \r --- Iteration 0 ---\rdiff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt\rindex 227a520ac1..78076b8fc4 100644\r--- a/ext/standard/tests/array/array_push.phpt\r+++ b/ext/standard/tests/array/array_push.phpt\r@@ -60,7 +60,7 @@ var_dump( $mixed_array[2] );\r \r echo"\nDone";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Edge Conditions ***\r int(11)\r int(1)\rdiff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt\rindex d19f5195d6..a76277883a 100644\r--- a/ext/standard/tests/array/array_slice.phpt\r+++ b/ext/standard/tests/array/array_slice.phpt\r@@ -68,7 +68,7 @@ foreach ($var_array as $sub_array)\r   var_dump (array_slice($var_array[2], -3, -2, false) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Iteration 1 ***\r \r *** Variation with first two Arguments ***\rdiff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt\rindex 9ebe83391e..265de4e846 100644\r--- a/ext/standard/tests/array/array_unshift.phpt\r+++ b/ext/standard/tests/array/array_unshift.phpt\r@@ -12,7 +12,7 @@ var_dump($a);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r array(1) {\r   [0]=>\rdiff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt\rindex 1f5457c9f7..151c9c70d0 100644\r--- a/ext/standard/tests/array/array_walk.phpt\r+++ b/ext/standard/tests/array/array_walk.phpt\r@@ -24,7 +24,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r int(0)\r string(4) "data"\rdiff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt\rindex dfc95d3af8..e5aeadcdc0 100644\r--- a/ext/standard/tests/array/array_walk_error2.phpt\r+++ b/ext/standard/tests/array/array_walk_error2.phpt\r@@ -54,7 +54,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk() : error conditions - callback parameters ***\r Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected\r Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected\rdiff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt\rindex 472cb1032d..d4d3e7d8eb 100644\r--- a/ext/standard/tests/array/array_walk_recursive1.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive1.phpt\r@@ -24,7 +24,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r int(0)\r string(4) "data"\rdiff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt\rindex f1686d7acd..2509c95f60 100644\r--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt\r@@ -54,7 +54,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk_recursive() : error conditions - callback parameters ***\r Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected\r Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected\rdiff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt\rindex a0c159d71d..a1cbdad2bd 100644\r--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt\r@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";\r var_dump( array_walk_recursive( $input, function() { echo "1\n"; }));\r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk_recursive() : anonymous function as callback ***\r -- Anonymous function with one argument --\r int(2)\rdiff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt\rindex 0354782eda..3689f8a798 100644\r--- a/ext/standard/tests/array/array_walk_variation7.phpt\r+++ b/ext/standard/tests/array/array_walk_variation7.phpt\r@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";\r var_dump( array_walk( $input, function() { echo "1\n"; }));\r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk() : anonymous function as callback ***\r -- Anonymous function with one argument --\r int(2)\rdiff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt\rindex d27cd569c0..b6abdeaef3 100644\r--- a/ext/standard/tests/array/uasort_variation8.phpt\r+++ b/ext/standard/tests/array/uasort_variation8.phpt\r@@ -29,7 +29,7 @@ var_dump($array_arg);\r \r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing uasort() : built in function as 'cmp_function' ***\r -- Testing uasort() with built-in 'cmp_function': strcasecmp() --\r bool(true)\rdiff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt\rindex 55ff362d41..4a750ccefa 100644\r--- a/ext/standard/tests/array/usort_variation8.phpt\r+++ b/ext/standard/tests/array/usort_variation8.phpt\r@@ -31,7 +31,7 @@ var_dump( usort($temp_array2, 'strcmp') );\r var_dump($temp_array2);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing usort() : usage variation ***\r \r -- Testing usort() with built-in 'cmp_function': strcasecmp() --\rdiff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt\rindex a28ea58d5a..7b550b36d1 100644\r--- a/ext/standard/tests/assert/assert_variation.phpt\r+++ b/ext/standard/tests/assert/assert_variation.phpt\r@@ -67,7 +67,7 @@ var_dump($rao=assert_options(ASSERT_CALLBACK));\r echo "ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n";\r var_dump($r2=assert(0 != 0));\r echo"\n";\r---EXPECTF--\r+--EXPECT--\r Initial values: assert_options(ASSERT_CALLBACK) => [f1]\r Initial values: ini.get("assert.callback") => [f1]\r f1 called\rdiff --git a/ext/standard/tests/file/auto_detect_line_endings_1.phpt b/ext/standard/tests/file/auto_detect_line_endings_1.phpt\rindex c79082ecdb..5a4ff0a10f 100644\r--- a/ext/standard/tests/file/auto_detect_line_endings_1.phpt\r+++ b/ext/standard/tests/file/auto_detect_line_endings_1.phpt\r@@ -15,7 +15,7 @@ var_dump(fgets(STDIN));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(1) "1"\r string(8) "fooBar1\r"\r string(8) "fooBar2\r"\rdiff --git a/ext/standard/tests/file/auto_detect_line_endings_2.phpt b/ext/standard/tests/file/auto_detect_line_endings_2.phpt\rindex f33a055e08..3994f1ee3b 100644\r--- a/ext/standard/tests/file/auto_detect_line_endings_2.phpt\r+++ b/ext/standard/tests/file/auto_detect_line_endings_2.phpt\r@@ -16,7 +16,7 @@ var_dump(fgets($stdin));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(2) "on"\r string(8) "fooBar1\r"\r string(8) "fooBar2\r"\rdiff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt\rindex 8352f4da4b..7a98e833a3 100644\r--- a/ext/standard/tests/file/basename.phpt\r+++ b/ext/standard/tests/file/basename.phpt\r@@ -138,7 +138,7 @@ check_basename( $file_path_variations );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r \r --Iteration 1--\rdiff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt\rindex 6605b795ff..4acadc6169 100644\r--- a/ext/standard/tests/file/fscanf.phpt\r+++ b/ext/standard/tests/file/fscanf.phpt\r@@ -75,7 +75,7 @@ echo "Done\n";\r $filename = __DIR__."/fscanf.dat";\r unlink($filename);\r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r NULL\r int(1)\rdiff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt\rindex f657c07005..507ed8e22d 100644\r--- a/ext/standard/tests/file/fscanf_variation10.phpt\r+++ b/ext/standard/tests/file/fscanf_variation10.phpt\r@@ -82,7 +82,7 @@ $file_path = __DIR__;\r $filename = "$file_path/fscanf_variation10.tmp";\r unlink($filename);\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Test fscanf(): different float format types with resource ***\r \r -- iteration 1 --\rdiff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt\rindex e82d9ae034..1cf1f25138 100644\r--- a/ext/standard/tests/file/is_dir_variation3.phpt\r+++ b/ext/standard/tests/file/is_dir_variation3.phpt\r@@ -30,7 +30,7 @@ foreach($dirnames as $dirname) {\r   var_dump( is_dir($dirname) );\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_dir() with Invalid arguments: expected bool(false) ***\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_executable_error.phpt b/ext/standard/tests/file/is_executable_error.phpt\rindex ad90d64435..e77ca86349 100644\r--- a/ext/standard/tests/file/is_executable_error.phpt\r+++ b/ext/standard/tests/file/is_executable_error.phpt\r@@ -10,7 +10,7 @@ echo "\n*** Testing is_exceutable() on non-existent directory ***\n";\r var_dump( is_executable(__DIR__."/is_executable") );\r \r echo "Done\n";\r---EXPECTF--\r+--EXPECT--\r *** Testing is_exceutable() on non-existent directory ***\r bool(false)\r Done\rdiff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt\rindex 92ad3320d3..802dbfdf7e 100644\r--- a/ext/standard/tests/file/is_executable_variation3.phpt\r+++ b/ext/standard/tests/file/is_executable_variation3.phpt\r@@ -40,7 +40,7 @@ foreach( $invalid_files as $invalid_file ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_executable(): usage variations ***\r \r *** Testing is_executable() on invalid files ***\rdiff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt\rindex d33b01dfb3..5bdb63e37c 100644\r--- a/ext/standard/tests/file/is_file_variation3.phpt\r+++ b/ext/standard/tests/file/is_file_variation3.phpt\r@@ -39,7 +39,7 @@ foreach([\r   clearstatcache();\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r float(-2.34555): 0\r string(1) " ": 0\r string(0) "": 0\rdiff --git a/ext/standard/tests/file/is_readable_error.phpt b/ext/standard/tests/file/is_readable_error.phpt\rindex 1520eb4d20..c8a6c34fa0 100644\r--- a/ext/standard/tests/file/is_readable_error.phpt\r+++ b/ext/standard/tests/file/is_readable_error.phpt\r@@ -11,7 +11,7 @@ var_dump( is_readable(__DIR__."/is_readable.tmp") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_readable() on non-existent file ***\r bool(false)\r Done\rdiff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt\rindex 97c794d1b7..f7eebdc2b8 100644\r--- a/ext/standard/tests/file/is_readable_variation3.phpt\r+++ b/ext/standard/tests/file/is_readable_variation3.phpt\r@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_readable(): usage variations ***\r \r *** Testing is_readable() on miscellaneous filenames ***\rdiff --git a/ext/standard/tests/file/is_uploaded_file_basic.phpt b/ext/standard/tests/file/is_uploaded_file_basic.phpt\rindex d053244a79..3e5bf6320c 100644\r--- a/ext/standard/tests/file/is_uploaded_file_basic.phpt\r+++ b/ext/standard/tests/file/is_uploaded_file_basic.phpt\r@@ -30,7 +30,7 @@ var_dump(is_uploaded_file('random_filename.txt'));\r var_dump(is_uploaded_file('__FILE__'));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_writable_error.phpt b/ext/standard/tests/file/is_writable_error.phpt\rindex e2a38412cd..f01e69b13d 100644\r--- a/ext/standard/tests/file/is_writable_error.phpt\r+++ b/ext/standard/tests/file/is_writable_error.phpt\r@@ -14,7 +14,7 @@ var_dump( is_writeable(__DIR__."/is_writable") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_writable() on non-existent file ***\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt\rindex c5843a5abf..167d874ac2 100644\r--- a/ext/standard/tests/file/is_writable_variation3.phpt\r+++ b/ext/standard/tests/file/is_writable_variation3.phpt\r@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {\r   clearstatcache();\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_writable(): usage variations ***\r \r *** Testing is_writable() with invalid filenames ***\rdiff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt\rindex 7af8748fe2..b80c052691 100644\r--- a/ext/standard/tests/file/move_uploaded_file_basic.phpt\r+++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt\r@@ -50,7 +50,7 @@ var_dump(move_uploaded_file($_FILES['file2']['tmp_name'], $destination4));\r unlink($destination4);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Valid move\r bool(true)\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt\rindex bb7ccf542b..c17d5d3e71 100644\r--- a/ext/standard/tests/general_functions/get_include_path_basic.phpt\r+++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt\r@@ -20,7 +20,7 @@ if (ini_get("include_path") == get_include_path()) {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing get_include_path()\r string(1) "."\r PASSED\rdiff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt\rindex 56327500ea..06e806b3a2 100644\r--- a/ext/standard/tests/general_functions/include_path.phpt\r+++ b/ext/standard/tests/general_functions/include_path.phpt\r@@ -31,7 +31,7 @@ var_dump(get_include_path());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(1) "."\r NULL\r string(1) "."\rdiff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt\rindex 200ecbd6ac..37de6d5a5b 100644\r--- a/ext/standard/tests/general_functions/is_array.phpt\r+++ b/ext/standard/tests/general_functions/is_array.phpt\r@@ -103,7 +103,7 @@ echo "Done\n";\r fclose($fp);\r closedir($dfp);\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_array() on different type of arrays ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt\rindex 7c8d693a1b..70aaed9c3f 100644\r--- a/ext/standard/tests/general_functions/is_bool.phpt\r+++ b/ext/standard/tests/general_functions/is_bool.phpt\r@@ -134,7 +134,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_bool() with valid boolean values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt\rindex dc6df0f109..1815e53c00 100644\r--- a/ext/standard/tests/general_functions/is_float_64bit.phpt\r+++ b/ext/standard/tests/general_functions/is_float_64bit.phpt\r@@ -131,7 +131,7 @@ foreach ($not_floats as $value ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_float(), is_double() and is_real() with float values***\r -- Iteration 1 --\r bool(false)\rdiff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt\rindex e5c6ce77e0..8e5e9332c0 100644\r--- a/ext/standard/tests/general_functions/is_int_64bit.phpt\r+++ b/ext/standard/tests/general_functions/is_int_64bit.phpt\r@@ -136,7 +136,7 @@ foreach ($not_int_types as $type ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_int(), is_integer() & is_long()  with valid integer values ***\r --Iteration 1--\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt\rindex 4fc325c744..6560707e57 100644\r--- a/ext/standard/tests/general_functions/is_null.phpt\r+++ b/ext/standard/tests/general_functions/is_null.phpt\r@@ -134,7 +134,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_null() with valid null values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt\rindex 491aa5d15b..8883c57ac2 100644\r--- a/ext/standard/tests/general_functions/is_numeric.phpt\r+++ b/ext/standard/tests/general_functions/is_numeric.phpt\r@@ -152,7 +152,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_numeric() with valid numeric values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt\rindex dd0e7689fd..8a5ac1bcbe 100644\r--- a/ext/standard/tests/general_functions/is_object.phpt\r+++ b/ext/standard/tests/general_functions/is_object.phpt\r@@ -145,7 +145,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_object() with valid objects ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt\rindex f7ef3f5317..6a89da9f56 100644\r--- a/ext/standard/tests/general_functions/is_scalar.phpt\r+++ b/ext/standard/tests/general_functions/is_scalar.phpt\r@@ -112,7 +112,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt\rindex 7760f79831..a4ef7a47b1 100644\r--- a/ext/standard/tests/general_functions/is_string.phpt\r+++ b/ext/standard/tests/general_functions/is_string.phpt\r@@ -147,7 +147,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_string() with valid string values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt\rindex 46d5d2d0f6..0eb1adf9ee 100644\r--- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt\r+++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt\r@@ -32,7 +32,7 @@ dump_string_length( '' );\r dump_string_length( null );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing ob_get_length() : basic functionality ***\r bool(false)\r int(26)\rdiff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt\rindex 23859a33ac..c64c15b404 100644\r--- a/ext/standard/tests/general_functions/php_uname_error.phpt\r+++ b/ext/standard/tests/general_functions/php_uname_error.phpt\r@@ -13,7 +13,7 @@ echo "\n-- Testing php_uname() function with invalid mode --\n";\r var_dump( php_uname('z') == php_uname('z') );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing php_uname() - error test\r \r -- Testing php_uname() function with invalid mode --\rdiff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt\rindex 3f24a5bc9d..d2ec63f5b4 100644\r--- a/ext/standard/tests/general_functions/print_r.phpt\r+++ b/ext/standard/tests/general_functions/print_r.phpt\r@@ -276,7 +276,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing print_r() on integer variables ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt\rindex a0e9e148c6..5df1637dbd 100644\r--- a/ext/standard/tests/general_functions/print_r_64bit.phpt\r+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt\r@@ -280,7 +280,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing print_r() on integer variables ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt\rindex 0600775f58..7b74761586 100644\r--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt\r+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt\r@@ -279,7 +279,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing var_dump() on integer variables ***\r -- Iteration 1 --\r int(0)\rdiff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt\rindex bdc61d9928..9f9cd0e896 100644\r--- a/ext/standard/tests/general_functions/var_export-locale.phpt\r+++ b/ext/standard/tests/general_functions/var_export-locale.phpt\r@@ -307,7 +307,7 @@ echo "\nDone";\r \r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing var_export() with integer values ***\r \r *** Output for integer values ***\rdiff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt\rindex 249df57943..448aac4e99 100644\r--- a/ext/standard/tests/image/image_type_to_extension.phpt\r+++ b/ext/standard/tests/image/image_type_to_extension.phpt\r@@ -33,7 +33,7 @@ image_type_to_extension()\r     var_dump(image_type_to_extension(0));\r ?>\r Done\r---EXPECTF--\r+--EXPECT--\r Constant: IMAGETYPE_GIF\r  With dot: .gif\r  Without dot: gif\rdiff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt\rindex 95811c6f3c..ca76b5c836 100644\r--- a/ext/standard/tests/math/lcg_value_basic.phpt\r+++ b/ext/standard/tests/math/lcg_value_basic.phpt\r@@ -24,7 +24,7 @@ if ($i != 100) {\r echo "MATHS test script completed\n";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r MATHS test script started\r \r  lcg_value tests...\rdiff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt\rindex 29b4aa0e6b..b25265446f 100644\r--- a/ext/standard/tests/network/inet.phpt\r+++ b/ext/standard/tests/network/inet.phpt\r@@ -35,7 +35,7 @@ foreach ($array as $val) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(9) "127.0.0.1"\r string(13) "255.255.255.0"\r bool(false)\rdiff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt\rindex c659eb70fb..dd81bde55c 100644\r--- a/ext/standard/tests/network/ip_x86_64.phpt\r+++ b/ext/standard/tests/network/ip_x86_64.phpt\r@@ -29,7 +29,7 @@ var_dump(long2ip(-110000));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(2130706433)\r string(9) "127.0.0.1"\r int(167772161)\rdiff --git a/ext/standard/tests/random/random_int.phpt b/ext/standard/tests/random/random_int.phpt\rindex 94654a7f72..6fd04420ee 100644\r--- a/ext/standard/tests/random/random_int.phpt\r+++ b/ext/standard/tests/random/random_int.phpt\r@@ -15,7 +15,7 @@ var_dump(is_int(random_int(PHP_INT_MIN, PHP_INT_MAX)));\r var_dump(random_int(42,42));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(true)\rdiff --git a/ext/standard/tests/serialize/bug45706.phpt b/ext/standard/tests/serialize/bug45706.phpt\rindex cc71dec4e6..c29081cab7 100644\r--- a/ext/standard/tests/serialize/bug45706.phpt\r+++ b/ext/standard/tests/serialize/bug45706.phpt\r@@ -12,7 +12,7 @@ $s = serialize($x);\r $s = str_replace("Foo", "Bar", $s);\r $y = unserialize($s);\r var_dump($y);\r---EXPECTF--\r+--EXPECT--\r array(2) {\r   [0]=>\r   object(__PHP_Incomplete_Class)#3 (5) {\rdiff --git a/ext/standard/tests/streams/bug61115.phpt b/ext/standard/tests/streams/bug61115.phpt\rindex 3caffde232..ce6b57651c 100644\r--- a/ext/standard/tests/streams/bug61115.phpt\r+++ b/ext/standard/tests/streams/bug61115.phpt\r@@ -13,5 +13,5 @@ try {\r     echo $e->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r Object of class Closure could not be converted to string\rdiff --git a/ext/standard/tests/streams/bug78662.phpt b/ext/standard/tests/streams/bug78662.phpt\rindex e874d5aef6..2ea00b67b1 100644\r--- a/ext/standard/tests/streams/bug78662.phpt\r+++ b/ext/standard/tests/streams/bug78662.phpt\r@@ -26,7 +26,7 @@ var_dump(fwrite($f, "bar"));\r var_dump(fread($f, 100));\r ?>\r Done\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r Done\rdiff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt\rindex 7dcc645422..64e9aa5773 100644\r--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt\r+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt\r@@ -41,7 +41,7 @@ fclose($server);\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing stream_set_timeout() : error conditions ***\r \r -- Testing stream_set_timeout() function with a closed socket --\rdiff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt\rindex 2603b69210..b6bd9973b6 100644\r--- a/ext/standard/tests/strings/chr_error.phpt\r+++ b/ext/standard/tests/strings/chr_error.phpt\r@@ -26,7 +26,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing chr() : error conditions ***\r \r -- Testing chr() function with no arguments --\rdiff --git a/ext/standard/tests/strings/fprintf_error.phpt b/ext/standard/tests/strings/fprintf_error.phpt\rindex 1ffc188051..bfef30a75b 100644\r--- a/ext/standard/tests/strings/fprintf_error.phpt\r+++ b/ext/standard/tests/strings/fprintf_error.phpt\r@@ -29,7 +29,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Error Conditions ***\r Wrong parameter count for fprintf()\r Wrong parameter count for fprintf()\rdiff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt\rindex f2abfd5ba8..2a04bd345e 100644\r--- a/ext/standard/tests/strings/htmlentities24.phpt\r+++ b/ext/standard/tests/strings/htmlentities24.phpt\r@@ -37,7 +37,7 @@ var_dump( htmlentities($str, ENT_COMPAT) );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Retrieving htmlentities for 256 characters ***\r string(12) "636872283029"\r string(12) "636872283129"\rdiff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt\rindex 6e5c5fac36..5677da6fe2 100644\r--- a/ext/standard/tests/strings/htmlspecialchars.phpt\r+++ b/ext/standard/tests/strings/htmlspecialchars.phpt\r@@ -37,7 +37,7 @@ var_dump( htmlspecialchars($str, ENT_COMPAT) );\r \r echo "Done\n"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Retrieving htmlspecialchars for 256 characters ***\r string(12) "636872283029"\r string(12) "636872283129"\rdiff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt\rindex 51287e04d7..8ac57ca92e 100644\r--- a/ext/standard/tests/strings/ltrim.phpt\r+++ b/ext/standard/tests/strings/ltrim.phpt\r@@ -41,7 +41,7 @@ var_dump( ltrim($str, "\nusi") );\r echo "\nDone\n";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Output for Error Conditions ***\r \r  *** Using heredoc string ***\rdiff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt\rindex 2bc16b3248..a6b52e3934 100644\r--- a/ext/standard/tests/strings/metaphone.phpt\r+++ b/ext/standard/tests/strings/metaphone.phpt\r@@ -24,7 +24,7 @@ foreach($array as $str) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(0) ""\r bool(false)\rdiff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt\rindex 60277fa184..38652ba0fa 100644\r--- a/ext/standard/tests/strings/parse_str_basic1.phpt\r+++ b/ext/standard/tests/strings/parse_str_basic1.phpt\r@@ -27,7 +27,7 @@ var_dump(parse_str($s1, $res3_array));\r var_dump($res3_array);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing parse_str() : basic functionality ***\r \r Basic test WITH undefined var for result arg\rdiff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt\rindex 25b5f8745d..0ea88a365b 100644\r--- a/ext/standard/tests/strings/parse_str_basic3.phpt\r+++ b/ext/standard/tests/strings/parse_str_basic3.phpt\r@@ -73,7 +73,7 @@ var_dump(parse_str($str, $res));\r var_dump($res);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing parse_str() : basic functionality ***\r \r Test string with array values and results array\rdiff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt\rindex 62591e9e6f..e9fc0a4383 100644\r--- a/ext/standard/tests/strings/printf_error.phpt\r+++ b/ext/standard/tests/strings/printf_error.phpt\r@@ -61,7 +61,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing printf() : error conditions ***\r \r -- Testing printf() function with Zero arguments --\rdiff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt\rindex 223a839f58..2fc531faad 100644\r--- a/ext/standard/tests/strings/rtrim.phpt\r+++ b/ext/standard/tests/strings/rtrim.phpt\r@@ -42,7 +42,7 @@ var_dump( rtrim($str, "ing") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Output for Normal Behaviour ***\r string(10) "rtrim test"\r string(13) "rtrim test   "\rdiff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt\rindex ef61ac495e..c4acc2ff68 100644\r--- a/ext/standard/tests/strings/soundex.phpt\r+++ b/ext/standard/tests/strings/soundex.phpt\r@@ -30,7 +30,7 @@ foreach ($array as $str) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\r string(4) "0000"\r string(4) "F650"\rdiff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt\rindex 07774a92ec..66d85647ff 100644\r--- a/ext/standard/tests/strings/sprintf_variation15.phpt\r+++ b/ext/standard/tests/strings/sprintf_variation15.phpt\r@@ -74,7 +74,7 @@ foreach($string_values as $string_value) {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing sprintf() : string formats with string values ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt\rindex ffaefb8418..0af8f9ed14 100644\r--- a/ext/standard/tests/strings/sscanf_error.phpt\r+++ b/ext/standard/tests/strings/sscanf_error.phpt\r@@ -20,7 +20,7 @@ try {\r     echo $exception->getMessage() . "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing sscanf() : error conditions ***\r \r -- Testing sscanf() function with more than expected no. of arguments --\rdiff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt\rindex a5a35769e4..c360004a14 100644\r--- a/ext/standard/tests/strings/str_ireplace.phpt\r+++ b/ext/standard/tests/strings/str_ireplace.phpt\r@@ -44,7 +44,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(8) "aaaaaaaT"\r string(8) "aaaaaaaT"\rdiff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt\rindex 7b1b5312a1..09e6cff53c 100644\r--- a/ext/standard/tests/strings/stristr.phpt\r+++ b/ext/standard/tests/strings/stristr.phpt\r@@ -14,7 +14,7 @@ stristr() function\r     var_dump(md5(stristr("\\\\a\\", "\\a")));\r     var_dump(stristr("tEsT sTrInG", " "));\r ?>\r---EXPECTF--\r+--EXPECT--\r string(11) "tEsT sTrInG"\r string(6) "sTrInG"\r string(6) "sTrInG"\rdiff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt\rindex a75dd96bbf..f28571ba7f 100644\r--- a/ext/standard/tests/strings/strrchr_variation1.phpt\r+++ b/ext/standard/tests/strings/strrchr_variation1.phpt\r@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {\r }\r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strrchr() function: with various double quoted strings ***\r -- Iteration 1 --\r string(16) "lo123456he #4 A "\rdiff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt\rindex 2ff6720fb9..e6e510dd55 100644\r--- a/ext/standard/tests/strings/strrchr_variation2.phpt\r+++ b/ext/standard/tests/strings/strrchr_variation2.phpt\r@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {\r }\r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strrchr() function: with various single quoted strings ***\r -- Iteration 1 --\r string(22) "lo123456he \x234 \101 "\rdiff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt\rindex 7c7e2bb4c7..041b66a00c 100644\r--- a/ext/standard/tests/strings/strtolower.phpt\r+++ b/ext/standard/tests/strings/strtolower.phpt\r@@ -65,7 +65,7 @@ else\r \r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strtolower() with 128 chars ***\r 00 => 00\r 01 => 01\rdiff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt\rindex c243ff10c7..6c7434ba16 100644\r--- a/ext/standard/tests/strings/strtoupper1.phpt\r+++ b/ext/standard/tests/strings/strtoupper1.phpt\r@@ -65,7 +65,7 @@ else\r \r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strtoupper() with 128 chars ***\r 00 => 00\r 01 => 01\rdiff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt\rindex a363e26f24..88cca824a6 100644\r--- a/ext/standard/tests/strings/strval_error.phpt\r+++ b/ext/standard/tests/strings/strval_error.phpt\r@@ -25,7 +25,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strval() : error conditions ***\r \r -- Testing strval() function with object which has not toString() method  --\rdiff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt\rindex fe687ed1ae..6028c17008 100644\r--- a/ext/standard/tests/strings/substr.phpt\r+++ b/ext/standard/tests/strings/substr.phpt\r@@ -66,7 +66,7 @@ var_dump (substr("abcdef" , 2, NULL) );\r echo"\nDone";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r --- Iteration 1 ---\r \r -- Variations for two arguments --\rdiff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt\rindex 1ad504c61d..a31d7213a1 100644\r--- a/ext/standard/tests/strings/trim1.phpt\r+++ b/ext/standard/tests/strings/trim1.phpt\r@@ -49,7 +49,7 @@ var_dump( trim($str, "us\ning") );\r \r echo "\nDone";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(0) ""\r string(1) "0"\rdiff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt\rindex f2057ea388..fdaecd6fb3 100644\r--- a/ext/standard/tests/strings/vfprintf_error1.phpt\r+++ b/ext/standard/tests/strings/vfprintf_error1.phpt\r@@ -42,7 +42,7 @@ $file = 'vfprintf_error1.txt';\r unlink( $file );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r -- Testing vfprintf() function with more than expected no. of arguments --\r Wrong parameter count for vfprintf()\r Wrong parameter count for vfprintf()\rdiff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt\rindex d7eb11fc55..87965cd1a2 100644\r--- a/ext/standard/tests/time/strptime_error.phpt\r+++ b/ext/standard/tests/time/strptime_error.phpt\r@@ -24,7 +24,7 @@ $format = '%b %d %Y %H:%M:%S';\r var_dump( strptime('foo', $format) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strptime() : error conditions ***\r \r -- Testing strptime() function on failure --\rdiff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt\rindex 8e58c81891..006377d5e9 100644\r--- a/ext/tokenizer/tests/001.phpt\r+++ b/ext/tokenizer/tests/001.phpt\r@@ -129,7 +129,7 @@ echo token_name(0x8000000F), "\n";\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r T_INCLUDE\r T_INCLUDE_ONCE\r T_EVAL\rdiff --git a/ext/xmlreader/tests/static.phpt b/ext/xmlreader/tests/static.phpt\rindex 1c6cb5b870..a722e31105 100644\r--- a/ext/xmlreader/tests/static.phpt\r+++ b/ext/xmlreader/tests/static.phpt\r@@ -22,7 +22,7 @@ while ($reader->read()) {\r     echo $reader->name, "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r books\r books\r books\rdiff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt\rindex 886e149261..c04ffe3167 100644\r--- a/ext/xmlwriter/tests/bug41326.phpt\r+++ b/ext/xmlwriter/tests/bug41326.phpt\r@@ -35,7 +35,7 @@ $xw->endElement();\r $xw->endDocument();\r print $xw->flush(true);\r ?>\r---EXPECTF--\r+--EXPECT--\r <?xml version="1.0"?>\r <test>\r  <foo/>\rdiff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt\rindex 55a25f1c9f..e7c1038350 100644\r--- a/tests/output/stream_isatty_err.phpt\r+++ b/tests/output/stream_isatty_err.phpt\r@@ -13,7 +13,7 @@ STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdErr();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\rdiff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt\rindex 2554eb4689..73514955d4 100644\r--- a/tests/output/stream_isatty_in-err.phpt\r+++ b/tests/output/stream_isatty_in-err.phpt\r@@ -13,7 +13,7 @@ STDIN STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdErr();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt\rindex 496bdd100e..9b65e8861b 100644\r--- a/tests/output/stream_isatty_in-out-err.phpt\r+++ b/tests/output/stream_isatty_in-out-err.phpt\r@@ -13,7 +13,7 @@ STDIN STDOUT STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt\rindex d58e9aa05c..c2bb346854 100644\r--- a/tests/output/stream_isatty_in-out.phpt\r+++ b/tests/output/stream_isatty_in-out.phpt\r@@ -13,7 +13,7 @@ STDIN STDOUT\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt\rindex e3ec1237bc..dc113a9720 100644\r--- a/tests/output/stream_isatty_out-err.phpt\r+++ b/tests/output/stream_isatty_out-err.phpt\r@@ -13,7 +13,7 @@ STDOUT STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\rdiff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt\rindex 3ea4996ac4..f18c986c5a 100644\r--- a/tests/output/stream_isatty_out.phpt\r+++ b/tests/output/stream_isatty_out.phpt\r@@ -13,7 +13,7 @@ STDOUT\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch and 'fork/tests/use-simpler-expect-section' have diverged,\r# and have 1 and 1 different commits each, respectively.\r#   (use "git pull" to merge the remote branch into yours)\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#

Folder mark

Use ascii lowercase if locale is default C

update NEWS

Merge branch 'sse2_strtolower' of https://github.com/laruence/php-src

* 'sse2_strtolower' of https://github.com/laruence/php-src:
  Also zend_str_tolower_dup_ex
  Remove unnecessary register qualifier
  SSE2 str_tolower

Also zend_str_tolower_dup_ex

Fix libtool to provide a simple way to generate only "shared" object files or libraries.

- Support for "-shared" option is taken from libtool-2.0 that is already at lease 15 years old.
- Change PHP build system to use "-shared" instead of "--tag=disable-static".

Use EXPECT instead of EXPECTF when possible\r\rEXPECTF logic in run tests is considerable, so lets avoid it\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is behind 'fork/tests/use-simpler-expect-section' by 1 commit, and can be fast-forwarded.\r#   (use "git pull" to update your local branch)\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r# ------------------------ >8 ------------------------\r# Do not modify or remove the line above.\r# Everything below it will be ignored.\rdiff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt\rindex f4abfb6c51..413f3205ad 100644\r--- a/Zend/tests/005.phpt\r+++ b/Zend/tests/005.phpt\r@@ -13,7 +13,7 @@ var_dump(strcasecmp("01", "01"));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r int(-3)\r int(-1)\rdiff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt\rindex 7067c23e0d..9cd845e337 100644\r--- a/Zend/tests/bug27669.phpt\r+++ b/Zend/tests/bug27669.phpt\r@@ -10,5 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy\r     $y[0] = 'hello';\r     A::{$y[0]}();\r ?>\r---EXPECTF--\r+--EXPECT--\r Hello World\rdiff --git a/Zend/tests/bug51827.phpt b/Zend/tests/bug51827.phpt\rindex 6c3d721716..1a2d9bdf39 100644\r--- a/Zend/tests/bug51827.phpt\r+++ b/Zend/tests/bug51827.phpt\r@@ -13,7 +13,7 @@ register_shutdown_function('ABC');\r register_shutdown_function('exploDe');\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r \r Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0\rdiff --git a/Zend/tests/bug63206.phpt b/Zend/tests/bug63206.phpt\rindex dc7bb1fd1d..6aba55eca1 100644\r--- a/Zend/tests/bug63206.phpt\r+++ b/Zend/tests/bug63206.phpt\r@@ -22,7 +22,7 @@ set_error_handler(function() {\r $triggerNotice1++;\r $triggerNotice2++;\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\r Internal handler\r Second handler\rdiff --git a/Zend/tests/bug63206_1.phpt b/Zend/tests/bug63206_1.phpt\rindex f08f913824..d054211638 100644\r--- a/Zend/tests/bug63206_1.phpt\r+++ b/Zend/tests/bug63206_1.phpt\r@@ -22,5 +22,5 @@ restore_error_handler();\r \r $triggerNotice++;\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\rdiff --git a/Zend/tests/bug63206_2.phpt b/Zend/tests/bug63206_2.phpt\rindex 7a2bf38543..a4a67f577e 100644\r--- a/Zend/tests/bug63206_2.phpt\r+++ b/Zend/tests/bug63206_2.phpt\r@@ -22,5 +22,5 @@ restore_exception_handler();\r \r throw new Exception();\r ?>\r---EXPECTF--\r+--EXPECT--\r Second handler\rdiff --git a/Zend/tests/incompat_ctx_user.phpt b/Zend/tests/incompat_ctx_user.phpt\rindex 8c7461e4f7..3fe0456175 100644\r--- a/Zend/tests/incompat_ctx_user.phpt\r+++ b/Zend/tests/incompat_ctx_user.phpt\r@@ -16,5 +16,5 @@ try {\r     echo "Exception: " . $e->getMessage() . "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r Exception: Non-static method A::foo() cannot be called statically\rdiff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt\rindex 27170420f0..02b7d59baf 100644\r--- a/Zend/tests/instanceof_001.phpt\r+++ b/Zend/tests/instanceof_001.phpt\r@@ -17,7 +17,7 @@ var_dump($c[0] instanceof stdClass);\r var_dump(@$inexistent instanceof stdClass);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(true)\rdiff --git a/Zend/tests/unexpected_ref_bug.phpt b/Zend/tests/unexpected_ref_bug.phpt\rindex 0d78410d1a..172b1e6224 100644\r--- a/Zend/tests/unexpected_ref_bug.phpt\r+++ b/Zend/tests/unexpected_ref_bug.phpt\r@@ -15,5 +15,5 @@ $my_var = str_repeat("A", 64);\r $data = call_user_func_array("str_replace", array(&$my_var, new Test(), "foo"));\r echo "Done.\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r Done.\rdiff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt\rindex ee8faf1c00..0997ef047c 100644\r--- a/ext/date/tests/012.phpt\r+++ b/ext/date/tests/012.phpt\r@@ -13,7 +13,7 @@ var_dump(date_isodate_set($dto, 2006, 100, 15));\r var_dump($dto->format("Y/m/d H:i:s"));\r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r object(DateTime)#1 (3) {\r   ["date"]=>\r   string(26) "2006-01-23 00:00:00.000000"\rdiff --git a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\rindex 715ea63dc9..f96753b019 100644\r--- a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r+++ b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r@@ -14,6 +14,6 @@ try {\r     echo $exception->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r DatePeriod::__construct(): The recurrence count '0' is invalid. Needs to be > 0\r DatePeriod::__construct(): The recurrence count '-1' is invalid. Needs to be > 0\rdiff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\rindex cb948e9df5..670dcb2ee3 100644\r--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";\r var_dump( $abbr["acst"] );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing DateTimeZone::listAbbreviations() : basic functionality ***\r string(5) "array"\r int(144)\rdiff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt\rindex 0d58c1f8e9..36f8d9bbdd 100644\r--- a/ext/date/tests/date_parse_001.phpt\r+++ b/ext/date/tests/date_parse_001.phpt\r@@ -14,7 +14,7 @@ Test basic date_parse()\r     var_dump(date_parse(""));\r     echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(12) {\r   ["year"]=>\r   int(2006)\rdiff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt\rindex 24b0094c9e..6a5180fdfb 100644\r--- a/ext/date/tests/date_parse_error.phpt\r+++ b/ext/date/tests/date_parse_error.phpt\r@@ -17,7 +17,7 @@ $invalid_date = "2OO9-02--27 10:00?00.5";\r var_dump( date_parse($invalid_date) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing date_parse() : error conditions ***\r \r -- Testing date_parse() function with unexpected characters in $date argument --\rdiff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt\rindex 303bd9b010..f96b635c08 100644\r--- a/ext/date/tests/gmmktime_basic.phpt\r+++ b/ext/date/tests/gmmktime_basic.phpt\r@@ -22,6 +22,6 @@ $year = 2008;\r var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing gmmktime() : basic functionality ***\r int(1218182888)\rdiff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt\rindex e40e40f38d..8bdb61df7b 100644\r--- a/ext/date/tests/mktime_error.phpt\r+++ b/ext/date/tests/mktime_error.phpt\r@@ -35,7 +35,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing mktime() : error conditions ***\r \r -- Testing mktime() function with Zero arguments --\rdiff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt\rindex b3bf7c84a1..0640b8a83d 100644\r--- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt\r+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt\r@@ -22,7 +22,7 @@ echo "\n-- Format a sample entry --\n";\r var_dump( $abbr["acst"] );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing timezone_abbreviations_list() : basic functionality ***\r string(5) "array"\r int(144)\rdiff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\rindex 50a1559f58..855acaaed8 100644\r--- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r+++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );\r var_dump( $finfo->set_flags( FILEINFO_MIME ) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing finfo_set_flags() : basic functionality ***\r bool(true)\r bool(true)\rdiff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt\rindex 95f2648f51..fe2921b560 100644\r--- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt\r+++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt\r@@ -25,7 +25,7 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile );\r var_dump( $finfo->set_flags( FILEINFO_MIME ) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing finfo_set_flags() : basic functionality ***\r bool(true)\r bool(true)\rdiff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt\rindex dc966b8cc9..b5f285342b 100644\r--- a/ext/filter/tests/007.phpt\r+++ b/ext/filter/tests/007.phpt\r@@ -23,7 +23,7 @@ var_dump(filter_has_var(INPUT_POST, ""));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(false)\rdiff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt\rindex 75e0968c62..1d4d64529d 100644\r--- a/ext/filter/tests/008.phpt\r+++ b/ext/filter/tests/008.phpt\r@@ -9,7 +9,7 @@ var_dump(filter_list());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(21) {\r   [0]=>\r   string(3) "int"\rdiff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt\rindex 14f8db01af..46b6044668 100644\r--- a/ext/filter/tests/010.phpt\r+++ b/ext/filter/tests/010.phpt\r@@ -17,7 +17,7 @@ var_dump(filter_var(1, 0, array()));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r array(7) {\r   [0]=>\r   int(1)\rdiff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt\rindex cee86ae82e..ceb21631d1 100644\r--- a/ext/hash/tests/hash_hkdf_edges.phpt\r+++ b/ext/hash/tests/hash_hkdf_edges.phpt\r@@ -25,7 +25,7 @@ catch (\Error $e) {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing hash_hkdf(): edge cases ***\r Length < digestSize: 98b16391063ece\r Length % digestSize != 0: 98b16391063ecee006a3ca8ee5776b1e5f\rdiff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt\rindex 4569c46c35..11b9d05738 100644\r--- a/ext/hash/tests/hash_hmac_file_basic.phpt\r+++ b/ext/hash/tests/hash_hmac_file_basic.phpt\r@@ -57,7 +57,7 @@ echo "sha256(raw): " . bin2hex(hash_hmac_file('sha256', $file, $key, TRUE)). "\n\r unlink($file);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing hash_hmac_file() : basic functionality ***\r gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918\r haval128,3: f1cea637451097d790354a86de3f54a3\rdiff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt\rindex 75b06f72a2..0eb55c4c66 100644\r--- a/ext/json/tests/json_last_error_msg_error.phpt\r+++ b/ext/json/tests/json_last_error_msg_error.phpt\r@@ -14,6 +14,6 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r string(8) "No error"\r json_last_error_msg() expects exactly 0 parameters, 1 given\rdiff --git a/ext/libxml/tests/bug76777.phpt b/ext/libxml/tests/bug76777.phpt\rindex 5e15024b81..c50e52203f 100644\r--- a/ext/libxml/tests/bug76777.phpt\r+++ b/ext/libxml/tests/bug76777.phpt\r@@ -29,7 +29,7 @@ libxml_set_external_entity_loader(function($p,$s,$c) {\r $dom=new DOMDocument($xml);\r $dom->schemaValidateSource($xsd);\r ?>\r---EXPECTF--\r+--EXPECT--\r NULL\r string(15) "nonexistent.xsd"\r array(4) {\rdiff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt\rindex 2401e0bb49..d7748bf954 100644\r--- a/ext/pcre/tests/preg_replace_error2.phpt\r+++ b/ext/pcre/tests/preg_replace_error2.phpt\r@@ -29,7 +29,7 @@ try {\r }\r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing preg_replace() : error conditions ***\r \r Arg value is: this is a string\rdiff --git a/ext/pcre/tests/split2.phpt b/ext/pcre/tests/split2.phpt\rindex 5fafee3b87..3d9714a420 100644\r--- a/ext/pcre/tests/split2.phpt\r+++ b/ext/pcre/tests/split2.phpt\r@@ -19,7 +19,7 @@ var_dump(preg_split('/(\d*)/', 'ab2c3u'));\r var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r array(15) {\r   [0]=>\r   string(0) ""\rdiff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt\rindex 8b9088b9b3..d44c0603e9 100644\r--- a/ext/phar/tests/phar_isvalidpharfilename.phpt\r+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt\r@@ -72,7 +72,7 @@ var_dump(Phar::isValidPharFilename('dir.phar.php', false));\r --CLEAN--\r <?php\r rmdir(__DIR__ . '/.phar');\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r bool(false)\rdiff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt\rindex 822b5ac628..26d7257602 100644\r--- a/ext/phar/tests/pharfileinfo_chmod.phpt\r+++ b/ext/phar/tests/pharfileinfo_chmod.phpt\r@@ -24,5 +24,5 @@ $b->chmod(0666);\r ?>\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>\r---EXPECTF--\r+--EXPECT--\r Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod\rdiff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt\rindex 38e23f706d..8b4385ad5f 100644\r--- a/ext/phar/tests/pharfileinfo_setmetadata.phpt\r+++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt\r@@ -40,7 +40,7 @@ echo $e->getMessage(), "\n";\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>\r---EXPECTF--\r+--EXPECT--\r Phar entry is a temporary directory (not an actual entry in the archive), cannot set metadata\r Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata\r Write operations disabled by the php.ini setting phar.readonly\rdiff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt\rindex 19acc3ba99..9e9e158602 100644\r--- a/ext/phar/tests/stat2_5.3.phpt\r+++ b/ext/phar/tests/stat2_5.3.phpt\r@@ -35,7 +35,7 @@ include $fname3;\r --CLEAN--\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>\r <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r is_link\r bool(false)\rdiff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt\rindex e9dbe2a6ce..36ffcf4952 100644\r--- a/ext/posix/tests/posix_getgrgid_error.phpt\r+++ b/ext/posix/tests/posix_getgrgid_error.phpt\r@@ -20,7 +20,7 @@ var_dump( posix_getgrgid($gid));\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getgrgid() : error conditions ***\r \r -- Testing posix_getgrgid() function with a negative group id --\rdiff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt\rindex 19e306b2ee..85f12d4917 100644\r--- a/ext/posix/tests/posix_getpgid_error.phpt\r+++ b/ext/posix/tests/posix_getpgid_error.phpt\r@@ -22,7 +22,7 @@ var_dump( posix_getpgid($pid) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getpgid() : error conditions ***\r \r -- Testing posix_getpgid() with negative pid  --\rdiff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt\rindex 365033b689..b4ec515e74 100644\r--- a/ext/posix/tests/posix_getpwuid_error.phpt\r+++ b/ext/posix/tests/posix_getpwuid_error.phpt\r@@ -20,7 +20,7 @@ var_dump( posix_getpwuid($uid) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_getpwuid() : error conditions ***\r \r -- Testing posix_getpwuid() function negative uid --\rdiff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt\rindex 8e05a23496..08080230aa 100644\r--- a/ext/posix/tests/posix_getsid_error.phpt\r+++ b/ext/posix/tests/posix_getsid_error.phpt\r@@ -15,5 +15,5 @@ PHP Testfest Berlin 2009-05-10\r <?php\r var_dump( posix_getsid(-1) );\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\rdiff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt\rindex 20cf8cef8b..c77acfe3a4 100644\r--- a/ext/posix/tests/posix_initgroups.phpt\r+++ b/ext/posix/tests/posix_initgroups.phpt\r@@ -11,5 +11,5 @@ if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found\r var_dump(posix_initgroups(NULL, NULL));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\rdiff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt\rindex 89474c4994..ea9b4f45dc 100644\r--- a/ext/posix/tests/posix_kill_error.phpt\r+++ b/ext/posix/tests/posix_kill_error.phpt\r@@ -28,7 +28,7 @@ var_dump( posix_kill($pid, 999) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_kill() : error conditions ***\r \r -- Testing posix_kill() function with invalid signal --\rdiff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt\rindex 60b096656a..2792ff5b3b 100644\r--- a/ext/posix/tests/posix_strerror_error.phpt\r+++ b/ext/posix/tests/posix_strerror_error.phpt\r@@ -20,7 +20,7 @@ echo gettype( posix_strerror($errno) )."\n";\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing posix_strerror() : error conditions ***\r \r -- Testing posix_strerror() function with invalid error number --\rdiff --git a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\rindex a135939052..607fead65c 100644\r--- a/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r+++ b/ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r@@ -16,7 +16,7 @@ var_dump($rc->hasProperty(1));\r var_dump($rc->hasProperty(1.5));\r var_dump($rc->hasProperty(true));\r ?>\r---EXPECTF--\r+--EXPECT--\r Check invalid params:\r bool(false)\r bool(false)\rdiff --git a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\rindex 728ddf9265..7e45eec411 100644\r--- a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r+++ b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r@@ -43,7 +43,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing ReflectionMethod::getClosure() : error conditions ***\r \r -- Testing ReflectionMethod::getClosure() function with invalid object --\rdiff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\rindex 113cabbbeb..c3bab48d6f 100644\r--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r@@ -69,7 +69,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Non-instance:\r string(72) "Given object is not an instance of the class this method was declared in"\r \rdiff --git a/ext/reflection/tests/ReflectionObject_getName_basic.phpt b/ext/reflection/tests/ReflectionObject_getName_basic.phpt\rindex 1885695cb1..94ad1e2c7b 100644\r--- a/ext/reflection/tests/ReflectionObject_getName_basic.phpt\r+++ b/ext/reflection/tests/ReflectionObject_getName_basic.phpt\r@@ -15,7 +15,7 @@ $r3 = new ReflectionObject($r2);\r var_dump($r3->getName());\r \r ?>\r---EXPECTF--\r+--EXPECT--\r string(8) "stdClass"\r string(1) "C"\r string(16) "ReflectionObject"\rdiff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\rindex 1472615178..7defcb76e0 100644\r--- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r+++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r@@ -25,7 +25,7 @@ reflectProperty("TestClass", "prot");\r reflectProperty("TestClass", "priv");\r \r ?>\r---EXPECTF--\r+--EXPECT--\r **********************************\r Reflecting on property TestClass::pub\r \rdiff --git a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\rindex f58590b3ea..1f0c2b5f2b 100644\r--- a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r@@ -32,7 +32,7 @@ $propInfo = new ReflectionProperty('TestClass', 'pub2');\r var_dump($propInfo->setValue($instanceWithNoProperties, "NewValue"));\r var_dump($instanceWithNoProperties->pub2);\r ?>\r---EXPECTF--\r+--EXPECT--\r Protected property:\r Cannot access non-public member TestClass::$prot\r \rdiff --git a/ext/session/tests/bug79221.phpt b/ext/session/tests/bug79221.phpt\rindex b0972c4697..0813457035 100644\r--- a/ext/session/tests/bug79221.phpt\r+++ b/ext/session/tests/bug79221.phpt\r@@ -40,6 +40,6 @@ session_start();\r var_dump($_SESSION);\r session_destroy();\r \r---EXPECTF--\r+--EXPECT--\r array(0) {\r }\rdiff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt\rindex 284649e277..d291d531c0 100644\r--- a/ext/session/tests/session_cache_limiter_error.phpt\r+++ b/ext/session/tests/session_cache_limiter_error.phpt\r@@ -89,7 +89,7 @@ fclose($fp);\r echo "Done";\r ob_end_flush();\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing session_cache_limiter() : error functionality ***\r \r -- Iteration 1 --\rdiff --git a/ext/spl/tests/bug61347.phpt b/ext/spl/tests/bug61347.phpt\rindex b83f48f7ff..4b4f9eaedf 100644\r--- a/ext/spl/tests/bug61347.phpt\r+++ b/ext/spl/tests/bug61347.phpt\r@@ -21,7 +21,7 @@ var_dump(isset($b[37])); //true\r var_dump(isset($b['no_exists'])); //false\r var_dump(empty($b['b'])); //true\r var_dump(empty($b[37])); //true\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r bool(false)\rdiff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt\rindex e26a8d7aea..cce4a7d6a6 100644\r--- a/ext/spl/tests/fileobject_005.phpt\r+++ b/ext/spl/tests/fileobject_005.phpt\r@@ -27,6 +27,6 @@ $fo->fwrite("blahlubba");\r $path = __DIR__.DIRECTORY_SEPARATOR.'fileobject_005.txt';\r unlink($path);\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r string(4) "blah"\rdiff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt\rindex 63d78cc78e..e245b95688 100644\r--- a/ext/spl/tests/iterator_045.phpt\r+++ b/ext/spl/tests/iterator_045.phpt\r@@ -88,7 +88,7 @@ $it->testUnset($unsets);\r $it->show();\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)\r Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)\r MyCachingIterator::testSet()\rdiff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt\rindex 4816896d8a..3b0eaf1d66 100644\r--- a/ext/spl/tests/regexIterator_setMode_error.phpt\r+++ b/ext/spl/tests/regexIterator_setMode_error.phpt\r@@ -18,7 +18,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r string(14) "Illegal mode 7"\r int(0)\rdiff --git a/ext/spl/tests/spl_heap_is_empty_basic.phpt b/ext/spl/tests/spl_heap_is_empty_basic.phpt\rindex 4a90734ad4..abf64f8d9d 100644\r--- a/ext/spl/tests/spl_heap_is_empty_basic.phpt\r+++ b/ext/spl/tests/spl_heap_is_empty_basic.phpt\r@@ -22,7 +22,7 @@ var_dump($heap->isEmpty());\r $heap->extract();\r var_dump($heap->isEmpty());\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(false)\r bool(true)\rdiff --git a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\rindex 994c67e0c3..459beeca53 100644\r--- a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r+++ b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r@@ -69,7 +69,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r Unable to prepare statement: 23, not authorized\r bool(true)\rdiff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\rindex 3f9fe84130..9a893c590d 100644\r--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r@@ -44,7 +44,7 @@ var_dump($db->close());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r Getting expanded SQL statement\r string(21) "SELECT 42, 'php', 43;"\r Execute statement\rdiff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt\rindex c51e98a67b..ed9f0458c4 100644\r--- a/ext/standard/tests/array/005.phpt\r+++ b/ext/standard/tests/array/005.phpt\r@@ -69,7 +69,7 @@ var_dump( current($mixed_array[1]) );\r \r echo"Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Error Conditions ***\r NULL\r \rdiff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt\rindex c62be0d27c..fc10d293ff 100644\r--- a/ext/standard/tests/array/009.phpt\r+++ b/ext/standard/tests/array/009.phpt\r@@ -71,7 +71,7 @@ foreach ($varient_arrays as $sub_array )  {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r -- Iteration 1 --\r int(0)\rdiff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt\rindex 6aa7864ee9..69015289e2 100644\r--- a/ext/standard/tests/array/array_diff_assoc_error.phpt\r+++ b/ext/standard/tests/array/array_diff_assoc_error.phpt\r@@ -33,7 +33,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff_assoc() : error conditions ***\r \r -- Testing array_diff_assoc() function with zero arguments --\rdiff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt\rindex d269f010b8..889c5ce1b2 100644\r--- a/ext/standard/tests/array/array_diff_error.phpt\r+++ b/ext/standard/tests/array/array_diff_error.phpt\r@@ -33,7 +33,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff() : error conditions ***\r \r -- Testing array_diff() function with zero arguments --\rdiff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt\rindex e957abce1c..80ff5728fe 100644\r--- a/ext/standard/tests/array/array_diff_key_error.phpt\r+++ b/ext/standard/tests/array/array_diff_key_error.phpt\r@@ -28,7 +28,7 @@ try {\r     echo $e->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_diff_key() : error conditions ***\r \r -- Testing array_diff_key() function with less than expected no. of arguments --\rdiff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt\rindex a1b18bd234..2cb21ca609 100644\r--- a/ext/standard/tests/array/array_filter.phpt\r+++ b/ext/standard/tests/array/array_filter.phpt\r@@ -28,7 +28,7 @@ var_dump(array_filter($array3, "even"));\r var_dump(array_filter(array()));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Odd :\r array(3) {\r   ["a"]=>\rdiff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt\rindex 265daf1fb4..ff88d7a7f8 100644\r--- a/ext/standard/tests/array/array_filter_variation10.phpt\r+++ b/ext/standard/tests/array/array_filter_variation10.phpt\r@@ -56,7 +56,7 @@ try {\r \r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_filter() : usage variations - using array keys in 'callback' ***\r 0 = 0\r 1 = 1\rdiff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt\rindex 4a6409bb1f..ef6cf45139 100644\r--- a/ext/standard/tests/array/array_key_exists_variation3.phpt\r+++ b/ext/standard/tests/array/array_key_exists_variation3.phpt\r@@ -34,7 +34,7 @@ foreach($keys as $key) {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_key_exists() : usage variations ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/array/array_map_error.phpt b/ext/standard/tests/array/array_map_error.phpt\rindex 4739bbf663..b41871e1c4 100644\r--- a/ext/standard/tests/array/array_map_error.phpt\r+++ b/ext/standard/tests/array/array_map_error.phpt\r@@ -38,7 +38,7 @@ var_dump( array_map('callback2', $arr1, $arr2, $arr3) );\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_map() : error conditions ***\r \r -- Testing array_map() function with one less than expected no. of arguments --\rdiff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt\rindex 08ecbf7147..75007779fa 100644\r--- a/ext/standard/tests/array/array_merge.phpt\r+++ b/ext/standard/tests/array/array_merge.phpt\r@@ -83,7 +83,7 @@ var_dump(array_merge());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_merge() basic functionality ***\r \r --- Iteration 0 ---\rdiff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt\rindex 227a520ac1..78076b8fc4 100644\r--- a/ext/standard/tests/array/array_push.phpt\r+++ b/ext/standard/tests/array/array_push.phpt\r@@ -60,7 +60,7 @@ var_dump( $mixed_array[2] );\r \r echo"\nDone";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Edge Conditions ***\r int(11)\r int(1)\rdiff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt\rindex d19f5195d6..a76277883a 100644\r--- a/ext/standard/tests/array/array_slice.phpt\r+++ b/ext/standard/tests/array/array_slice.phpt\r@@ -68,7 +68,7 @@ foreach ($var_array as $sub_array)\r   var_dump (array_slice($var_array[2], -3, -2, false) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Iteration 1 ***\r \r *** Variation with first two Arguments ***\rdiff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt\rindex 9ebe83391e..265de4e846 100644\r--- a/ext/standard/tests/array/array_unshift.phpt\r+++ b/ext/standard/tests/array/array_unshift.phpt\r@@ -12,7 +12,7 @@ var_dump($a);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r array(1) {\r   [0]=>\rdiff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt\rindex 1f5457c9f7..151c9c70d0 100644\r--- a/ext/standard/tests/array/array_walk.phpt\r+++ b/ext/standard/tests/array/array_walk.phpt\r@@ -24,7 +24,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r int(0)\r string(4) "data"\rdiff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt\rindex dfc95d3af8..e5aeadcdc0 100644\r--- a/ext/standard/tests/array/array_walk_error2.phpt\r+++ b/ext/standard/tests/array/array_walk_error2.phpt\r@@ -54,7 +54,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk() : error conditions - callback parameters ***\r Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected\r Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected\rdiff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt\rindex 472cb1032d..d4d3e7d8eb 100644\r--- a/ext/standard/tests/array/array_walk_recursive1.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive1.phpt\r@@ -24,7 +24,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(1)\r int(0)\r string(4) "data"\rdiff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt\rindex f1686d7acd..2509c95f60 100644\r--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt\r@@ -54,7 +54,7 @@ try {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk_recursive() : error conditions - callback parameters ***\r Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected\r Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected\rdiff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt\rindex a0c159d71d..a1cbdad2bd 100644\r--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt\r+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt\r@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";\r var_dump( array_walk_recursive( $input, function() { echo "1\n"; }));\r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk_recursive() : anonymous function as callback ***\r -- Anonymous function with one argument --\r int(2)\rdiff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt\rindex 0354782eda..3689f8a798 100644\r--- a/ext/standard/tests/array/array_walk_variation7.phpt\r+++ b/ext/standard/tests/array/array_walk_variation7.phpt\r@@ -33,7 +33,7 @@ echo "-- Anonymous function with null argument --\n";\r var_dump( array_walk( $input, function() { echo "1\n"; }));\r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing array_walk() : anonymous function as callback ***\r -- Anonymous function with one argument --\r int(2)\rdiff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt\rindex d27cd569c0..b6abdeaef3 100644\r--- a/ext/standard/tests/array/uasort_variation8.phpt\r+++ b/ext/standard/tests/array/uasort_variation8.phpt\r@@ -29,7 +29,7 @@ var_dump($array_arg);\r \r echo "Done"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing uasort() : built in function as 'cmp_function' ***\r -- Testing uasort() with built-in 'cmp_function': strcasecmp() --\r bool(true)\rdiff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt\rindex 55ff362d41..4a750ccefa 100644\r--- a/ext/standard/tests/array/usort_variation8.phpt\r+++ b/ext/standard/tests/array/usort_variation8.phpt\r@@ -31,7 +31,7 @@ var_dump( usort($temp_array2, 'strcmp') );\r var_dump($temp_array2);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing usort() : usage variation ***\r \r -- Testing usort() with built-in 'cmp_function': strcasecmp() --\rdiff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt\rindex a28ea58d5a..7b550b36d1 100644\r--- a/ext/standard/tests/assert/assert_variation.phpt\r+++ b/ext/standard/tests/assert/assert_variation.phpt\r@@ -67,7 +67,7 @@ var_dump($rao=assert_options(ASSERT_CALLBACK));\r echo "ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n";\r var_dump($r2=assert(0 != 0));\r echo"\n";\r---EXPECTF--\r+--EXPECT--\r Initial values: assert_options(ASSERT_CALLBACK) => [f1]\r Initial values: ini.get("assert.callback") => [f1]\r f1 called\rdiff --git a/ext/standard/tests/file/auto_detect_line_endings_1.phpt b/ext/standard/tests/file/auto_detect_line_endings_1.phpt\rindex c79082ecdb..5a4ff0a10f 100644\r--- a/ext/standard/tests/file/auto_detect_line_endings_1.phpt\r+++ b/ext/standard/tests/file/auto_detect_line_endings_1.phpt\r@@ -15,7 +15,7 @@ var_dump(fgets(STDIN));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(1) "1"\r string(8) "fooBar1\r"\r string(8) "fooBar2\r"\rdiff --git a/ext/standard/tests/file/auto_detect_line_endings_2.phpt b/ext/standard/tests/file/auto_detect_line_endings_2.phpt\rindex f33a055e08..3994f1ee3b 100644\r--- a/ext/standard/tests/file/auto_detect_line_endings_2.phpt\r+++ b/ext/standard/tests/file/auto_detect_line_endings_2.phpt\r@@ -16,7 +16,7 @@ var_dump(fgets($stdin));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(2) "on"\r string(8) "fooBar1\r"\r string(8) "fooBar2\r"\rdiff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt\rindex 8352f4da4b..7a98e833a3 100644\r--- a/ext/standard/tests/file/basename.phpt\r+++ b/ext/standard/tests/file/basename.phpt\r@@ -138,7 +138,7 @@ check_basename( $file_path_variations );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r \r --Iteration 1--\rdiff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt\rindex 6605b795ff..4acadc6169 100644\r--- a/ext/standard/tests/file/fscanf.phpt\r+++ b/ext/standard/tests/file/fscanf.phpt\r@@ -75,7 +75,7 @@ echo "Done\n";\r $filename = __DIR__."/fscanf.dat";\r unlink($filename);\r ?>\r---EXPECTF--\r+--EXPECT--\r int(0)\r NULL\r int(1)\rdiff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt\rindex f657c07005..507ed8e22d 100644\r--- a/ext/standard/tests/file/fscanf_variation10.phpt\r+++ b/ext/standard/tests/file/fscanf_variation10.phpt\r@@ -82,7 +82,7 @@ $file_path = __DIR__;\r $filename = "$file_path/fscanf_variation10.tmp";\r unlink($filename);\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Test fscanf(): different float format types with resource ***\r \r -- iteration 1 --\rdiff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt\rindex e82d9ae034..1cf1f25138 100644\r--- a/ext/standard/tests/file/is_dir_variation3.phpt\r+++ b/ext/standard/tests/file/is_dir_variation3.phpt\r@@ -30,7 +30,7 @@ foreach($dirnames as $dirname) {\r   var_dump( is_dir($dirname) );\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_dir() with Invalid arguments: expected bool(false) ***\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_executable_error.phpt b/ext/standard/tests/file/is_executable_error.phpt\rindex ad90d64435..e77ca86349 100644\r--- a/ext/standard/tests/file/is_executable_error.phpt\r+++ b/ext/standard/tests/file/is_executable_error.phpt\r@@ -10,7 +10,7 @@ echo "\n*** Testing is_exceutable() on non-existent directory ***\n";\r var_dump( is_executable(__DIR__."/is_executable") );\r \r echo "Done\n";\r---EXPECTF--\r+--EXPECT--\r *** Testing is_exceutable() on non-existent directory ***\r bool(false)\r Done\rdiff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt\rindex 92ad3320d3..802dbfdf7e 100644\r--- a/ext/standard/tests/file/is_executable_variation3.phpt\r+++ b/ext/standard/tests/file/is_executable_variation3.phpt\r@@ -40,7 +40,7 @@ foreach( $invalid_files as $invalid_file ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_executable(): usage variations ***\r \r *** Testing is_executable() on invalid files ***\rdiff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt\rindex d33b01dfb3..5bdb63e37c 100644\r--- a/ext/standard/tests/file/is_file_variation3.phpt\r+++ b/ext/standard/tests/file/is_file_variation3.phpt\r@@ -39,7 +39,7 @@ foreach([\r   clearstatcache();\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r float(-2.34555): 0\r string(1) " ": 0\r string(0) "": 0\rdiff --git a/ext/standard/tests/file/is_readable_error.phpt b/ext/standard/tests/file/is_readable_error.phpt\rindex 1520eb4d20..c8a6c34fa0 100644\r--- a/ext/standard/tests/file/is_readable_error.phpt\r+++ b/ext/standard/tests/file/is_readable_error.phpt\r@@ -11,7 +11,7 @@ var_dump( is_readable(__DIR__."/is_readable.tmp") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_readable() on non-existent file ***\r bool(false)\r Done\rdiff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt\rindex 97c794d1b7..f7eebdc2b8 100644\r--- a/ext/standard/tests/file/is_readable_variation3.phpt\r+++ b/ext/standard/tests/file/is_readable_variation3.phpt\r@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_readable(): usage variations ***\r \r *** Testing is_readable() on miscellaneous filenames ***\rdiff --git a/ext/standard/tests/file/is_uploaded_file_basic.phpt b/ext/standard/tests/file/is_uploaded_file_basic.phpt\rindex d053244a79..3e5bf6320c 100644\r--- a/ext/standard/tests/file/is_uploaded_file_basic.phpt\r+++ b/ext/standard/tests/file/is_uploaded_file_basic.phpt\r@@ -30,7 +30,7 @@ var_dump(is_uploaded_file('random_filename.txt'));\r var_dump(is_uploaded_file('__FILE__'));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_writable_error.phpt b/ext/standard/tests/file/is_writable_error.phpt\rindex e2a38412cd..f01e69b13d 100644\r--- a/ext/standard/tests/file/is_writable_error.phpt\r+++ b/ext/standard/tests/file/is_writable_error.phpt\r@@ -14,7 +14,7 @@ var_dump( is_writeable(__DIR__."/is_writable") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_writable() on non-existent file ***\r bool(false)\r bool(false)\rdiff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt\rindex c5843a5abf..167d874ac2 100644\r--- a/ext/standard/tests/file/is_writable_variation3.phpt\r+++ b/ext/standard/tests/file/is_writable_variation3.phpt\r@@ -37,7 +37,7 @@ foreach( $misc_files as $misc_file ) {\r   clearstatcache();\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_writable(): usage variations ***\r \r *** Testing is_writable() with invalid filenames ***\rdiff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt\rindex 7af8748fe2..b80c052691 100644\r--- a/ext/standard/tests/file/move_uploaded_file_basic.phpt\r+++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt\r@@ -50,7 +50,7 @@ var_dump(move_uploaded_file($_FILES['file2']['tmp_name'], $destination4));\r unlink($destination4);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r Valid move\r bool(true)\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt\rindex bb7ccf542b..c17d5d3e71 100644\r--- a/ext/standard/tests/general_functions/get_include_path_basic.phpt\r+++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt\r@@ -20,7 +20,7 @@ if (ini_get("include_path") == get_include_path()) {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing get_include_path()\r string(1) "."\r PASSED\rdiff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt\rindex 56327500ea..06e806b3a2 100644\r--- a/ext/standard/tests/general_functions/include_path.phpt\r+++ b/ext/standard/tests/general_functions/include_path.phpt\r@@ -31,7 +31,7 @@ var_dump(get_include_path());\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(1) "."\r NULL\r string(1) "."\rdiff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt\rindex 200ecbd6ac..37de6d5a5b 100644\r--- a/ext/standard/tests/general_functions/is_array.phpt\r+++ b/ext/standard/tests/general_functions/is_array.phpt\r@@ -103,7 +103,7 @@ echo "Done\n";\r fclose($fp);\r closedir($dfp);\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_array() on different type of arrays ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt\rindex 7c8d693a1b..70aaed9c3f 100644\r--- a/ext/standard/tests/general_functions/is_bool.phpt\r+++ b/ext/standard/tests/general_functions/is_bool.phpt\r@@ -134,7 +134,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_bool() with valid boolean values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt\rindex dc6df0f109..1815e53c00 100644\r--- a/ext/standard/tests/general_functions/is_float_64bit.phpt\r+++ b/ext/standard/tests/general_functions/is_float_64bit.phpt\r@@ -131,7 +131,7 @@ foreach ($not_floats as $value ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_float(), is_double() and is_real() with float values***\r -- Iteration 1 --\r bool(false)\rdiff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt\rindex e5c6ce77e0..8e5e9332c0 100644\r--- a/ext/standard/tests/general_functions/is_int_64bit.phpt\r+++ b/ext/standard/tests/general_functions/is_int_64bit.phpt\r@@ -136,7 +136,7 @@ foreach ($not_int_types as $type ) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_int(), is_integer() & is_long()  with valid integer values ***\r --Iteration 1--\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt\rindex 4fc325c744..6560707e57 100644\r--- a/ext/standard/tests/general_functions/is_null.phpt\r+++ b/ext/standard/tests/general_functions/is_null.phpt\r@@ -134,7 +134,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_null() with valid null values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt\rindex 491aa5d15b..8883c57ac2 100644\r--- a/ext/standard/tests/general_functions/is_numeric.phpt\r+++ b/ext/standard/tests/general_functions/is_numeric.phpt\r@@ -152,7 +152,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_numeric() with valid numeric values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt\rindex dd0e7689fd..8a5ac1bcbe 100644\r--- a/ext/standard/tests/general_functions/is_object.phpt\r+++ b/ext/standard/tests/general_functions/is_object.phpt\r@@ -145,7 +145,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_object() with valid objects ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt\rindex f7ef3f5317..6a89da9f56 100644\r--- a/ext/standard/tests/general_functions/is_scalar.phpt\r+++ b/ext/standard/tests/general_functions/is_scalar.phpt\r@@ -112,7 +112,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing basic operations ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt\rindex 7760f79831..a4ef7a47b1 100644\r--- a/ext/standard/tests/general_functions/is_string.phpt\r+++ b/ext/standard/tests/general_functions/is_string.phpt\r@@ -147,7 +147,7 @@ fclose($fp);\r closedir($dfp);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing is_string() with valid string values ***\r -- Iteration 1 --\r bool(true)\rdiff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt\rindex 46d5d2d0f6..0eb1adf9ee 100644\r--- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt\r+++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt\r@@ -32,7 +32,7 @@ dump_string_length( '' );\r dump_string_length( null );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing ob_get_length() : basic functionality ***\r bool(false)\r int(26)\rdiff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt\rindex 23859a33ac..c64c15b404 100644\r--- a/ext/standard/tests/general_functions/php_uname_error.phpt\r+++ b/ext/standard/tests/general_functions/php_uname_error.phpt\r@@ -13,7 +13,7 @@ echo "\n-- Testing php_uname() function with invalid mode --\n";\r var_dump( php_uname('z') == php_uname('z') );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing php_uname() - error test\r \r -- Testing php_uname() function with invalid mode --\rdiff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt\rindex 3f24a5bc9d..d2ec63f5b4 100644\r--- a/ext/standard/tests/general_functions/print_r.phpt\r+++ b/ext/standard/tests/general_functions/print_r.phpt\r@@ -276,7 +276,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing print_r() on integer variables ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt\rindex a0e9e148c6..5df1637dbd 100644\r--- a/ext/standard/tests/general_functions/print_r_64bit.phpt\r+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt\r@@ -280,7 +280,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing print_r() on integer variables ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt\rindex 0600775f58..7b74761586 100644\r--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt\r+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt\r@@ -279,7 +279,7 @@ closedir($dir_handle);\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing var_dump() on integer variables ***\r -- Iteration 1 --\r int(0)\rdiff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt\rindex bdc61d9928..9f9cd0e896 100644\r--- a/ext/standard/tests/general_functions/var_export-locale.phpt\r+++ b/ext/standard/tests/general_functions/var_export-locale.phpt\r@@ -307,7 +307,7 @@ echo "\nDone";\r \r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing var_export() with integer values ***\r \r *** Output for integer values ***\rdiff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt\rindex 249df57943..448aac4e99 100644\r--- a/ext/standard/tests/image/image_type_to_extension.phpt\r+++ b/ext/standard/tests/image/image_type_to_extension.phpt\r@@ -33,7 +33,7 @@ image_type_to_extension()\r     var_dump(image_type_to_extension(0));\r ?>\r Done\r---EXPECTF--\r+--EXPECT--\r Constant: IMAGETYPE_GIF\r  With dot: .gif\r  Without dot: gif\rdiff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt\rindex 95811c6f3c..ca76b5c836 100644\r--- a/ext/standard/tests/math/lcg_value_basic.phpt\r+++ b/ext/standard/tests/math/lcg_value_basic.phpt\r@@ -24,7 +24,7 @@ if ($i != 100) {\r echo "MATHS test script completed\n";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r MATHS test script started\r \r  lcg_value tests...\rdiff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt\rindex 29b4aa0e6b..b25265446f 100644\r--- a/ext/standard/tests/network/inet.phpt\r+++ b/ext/standard/tests/network/inet.phpt\r@@ -35,7 +35,7 @@ foreach ($array as $val) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(9) "127.0.0.1"\r string(13) "255.255.255.0"\r bool(false)\rdiff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt\rindex c659eb70fb..dd81bde55c 100644\r--- a/ext/standard/tests/network/ip_x86_64.phpt\r+++ b/ext/standard/tests/network/ip_x86_64.phpt\r@@ -29,7 +29,7 @@ var_dump(long2ip(-110000));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r int(2130706433)\r string(9) "127.0.0.1"\r int(167772161)\rdiff --git a/ext/standard/tests/random/random_int.phpt b/ext/standard/tests/random/random_int.phpt\rindex 94654a7f72..6fd04420ee 100644\r--- a/ext/standard/tests/random/random_int.phpt\r+++ b/ext/standard/tests/random/random_int.phpt\r@@ -15,7 +15,7 @@ var_dump(is_int(random_int(PHP_INT_MIN, PHP_INT_MAX)));\r var_dump(random_int(42,42));\r \r ?>\r---EXPECTF--\r+--EXPECT--\r bool(true)\r bool(true)\r bool(true)\rdiff --git a/ext/standard/tests/serialize/bug45706.phpt b/ext/standard/tests/serialize/bug45706.phpt\rindex cc71dec4e6..c29081cab7 100644\r--- a/ext/standard/tests/serialize/bug45706.phpt\r+++ b/ext/standard/tests/serialize/bug45706.phpt\r@@ -12,7 +12,7 @@ $s = serialize($x);\r $s = str_replace("Foo", "Bar", $s);\r $y = unserialize($s);\r var_dump($y);\r---EXPECTF--\r+--EXPECT--\r array(2) {\r   [0]=>\r   object(__PHP_Incomplete_Class)#3 (5) {\rdiff --git a/ext/standard/tests/streams/bug61115.phpt b/ext/standard/tests/streams/bug61115.phpt\rindex 3caffde232..ce6b57651c 100644\r--- a/ext/standard/tests/streams/bug61115.phpt\r+++ b/ext/standard/tests/streams/bug61115.phpt\r@@ -13,5 +13,5 @@ try {\r     echo $e->getMessage(), "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r Object of class Closure could not be converted to string\rdiff --git a/ext/standard/tests/streams/bug78662.phpt b/ext/standard/tests/streams/bug78662.phpt\rindex e874d5aef6..2ea00b67b1 100644\r--- a/ext/standard/tests/streams/bug78662.phpt\r+++ b/ext/standard/tests/streams/bug78662.phpt\r@@ -26,7 +26,7 @@ var_dump(fwrite($f, "bar"));\r var_dump(fread($f, 100));\r ?>\r Done\r---EXPECTF--\r+--EXPECT--\r bool(false)\r bool(false)\r Done\rdiff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt\rindex 7dcc645422..64e9aa5773 100644\r--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt\r+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt\r@@ -41,7 +41,7 @@ fclose($server);\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing stream_set_timeout() : error conditions ***\r \r -- Testing stream_set_timeout() function with a closed socket --\rdiff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt\rindex 2603b69210..b6bd9973b6 100644\r--- a/ext/standard/tests/strings/chr_error.phpt\r+++ b/ext/standard/tests/strings/chr_error.phpt\r@@ -26,7 +26,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing chr() : error conditions ***\r \r -- Testing chr() function with no arguments --\rdiff --git a/ext/standard/tests/strings/fprintf_error.phpt b/ext/standard/tests/strings/fprintf_error.phpt\rindex 1ffc188051..bfef30a75b 100644\r--- a/ext/standard/tests/strings/fprintf_error.phpt\r+++ b/ext/standard/tests/strings/fprintf_error.phpt\r@@ -29,7 +29,7 @@ try {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing Error Conditions ***\r Wrong parameter count for fprintf()\r Wrong parameter count for fprintf()\rdiff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt\rindex f2abfd5ba8..2a04bd345e 100644\r--- a/ext/standard/tests/strings/htmlentities24.phpt\r+++ b/ext/standard/tests/strings/htmlentities24.phpt\r@@ -37,7 +37,7 @@ var_dump( htmlentities($str, ENT_COMPAT) );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Retrieving htmlentities for 256 characters ***\r string(12) "636872283029"\r string(12) "636872283129"\rdiff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt\rindex 6e5c5fac36..5677da6fe2 100644\r--- a/ext/standard/tests/strings/htmlspecialchars.phpt\r+++ b/ext/standard/tests/strings/htmlspecialchars.phpt\r@@ -37,7 +37,7 @@ var_dump( htmlspecialchars($str, ENT_COMPAT) );\r \r echo "Done\n"\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Retrieving htmlspecialchars for 256 characters ***\r string(12) "636872283029"\r string(12) "636872283129"\rdiff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt\rindex 51287e04d7..8ac57ca92e 100644\r--- a/ext/standard/tests/strings/ltrim.phpt\r+++ b/ext/standard/tests/strings/ltrim.phpt\r@@ -41,7 +41,7 @@ var_dump( ltrim($str, "\nusi") );\r echo "\nDone\n";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Output for Error Conditions ***\r \r  *** Using heredoc string ***\rdiff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt\rindex 2bc16b3248..a6b52e3934 100644\r--- a/ext/standard/tests/strings/metaphone.phpt\r+++ b/ext/standard/tests/strings/metaphone.phpt\r@@ -24,7 +24,7 @@ foreach($array as $str) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(0) ""\r bool(false)\rdiff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt\rindex 60277fa184..38652ba0fa 100644\r--- a/ext/standard/tests/strings/parse_str_basic1.phpt\r+++ b/ext/standard/tests/strings/parse_str_basic1.phpt\r@@ -27,7 +27,7 @@ var_dump(parse_str($s1, $res3_array));\r var_dump($res3_array);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing parse_str() : basic functionality ***\r \r Basic test WITH undefined var for result arg\rdiff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt\rindex 25b5f8745d..0ea88a365b 100644\r--- a/ext/standard/tests/strings/parse_str_basic3.phpt\r+++ b/ext/standard/tests/strings/parse_str_basic3.phpt\r@@ -73,7 +73,7 @@ var_dump(parse_str($str, $res));\r var_dump($res);\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing parse_str() : basic functionality ***\r \r Test string with array values and results array\rdiff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt\rindex 62591e9e6f..e9fc0a4383 100644\r--- a/ext/standard/tests/strings/printf_error.phpt\r+++ b/ext/standard/tests/strings/printf_error.phpt\r@@ -61,7 +61,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing printf() : error conditions ***\r \r -- Testing printf() function with Zero arguments --\rdiff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt\rindex 223a839f58..2fc531faad 100644\r--- a/ext/standard/tests/strings/rtrim.phpt\r+++ b/ext/standard/tests/strings/rtrim.phpt\r@@ -42,7 +42,7 @@ var_dump( rtrim($str, "ing") );\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Output for Normal Behaviour ***\r string(10) "rtrim test"\r string(13) "rtrim test   "\rdiff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt\rindex ef61ac495e..c4acc2ff68 100644\r--- a/ext/standard/tests/strings/soundex.phpt\r+++ b/ext/standard/tests/strings/soundex.phpt\r@@ -30,7 +30,7 @@ foreach ($array as $str) {\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r bool(false)\r string(4) "0000"\r string(4) "F650"\rdiff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt\rindex 07774a92ec..66d85647ff 100644\r--- a/ext/standard/tests/strings/sprintf_variation15.phpt\r+++ b/ext/standard/tests/strings/sprintf_variation15.phpt\r@@ -74,7 +74,7 @@ foreach($string_values as $string_value) {\r \r echo "Done";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing sprintf() : string formats with string values ***\r \r -- Iteration 1 --\rdiff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt\rindex ffaefb8418..0af8f9ed14 100644\r--- a/ext/standard/tests/strings/sscanf_error.phpt\r+++ b/ext/standard/tests/strings/sscanf_error.phpt\r@@ -20,7 +20,7 @@ try {\r     echo $exception->getMessage() . "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing sscanf() : error conditions ***\r \r -- Testing sscanf() function with more than expected no. of arguments --\rdiff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt\rindex a5a35769e4..c360004a14 100644\r--- a/ext/standard/tests/strings/str_ireplace.phpt\r+++ b/ext/standard/tests/strings/str_ireplace.phpt\r@@ -44,7 +44,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data));\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(8) "aaaaaaaT"\r string(8) "aaaaaaaT"\rdiff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt\rindex 7b1b5312a1..09e6cff53c 100644\r--- a/ext/standard/tests/strings/stristr.phpt\r+++ b/ext/standard/tests/strings/stristr.phpt\r@@ -14,7 +14,7 @@ stristr() function\r     var_dump(md5(stristr("\\\\a\\", "\\a")));\r     var_dump(stristr("tEsT sTrInG", " "));\r ?>\r---EXPECTF--\r+--EXPECT--\r string(11) "tEsT sTrInG"\r string(6) "sTrInG"\r string(6) "sTrInG"\rdiff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt\rindex a75dd96bbf..f28571ba7f 100644\r--- a/ext/standard/tests/strings/strrchr_variation1.phpt\r+++ b/ext/standard/tests/strings/strrchr_variation1.phpt\r@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {\r }\r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strrchr() function: with various double quoted strings ***\r -- Iteration 1 --\r string(16) "lo123456he #4 A "\rdiff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt\rindex 2ff6720fb9..e6e510dd55 100644\r--- a/ext/standard/tests/strings/strrchr_variation2.phpt\r+++ b/ext/standard/tests/strings/strrchr_variation2.phpt\r@@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) {\r }\r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strrchr() function: with various single quoted strings ***\r -- Iteration 1 --\r string(22) "lo123456he \x234 \101 "\rdiff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt\rindex 7c7e2bb4c7..041b66a00c 100644\r--- a/ext/standard/tests/strings/strtolower.phpt\r+++ b/ext/standard/tests/strings/strtolower.phpt\r@@ -65,7 +65,7 @@ else\r \r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strtolower() with 128 chars ***\r 00 => 00\r 01 => 01\rdiff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt\rindex c243ff10c7..6c7434ba16 100644\r--- a/ext/standard/tests/strings/strtoupper1.phpt\r+++ b/ext/standard/tests/strings/strtoupper1.phpt\r@@ -65,7 +65,7 @@ else\r \r echo "*** Done ***";\r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strtoupper() with 128 chars ***\r 00 => 00\r 01 => 01\rdiff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt\rindex a363e26f24..88cca824a6 100644\r--- a/ext/standard/tests/strings/strval_error.phpt\r+++ b/ext/standard/tests/strings/strval_error.phpt\r@@ -25,7 +25,7 @@ try {\r }\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strval() : error conditions ***\r \r -- Testing strval() function with object which has not toString() method  --\rdiff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt\rindex fe687ed1ae..6028c17008 100644\r--- a/ext/standard/tests/strings/substr.phpt\r+++ b/ext/standard/tests/strings/substr.phpt\r@@ -66,7 +66,7 @@ var_dump (substr("abcdef" , 2, NULL) );\r echo"\nDone";\r \r ?>\r---EXPECTF--\r+--EXPECT--\r --- Iteration 1 ---\r \r -- Variations for two arguments --\rdiff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt\rindex 1ad504c61d..a31d7213a1 100644\r--- a/ext/standard/tests/strings/trim1.phpt\r+++ b/ext/standard/tests/strings/trim1.phpt\r@@ -49,7 +49,7 @@ var_dump( trim($str, "us\ning") );\r \r echo "\nDone";\r ?>\r---EXPECTF--\r+--EXPECT--\r string(0) ""\r string(0) ""\r string(1) "0"\rdiff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt\rindex f2057ea388..fdaecd6fb3 100644\r--- a/ext/standard/tests/strings/vfprintf_error1.phpt\r+++ b/ext/standard/tests/strings/vfprintf_error1.phpt\r@@ -42,7 +42,7 @@ $file = 'vfprintf_error1.txt';\r unlink( $file );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r -- Testing vfprintf() function with more than expected no. of arguments --\r Wrong parameter count for vfprintf()\r Wrong parameter count for vfprintf()\rdiff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt\rindex d7eb11fc55..87965cd1a2 100644\r--- a/ext/standard/tests/time/strptime_error.phpt\r+++ b/ext/standard/tests/time/strptime_error.phpt\r@@ -24,7 +24,7 @@ $format = '%b %d %Y %H:%M:%S';\r var_dump( strptime('foo', $format) );\r \r ?>\r---EXPECTF--\r+--EXPECT--\r *** Testing strptime() : error conditions ***\r \r -- Testing strptime() function on failure --\rdiff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt\rindex 8e58c81891..006377d5e9 100644\r--- a/ext/tokenizer/tests/001.phpt\r+++ b/ext/tokenizer/tests/001.phpt\r@@ -129,7 +129,7 @@ echo token_name(0x8000000F), "\n";\r \r echo "Done\n";\r ?>\r---EXPECTF--\r+--EXPECT--\r T_INCLUDE\r T_INCLUDE_ONCE\r T_EVAL\rdiff --git a/ext/xmlreader/tests/static.phpt b/ext/xmlreader/tests/static.phpt\rindex 1c6cb5b870..a722e31105 100644\r--- a/ext/xmlreader/tests/static.phpt\r+++ b/ext/xmlreader/tests/static.phpt\r@@ -22,7 +22,7 @@ while ($reader->read()) {\r     echo $reader->name, "\n";\r }\r ?>\r---EXPECTF--\r+--EXPECT--\r books\r books\r books\rdiff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt\rindex 886e149261..c04ffe3167 100644\r--- a/ext/xmlwriter/tests/bug41326.phpt\r+++ b/ext/xmlwriter/tests/bug41326.phpt\r@@ -35,7 +35,7 @@ $xw->endElement();\r $xw->endDocument();\r print $xw->flush(true);\r ?>\r---EXPECTF--\r+--EXPECT--\r <?xml version="1.0"?>\r <test>\r  <foo/>\rdiff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt\rindex 55a25f1c9f..e7c1038350 100644\r--- a/tests/output/stream_isatty_err.phpt\r+++ b/tests/output/stream_isatty_err.phpt\r@@ -13,7 +13,7 @@ STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdErr();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\rdiff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt\rindex 2554eb4689..73514955d4 100644\r--- a/tests/output/stream_isatty_in-err.phpt\r+++ b/tests/output/stream_isatty_in-err.phpt\r@@ -13,7 +13,7 @@ STDIN STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdErr();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt\rindex 496bdd100e..9b65e8861b 100644\r--- a/tests/output/stream_isatty_in-out-err.phpt\r+++ b/tests/output/stream_isatty_in-out-err.phpt\r@@ -13,7 +13,7 @@ STDIN STDOUT STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt\rindex d58e9aa05c..c2bb346854 100644\r--- a/tests/output/stream_isatty_in-out.phpt\r+++ b/tests/output/stream_isatty_in-out.phpt\r@@ -13,7 +13,7 @@ STDIN STDOUT\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(false)\r STDIN (fopen): bool(false)\r STDIN (php://fd/0): bool(false)\rdiff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt\rindex e3ec1237bc..dc113a9720 100644\r--- a/tests/output/stream_isatty_out-err.phpt\r+++ b/tests/output/stream_isatty_out-err.phpt\r@@ -13,7 +13,7 @@ STDOUT STDERR\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\rdiff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt\rindex 3ea4996ac4..f18c986c5a 100644\r--- a/tests/output/stream_isatty_out.phpt\r+++ b/tests/output/stream_isatty_out.phpt\r@@ -13,7 +13,7 @@ STDOUT\r require __DIR__.'/stream_isatty.inc';\r testToStdOut();\r ?>\r---EXPECTF--\r+--EXPECT--\r STDIN (constant): bool(true)\r STDIN (fopen): bool(true)\r STDIN (php://fd/0): bool(true)\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch and 'fork/tests/use-simpler-expect-section' have diverged,\r# and have 1 and 1 different commits each, respectively.\r#   (use "git pull" to merge the remote branch into yours)\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r#\r# Date:      Mon Apr 27 21:01:47 2020 +0200\r#\r# On branch tests/use-simpler-expect-section\r# Your branch is up to date with 'fork/tests/use-simpler-expect-section'.\r#\r# Changes to be committed:\r# modified:   Zend/tests/005.phpt\r# modified:   Zend/tests/bug27669.phpt\r# modified:   Zend/tests/bug51827.phpt\r# modified:   Zend/tests/bug63206.phpt\r# modified:   Zend/tests/bug63206_1.phpt\r# modified:   Zend/tests/bug63206_2.phpt\r# modified:   Zend/tests/incompat_ctx_user.phpt\r# modified:   Zend/tests/instanceof_001.phpt\r# modified:   Zend/tests/unexpected_ref_bug.phpt\r# modified:   ext/date/tests/012.phpt\r# modified:   ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt\r# modified:   ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt\r# modified:   ext/date/tests/date_parse_001.phpt\r# modified:   ext/date/tests/date_parse_error.phpt\r# modified:   ext/date/tests/gmmktime_basic.phpt\r# modified:   ext/date/tests/mktime_error.phpt\r# modified:   ext/date/tests/timezone_abbreviations_list_basic1.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt\r# modified:   ext/fileinfo/tests/finfo_set_flags_basic.phpt\r# modified:   ext/filter/tests/007.phpt\r# modified:   ext/filter/tests/008.phpt\r# modified:   ext/filter/tests/010.phpt\r# modified:   ext/hash/tests/hash_hkdf_edges.phpt\r# modified:   ext/hash/tests/hash_hmac_file_basic.phpt\r# modified:   ext/json/tests/json_last_error_msg_error.phpt\r# modified:   ext/libxml/tests/bug76777.phpt\r# modified:   ext/pcre/tests/preg_replace_error2.phpt\r# modified:   ext/pcre/tests/split2.phpt\r# modified:   ext/phar/tests/phar_isvalidpharfilename.phpt\r# modified:   ext/phar/tests/pharfileinfo_chmod.phpt\r# modified:   ext/phar/tests/pharfileinfo_setmetadata.phpt\r# modified:   ext/phar/tests/stat2_5.3.phpt\r# modified:   ext/posix/tests/posix_getgrgid_error.phpt\r# modified:   ext/posix/tests/posix_getpgid_error.phpt\r# modified:   ext/posix/tests/posix_getpwuid_error.phpt\r# modified:   ext/posix/tests/posix_getsid_error.phpt\r# modified:   ext/posix/tests/posix_initgroups.phpt\r# modified:   ext/posix/tests/posix_kill_error.phpt\r# modified:   ext/posix/tests/posix_strerror_error.phpt\r# modified:   ext/reflection/tests/ReflectionClass_hasProperty_002.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_getClosure_error.phpt\r# modified:   ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt\r# modified:   ext/reflection/tests/ReflectionObject_getName_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt\r# modified:   ext/reflection/tests/ReflectionProperty_setValue_error.phpt\r# modified:   ext/session/tests/bug79221.phpt\r# modified:   ext/session/tests/session_cache_limiter_error.phpt\r# modified:   ext/spl/tests/bug61347.phpt\r# modified:   ext/spl/tests/fileobject_005.phpt\r# modified:   ext/spl/tests/iterator_045.phpt\r# modified:   ext/spl/tests/regexIterator_setMode_error.phpt\r# modified:   ext/spl/tests/spl_heap_is_empty_basic.phpt\r# modified:   ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt\r# modified:   ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt\r# modified:   ext/standard/tests/array/005.phpt\r# modified:   ext/standard/tests/array/009.phpt\r# modified:   ext/standard/tests/array/array_diff_assoc_error.phpt\r# modified:   ext/standard/tests/array/array_diff_error.phpt\r# modified:   ext/standard/tests/array/array_diff_key_error.phpt\r# modified:   ext/standard/tests/array/array_filter.phpt\r# modified:   ext/standard/tests/array/array_filter_variation10.phpt\r# modified:   ext/standard/tests/array/array_key_exists_variation3.phpt\r# modified:   ext/standard/tests/array/array_map_error.phpt\r# modified:   ext/standard/tests/array/array_merge.phpt\r# modified:   ext/standard/tests/array/array_push.phpt\r# modified:   ext/standard/tests/array/array_slice.phpt\r# modified:   ext/standard/tests/array/array_unshift.phpt\r# modified:   ext/standard/tests/array/array_walk.phpt\r# modified:   ext/standard/tests/array/array_walk_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive1.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_error2.phpt\r# modified:   ext/standard/tests/array/array_walk_recursive_variation7.phpt\r# modified:   ext/standard/tests/array/array_walk_variation7.phpt\r# modified:   ext/standard/tests/array/uasort_variation8.phpt\r# modified:   ext/standard/tests/array/usort_variation8.phpt\r# modified:   ext/standard/tests/assert/assert_variation.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_1.phpt\r# modified:   ext/standard/tests/file/auto_detect_line_endings_2.phpt\r# modified:   ext/standard/tests/file/basename.phpt\r# modified:   ext/standard/tests/file/fscanf.phpt\r# modified:   ext/standard/tests/file/fscanf_variation10.phpt\r# modified:   ext/standard/tests/file/is_dir_variation3.phpt\r# modified:   ext/standard/tests/file/is_executable_error.phpt\r# modified:   ext/standard/tests/file/is_executable_variation3.phpt\r# modified:   ext/standard/tests/file/is_file_variation3.phpt\r# modified:   ext/standard/tests/file/is_readable_error.phpt\r# modified:   ext/standard/tests/file/is_readable_variation3.phpt\r# modified:   ext/standard/tests/file/is_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/file/is_writable_error.phpt\r# modified:   ext/standard/tests/file/is_writable_variation3.phpt\r# modified:   ext/standard/tests/file/move_uploaded_file_basic.phpt\r# modified:   ext/standard/tests/general_functions/get_include_path_basic.phpt\r# modified:   ext/standard/tests/general_functions/include_path.phpt\r# modified:   ext/standard/tests/general_functions/is_array.phpt\r# modified:   ext/standard/tests/general_functions/is_bool.phpt\r# modified:   ext/standard/tests/general_functions/is_float_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_int_64bit.phpt\r# modified:   ext/standard/tests/general_functions/is_null.phpt\r# modified:   ext/standard/tests/general_functions/is_numeric.phpt\r# modified:   ext/standard/tests/general_functions/is_object.phpt\r# modified:   ext/standard/tests/general_functions/is_scalar.phpt\r# modified:   ext/standard/tests/general_functions/is_string.phpt\r# modified:   ext/standard/tests/general_functions/ob_get_length_basic.phpt\r# modified:   ext/standard/tests/general_functions/php_uname_error.phpt\r# modified:   ext/standard/tests/general_functions/print_r.phpt\r# modified:   ext/standard/tests/general_functions/print_r_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_dump_64bit.phpt\r# modified:   ext/standard/tests/general_functions/var_export-locale.phpt\r# modified:   ext/standard/tests/image/image_type_to_extension.phpt\r# modified:   ext/standard/tests/math/lcg_value_basic.phpt\r# modified:   ext/standard/tests/network/inet.phpt\r# modified:   ext/standard/tests/network/ip_x86_64.phpt\r# modified:   ext/standard/tests/random/random_int.phpt\r# modified:   ext/standard/tests/serialize/bug45706.phpt\r# modified:   ext/standard/tests/streams/bug61115.phpt\r# modified:   ext/standard/tests/streams/bug78662.phpt\r# modified:   ext/standard/tests/streams/stream_set_timeout_error.phpt\r# modified:   ext/standard/tests/strings/chr_error.phpt\r# modified:   ext/standard/tests/strings/fprintf_error.phpt\r# modified:   ext/standard/tests/strings/htmlentities24.phpt\r# modified:   ext/standard/tests/strings/htmlspecialchars.phpt\r# modified:   ext/standard/tests/strings/ltrim.phpt\r# modified:   ext/standard/tests/strings/metaphone.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic1.phpt\r# modified:   ext/standard/tests/strings/parse_str_basic3.phpt\r# modified:   ext/standard/tests/strings/printf_error.phpt\r# modified:   ext/standard/tests/strings/rtrim.phpt\r# modified:   ext/standard/tests/strings/soundex.phpt\r# modified:   ext/standard/tests/strings/sprintf_variation15.phpt\r# modified:   ext/standard/tests/strings/sscanf_error.phpt\r# modified:   ext/standard/tests/strings/str_ireplace.phpt\r# modified:   ext/standard/tests/strings/stristr.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation1.phpt\r# modified:   ext/standard/tests/strings/strrchr_variation2.phpt\r# modified:   ext/standard/tests/strings/strtolower.phpt\r# modified:   ext/standard/tests/strings/strtoupper1.phpt\r# modified:   ext/standard/tests/strings/strval_error.phpt\r# modified:   ext/standard/tests/strings/substr.phpt\r# modified:   ext/standard/tests/strings/trim1.phpt\r# modified:   ext/standard/tests/strings/vfprintf_error1.phpt\r# modified:   ext/standard/tests/time/strptime_error.phpt\r# modified:   ext/tokenizer/tests/001.phpt\r# modified:   ext/xmlreader/tests/static.phpt\r# modified:   ext/xmlwriter/tests/bug41326.phpt\r# modified:   tests/output/stream_isatty_err.phpt\r# modified:   tests/output/stream_isatty_in-err.phpt\r# modified:   tests/output/stream_isatty_in-out-err.phpt\r# modified:   tests/output/stream_isatty_in-out.phpt\r# modified:   tests/output/stream_isatty_out-err.phpt\r# modified:   tests/output/stream_isatty_out.phpt\r#\r# Changes not staged for commit:\r# modified:   run-tests.php\r#

Reduce code duplication using for loop

Slipt error messages while checking magic methods attributes

Closes GH-5465

Check func_info consistency

Make sure explicitly specified func_info is a subset of
automatically computed info. This will at least prevent
cases where a type is removed from stubs, but not removed
from func_info.

Closes GH-5471.

Fixed bug #79432