Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflicts

diff --cc ext/standard/tests/file/disk.phpt
Simple merge

diff --cc ext/standard/tests/file/disk_total_space_error-win32.phpt
Simple merge

diff --cc ext/standard/tests/file/disk_total_space_error.phpt
Simple merge

diff --cc ext/standard/tests/file/disk_total_space_variation.phpt
Simple merge