Fix test cases

These tests are not supposed to check the result of `fclose(false)`.
php · Jul 10, 2020 · 2ad75ba · 2ad75ba
1 parent 2297a6d
commit 2ad75ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt
@@ -64,9 +64,9 @@ foreach($paths as $path) {
          }
          else {
             fpassthru($h);
+            fclose($h);
             echo "\n";
          }
-         fclose($h);
 };
 
 unlink($firstfile);
@@ -91,22 +91,16 @@ file in root
 Warning: fopen(c\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --\--
 
 Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --/--
 
 Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --c:fopen10.tmpdirTwo--
 file in fopen10.tmpdirTwo
 
@@ -115,8 +109,6 @@ file in fopen10.tmpdirTwo
 Warning: fopen(c:adir\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --c:\/--
 file in root
 
@@ -136,5 +128,3 @@ file in fopen10.tmpDir
 
 Warning: fopen(/sortout\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
-
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt
@@ -63,9 +63,9 @@ foreach($paths as $path) {
          }
          else {
             fpassthru($h);
+            fclose($h);
             echo "\n";
          }
-         fclose($h);
 };
 
 unlink($firstfile);
@@ -89,22 +89,16 @@ file in root
 Warning: fopen(c\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --\--
 
 Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --/--
 
 Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --c:fopen11.tmpdirTwo--
 file in fopen11.tmpdirTwo
 
@@ -113,8 +107,6 @@ file in fopen11.tmpdirTwo
 Warning: fopen(c:adir\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
-
 --c:\/--
 file in root
 
@@ -134,5 +126,3 @@ file in fopen11.tmpDir
 
 Warning: fopen(/sortout\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
-
-Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d