Skip to content

Commit ac86bf8

Browse files
felipenspfelipensp
committedJun 7, 2011
- Test fixes
1 parent 33a8442 commit ac86bf8

16 files changed

+92
-55
lines changed
 

‎ext/standard/tests/file/glob_variation.phpt

+21-16
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,24 @@ array(0) {
325325
}
326326

327327
-- Iteration 8 --
328-
array(0) {
329-
}
330-
array(0) {
331-
}
332-
array(0) {
333-
}
334-
array(1) {
335-
[0]=>
336-
string(%d) "%s/glob_variation/WONDER5"
337-
}
338-
array(0) {
339-
}
340-
array(0) {
341-
}
328+
329+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
330+
NULL
331+
332+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
333+
NULL
334+
335+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
336+
NULL
337+
338+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
339+
NULL
340+
341+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
342+
NULL
343+
344+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
345+
NULL
342346

343347
-- Iteration 9 --
344348
array(0) {
@@ -441,8 +445,9 @@ array(1) {
441445
array(0) {
442446
}
443447
-- Iteration 8 --
444-
array(0) {
445-
}
448+
449+
Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
450+
NULL
446451
-- Iteration 9 --
447452
array(0) {
448453
}

‎ext/standard/tests/file/is_dir_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool(false)
4242
bool(false)
4343
bool(false)
4444

45-
Warning: is_dir() expects parameter 1 to be string, resource given in %s on line %d
45+
Warning: is_dir() expects parameter 1 to be valid path, resource given in %s on line %d
4646
NULL
4747
bool(false)
4848
bool(false)

‎ext/standard/tests/file/is_dir_variation4.phpt

+6-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,13 @@ bool(true)
7777
bool(false)
7878

7979
-- Iteration 9 --
80-
bool(true)
80+
81+
Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
82+
NULL
8183

8284
-- Iteration 10 --
83-
bool(true)
85+
86+
Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
87+
NULL
8488

8589
*** Done ***

‎ext/standard/tests/file/is_executable_variation1.phpt

+6-2
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,13 @@ bool(false)
7676
-- Iteration 5 --
7777
bool(false)
7878
-- Iteration 6 --
79-
bool(true)
79+
80+
Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
81+
NULL
8082
-- Iteration 7 --
81-
bool(true)
83+
84+
Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
85+
NULL
8286
-- Iteration 8 --
8387
bool(false)
8488
-- Iteration 9 --

‎ext/standard/tests/file/is_executable_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ bool(false)
6262
bool(false)
6363
bool(false)
6464

65-
Warning: is_executable() expects parameter 1 to be string, array given in %s on line %d
65+
Warning: is_executable() expects parameter 1 to be valid path, array given in %s on line %d
6666
NULL
6767
bool(false)
6868
Done

‎ext/standard/tests/file/is_file_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Warning: is_file() expects exactly 1 parameter, 2 given in %s on line %d
4545
NULL
4646
bool(false)
4747

48-
Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d
48+
Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
4949
NULL
5050

5151
*** Done ***

‎ext/standard/tests/file/is_file_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bool(false)
5151
bool(false)
5252
bool(false)
5353

54-
Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d
54+
Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
5555
NULL
5656
bool(false)
5757
bool(false)

‎ext/standard/tests/file/is_file_variation4.phpt

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ bool(false)
6767
- Iteration 6 -
6868
bool(false)
6969
- Iteration 7 -
70-
bool(true)
70+
71+
Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
72+
NULL
7173
- Iteration 8 -
72-
bool(true)
74+
75+
Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
76+
NULL
7377

7478
*** Done ***

‎ext/standard/tests/file/is_readable_variation1.phpt

+9-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,17 @@ bool(false)
8787
-- Iteration 6 --
8888
bool(false)
8989
-- Iteration 7 --
90-
bool(true)
90+
91+
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
92+
NULL
9193
-- Iteration 8 --
92-
bool(true)
94+
95+
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
96+
NULL
9397
-- Iteration 9 --
94-
bool(true)
98+
99+
Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
100+
NULL
95101
-- Iteration 10 --
96102
bool(true)
97103
-- Iteration 11 --

‎ext/standard/tests/file/is_readable_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bool(false)
6161
bool(false)
6262
bool(false)
6363

64-
Warning: is_readable() expects parameter 1 to be string, array given in %s on line %d
64+
Warning: is_readable() expects parameter 1 to be valid path, array given in %s on line %d
6565
NULL
6666
bool(false)
6767
Done

‎ext/standard/tests/file/is_writable_variation1.phpt

+19-7
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,30 @@ bool(false)
9696
bool(false)
9797
bool(false)
9898
-- Iteration 7 --
99-
bool(true)
100-
bool(true)
99+
100+
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
101+
NULL
102+
103+
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
104+
NULL
101105
-- Iteration 8 --
102-
bool(true)
103-
bool(true)
106+
107+
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
108+
NULL
109+
110+
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
111+
NULL
104112
-- Iteration 9 --
105-
bool(true)
106-
bool(true)
113+
114+
Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
115+
NULL
116+
117+
Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
118+
NULL
107119
-- Iteration 10 --
108120
bool(true)
109121
bool(true)
110122
-- Iteration 11 --
111123
bool(true)
112124
bool(true)
113-
Done
125+
Done

‎ext/standard/tests/file/is_writable_variation3.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ bool(false)
6767
bool(false)
6868
bool(false)
6969

70-
Warning: is_writable() expects parameter 1 to be string, array given in %s on line %d
70+
Warning: is_writable() expects parameter 1 to be valid path, array given in %s on line %d
7171
NULL
7272

73-
Warning: is_writeable() expects parameter 1 to be string, array given in %s on line %d
73+
Warning: is_writeable() expects parameter 1 to be valid path, array given in %s on line %d
7474
NULL
7575
bool(false)
7676
bool(false)

‎ext/standard/tests/file/lchown_error.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ bool(true)
6767
Warning: lchown(): No such file or directory in %s on line %d
6868
bool(false)
6969

70-
Warning: lchown() expects parameter 1 to be string, object given in %s on line %d
70+
Warning: lchown() expects parameter 1 to be valid path, object given in %s on line %d
7171
bool(true)
7272

73-
Warning: lchown() expects parameter 1 to be string, array given in %s on line %d
73+
Warning: lchown() expects parameter 1 to be valid path, array given in %s on line %d
7474
bool(true)
7575

7676
Warning: lchown(): Operation not permitted in %s on line %d

‎ext/standard/tests/file/lstat_stat_error.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bool(false)
5151
Warning: lstat(): Lstat failed for 22 in %s on line %d
5252
bool(false)
5353

54-
Warning: lstat() expects parameter 1 to be string, array given in %s on line %d
54+
Warning: lstat() expects parameter 1 to be valid path, array given in %s on line %d
5555
NULL
5656

5757
*** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@ bool(false)
7474
Warning: stat(): stat failed for 22 in %s on line %d
7575
bool(false)
7676

77-
Warning: stat() expects parameter 1 to be string, array given in %s on line %d
77+
Warning: stat() expects parameter 1 to be valid path, array given in %s on line %d
7878
NULL
7979
Done

‎ext/standard/tests/file/parse_ini_file_variation4.phpt

+5-5
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,19 @@ Error: 2 - parse_ini_file(0.5): failed to open stream: No such file or directory
145145
bool(false)
146146

147147
--empty array--
148-
Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d)
148+
Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
149149
bool(false)
150150

151151
--int indexed array--
152-
Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d)
152+
Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
153153
bool(false)
154154

