Skip to content

Commit 2ad75ba

Browse files
committed
Fix test cases
These tests are not supposed to check the result of `fclose(false)`.
1 parent 2297a6d commit 2ad75ba

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

ext/standard/tests/file/fopen_variation10-win32.phpt

+1-11
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ foreach($paths as $path) {
6464
}
6565
else {
6666
fpassthru($h);
67+
fclose($h);
6768
echo "\n";
6869
}
69-
fclose($h);
7070
};
7171

7272
unlink($firstfile);
@@ -91,22 +91,16 @@ file in root
9191
Warning: fopen(c\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
9292
file not opened for read
9393

94-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
95-
9694
--\--
9795

9896
Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
9997
file not opened for read
10098

101-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
102-
10399
--/--
104100

105101
Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
106102
file not opened for read
107103

108-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
109-
110104
--c:fopen10.tmpdirTwo--
111105
file in fopen10.tmpdirTwo
112106

@@ -115,8 +109,6 @@ file in fopen10.tmpdirTwo
115109
Warning: fopen(c:adir\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
116110
file not opened for read
117111

118-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
119-
120112
--c:\/--
121113
file in root
122114

@@ -136,5 +128,3 @@ file in fopen10.tmpDir
136128

137129
Warning: fopen(/sortout\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
138130
file not opened for read
139-
140-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d

ext/standard/tests/file/fopen_variation11-win32.phpt

+1-11
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ foreach($paths as $path) {
6363
}
6464
else {
6565
fpassthru($h);
66+
fclose($h);
6667
echo "\n";
6768
}
68-
fclose($h);
6969
};
7070

7171
unlink($firstfile);
@@ -89,22 +89,16 @@ file in root
8989
Warning: fopen(c\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
9090
file not opened for read
9191

92-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
93-
9492
--\--
9593

9694
Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
9795
file not opened for read
9896

99-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
100-
10197
--/--
10298

10399
Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
104100
file not opened for read
105101

106-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
107-
108102
--c:fopen11.tmpdirTwo--
109103
file in fopen11.tmpdirTwo
110104

@@ -113,8 +107,6 @@ file in fopen11.tmpdirTwo
113107
Warning: fopen(c:adir\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
114108
file not opened for read
115109

116-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
117-
118110
--c:\/--
119111
file in root
120112

@@ -134,5 +126,3 @@ file in fopen11.tmpDir
134126

135127
Warning: fopen(/sortout\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
136128
file not opened for read
137-
138-
Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d

0 commit comments

Comments
 (0)