From: George Peter Banyard <girgias@php.net>
Date: Fri, 3 Apr 2020 20:23:03 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc5a88f6140ae6fa978e6ea3ae0fc723971cd4f0;p=php

Merge branch 'PHP-7.4'
---

fc5a88f6140ae6fa978e6ea3ae0fc723971cd4f0
diff --cc ext/mbstring/tests/mb_substitute_character_basic.phpt
index 63ae10f76c,0fc062ec21..39af2d0c76
--- a/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 53a21c8787,be3b81018a..819d60493c
--- a/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===