155155
--associative array--
156-
Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d)
156+
Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
157157
bool(false)
158158

159159
--nested arrays--
160-
Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d)
160+
Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
161161
bool(false)
162162

163163
--uppercase NULL--
@@ -197,7 +197,7 @@ Error: 2 - parse_ini_file(Class A object): failed to open stream: No such file o
197197
bool(false)
198198

199199
--instance of classWithoutToString--
200-
Error: 2 - parse_ini_file() expects parameter 1 to be string, object given, %s(%d)
200+
Error: 2 - parse_ini_file() expects parameter 1 to be valid path, object given, %s(%d)
201201
bool(false)
202202

203203
--undefined var--

‎ext/standard/tests/file/tempnam_variation7.phpt

+9-7
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,23 @@ File name is => %s%etempnam_variation3.tmp%s
9494
File permissions are => 100600
9595
File created in => temp dir
9696
-- Iteration 6 --
97-
File name is => %s%etempnam_variation3.tmp%s
98-
File permissions are => 100600
99-
File created in => temp dir
97+
98+
Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
99+
-- File is not created --
100+
101+
Warning: unlink(): Invalid argument in %s on line %d
100102
-- Iteration 7 --
101103

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

105-
Warning: unlink(): %s in %s on line %d
107+
Warning: unlink(): Invalid argument in %s on line %d
106108
-- Iteration 8 --
107-
File name is => %s%etempnam_variation3.tmp%s
109+
File name is => /tmp/tempnam_variation3.tmp%s
108110
File permissions are => 100600
109111
File created in => temp dir
110112
-- Iteration 9 --
111-
File name is => %s%etempnam_variation3.tmp%s
113+
File name is => /tmp/tempnam_variation3.tmp%s
112114
File permissions are => 100600
113115
File created in => temp dir
114116

0 commit comments

Comments
 (0)
Please sign in to comment.