Fixed test

diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt
index c2621d72115fc63d2c35bd5ae9cc0df0db99b23a..a03ec981dd73d448ed0f40c20eae1697110f3995 100644 (file)
--- a/ext/standard/tests/strings/str_word_count.phpt
+++ b/ext/standard/tests/strings/str_word_count.phpt
@@ -82,7 +82,7 @@ Warning: str_word_count() expects parameter 2 to be long, array given in %s on l
 Warning: Wrong parameter count for str_word_count() in %s on line 13
 NULL
 
-Warning: str_word_count() expects parameter 2 to be long, native string given in %s on line 14
+Warning: str_word_count() expects parameter 2 to be long, string given in %s on line 14
 
 Warning: Wrong parameter count for str_word_count() in %s on line 14
 NULL
@@ -92,12 +92,12 @@ int(5)
 int(6)
 int(5)
 
-Warning: str_word_count() expects parameter 3 to be native string, array given in %s on line 21
+Warning: str_word_count() expects parameter 3 to be string, array given in %s on line 21
 
 Warning: Wrong parameter count for str_word_count() in %s on line 21
 NULL
 
-Warning: str_word_count() expects parameter 3 to be native string, object given in %s on line 22
+Warning: str_word_count() expects parameter 3 to be string, object given in %s on line 22
 
 Warning: Wrong parameter count for str_word_count() in %s on line 22
 NULL
@@ -141,12 +141,12 @@ array(5) {
   string(3) "foo"
 }
 
-Warning: str_word_count() expects parameter 3 to be native string, array given in %s on line 27
+Warning: str_word_count() expects parameter 3 to be string, array given in %s on line 27
 
 Warning: Wrong parameter count for str_word_count() in %s on line 27
 NULL
 
-Warning: str_word_count() expects parameter 3 to be native string, object given in %s on line 28
+Warning: str_word_count() expects parameter 3 to be string, object given in %s on line 28
 
 Warning: Wrong parameter count for str_word_count() in %s on line 28
 NULL
@@ -205,12 +205,222 @@ array(5) {
   string(3) "foo"
 }
 
-Warning: str_word_count() expects parameter 3 to be native string, array given in %s on line 33
+Warning: str_word_count() expects parameter 3 to be string, array given in %s on line 33
 
 Warning: Wrong parameter count for str_word_count() in %s on line 33
 NULL
 
-Warning: str_word_count() expects parameter 3 to be native string, object given in %s on line 34
+Warning: str_word_count() expects parameter 3 to be string, object given in %s on line 34
+
+Warning: Wrong parameter count for str_word_count() in %s on line 34
+NULL
+array(7) {
+  [0]=>
+  string(1) "F"
+  [2]=>
+  string(1) "o"
+  [4]=>
+  string(1) "B"
+  [6]=>
+  string(1) "r"
+  [9]=>
+  string(1) "s"
+  [11]=>
+  string(3) "bar"
+  [15]=>
+  string(3) "foo"
+}
+array(2) {
+  [0]=>
+  string(5) "foo'0"
+  [6]=>
+  string(8) "bar-0var"
+}
+array(1) {
+  [1]=>
+  string(4) "foo'"
+}
+array(1) {
+  [0]=>
+  string(5) "'foo'"
+}
+array(1) {
+  [1]=>
+  string(3) "foo"
+}
+array(1) {
+  [0]=>
+  string(5) "-foo-"
+}
+--UEXPECTF--
+array(6) {
+  [0]=>
+  string(5) "Hello"
+  [1]=>
+  string(6) "friend"
+  [2]=>
+  string(6) "you're"
+  [3]=>
+  string(7) "looking"
+  [4]=>
+  string(4) "good"
+  [5]=>
+  string(5) "today"
+}
+array(6) {
+  [0]=>
+  string(5) "Hello"
+  [6]=>
+  string(6) "friend"
+  [14]=>
+  string(6) "you're"
+  [27]=>
+  string(7) "looking"
+  [44]=>
+  string(4) "good"
+  [49]=>
+  string(5) "today"
+}
+int(6)
+NULL
+NULL
+NULL
+NULL
+
+Warning: str_word_count() expects parameter 2 to be long, array given in %s on line 13
+
+Warning: Wrong parameter count for str_word_count() in %s on line 13
+NULL
+
+Warning: str_word_count() expects parameter 2 to be long, Unicode string given in %s on line 14
+
+Warning: Wrong parameter count for str_word_count() in %s on line 14
+NULL
+unicode(55) "Hello friend, you're  
+    looking          good today!"
+int(5)
+int(6)
+int(5)
+
+Warning: str_word_count() expects parameter 3 to be binary string, array given in %s on line 21
+
+Warning: Wrong parameter count for str_word_count() in %s on line 21
+NULL
+
+Warning: str_word_count() expects parameter 3 to be binary string, object given in %s on line 22
+
+Warning: Wrong parameter count for str_word_count() in %s on line 22
+NULL
+int(7)
+array(5) {
+  [0]=>
+  string(3) "F0o"
+  [1]=>
+  string(3) "B4r"
+  [2]=>
+  string(1) "s"
+  [3]=>
+  string(3) "bar"
+  [4]=>
+  string(3) "foo"
+}
+array(6) {
+  [0]=>
+  string(3) "F0o"
+  [1]=>
+  string(1) "B"
+  [2]=>
+  string(1) "r"
+  [3]=>
+  string(2) "1s"
+  [4]=>
+  string(3) "bar"
+  [5]=>
+  string(3) "foo"
+}
+array(5) {
+  [0]=>
+  string(3) "F0o"
+  [1]=>
+  string(3) "B4r"
+  [2]=>
+  string(2) "1s"
+  [3]=>
+  string(3) "bar"
+  [4]=>
+  string(3) "foo"
+}
+
+Warning: str_word_count() expects parameter 3 to be binary string, array given in %s on line 27
+
+Warning: Wrong parameter count for str_word_count() in %s on line 27
+NULL
+
+Warning: str_word_count() expects parameter 3 to be binary string, object given in %s on line 28
+
+Warning: Wrong parameter count for str_word_count() in %s on line 28
+NULL
+array(7) {
+  [0]=>
+  string(1) "F"
+  [1]=>
+  string(1) "o"
+  [2]=>
+  string(1) "B"
+  [3]=>
+  string(1) "r"
+  [4]=>
+  string(1) "s"
+  [5]=>
+  string(3) "bar"
+  [6]=>
+  string(3) "foo"
+}
+array(5) {
+  [0]=>
+  string(3) "F0o"
+  [4]=>
+  string(3) "B4r"
+  [9]=>
+  string(1) "s"
+  [11]=>
+  string(3) "bar"
+  [15]=>
+  string(3) "foo"
+}
+array(6) {
+  [0]=>
+  string(3) "F0o"
+  [4]=>
+  string(1) "B"
+  [6]=>
+  string(1) "r"
+  [8]=>
+  string(2) "1s"
+  [11]=>
+  string(3) "bar"
+  [15]=>
+  string(3) "foo"
+}
+array(5) {
+  [0]=>
+  string(3) "F0o"
+  [4]=>
+  string(3) "B4r"
+  [8]=>
+  string(2) "1s"
+  [11]=>
+  string(3) "bar"
+  [15]=>
+  string(3) "foo"
+}
+
+Warning: str_word_count() expects parameter 3 to be binary string, array given in %s on line 33
+
+Warning: Wrong parameter count for str_word_count() in %s on line 33
+NULL
+
+Warning: str_word_count() expects parameter 3 to be binary string, object given in %s on line 34
 
 Warning: Wrong parameter count for str_word_count() in %s on line 34
 NULL