fileinfo: Deprecate finfo_close()

This is for consistency with other `*_close()` functions that have become
obsolete when migrating from resources to objects.

Author: TimWolla

NEWS

@@ -70,6 +70,7 @@ PHP                                                                        NEWS
 - Fileinfo:
   . Upgrade to file 5.46. (nielsdos)
   . Change return type of finfo_close() to true. (timwolla)
+  . Deprecate finfo_close(), since it is a noop. (timwolla)
 
 - FPM:
   . Fixed GH-17645 (FPM with httpd ProxyPass does not decode script path).

UPGRADING

@@ -196,6 +196,10 @@ PHP 8.5 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- Fileinfo:
+  . finfo_close() has been deprecated, as it is a noop since the migration
+    to the finfo resource object in PHP 8.1.
+
 - Hash:
   . The MHASH_* constants have been deprecated.  These have been overlooked
     when the mhash*() function family has been deprecated per

ext/fileinfo/fileinfo.c

@@ -31,10 +31,11 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h" /* needed for context stuff */
+#include "Zend/zend_attributes.h"
+#include "Zend/zend_exceptions.h"
 #include "php_fileinfo.h"
 #include "fileinfo_arginfo.h"
 #include "fopen_wrappers.h" /* needed for is_url */
-#include "Zend/zend_exceptions.h"
 
 /* {{{ macros and type definitions */
 typedef struct _php_fileinfo {

ext/fileinfo/fileinfo.stub.php

@@ -92,6 +92,7 @@ public function set_flags(int $flags): true {}
 /** @refcount 1 */
 function finfo_open(int $flags = FILEINFO_NONE, ?string $magic_database = null): finfo|false {}
 
+#[\Deprecated(since: '8.5', message: 'as finfo objects are freed automatically')]
 function finfo_close(finfo $finfo): true {}
 
 function finfo_set_flags(finfo $finfo, int $flags): true {}

ext/fileinfo/fileinfo_arginfo.h

@@ -7,7 +7,6 @@ fileinfo
 $filename = __DIR__ . '/bug79756.xls';
 $finfo = finfo_open(FILEINFO_MIME);
 $mime = finfo_file($finfo, $filename);
-finfo_close($finfo);
 echo $mime;
 ?>
 --EXPECT--

ext/fileinfo/tests/bug79756.phpt

@@ -15,13 +15,11 @@ $m =  "0           byte        x\n".
 file_put_contents($fd, $a);
 $fi = finfo_open(FILEINFO_NONE);
 var_dump(finfo_file($fi, $fd));
-finfo_close($fi);
 
 file_put_contents($fd, $b);
 file_put_contents($fm, $m);
 $fi = finfo_open(FILEINFO_NONE, $fm);
 var_dump(finfo_file($fi, $fd));
-finfo_close($fi);
 ?>
 Done
 --CLEAN--

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

@@ -15,13 +15,11 @@ $m =  "0           byte        x\n".
 file_put_contents($fd, $a);
 $fi = finfo_open(FILEINFO_NONE);
 var_dump(finfo_file($fi, $fd));
-finfo_close($fi);
 
 file_put_contents($fd, $b);
 file_put_contents($fm, $m);
 $fi = finfo_open(FILEINFO_NONE, $fm);
 var_dump(finfo_file($fi, $fd));
-finfo_close($fi);
 ?>
 Done
 --CLEAN--

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

@@ -19,7 +19,6 @@ $fi = finfo_open(FILEINFO_NONE);
 $t = microtime(true);
 var_dump(finfo_file($fi, $fd));
 $t = microtime(true) - $t;
-finfo_close($fi);
 if ($t < 3) {
     echo "Ok\n";
 } else {

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

@@ -23,7 +23,6 @@ $fi = finfo_open(FILEINFO_NONE);
 $t = microtime(true);
 var_dump(finfo_file($fi, $fd));
 $t = microtime(true) - $t;
-finfo_close($fi);
 if ($t < 1.5) {
     echo "Ok\n";
 } else {

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

@@ -19,7 +19,6 @@ $fi = finfo_open(FILEINFO_NONE);
 $t = microtime(true);
 var_dump(finfo_file($fi, $fd));
 $t = microtime(true) - $t;
-finfo_close($fi);
 if ($t < 1.5) {
     echo "Ok\n";
 } else {

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

@@ -27,7 +27,6 @@ foreach( $options as $option ) {
     foreach( $buffers as $string ) {
         var_dump( finfo_buffer( $finfo, $string, $option ) );
     }
-    finfo_close( $finfo );
 }
 
 ?>

ext/fileinfo/tests/finfo_buffer_basic-mb.phpt

@@ -27,7 +27,6 @@ foreach( $options as $option ) {
     foreach( $buffers as $string ) {
         var_dump( finfo_buffer( $finfo, $string, $option ) );
     }
-    finfo_close( $finfo );
 }
 
 ?>

ext/fileinfo/tests/finfo_buffer_basic.phpt

@@ -23,6 +23,8 @@ unset( $finfo );
 *** Testing finfo_close() : basic functionality ***
 object(finfo)#%d (0) {
 }
+
+Deprecated: Function finfo_close() is deprecated since 8.5, as finfo objects are freed automatically in %s on line %d
 bool(true)
 object(finfo)#%d (%d) {
 }

ext/fileinfo/tests/finfo_close_basic.phpt

@@ -15,8 +15,10 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing finfo_close() : error conditions ***
 
 -- Testing finfo_close() function with wrong resource type --
+
+Deprecated: Function finfo_close() is deprecated since 8.5, as finfo objects are freed automatically in %s on line %d
 finfo_close(): Argument #1 ($finfo) must be of type finfo, resource given

ext/fileinfo/tests/finfo_close_error.phpt

@@ -12,8 +12,6 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
 var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
 var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
 
-finfo_close( $finfo );
-
 // OO way
 $finfo = new finfo( FILEINFO_NONE, $magicFile );
 var_dump( $finfo->set_flags( FILEINFO_MIME ) );

ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt

@@ -12,8 +12,6 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
 var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
 var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
 
-finfo_close( $finfo );
-
 // OO way
 $finfo = new finfo( FILEINFO_NONE, $magicFile );
 var_dump( $finfo->set_flags( FILEINFO_MIME ) );

ext/fileinfo/tests/finfo_set_flags_basic.phpt

@@ -18,7 +18,6 @@ foreach($lst as $p) {
 	if ($i !== $exp) {
 		echo "'$p' failed\nexp: '$exp'\ngot: '$i'\n";
 	} 
-	finfo_close($finfo);
 }
 
 echo "==DONE==";