Permalink
Browse files

s/valid path/a valid path/

  • Loading branch information...
1 parent 2b72c6e commit 547ab485214d860551d20c2d8333f6bfbc85e54b @felipensp felipensp committed Jun 8, 2011
View
@@ -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;
}
@@ -33,10 +33,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===
@@ -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===
@@ -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 ---
@@ -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)
@@ -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 ***
@@ -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 ***
@@ -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 ***
@@ -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 ***
@@ -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) {
@@ -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 ***
@@ -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)
@@ -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 ***
@@ -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)
@@ -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)
@@ -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

0 comments on commit 547ab48

Please sign in to comment.