Merge branch 'PHP-7.4'

diff --cc ext/mbstring/tests/mb_substitute_character_basic.phpt
index 63ae10f76c1ef21a859604939d25d365a0991ef2,0fc062ec21ba7b64d503e79bbcbcca7c4c98117a..39af2d0c76ce7f42a6db22ae7fed720493a5c8fe
--- 1/ext/mbstring/tests/mb_substitute_character_basic.phpt
--- 2/ext/mbstring/tests/mb_substitute_character_basic.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt
@@@ -27,7 -27,8 +27,7 @@@ var_dump( mb_substitute_character() )
  var_dump( mb_substitute_character("b") );
  
  ?>
- --EXPECTF--
 -===DONE===
+ --EXPECT--
  *** Testing mb_substitute_character() : basic functionality ***
  int(63)
  bool(true)
@@@ -36,6 -37,5 +36,4 @@@ bool(true
  int(1234)
  bool(true)
  string(4) "none"
- 
- Warning: mb_substitute_character(): Unknown character in %s on line %d
- bool(false)
+ bool(true)
 -===DONE===

diff --cc ext/mbstring/tests/mb_substitute_character_variation1.phpt
index 53a21c87878f966508ac00ff5ae371c70c3a9f95,be3b81018a72513bf49200f7ac09d0a5542a19ae..819d60493ca666430e864233671df96dda6abefa
--- 1/ext/mbstring/tests/mb_substitute_character_variation1.phpt
--- 2/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@@ -220,9 -210,8 +209,7 @@@ Error: 8 - Object of class classWithout
  bool(true)
  
  --undefined var--
- Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
- bool(false)
+ bool(true)
  
  --unset var--
- Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
- bool(false)
+ bool(true)
 -===DONE===