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

Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Went to fast and forgot to update tests"
  Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"
---

1e8459d626f93a961c15b191be4adda3e22b05bb
diff --cc ext/mbstring/tests/mb_substitute_character.phpt
index 490542837f,6bc533f038..9e50823ef4
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@@ -25,7 -25,7 +25,7 @@@ var_dump(bin2hex(mb_convert_encoding("\
  
  var_dump(mb_substitute_character('BAD_NAME'));
  ?>
----EXPECT--
++--EXPECTF--
  bool(true)
  int(12356)
  string(8) "82a282a0"
@@@ -38,4 -38,5 +38,6 @@@ string(4) "82a0
  bool(true)
  string(6) "entity"
  string(20) "262378323636303b82a0"
- bool(true)
 -ERR: Warning
++
++Warning: mb_substitute_character(): Unknown character in %s on line %d
+ bool(false)
diff --cc ext/mbstring/tests/mb_substitute_character_basic.phpt
index 39af2d0c76,9fa3a5b1ac..63ae10f76c
--- 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") );
  
  ?>
- --EXPECT--
 -===DONE===
+ --EXPECTF--
  *** Testing mb_substitute_character() : basic functionality ***
  int(63)
  bool(true)
@@@ -36,4 -37,7 +36,6 @@@ bool(true
  int(1234)
  bool(true)
  string(4) "none"
- bool(true)
+ 
+ Warning: mb_substitute_character(): Unknown character in %s on line %d
+ bool(false)
 -===DONE===
diff --cc ext/mbstring/tests/mb_substitute_character_variation1.phpt
index 819d60493c,f738876469..53a21c8787
--- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@@ -209,7 -221,10 +220,9 @@@ Error: 8 - Object of class classWithout
  bool(true)
  
  --undefined var--
- bool(true)
+ Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+ bool(false)
  
  --unset var--
- bool(true)
+ Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+ bool(false)
 -===DONE===