s/valid path/a valid path/

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index cd5e52f20d5a1158cff4e45e954d61994eafcf0c..3ae6088786a728c7921d4774f3535fd429e7a1bf 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -434,14 +434,14 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const cha
                                                *p = Z_STRVAL_PP(arg);
                                                *pl = Z_STRLEN_PP(arg);
                                                if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-                                                       return "valid path";
+                                                       return "a valid path";
                                                }
                                                break;
 
                                        case IS_OBJECT:
                                                if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) {
                                                        if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-                                                               return "valid path";
+                                                               return "a valid path";
                                                        }
                                                        break;
                                                }

diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt
index ab688d8b7071e2161e36de6efc78bfc3835270d5..4321b424722f30419da1d48ff8e9845569e71542 100644 (file)
--- a/ext/oci8/tests/null_byte_1.phpt
+++ b/ext/oci8/tests/null_byte_1.phpt
@@ -32,10 +32,10 @@ var_dump($r);
 --EXPECTF--
 Test 1: Import
 
-Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 Test 2: Export
 
-Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt
index edbb90de07d15761a0023f22624583f50de73f2b..5e26b5a6361f1b9e76c17a2d87406d245730bd6d 100644 (file)
--- a/ext/standard/tests/file/bug39863.phpt
+++ b/ext/standard/tests/file/bug39863.phpt
@@ -17,7 +17,7 @@ else {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
 PASS
 ===DONE===
 

diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index debc84b14eff34570f97971caeabbee15e89692f..adb1acaf8290463d671bd7d16b837a0954214685 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -106,34 +106,34 @@ float(%d)
 
 -- Iteration 9 --
 
-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 10 --
 
-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 11 --
 
-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 12 --
 
-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index 4cf4110f56b7138767efe9632f11b64e58ad692c..78f1932e3a816d69cf3eb5ce37badc34a87e5f5c 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -100,22 +100,22 @@ float(%d)
 
 -- Iteration 9 --
 
-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 10 --
 
-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 11 --
 
-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 12 --
 
-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 *** Testing with Binary Input ***
 float(64246190080)

diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt
index b61f8984d54b18f4360c3a6f303edf97155454fd..b275944f782ddbf26f5f2cf5aa007dcfd2412073 100644 (file)
--- a/ext/standard/tests/file/filegroup_variation3.phpt
+++ b/ext/standard/tests/file/filegroup_variation3.phpt
@@ -75,11 +75,11 @@ Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in
 bool(false)
 - Iteration 7 -
 
-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -
 
-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt
index ab8afd601d1932317dc86e411cfe081765663266..6cb95ecf34eac858ba59a2856a4ebdaeabd8c032 100644 (file)
--- a/ext/standard/tests/file/fileinode_variation3.phpt
+++ b/ext/standard/tests/file/fileinode_variation3.phpt
@@ -76,11 +76,11 @@ Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in
 bool(false)
 - Iteration 7 -
 
-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -
 
-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt
index e46d82c1afe51b1781bbc097e71b8e05d2457754..6f91c31d1132be852e439ff019a85c07b30ccff7 100644 (file)
--- a/ext/standard/tests/file/fileowner_variation3.phpt
+++ b/ext/standard/tests/file/fileowner_variation3.phpt
@@ -76,11 +76,11 @@ Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in
 bool(false)
 - Iteration 7 -
 
-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -
 
-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt
index 9c59cf7cdbc9569368a9d85c0e5a6e3c050a00b5..575fe11a2f0c105c717cc5ef756e7eba01b75604 100644 (file)
--- a/ext/standard/tests/file/fileperms_variation3.phpt
+++ b/ext/standard/tests/file/fileperms_variation3.phpt
@@ -75,11 +75,11 @@ Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in
 bool(false)
 - Iteration 7 -
 
-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -
 
-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/glob_variation.phpt b/ext/standard/tests/file/glob_variation.phpt
index 01a955dc14fe4d9aff1279e02c6193a04dd816cd..00fd6ff3ed4bb8b851b42981edad83e68d2acfb8 100755 (executable)
--- a/ext/standard/tests/file/glob_variation.phpt
+++ b/ext/standard/tests/file/glob_variation.phpt
@@ -326,22 +326,22 @@ array(0) {
 
 -- Iteration 8 --
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -446,7 +446,7 @@ array(0) {
 }
 -- Iteration 8 --
 
-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --
 array(0) {

diff --git a/ext/standard/tests/file/is_dir_variation4.phpt b/ext/standard/tests/file/is_dir_variation4.phpt
index 0867d1b605a307bbc1ee6823974178f31938e7aa..5c0be485c56aabd5dc0c0b6ac84bddf5bec1575f 100644 (file)
--- a/ext/standard/tests/file/is_dir_variation4.phpt
+++ b/ext/standard/tests/file/is_dir_variation4.phpt
@@ -78,12 +78,12 @@ bool(false)
 
 -- Iteration 9 --
 
-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 -- Iteration 10 --
 
-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt
index 2e579ccff64a7ab9c725d60fe68469911cc65bd7..231f1bff3fb0241348c11ce3f4df31ba9b437f55 100644 (file)
--- a/ext/standard/tests/file/is_executable_variation1.phpt
+++ b/ext/standard/tests/file/is_executable_variation1.phpt
@@ -77,11 +77,11 @@ bool(false)
 bool(false)
 -- Iteration 6 --
 
-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --
 bool(false)

diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt
index 11ca5d5558493d95b13393133c3d1630ac73eaaa..b927446b7ca376446a0b92bf52f2fa1924d0460d 100644 (file)
--- a/ext/standard/tests/file/is_file_variation4.phpt
+++ b/ext/standard/tests/file/is_file_variation4.phpt
@@ -68,11 +68,11 @@ bool(false)
 bool(false)
 - Iteration 7 -
 
-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -
 
-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt
index e9f168a8e1cc16081412e0330cb9569004701f35..5becac00a24476db8c1a160a4b996e81d942bd2a 100644 (file)
--- a/ext/standard/tests/file/is_readable_variation1.phpt
+++ b/ext/standard/tests/file/is_readable_variation1.phpt
@@ -88,15 +88,15 @@ bool(false)
 bool(false)
 -- Iteration 7 --
 
-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt
index 524684dea8132954edf673e9262391b81a0e5afc..718c7fb8e9673c8bcc456e72282a4a2783ff5ef0 100644 (file)
--- a/ext/standard/tests/file/is_writable_variation1.phpt
+++ b/ext/standard/tests/file/is_writable_variation1.phpt
@@ -97,24 +97,24 @@ bool(false)
 bool(false)
 -- Iteration 7 --
 
-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index e76e1f0c6aaf44b0a548f744c72ac25ee05fc3ba..dd823d47a22d36833e427eb5a81cbb24f76f7824 100644 (file)
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -95,13 +95,13 @@ File permissions are => 100600
 File created in => temp dir
 -- Iteration 6 --
 
-Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
 -- File is not created --
 
 Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 7 --
 
-Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
 -- File is not created --
 
 Warning: unlink(): Invalid argument in %s on line %d