- Missing fixes for grammar fix 's/valid path/a valid path/'

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3ae6088786a728c7921d4774f3535fd429e7a1bf..28ac9e9364586f418afadcd33b27546d88e2609d 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -449,7 +449,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const cha
                                        case IS_ARRAY:
                                        case IS_RESOURCE:
                                        default:
-                                               return c == 's' ? "string" : "valid path";
+                                               return c == 's' ? "string" : "a valid path";
                                }
                        }
                        break;

diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt
index 6c5ac7b455fd9804912fbed286af6b32ad30e8de..872aa289bc94c331b27e4ed00a50774159fe7b13 100644 (file)
--- a/ext/phar/tests/fopen_edgecases2.phpt
+++ b/ext/phar/tests/fopen_edgecases2.phpt
@@ -36,7 +36,7 @@ include $pname . '/foo/hi';
 <?php rmdir(dirname(__FILE__) . '/poo'); ?>
 <?php unlink(dirname(__FILE__) . '/foob'); ?>
 --EXPECTF--
-Warning: fopen() expects parameter 1 to be string, array given in %sfopen_edgecases2.php on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_edgecases2.php on line %d
 blah
 test
 

diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt
index c0f5ebc067e04786d6fedeea98d90702b424565d..be899df81b7a67d72ec63329ce351c5b40fe78f7 100644 (file)
--- a/ext/phar/tests/opendir_edgecases.phpt
+++ b/ext/phar/tests/opendir_edgecases.phpt
@@ -52,10 +52,10 @@ include $pname . '/foo';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 <?php rmdir(dirname(__FILE__) . '/poo');
 --EXPECTF--
-Warning: opendir() expects parameter 1 to be %string, array given in %sopendir_edgecases.php on line %d
+Warning: opendir() expects parameter 1 to be a valid path, array given in %sopendir_edgecases.php on line %d
 .
 ..
 foo
 
 Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d
-===DONE===
\ No newline at end of file
+===DONE===

diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt
index 8b4d4b90e2d92cf043a2f83fd945e659204dca49..c4c0431ccc99e1a4a4355ec240a70e0a67aa05ab 100644 (file)
--- a/ext/standard/tests/dir/chdir_variation1.phpt
+++ b/ext/standard/tests/dir/chdir_variation1.phpt
@@ -201,7 +201,7 @@ bool(false)
 
 -- Iteration 18 --
 
-Warning: chdir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, array given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
@@ -230,6 +230,6 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: chdir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt
index 34aa72dacda2f22c256f6fd8e77905dd54b9db31..0b35413adacc9439dc510e7ad93c39cb85e7278f 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation1.phpt
+++ b/ext/standard/tests/dir/scandir_variation1.phpt
@@ -205,7 +205,7 @@ bool(false)
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
@@ -248,6 +248,6 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 671a6c17334d09272fd058f7f1bd634b4d993171..a369c9d97785d0199ac6c6a08878d08dd7a41007 100644 (file)
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -145,7 +145,7 @@ Warning: feof() expects parameter 1 to be resource, boolean given in %s on line
 bool(false)
 -- Iteration 5 --
 
-Warning: fopen() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@ Warning: feof() expects parameter 1 to be resource, array given in %s on line %d
 bool(false)
 -- Iteration 6 --
 
-Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, object given in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d

diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt
index 89f20f4a6489119802a98f9b2028b8ac110e72c8..7c637b8560bab5e5010278aa723a5055e48d6c0d 100644 (file)
--- a/ext/standard/tests/file/chmod_variation3.phpt
+++ b/ext/standard/tests/file/chmod_variation3.phpt
@@ -143,19 +143,19 @@ Error: 2 - chmod(): No such file or directory, %s(%d)
 bool(false)
 
 --empty array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -195,7 +195,7 @@ Error: 2 - chmod(): No such file or directory, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt
