- MFH: these should have been in the previous commit.

diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 14e67983be194af6eddc9fcbb66e51d2ff0cd4c1..714c0e5703116d7495c005828e1d738a84cb067f 100644 (file)
--- a/ext/mbstring/tests/mb_stristr_variation2.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation2.phpt
@@ -165,33 +165,33 @@ Error: 2 - mb_stristr() expects parameter 2 to be string, array given, %s(%d)
 bool(false)
 
 --uppercase NULL--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --lowercase true--
 bool(false)
 
 --lowercase false--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --uppercase TRUE--
 bool(false)
 
 --uppercase FALSE--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --instance of classWithToString--
@@ -202,11 +202,11 @@ Error: 2 - mb_stristr() expects parameter 2 to be string, object given, %s(%d)
 bool(false)
 
 --undefined var--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --unset var--
-Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
 bool(false)
 
 --resource--

diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt
index 02f2d6ea6c1a0a7b3800cc6fbcdd63e44d0a0a06..f70bb67ada7c7c7eec6063ff5a32226920ba0679 100644 (file)
--- a/ext/mbstring/tests/mb_strstr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation2.phpt
@@ -165,33 +165,33 @@ Error: 2 - mb_strstr() expects parameter 2 to be string, array given, %s(%d)
 bool(false)
 
 --uppercase NULL--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --lowercase true--
 bool(false)
 
 --lowercase false--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --uppercase TRUE--
 bool(false)
 
 --uppercase FALSE--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --instance of classWithToString--
@@ -202,11 +202,11 @@ Error: 2 - mb_strstr() expects parameter 2 to be string, object given, %s(%d)
 bool(false)
 
 --undefined var--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --unset var--
-Error: 2 - mb_strstr(): Empty delimiter., %s(%d)
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
 bool(false)
 
 --resource--

diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt
index 7fe7125f472dc42b68146024bb9cb2d780dfe27b..87b5eed1898144d0fea271c26ac7d605299d1963 100644 (file)
--- a/ext/mbstring/tests/mb_substr_count_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt
@@ -133,12 +133,12 @@ int(0)
 
 -- Iteration 10 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 11 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 12 --
@@ -146,7 +146,7 @@ int(0)
 
 -- Iteration 13 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 14 --
@@ -154,17 +154,17 @@ int(0)
 
 -- Iteration 15 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 16 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 18 --
@@ -181,16 +181,16 @@ int(1)
 
 -- Iteration 22 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 23 --
 
-Warning: mb_substr_count(): Empty substring. in %s on line %d
+Warning: mb_substr_count(): Empty substring in %s on line %d
 bool(false)
 
 -- Iteration 24 --
 
 Warning: mb_substr_count() expects parameter 2 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done