From: Felipe Pena Date: Wed, 8 Jun 2011 00:53:55 +0000 (+0000) Subject: s/valid path/a valid path/ X-Git-Tag: php-5.4.0alpha1~73 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddaddf6c2ad337b6b2140c82cdeca56f30333947;p=php s/valid path/a valid path/ --- diff --git a/Zend/zend_API.c b/Zend/zend_API.c index cd5e52f20d..3ae6088786 100644 --- 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 ab688d8b70..4321b42472 100644 --- 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 edbb90de07..5e26b5a636 100644 --- a/ext/standard/tests/file/bug39863.phpt +++ b/ext/standard/tests/file/bug39863.phpt @@ -17,7 +17,7 @@ else { ===DONE=== --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 debc84b14e..adb1acaf82 100644 --- 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 4cf4110f56..78f1932e3a 100644 --- 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 b61f8984d5..b275944f78 100644 --- 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 ab8afd601d..6cb95ecf34 100644 --- 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 e46d82c1af..6f91c31d11 100644 --- 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 9c59cf7cdb..575fe11a2f 100644 --- 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 01a955dc14..00fd6ff3ed 100755 --- 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 0867d1b605..5c0be485c5 100644 --- 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 2e579ccff6..231f1bff3f 100644 --- 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 11ca5d5558..b927446b7c 100644 --- 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 e9f168a8e1..5becac00a2 100644 --- 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 524684dea8..718c7fb8e9 100644 --- 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 e76e1f0c6a..dd823d47a2 100644 --- 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