Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test cases

diff --cc ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
index f804891a13c84e0c764e613a1ec96ed3f17ef9d6,be4641f0cc4b1fcd827e001a382214c560172c01..9935c646be3a391b8900a570aa957b6bb8a9c1f5
--- 1/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
--- 2/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
@@@ -10,10 -10,8 +10,10 @@@ skip_if_no_required_exts()
  skip_if_wrong_cp(950, "ansi");
  
  ?>
 +--CONFLICTS--
 +file_big5
  --INI--
- defalut_charset=big5
+ default_charset=big5
  --FILE--
  <?php
  /*

diff --cc ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
index a768c2397bfeb50bd679f183a81e98799234d291,333559cb3ee82e264d8232ccec67586c862f2bbe..a308e7b9d14501e96cb32f4c29bcebe5bcff06dd
--- 1/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
--- 2/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
@@@ -10,10 -10,8 +10,10 @@@ skip_if_no_required_exts()
  skip_if_wrong_cp(950, "ansi");
  
  ?>
 +--CONFLICTS--
 +file_big5
  --INI--
- defalut_charset=cp950
+ default_charset=cp950
  --FILE--
  <?php
  /*