Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

s/valid path/a valid path/

  • Loading branch information...
commit 547ab485214d860551d20c2d8333f6bfbc85e54b 1 parent 2b72c6e
Felipe Pena felipensp authored
4 Zend/zend_API.c
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;
}
4 ext/oci8/tests/null_byte_1.phpt
View
@@ -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===
2  ext/standard/tests/file/bug39863.phpt
View
@@ -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===
16 ext/standard/tests/file/disk_free_space_variation.phpt
View
@@ -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 ---
8 ext/standard/tests/file/disk_total_space_variation.phpt
View
@@ -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)
4 ext/standard/tests/file/filegroup_variation3.phpt
View
@@ -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 ***
4 ext/standard/tests/file/fileinode_variation3.phpt
View
@@ -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 ***
4 ext/standard/tests/file/fileowner_variation3.phpt
View
@@ -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 ***
4 ext/standard/tests/file/fileperms_variation3.phpt
View
@@ -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 ***
14 ext/standard/tests/file/glob_variation.phpt
View
@@ -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) {
4 ext/standard/tests/file/is_dir_variation4.phpt
View
@@ -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 ***
4 ext/standard/tests/file/is_executable_variation1.phpt
View
@@ -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)
4 ext/standard/tests/file/is_file_variation4.phpt
View
@@ -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 ***
6 ext/standard/tests/file/is_readable_variation1.phpt
View
@@ -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)
12 ext/standard/tests/file/is_writable_variation1.phpt
View
@@ -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)
4 ext/standard/tests/file/tempnam_variation7.phpt
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.