master
Implement fine-grained conflict handling
Update the tests committed in r305098 (as part of the fix for bug #53226) to use the PHP_MAXPATHLEN constant, as recommended by Pierre.
Resolve open_basedir paths on ini update
Fix GH-19480: error_log php.ini cannot be unset when open_basedir is configured
[ci skip] Various typo fixes in stub comments and CHANGES file
Close PHP tags in tests
Sync leading and final newlines in *.phpt sections
Make error messages more consistent by fixing capitalization
Fix #71542: disk_total_space does not work with relative paths
Trim trailing whitespace in tests
Make more tests run on Linux
Fixed bug #42560