Fix exception message of implode()

diff --git a/ext/standard/string.c b/ext/standard/string.c
index e701a9bb0ee60ff7b59a14bcea52278f110f4ed8..72b8123d945cb6acbfe7a1bf2b30a208f5d69a8a 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1284,7 +1284,7 @@ PHP_FUNCTION(implode)
                pieces = arg1_array;
        } else {
                if (arg1_str == NULL) {
-                       zend_type_error("The first argument must be string");
+                       zend_type_error("The first argument must be a string");
                        return;
                }
        }

diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 50889265501a53d7ccd7161307042446864f76a7..ae460d6037f9082f554ed1ee5e290069c13c28a4 100644 (file)
Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ

diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index db11ff091a1cd9138d14e2d4c2a26274b16671e0..c3035fb57fbe65082d12148de64bc26d4a2502dc 100644 (file)
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -125,15 +125,15 @@ string(29) "element11.07654321E-9element2"
 -- Iteration 9 --
 string(19) "element10.5element2"
 -- Iteration 10 --
-The first argument must be string
+The first argument must be a string
 -- Iteration 11 --
-The first argument must be string
+The first argument must be a string
 -- Iteration 12 --
-The first argument must be string
+The first argument must be a string
 -- Iteration 13 --
-The first argument must be string
+The first argument must be a string
 -- Iteration 14 --
-The first argument must be string
+The first argument must be a string
 -- Iteration 15 --
 string(17) "element11element2"
 -- Iteration 16 --

diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt
index 99a791ee561a8340709df4866f50a31dddcf2d92..e1739facc538eb72d9a00340ce4cd5733bcc74a3 100644 (file)
Binary files a/ext/standard/tests/strings/join_variation4.phpt and b/ext/standard/tests/strings/join_variation4.phpt differ

diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt
index 7880ff07ad314fafd8f42592265b6000aced69fa..4e8ad88d14704419f2f39419e33d8825649db69e 100644 (file)
--- a/ext/standard/tests/strings/join_variation5.phpt
+++ b/ext/standard/tests/strings/join_variation5.phpt
@@ -41,7 +41,7 @@ Warning: Array to string conversion in %s on line %d
 
 Warning: Array to string conversion in %s on line %d
 string(27) "ArrayTESTArrayTESTPHPTEST50"
-The first argument must be string
+The first argument must be a string
 
 Warning: Array to string conversion in %s on line %d