summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2020-04-03 22:10:56 +0200
committerGeorge Peter Banyard <girgias@php.net>2020-04-03 22:10:56 +0200
commitc31b2bbd46b4f01880cba505734cd0708385158b (patch)
treeefd1adb194339de2d42676373763f5942a12695e
parent7a4261187091f5376107561577c0d444b2788b9c (diff)
parent656eac74fa6074aebc087bb73d2e4651f7dc8c9e (diff)
downloadphp-git-c31b2bbd46b4f01880cba505734cd0708385158b.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
-rw-r--r--ext/mbstring/tests/mb_substitute_character.phpt6
-rw-r--r--ext/mbstring/tests/mb_substitute_character_basic.phpt6
-rw-r--r--ext/mbstring/tests/mb_substitute_character_variation1.phpt39
3 files changed, 17 insertions, 34 deletions
diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
index 9e50823ef4..490542837f 100644
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -25,7 +25,7 @@ var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8
var_dump(mb_substitute_character('BAD_NAME'));
?>
---EXPECTF--
+--EXPECT--
bool(true)
int(12356)
string(8) "82a282a0"
@@ -38,6 +38,4 @@ string(4) "82a0"
bool(true)
string(6) "entity"
string(20) "262378323636303b82a0"
-
-Warning: mb_substitute_character(): Unknown character in %s on line %d
-bool(false)
+bool(true)
diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt
index 9fa3a5b1ac..0fc062ec21 100644
--- a/ext/mbstring/tests/mb_substitute_character_basic.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt
@@ -28,7 +28,7 @@ var_dump( mb_substitute_character("b") );
?>
===DONE===
---EXPECTF--
+--EXPECT--
*** Testing mb_substitute_character() : basic functionality ***
int(63)
bool(true)
@@ -37,7 +37,5 @@ 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 --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
index f738876469..be3b81018a 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@ -123,8 +123,7 @@ fclose($fp);
*** Testing mb_substitute_character() : usage variation ***
--int 0--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--int 1--
bool(true)
@@ -152,12 +151,10 @@ Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
bool(false)
--float .5--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--empty array--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--int indexed array--
bool(true)
@@ -169,26 +166,22 @@ bool(true)
bool(true)
--uppercase NULL--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--lowercase null--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--lowercase true--
bool(true)
--lowercase false--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--uppercase TRUE--
bool(true)
--uppercase FALSE--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--empty string DQ--
bool(true)
@@ -197,20 +190,16 @@ bool(true)
bool(true)
--string DQ--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--string SQ--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--mixed case string--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--heredoc--
-Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
-bool(false)
+bool(true)
--instance of classWithToString--
Error: 8 - Object of class classWithToString could not be converted to int, %s(%d)
@@ -221,10 +210,8 @@ Error: 8 - Object of class classWithoutToString could not be converted to int, %
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===