Skip to content

Commit ddaddf6

Browse files
felipenspfelipensp
committed
s/valid path/a valid path/
1 parent c27079d commit ddaddf6

16 files changed

+49
-49
lines changed

Diff for: ‎Zend/zend_API.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -434,14 +434,14 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const cha
434434
*p = Z_STRVAL_PP(arg);
435435
*pl = Z_STRLEN_PP(arg);
436436
if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
437-
return "valid path";
437+
return "a valid path";
438438
}
439439
break;
440440

441441
case IS_OBJECT:
442442
if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) {
443443
if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
444-
return "valid path";
444+
return "a valid path";
445445
}
446446
break;
447447
}

Diff for: ‎ext/oci8/tests/null_byte_1.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ var_dump($r);
3232
--EXPECTF--
3333
Test 1: Import
3434

35-
Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
35+
Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
3636
NULL
3737
Test 2: Export
3838

39-
Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
39+
Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
4040
NULL
4141
===DONE===

Diff for: ‎ext/standard/tests/file/bug39863.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ else {
1717
===DONE===
1818
<?php exit(0); ?>
1919
--EXPECTF--
20-
Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
20+
Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
2121
PASS
2222
===DONE===
2323

Diff for: ‎ext/standard/tests/file/disk_free_space_variation.phpt

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,34 +106,34 @@ float(%d)
106106

107107
-- Iteration 9 --
108108

109-
Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
109+
Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
110110
NULL
111111

112-
Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
112+
Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
113113
NULL
114114

115115
-- Iteration 10 --
116116

117-
Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
117+
Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
118118
NULL
119119

120-
Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
120+
Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
121121
NULL
122122

123123
-- Iteration 11 --
124124

125-
Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
125+
Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
126126
NULL
127127

128-
Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
128+
Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
129129
NULL
130130

131131
-- Iteration 12 --
132132

133-
Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
133+
Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
134134
NULL
135135

136-
Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
136+
Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
137137
NULL
138138

139139
--- Done ---

Diff for: ‎ext/standard/tests/file/disk_total_space_variation.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,22 @@ float(%d)
100100

101101
-- Iteration 9 --
102102

103-
Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
103+
Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
104104
NULL
105105

106106
-- Iteration 10 --
107107

108-
Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
108+
Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
109109
NULL
110110

111111
-- Iteration 11 --
112112

113-
Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
113+
Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
114114
NULL
115115

116116
-- Iteration 12 --
117117

118-
Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
118+
Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
119119
NULL
120120
*** Testing with Binary Input ***
121121
float(64246190080)

Diff for: ‎ext/standard/tests/file/filegroup_variation3.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in
7575
bool(false)
7676
- Iteration 7 -
7777

78-
Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
78+
Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
7979
NULL
8080
- Iteration 8 -
8181

82-
Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
82+
Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
8383
NULL
8484

8585
*** Done ***

Diff for: ‎ext/standard/tests/file/fileinode_variation3.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in
7676
bool(false)
7777
- Iteration 7 -
7878

79-
Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
79+
Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
8080
NULL
8181
- Iteration 8 -
8282

83-
Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
83+
Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
8484
NULL
8585

8686
*** Done ***

Diff for: ‎ext/standard/tests/file/fileowner_variation3.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in
7676
bool(false)
7777
- Iteration 7 -
7878

79-
Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
79+
Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
8080
NULL
8181
- Iteration 8 -
8282

83-
Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
83+
Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
8484
NULL
8585

8686
*** Done ***

Diff for: ‎ext/standard/tests/file/fileperms_variation3.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in
7575
bool(false)
7676
- Iteration 7 -
7777

78-
Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
78+
Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
7979
NULL
8080
- Iteration 8 -
8181

82-
Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
82+
Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
8383
NULL
8484

8585
*** Done ***

Diff for: ‎ext/standard/tests/file/glob_variation.phpt

+7-7
Original file line numberDiff line numberDiff line change
@@ -326,22 +326,22 @@ array(0) {
326326

327327
-- Iteration 8 --
328328

329-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
329+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
330330
NULL
331331

332-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
332+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
333333
NULL
334334

335-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
335+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
336336
NULL
337337

338-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
338+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
339339
NULL
340340

341-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
341+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
342342
NULL
343343

344-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
344+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
345345
NULL
346346

347347
-- Iteration 9 --
@@ -446,7 +446,7 @@ array(0) {
446446
}
447447
-- Iteration 8 --
448448

449-
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
449+
Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
450450
NULL
451451
-- Iteration 9 --
452452
array(0) {

Diff for: ‎ext/standard/tests/file/is_dir_variation4.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ bool(false)
7878

7979
-- Iteration 9 --
8080

81-
Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
81+
Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
8282
NULL
8383

8484
-- Iteration 10 --
8585

86-
Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
86+
Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
8787
NULL
8888

8989
*** Done ***

Diff for: ‎ext/standard/tests/file/is_executable_variation1.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ bool(false)
7777
bool(false)
7878
-- Iteration 6 --
7979

80-
Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
80+
Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
8181
NULL
8282
-- Iteration 7 --
8383

84-
Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
84+
Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
8585
NULL
8686
-- Iteration 8 --
8787
bool(false)

Diff for: ‎ext/standard/tests/file/is_file_variation4.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ bool(false)
6868
bool(false)
6969
- Iteration 7 -
7070

71-
Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
71+
Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
7272
NULL
7373
- Iteration 8 -
7474

75-
Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
75+
Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
7676
NULL
7777

7878
*** Done ***

Diff for: ‎ext/standard/tests/file/is_readable_variation1.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ bool(false)
8888
bool(false)
8989
-- Iteration 7 --
9090

91-
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
91+
Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
9292
NULL
9393
-- Iteration 8 --
9494

95-
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
95+
Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
9696
NULL
9797
-- Iteration 9 --
9898

99-
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
99+
Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
100100
NULL
101101
-- Iteration 10 --
102102
bool(true)

Diff for: ‎ext/standard/tests/file/is_writable_variation1.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -97,24 +97,24 @@ bool(false)
9797
bool(false)
9898
-- Iteration 7 --
9999

100-
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
100+
Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
101101
NULL
102102

103-
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
103+
Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
104104
NULL
105105
-- Iteration 8 --
106106

107-
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
107+
Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
108108
NULL
109109

110-
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
110+
Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
111111
NULL
112112
-- Iteration 9 --
113113

114-
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
114+
Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
115115
NULL
116116

117-
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
117+
Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
118118
NULL
119119
-- Iteration 10 --
120120
bool(true)

Diff for: ‎ext/standard/tests/file/tempnam_variation7.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ File permissions are => 100600
9595
File created in => temp dir
9696
-- Iteration 6 --
9797

98-
Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
98+
Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
9999
-- File is not created --
100100

101101
Warning: unlink(): Invalid argument in %s on line %d
102102
-- Iteration 7 --
103103

104-
Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
104+
Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
105105
-- File is not created --
106106

107107
Warning: unlink(): Invalid argument in %s on line %d

0 commit comments

Comments
 (0)