index 98d84765c42ab7016782556af492ac2b7e9375ed..afac40c9ab0296ec62dda7a35290b41dc62487b9 100644 (file)
--- a/ext/standard/tests/file/filegroup_variation2.phpt
+++ b/ext/standard/tests/file/filegroup_variation2.phpt
@@ -58,7 +58,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: filegroup() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 
 Warning: filegroup(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt
index eb0fc96010df4723619c55baa0afbe2f10af75ee..e8e7af6a6e9a4173304ec3e156e28103c90b892d 100644 (file)
--- a/ext/standard/tests/file/fileinode_variation2.phpt
+++ b/ext/standard/tests/file/fileinode_variation2.phpt
@@ -59,7 +59,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileinode() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 
 Warning: fileinode(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt
index b904b6b366d0a687ad3cfd5b1c938bdc9f68fd40..feff767879943bc63f097e3081c41cd60de98fcc 100644 (file)
--- a/ext/standard/tests/file/fileowner_variation2.phpt
+++ b/ext/standard/tests/file/fileowner_variation2.phpt
@@ -59,7 +59,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileowner() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 
 Warning: fileowner(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt
index a7cfdb6b221129fd94223886cf0162f04dd92e5f..47c0c6593acfdbcf5a728152bc8f31deb4ef4a9e 100644 (file)
--- a/ext/standard/tests/file/fileperms_variation2.phpt
+++ b/ext/standard/tests/file/fileperms_variation2.phpt
@@ -58,7 +58,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileperms() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 
 Warning: fileperms(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index 579c70a01be3461cd11e8fd7e095dd14af673b1b..41826ad7ecd8ca4492c6820ea2bb92bc47454e98 100644 (file)
--- a/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@ -42,7 +42,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: is_dir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 bool(false)
 bool(false)

diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt
index 0a1f3823b931169c4ac24d2223eb4b346dc76984..925f9963c09ed2703cc05af408a3cdff34bba74a 100644 (file)
--- a/ext/standard/tests/file/is_executable_variation3.phpt
+++ b/ext/standard/tests/file/is_executable_variation3.phpt
@@ -62,7 +62,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: is_executable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 bool(false)
 Done

diff --git a/ext/standard/tests/file/is_file_error.phpt b/ext/standard/tests/file/is_file_error.phpt
index 6c481f0fdb131fdcdd00f914bb4035db7d75b2a2..abccb721a1be1d4e89bcad6aa07ac3ca3c00bfbc 100644 (file)
--- a/ext/standard/tests/file/is_file_error.phpt
+++ b/ext/standard/tests/file/is_file_error.phpt
@@ -45,7 +45,7 @@ Warning: is_file() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 bool(false)
 
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index e11c862ea3d91af9e4458d6c83a0bd0fd322b578..2a13e4677924f14f8feb78ad95cb38ffb08fc5de 100644 (file)
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -51,7 +51,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
 NULL
 bool(false)
 bool(false)

diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt
index 782c4bc07eedd7d9d2652a739f708b2d8b11c09c..dc4d3b16f394cb701a84c044a7a460112d914859 100644 (file)
--- a/ext/standard/tests/file/is_readable_variation3.phpt
+++ b/ext/standard/tests/file/is_readable_variation3.phpt
@@ -61,7 +61,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: is_readable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 bool(false)
 Done

diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt
index 25aa9c0433f5f4ed4fd82b6f668c08aaec423fb2..66a80abf1eecea62ac53a56fbfb4e60e7add044d 100644 (file)
--- a/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@ -67,10 +67,10 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: is_writable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 
-Warning: is_writeable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 bool(false)
 bool(false)

diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index 72f105218370a6a8d2f39f87ed6b35483eaf41ad..979959e280040127ba3477a35541b035e20b8e06 100644 (file)
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -67,10 +67,10 @@ bool(true)
 Warning: lchown(): No such file or directory in %s on line %d
 bool(false)
 
-Warning: lchown() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, object given in %s on line %d
 bool(true)
 
-Warning: lchown() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, array given in %s on line %d
 bool(true)
 
 Warning: lchown(): Operation not permitted in %s on line %d

diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt
index d7ee41f9aeb71f37d723f33ed6d9f1a325d6bcd9..385167fe32f2cdae2da323cfce1191a674678eeb 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_error.phpt
+++ b/ext/standard/tests/file/lstat_stat_error.phpt
@@ -51,7 +51,7 @@ bool(false)
 Warning: lstat(): Lstat failed for 22 in %s on line %d
 bool(false)
 
-Warning: lstat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lstat() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 
 *** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@ bool(false)
 Warning: stat(): stat failed for 22 in %s on line %d
 bool(false)
 
-Warning: stat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: stat() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt
index d8ce01dbce59260ba4aaf08f8304be3798b649e6..66cab3bedcb8ac4548b33702b203cafe631c3cf1 100644 (file)
--- a/ext/standard/tests/file/parse_ini_file_variation4.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -145,19 +145,19 @@ Error: 2 - parse_ini_file(0.5): failed to open stream: No such file or directory
 bool(false)
 
 --empty array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
 bool(false)
 
 --int indexed array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
 bool(false)
 
 --associative array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
 bool(false)
 
 --nested arrays--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
 bool(false)
 
 --uppercase NULL--
@@ -197,7 +197,7 @@ Error: 2 - parse_ini_file(Class A object): failed to open stream: No such file o
 bool(false)
 
 --instance of classWithoutToString--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, object given, %s(%d)
 bool(false)
 
 --undefined var--