From 0a0443f07c90d0326b43f5a0451e6bedadfb7988 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Thu, 9 Jun 2011 00:23:43 +0000
Subject: [PATCH] - Missing fixes for grammar fix 's/valid path/a valid path/'

---
 Zend/zend_API.c                                        |  2 +-
 ext/phar/tests/fopen_edgecases2.phpt                   |  2 +-
 ext/phar/tests/opendir_edgecases.phpt                  |  4 ++--
 ext/standard/tests/dir/chdir_variation1.phpt           |  4 ++--
 ext/standard/tests/dir/scandir_variation1.phpt         |  4 ++--
 ext/standard/tests/file/007_error.phpt                 |  4 ++--
 ext/standard/tests/file/chmod_variation3.phpt          | 10 +++++-----
 ext/standard/tests/file/filegroup_variation2.phpt      |  2 +-
 ext/standard/tests/file/fileinode_variation2.phpt      |  2 +-
 ext/standard/tests/file/fileowner_variation2.phpt      |  2 +-
 ext/standard/tests/file/fileperms_variation2.phpt      |  2 +-
 ext/standard/tests/file/is_dir_variation3.phpt         |  2 +-
 ext/standard/tests/file/is_executable_variation3.phpt  |  2 +-
 ext/standard/tests/file/is_file_error.phpt             |  2 +-
 ext/standard/tests/file/is_file_variation3.phpt        |  2 +-
 ext/standard/tests/file/is_readable_variation3.phpt    |  2 +-
 ext/standard/tests/file/is_writable_variation3.phpt    |  4 ++--
 ext/standard/tests/file/lchown_error.phpt              |  4 ++--
 ext/standard/tests/file/lstat_stat_error.phpt          |  4 ++--
 ext/standard/tests/file/parse_ini_file_variation4.phpt | 10 +++++-----
 20 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3ae6088786..28ac9e9364 100644
--- 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 6c5ac7b455..872aa289bc 100644
--- 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 c0f5ebc067..be899df81b 100644
--- 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 8b4d4b90e2..c4c0431ccc 100644
--- 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 34aa72dacd..0b35413ada 100644
--- 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 671a6c1733..a369c9d977 100644
--- 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 89f20f4a64..7c637b8560 100644
--- 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 98d84765c4..afac40c9ab 100644
--- 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 eb0fc96010..e8e7af6a6e 100644
--- 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 b904b6b366..feff767879 100644
--- 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 a7cfdb6b22..47c0c6593a 100644
--- 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 579c70a01b..41826ad7ec 100644
--- 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 0a1f3823b9..925f9963c0 100644
--- 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 6c481f0fdb..abccb721a1 100644
--- 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 e11c862ea3..2a13e46779 100644
--- 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 782c4bc07e..dc4d3b16f3 100644
--- 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 25aa9c0433..66a80abf1e 100644
--- 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 72f1052183..979959e280 100644
--- 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 d7ee41f9ae..385167fe32 100644
--- 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 d8ce01dbce..66cab3bedc 100644
--- 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--
-- 
2.50.1