Merge branch 'PHP-7.4'

diff --cc ext/bz2/tests/004.phpt
Simple merge

diff --cc ext/com_dotnet/com_persist.c
Simple merge

diff --cc ext/exif/exif.c
Simple merge

diff --cc ext/gd/gd.c
Simple merge

diff --cc ext/hash/hash.c
Simple merge

diff --cc ext/phar/dirstream.c
Simple merge

diff --cc ext/spl/spl_directory.c
Simple merge

diff --cc ext/standard/exec.c
Simple merge

diff --cc ext/standard/file.c
Simple merge

diff --cc ext/standard/file.h
Simple merge

diff --cc ext/standard/tests/file/fwrite.phpt
index 4cd8a2f08a8ff8071ce394d4d499fceaac7695a4,3f8123a8f71dfe2f1f0aefc44a9c2a19d63fddd3..c3a475942bd2df22c5e5fe0c913db103bf1c9d0f
--- 1/ext/standard/tests/file/fwrite.phpt
--- 2/ext/standard/tests/file/fwrite.phpt
+++ b/ext/standard/tests/file/fwrite.phpt
@@@ -25,8 -30,12 +25,8 @@@ var_dump(file_get_contents($filename))
  echo "Done\n";
  ?>
  --EXPECTF--
 -Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d
 -bool(false)
 -
 -Warning: fwrite() expects parameter 2 to be string, array given in %s on line %d
 -bool(false)
 +int(0)
- int(0)
+ bool(false)
  int(0)
  int(4)
  int(0)

diff --cc sapi/phpdbg/phpdbg.h
Simple merge