Skip to content

Commit 7831f65

Browse files
authored
fileinfo: Stop calling finfo_close() in tests (#18405)
This function is a noop and will be proposed for deprecation. This patch removes the useless calls.
1 parent 0e1bbf9 commit 7831f65

11 files changed

+0
-15
lines changed

ext/fileinfo/tests/bug79756.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ fileinfo
77
$filename = __DIR__ . '/bug79756.xls';
88
$finfo = finfo_open(FILEINFO_MIME);
99
$mime = finfo_file($finfo, $filename);
10-
finfo_close($finfo);
1110
echo $mime;
1211
?>
1312
--EXPECT--

ext/fileinfo/tests/cve-2014-1943-mb.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ $m = "0 byte x\n".
1515
file_put_contents($fd, $a);
1616
$fi = finfo_open(FILEINFO_NONE);
1717
var_dump(finfo_file($fi, $fd));
18-
finfo_close($fi);
1918

2019
file_put_contents($fd, $b);
2120
file_put_contents($fm, $m);
2221
$fi = finfo_open(FILEINFO_NONE, $fm);
2322
var_dump(finfo_file($fi, $fd));
24-
finfo_close($fi);
2523
?>
2624
Done
2725
--CLEAN--

ext/fileinfo/tests/cve-2014-1943.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ $m = "0 byte x\n".
1515
file_put_contents($fd, $a);
1616
$fi = finfo_open(FILEINFO_NONE);
1717
var_dump(finfo_file($fi, $fd));
18-
finfo_close($fi);
1918

2019
file_put_contents($fd, $b);
2120
file_put_contents($fm, $m);
2221
$fi = finfo_open(FILEINFO_NONE, $fm);
2322
var_dump(finfo_file($fi, $fd));
24-
finfo_close($fi);
2523
?>
2624
Done
2725
--CLEAN--

ext/fileinfo/tests/cve-2014-3538-mb.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $fi = finfo_open(FILEINFO_NONE);
1919
$t = microtime(true);
2020
var_dump(finfo_file($fi, $fd));
2121
$t = microtime(true) - $t;
22-
finfo_close($fi);
2322
if ($t < 3) {
2423
echo "Ok\n";
2524
} else {

ext/fileinfo/tests/cve-2014-3538-nojit.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ $fi = finfo_open(FILEINFO_NONE);
2323
$t = microtime(true);
2424
var_dump(finfo_file($fi, $fd));
2525
$t = microtime(true) - $t;
26-
finfo_close($fi);
2726
if ($t < 1.5) {
2827
echo "Ok\n";
2928
} else {

ext/fileinfo/tests/cve-2014-3538.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $fi = finfo_open(FILEINFO_NONE);
1919
$t = microtime(true);
2020
var_dump(finfo_file($fi, $fd));
2121
$t = microtime(true) - $t;
22-
finfo_close($fi);
2322
if ($t < 1.5) {
2423
echo "Ok\n";
2524
} else {

ext/fileinfo/tests/finfo_buffer_basic-mb.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ foreach( $options as $option ) {
2727
foreach( $buffers as $string ) {
2828
var_dump( finfo_buffer( $finfo, $string, $option ) );
2929
}
30-
finfo_close( $finfo );
3130
}
3231

3332
?>

ext/fileinfo/tests/finfo_buffer_basic.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ foreach( $options as $option ) {
2727
foreach( $buffers as $string ) {
2828
var_dump( finfo_buffer( $finfo, $string, $option ) );
2929
}
30-
finfo_close( $finfo );
3130
}
3231

3332
?>

ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
1212
var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
1313
var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
1414

15-
finfo_close( $finfo );
16-
1715
// OO way
1816
$finfo = new finfo( FILEINFO_NONE, $magicFile );
1917
var_dump( $finfo->set_flags( FILEINFO_MIME ) );

ext/fileinfo/tests/finfo_set_flags_basic.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
1212
var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
1313
var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
1414

15-
finfo_close( $finfo );
16-
1715
// OO way
1816
$finfo = new finfo( FILEINFO_NONE, $magicFile );
1917
var_dump( $finfo->set_flags( FILEINFO_MIME ) );

ext/fileinfo/tests/finfo_upstream.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ foreach($lst as $p) {
1818
if ($i !== $exp) {
1919
echo "'$p' failed\nexp: '$exp'\ngot: '$i'\n";
2020
}
21-
finfo_close($finfo);
2221
}
2322

2423
echo "==DONE==";

0 commit comments

Comments
 (0)